* [gentoo-commits] repo/gentoo:master commit in: app-admin/calamares/, app-admin/calamares/files/
@ 2020-10-21 11:54 David Seifert
0 siblings, 0 replies; 3+ messages in thread
From: David Seifert @ 2020-10-21 11:54 UTC (permalink / raw
To: gentoo-commits
commit: 2a0cbc53e96583cc6572ea7a7846b750960df4ff
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 21 11:53:48 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Oct 21 11:53:48 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a0cbc53
app-admin/calamares: Version bump to 3.2.32.1
Bug: https://bugs.gentoo.org/744316
Closes: https://bugs.gentoo.org/749984
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: David Seifert <soap <AT> gentoo.org>
app-admin/calamares/Manifest | 1 +
app-admin/calamares/calamares-3.2.32.1.ebuild | 95 ++++++++++++++++++++++
.../calamares-3.2.32.1-remove-broken-tests.ebuild | 70 ++++++++++++++++
3 files changed, 166 insertions(+)
diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index 98c99a4cf27..9901780ae48 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1 +1,2 @@
DIST calamares-3.2.28.3.tar.gz 3837417 BLAKE2B d248423e09aa21cd3808e00408f34d7c178a19d2c82bed5ab0dedff945ab7aad601f4aefbee62a772e4fdf5915dc3888af1fb0711e4bbe1e9b089adfbae2b1a0 SHA512 124de0bdd09fe15450460fa858c6f3df3a00c609684238bf3bc8eb18f10c39c4bc0e8fd02b0e9bae50d42bade2716cb16247c23ace397288a5e8f27790b60280
+DIST calamares-3.2.32.1.tar.gz 3425260 BLAKE2B e10174d400a402cfe3d7a015f4fe7a02ad1653e5a4cdf65c31360467e3b3ff10629d991dd206424d51c67533f8ab550e09e74b4334dbebe9e5fec1a06ed0dbd4 SHA512 30e523dd3c340f9c4385a53a4011ed0f16e317572fa2e5b6acfe638aaf029538f0ab85924999e9683ba10014be99b3c35ff3234bc85cefa2ccd14e2715c87222
diff --git a/app-admin/calamares/calamares-3.2.32.1.ebuild b/app-admin/calamares/calamares-3.2.32.1.ebuild
new file mode 100644
index 00000000000..0c4287a8e8f
--- /dev/null
+++ b/app-admin/calamares/calamares-3.2.32.1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit ecm python-single-r1
+
+DESCRIPTION="Distribution-independent installer framework"
+HOMEPAGE="https://calamares.io"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="5"
+KEYWORDS="~amd64"
+IUSE="+networkmanager +upower"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+ dev-qt/linguist-tools:5
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+ dev-cpp/yaml-cpp:=
+ $(python_gen_cond_dep '
+ >=dev-libs/boost-1.55:=[python,${PYTHON_MULTI_USEDEP}]
+ dev-libs/libpwquality[${PYTHON_MULTI_USEDEP}]
+ ')
+ dev-qt/qtconcurrent:5
+ dev-qt/qtdbus:5
+ dev-qt/qtdeclarative:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwebengine:5[widgets]
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ kde-frameworks/kconfig:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/kcrash:5
+ kde-frameworks/kpackage:5
+ kde-frameworks/kparts:5
+ kde-frameworks/kservice:5
+ sys-apps/dbus
+ sys-apps/dmidecode
+ sys-auth/polkit-qt
+ >=sys-libs/kpmcore-4.0.0:5=
+"
+DEPEND="${COMMON_DEPEND}
+ test? ( dev-qt/qttest:5 )
+"
+RDEPEND="${COMMON_DEPEND}
+ app-admin/sudo
+ dev-libs/libatasmart
+ net-misc/rsync
+ || ( sys-boot/grub:2 sys-boot/systemd-boot )
+ sys-boot/os-prober
+ sys-fs/squashfs-tools
+ sys-libs/timezone-data
+ virtual/udev
+ networkmanager? ( net-misc/networkmanager )
+ upower? ( sys-power/upower )
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.2.32.1-remove-broken-tests.ebuild )
+
+src_prepare() {
+ ecm_src_prepare
+ export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
+ PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
+ PYTHON_CFLAGS="$(python_get_CFLAGS)"\
+ PYTHON_LIBS="$(python_get_LIBS)"
+
+ sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' \
+ calamares.desktop || die
+ sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' \
+ calamares.desktop || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DINSTALL_CONFIG=ON
+ -DWEBVIEW_FORCE_WEBKIT=OFF
+ -DCMAKE_DISABLE_FIND_PACKAGE_LIBPARTED=ON
+ -DWITH_PYTHONQT=OFF
+ )
+
+ ecm_src_configure
+}
+
+src_install() {
+ ecm_src_install
+ dobin "${FILESDIR}"/calamares-pkexec
+}
diff --git a/app-admin/calamares/files/calamares-3.2.32.1-remove-broken-tests.ebuild b/app-admin/calamares/files/calamares-3.2.32.1-remove-broken-tests.ebuild
new file mode 100644
index 00000000000..6ecf6c36a99
--- /dev/null
+++ b/app-admin/calamares/files/calamares-3.2.32.1-remove-broken-tests.ebuild
@@ -0,0 +1,70 @@
+--- a/src/libcalamares/CMakeLists.txt
++++ b/src/libcalamares/CMakeLists.txt
+@@ -238,12 +238,6 @@
+ endif()
+
+ calamares_add_test(
+- libcalamaresutilstest
+- SOURCES
+- utils/Tests.cpp
+-)
+-
+-calamares_add_test(
+ libcalamaresutilspathstest
+ SOURCES
+ utils/TestPaths.cpp
+--- a/src/modules/locale/CMakeLists.txt
++++ b/src/modules/locale/CMakeLists.txt
+@@ -37,18 +37,3 @@
+ yamlcpp
+ SHARED_LIB
+ )
+-
+-calamares_add_test(
+- localetest
+- SOURCES
+- Tests.cpp
+- Config.cpp
+- LocaleConfiguration.cpp
+- SetTimezoneJob.cpp
+- timezonewidget/TimeZoneImage.cpp
+- DEFINITIONS
+- SOURCE_DIR="${CMAKE_CURRENT_LIST_DIR}/images"
+- DEBUG_TIMEZONES=1
+- LIBRARIES
+- Qt5::Gui
+-)
+--- a/src/modules/packagechooser/CMakeLists.txt
++++ b/src/modules/packagechooser/CMakeLists.txt
+@@ -58,13 +58,3 @@
+ ${_extra_libraries}
+ SHARED_LIB
+ )
+-
+-calamares_add_test(
+- packagechoosertest
+- GUI
+- SOURCES
+- Tests.cpp
+- LIBRARIES
+- calamares_viewmodule_packagechooser
+- ${_extra_libraries}
+-)
+--- a/src/modules/users/CMakeLists.txt
++++ b/src/modules/users/CMakeLists.txt
+@@ -70,15 +70,6 @@
+ )
+
+ calamares_add_test(
+- usershostnametest
+- SOURCES
+- TestSetHostNameJob.cpp
+- SetHostNameJob.cpp
+- LIBRARIES
+- Qt5::DBus # HostName job can use DBus to systemd
+-)
+-
+-calamares_add_test(
+ userstest
+ SOURCES
+ Tests.cpp
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/calamares/, app-admin/calamares/files/
@ 2021-08-07 16:07 Sebastian Pipping
0 siblings, 0 replies; 3+ messages in thread
From: Sebastian Pipping @ 2021-08-07 16:07 UTC (permalink / raw
To: gentoo-commits
commit: 4e7137845d4e053f2143446cbd427add660f61de
Author: Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 7 16:04:05 2021 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sat Aug 7 16:06:39 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e713784
app-admin/calamares: Fix odd patch filename
Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org>
Package-Manager: Portage-3.0.20, Repoman-3.0.3
app-admin/calamares/calamares-3.2.32.1.ebuild | 2 +-
...broken-tests.ebuild => calamares-3.2.32.1-remove-broken-tests.patch} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-admin/calamares/calamares-3.2.32.1.ebuild b/app-admin/calamares/calamares-3.2.32.1.ebuild
index 2f6bd1c6439..ee3b007777a 100644
--- a/app-admin/calamares/calamares-3.2.32.1.ebuild
+++ b/app-admin/calamares/calamares-3.2.32.1.ebuild
@@ -63,7 +63,7 @@ RDEPEND="${COMMON_DEPEND}
upower? ( sys-power/upower )
"
-PATCHES=( "${FILESDIR}"/${PN}-3.2.32.1-remove-broken-tests.ebuild )
+PATCHES=( "${FILESDIR}"/${PN}-3.2.32.1-remove-broken-tests.patch )
src_prepare() {
ecm_src_prepare
diff --git a/app-admin/calamares/files/calamares-3.2.32.1-remove-broken-tests.ebuild b/app-admin/calamares/files/calamares-3.2.32.1-remove-broken-tests.patch
similarity index 100%
rename from app-admin/calamares/files/calamares-3.2.32.1-remove-broken-tests.ebuild
rename to app-admin/calamares/files/calamares-3.2.32.1-remove-broken-tests.patch
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/calamares/, app-admin/calamares/files/
@ 2024-09-05 16:50 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2024-09-05 16:50 UTC (permalink / raw
To: gentoo-commits
commit: 48663c60d421834bbd9711b4faa957d77910153e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 5 16:37:35 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Sep 5 16:50:24 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48663c60
app-admin/calamares: drop 3.2.60-r5
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-admin/calamares/Manifest | 1 -
app-admin/calamares/calamares-3.2.60-r5.ebuild | 123 ---------------------
.../calamares/files/calamares-3.2.60-ldflags.patch | 14 ---
app-admin/calamares/files/calamares-pkexec | 2 -
4 files changed, 140 deletions(-)
diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index 66fea02d53c4..0afd81546d68 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1,2 +1 @@
-DIST calamares-3.2.60.tar.gz 4260547 BLAKE2B edf300ce9d534cd506b2341b3ce314bbde7fcc6dac40ad2307e549bbeab7a63ddfe6d7ae8c8176ee1ad4e4b02c9eadcd5efc66872e1f464c39200d8d117dca80 SHA512 dfc01212f74694f10d40dd1d1ad61db384c83021dc9cd4753027a9cf40b92c8e8b2d5032df76533a8f22c05448aba546c9bb21c38c03fb0cb8d7de35fb79fb7f
DIST calamares-3.3.6.tar.gz 4733000 BLAKE2B 6c5bae1c7939d84fdbf599e7c5b478c799efbdf21f1aa120fda05106775477274eafd5687a787c177b747226c8438aec72acc90414bff9c7952d71ce8cb5e376 SHA512 3fa38f136a7a8c1f7dc2be8f98d2f323e38ab3bb535ffaf833d26839c3a2fe1d1dab392cd103380098328fc7465f262cde7ae09efa996c7fb66233d8391ae4f6
diff --git a/app-admin/calamares/calamares-3.2.60-r5.ebuild b/app-admin/calamares/calamares-3.2.60-r5.ebuild
deleted file mode 100644
index 592c5af31d92..000000000000
--- a/app-admin/calamares/calamares-3.2.60-r5.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="true"
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit ecm python-single-r1
-
-DESCRIPTION="Distribution-independent installer framework"
-HOMEPAGE="https://calamares.io"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="5"
-KEYWORDS="~amd64"
-IUSE="+networkmanager +upower"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
- dev-qt/linguist-tools:5
-"
-COMMON_DEPEND="${PYTHON_DEPS}
- dev-cpp/yaml-cpp:=
- $(python_gen_cond_dep '
- dev-libs/boost:=[python,${PYTHON_USEDEP}]
- dev-libs/libpwquality[${PYTHON_USEDEP}]
- ')
- dev-qt/qtconcurrent:5
- dev-qt/qtdbus:5
- dev-qt/qtdeclarative:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtsvg:5
- dev-qt/qtwebengine:5[widgets]
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- kde-frameworks/kconfig:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/kcrash:5
- kde-frameworks/kpackage:5
- kde-frameworks/kparts:5
- kde-frameworks/kservice:5
- sys-apps/dbus
- sys-apps/dmidecode
- sys-auth/polkit-qt[qt5(+)]
- >=sys-libs/kpmcore-4.0.0:5=
- virtual/libcrypt:=
-"
-DEPEND="${COMMON_DEPEND}
- test? ( dev-qt/qttest:5 )
-"
-RDEPEND="${COMMON_DEPEND}
- app-admin/sudo
- dev-libs/libatasmart
- net-misc/rsync
- || (
- sys-boot/grub:2
- sys-apps/systemd[gnuefi(-)]
- sys-apps/systemd[boot(-)]
- sys-apps/systemd-utils[boot]
- )
- sys-boot/os-prober
- sys-fs/squashfs-tools
- sys-libs/timezone-data
- virtual/udev
- networkmanager? ( net-misc/networkmanager )
- upower? ( sys-power/upower )
-"
-
-PATCHES=(
- "${FILESDIR}/${P}-ldflags.patch"
-)
-
-src_prepare() {
- ecm_src_prepare
- export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
- PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
- PYTHON_CFLAGS="$(python_get_CFLAGS)"\
- PYTHON_LIBS="$(python_get_LIBS)"
-
- sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' \
- calamares.desktop || die
- sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' \
- calamares.desktop || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -DINSTALL_CONFIG=ON
- -DWEBVIEW_FORCE_WEBKIT=OFF
- -DCMAKE_DISABLE_FIND_PACKAGE_LIBPARTED=ON
- -DWITH_PYTHONQT=OFF
- )
-
- ecm_src_configure
-}
-
-src_test() {
- local myctestargs=(
- # Skipped tests:
- # load-dracut: tries and fails to find Dracut config
- # libcalamaresnetworktest: needs network
- # libcalamaresutilstest: inspects /tmp (expects namespace?)
- #
- # Need investigation:
- # test_libcalamaresuipaste
- # validate-netinstall
- # validate-services-systemd
- # localetest
- # machineidtest
- # packagechoosertest
- -E "(load-dracut|libcalamaresnetworktest|libcalamaresutilstest|test_libcalamaresuipaste|validate-netinstall|validate-services-systemd|localetest|machineidtest|packagechoosertest)"
- )
-
- cmake_src_test
-}
-
-src_install() {
- ecm_src_install
- dobin "${FILESDIR}"/calamares-pkexec
-}
diff --git a/app-admin/calamares/files/calamares-3.2.60-ldflags.patch b/app-admin/calamares/files/calamares-3.2.60-ldflags.patch
deleted file mode 100644
index f81c49b50641..000000000000
--- a/app-admin/calamares/files/calamares-3.2.60-ldflags.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-From: Mario Haustein <mario.haustein@hrz.tu-chemnitz.de>
-Bug: https://bugs.gentoo.org/865281
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -203,7 +203,7 @@ set( CMAKE_C_FLAGS_MINSIZEREL "-Os -DNDEBUG" )
- set( CMAKE_C_FLAGS_RELEASE "-O4 -DNDEBUG" )
- set( CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g" )
-
--set( CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined -Wl,--fatal-warnings" )
-+set( CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined -Wl,--fatal-warnings ${CMAKE_SHARED_LINKER_FLAGS}" )
-
- if( CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
- message( STATUS "Found Clang ${CMAKE_CXX_COMPILER_VERSION}, setting up Clang-specific compiler flags." )
diff --git a/app-admin/calamares/files/calamares-pkexec b/app-admin/calamares/files/calamares-pkexec
deleted file mode 100644
index 3300d3b70c61..000000000000
--- a/app-admin/calamares/files/calamares-pkexec
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-pkexec "/usr/bin/calamares" "$@"
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-09-05 16:50 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-10-21 11:54 [gentoo-commits] repo/gentoo:master commit in: app-admin/calamares/, app-admin/calamares/files/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2021-08-07 16:07 Sebastian Pipping
2024-09-05 16:50 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox