[gentoo-commits] repo/gentoo:master commit in: kde-apps/kalarm/files/

2022-12-03 Thread Andreas Sturmlechner
commit: b64f3378599e8c9aa4beeb50b01153a003b5b891
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Dec  3 10:49:32 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Dec  3 10:50:47 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b64f3378

kde-apps/kalarm: Drop obsolete patch

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../kalarm/files/kalarm-22.04.3-without_x11.patch  | 73 --
 1 file changed, 73 deletions(-)

diff --git a/kde-apps/kalarm/files/kalarm-22.04.3-without_x11.patch 
b/kde-apps/kalarm/files/kalarm-22.04.3-without_x11.patch
deleted file mode 100644
index 2f904201566b..
--- a/kde-apps/kalarm/files/kalarm-22.04.3-without_x11.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From f8646ef6db5b4d0e6add5c9a83a13707f6175b13 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner 
-Date: Sat, 27 Nov 2021 12:59:32 +0100
-Subject: [PATCH] Add CMake option to build WITHOUT_X11
-
-We want to be able to build without X11 support even if some of the used
-libraries may not work w/o X11 themselves yet or need to be built with
-X11 support for other reverse dependencies.
-
-KDEPIM_HAVE_X11 already exists and is set automagically so far, but using
--DCMAKE_DISABLE_FIND_PACKAGE_X11 will break if any dependencies list X11
-as required in their cmake config.
-
-Introducing this option means there is no behavior change by default,
-cmake will just skip finding X11 or adding unwanted features if the
-option is enabled.
-
-* backported to release/22.04
-
-Signed-off-by: Andreas Sturmlechner 

- CMakeLists.txt | 17 +
- src/CMakeLists.txt |  2 +-
- 2 files changed, 10 insertions(+), 9 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 06623ad9..3446a87c 100644
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -114,18 +114,19 @@ find_package(KF5PimTextEdit ${KPIMTEXTEDIT_LIB_VERSION} 
CONFIG REQUIRED)
- configure_file(kalarm-version-string.h.cmake 
${CMAKE_CURRENT_BINARY_DIR}/kalarm-version-string.h @ONLY)
- 
- if (NOT APPLE)
--find_package(X11)
--endif()
--if (X11_FOUND)
--if (QT_MAJOR_VERSION STREQUAL "5")
--find_package(Qt5X11Extras ${QT_REQUIRED_VERSION} REQUIRED NO_MODULE)
--else()
--#TODO X11 on Qt6
-+option(WITHOUT_X11 "Build without X11 integration (skips finding X11)" 
OFF)
-+if (NOT WITHOUT_X11)
-+find_package(X11)
-+set(KDEPIM_HAVE_X11 ${X11_FOUND})
-+if (X11_FOUND)
-+find_package(Qt5X11Extras ${QT_REQUIRED_VERSION} REQUIRED 
NO_MODULE)
-+endif()
- endif()
- endif()
-+add_feature_info(WITHOUT_X11 ${WITHOUT_X11} "Build without X11 integration")
-+
- set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
- 
--set(KDEPIM_HAVE_X11 ${X11_FOUND})
- configure_file(src/config-kalarm.h.cmake 
${CMAKE_CURRENT_BINARY_DIR}/config-kalarm.h)
- 
- include_directories(${kalarm_SOURCE_DIR} ${kalarm_BINARY_DIR})
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index e8d70203..3aee2965 100644
 a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -298,7 +298,7 @@ target_link_libraries(kalarm_bin
- KF5::PimCommon
- )
- 
--if (Qt${QT_MAJOR_VERSION}X11Extras_FOUND)
-+if(KDEPIM_HAVE_X11)
- target_link_libraries(kalarm_bin Qt${QT_MAJOR_VERSION}::X11Extras 
${X11_X11_LIB})
- endif()
- 
--- 
-2.35.1
-



[gentoo-commits] repo/gentoo:master commit in: kde-apps/kalarm/files/

2022-08-23 Thread Andreas Sturmlechner
commit: 462eed65e8bfa0380704852d616e2d210e9c41b7
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Aug 23 11:01:04 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Aug 23 11:01:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=462eed65

kde-apps/kalarm: Add missing patch

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../kalarm/files/kalarm-22.07.90-without_x11.patch | 75 ++
 1 file changed, 75 insertions(+)

diff --git a/kde-apps/kalarm/files/kalarm-22.07.90-without_x11.patch 
b/kde-apps/kalarm/files/kalarm-22.07.90-without_x11.patch
new file mode 100644
index ..6dc0d4e02d0d
--- /dev/null
+++ b/kde-apps/kalarm/files/kalarm-22.07.90-without_x11.patch
@@ -0,0 +1,75 @@
+From 308aa74653acc86cd6a206599a56500c827927ef Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Sat, 27 Nov 2021 12:59:32 +0100
+Subject: [PATCH] Add CMake option to build WITHOUT_X11
+
+We want to be able to build without X11 support even if some of the used
+libraries may not work w/o X11 themselves yet or need to be built with
+X11 support for other reverse dependencies.
+
+KDEPIM_HAVE_X11 already exists and is set automagically so far, but using
+-DCMAKE_DISABLE_FIND_PACKAGE_X11 will break if any dependencies list X11
+as required in their cmake config.
+
+Introducing this option means there is no behavior change by default,
+cmake will just skip finding X11 or adding unwanted features if the
+option is enabled.
+
+Signed-off-by: Andreas Sturmlechner 
+---
+ CMakeLists.txt | 21 +
+ src/CMakeLists.txt |  2 +-
+ 2 files changed, 14 insertions(+), 9 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 05ef5181..c1849f2a 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -127,18 +127,23 @@ endif()
+ configure_file(kalarm-version-string.h.cmake 
${CMAKE_CURRENT_BINARY_DIR}/kalarm-version-string.h @ONLY)
+ 
+ if (NOT APPLE)
+-find_package(X11)
+-endif()
+-if (X11_FOUND)
+-if (QT_MAJOR_VERSION STREQUAL "5")
+-find_package(Qt5X11Extras ${QT_REQUIRED_VERSION} REQUIRED NO_MODULE)
+-else()
+-find_package(Qt${QT_MAJOR_VERSION} ${QT_REQUIRED_VERSION} CONFIG 
REQUIRED Gui) # qtx11extras_p.h for Qt6 < 6.2
++option(WITHOUT_X11 "Build without X11 integration (skips finding X11)" 
OFF)
++if (NOT WITHOUT_X11)
++find_package(X11)
++set(KDEPIM_HAVE_X11 ${X11_FOUND})
++if (X11_FOUND)
++if (QT_MAJOR_VERSION STREQUAL "5")
++find_package(Qt5X11Extras ${QT_REQUIRED_VERSION} REQUIRED 
NO_MODULE)
++else()
++find_package(Qt${QT_MAJOR_VERSION} ${QT_REQUIRED_VERSION} 
CONFIG REQUIRED Gui) # qtx11extras_p.h for Qt6 < 6.2
++endif()
++endif()
+ endif()
++add_feature_info(WITHOUT_X11 ${WITHOUT_X11} "Build without X11 
integration")
+ endif()
++
+ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
+ 
+-set(KDEPIM_HAVE_X11 ${X11_FOUND})
+ configure_file(src/config-kalarm.h.cmake 
${CMAKE_CURRENT_BINARY_DIR}/config-kalarm.h)
+ 
+ include_directories(${kalarm_SOURCE_DIR} ${kalarm_BINARY_DIR})
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 6bb3e5ba..9a3fb73c 100644
+--- a/src/CMakeLists.txt
 b/src/CMakeLists.txt
+@@ -335,7 +335,7 @@ if (ENABLE_WAKE_FROM_SUSPEND)
+   target_link_libraries(kalarm_bin KF5::AuthCore)
+ endif()
+ 
+-if(X11_FOUND)
++if(KDEPIM_HAVE_X11)
+ if (QT_MAJOR_VERSION STREQUAL "5")
+ target_link_libraries(kalarm_bin Qt${QT_MAJOR_VERSION}::X11Extras 
${X11_X11_LIB})
+ elseif (Qt6_VERSION_MINOR LESS 2)
+-- 
+GitLab
+



[gentoo-commits] repo/gentoo:master commit in: kde-apps/kalarm/files/

2021-12-05 Thread Conrad Kostecki
commit: 6d4e288f1e3b0f60982f0aa98fdcb909d8008584
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Fri Dec  3 16:39:21 2021 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sun Dec  5 21:45:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d4e288f

kde-apps/kalarm: remove unused patch(es)

Closes: https://github.com/gentoo/gentoo/pull/23165
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Conrad Kostecki  gentoo.org>

 .../kalarm/files/kalarm-21.08.3-x11-optional.patch | 34 --
 1 file changed, 34 deletions(-)

diff --git a/kde-apps/kalarm/files/kalarm-21.08.3-x11-optional.patch 
b/kde-apps/kalarm/files/kalarm-21.08.3-x11-optional.patch
deleted file mode 100644
index 0b92c6fe5803..
--- a/kde-apps/kalarm/files/kalarm-21.08.3-x11-optional.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 1e5edd84cea5cac4dea2c488cea47766c1a33745 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner 
-Date: Thu, 25 Nov 2021 18:33:30 +0100
-Subject: [PATCH] Add WITH_X11 switch
-
-Signed-off-by: Andreas Sturmlechner 

- CMakeLists.txt | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fa699213..f928bf8b 100644
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -58,6 +58,7 @@ find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED DBus 
Gui Network Widgets
- set(CALENDARUTILS_LIB_VERSION "5.19.40")
- 
- option(FILE_RESOURCES "Use file system resources instead of Akonadi 
resources." TRUE)
-+option(WITH_X11 "Build with X11 support" TRUE)
- 
- # Find KF5 packages
- find_package(KF5Auth ${KF5_MIN_VERSION} CONFIG REQUIRED)
-@@ -106,7 +107,7 @@ find_package(KF5PimTextEdit ${KPIMTEXTEDIT_LIB_VERSION} 
CONFIG REQUIRED)
- 
- configure_file(kalarm-version-string.h.cmake 
${CMAKE_CURRENT_BINARY_DIR}/kalarm-version-string.h @ONLY)
- 
--if (NOT APPLE)
-+if (NOT APPLE AND WITH_X11)
- find_package(X11)
- endif()
- if (X11_FOUND)
--- 
-2.33.1
-



[gentoo-commits] repo/gentoo:master commit in: kde-apps/kalarm/files/, kde-apps/blogilo/, kde-apps/libkleo/, kde-apps/knotes/, ...

2017-05-07 Thread Andreas Sturmlechner
commit: c50f0f9eef12c54abf315f26ba4b06438d37af43
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun May  7 14:50:40 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun May  7 14:52:11 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c50f0f9e

kde-apps: Drop KDE PIM 4.4.2016.01

This drops back 'veryoldpim' to unstable.
No one from KDE team is using it at this point.

Package-Manager: Portage-2.3.5, Repoman-2.3.1

 kde-apps/akregator/Manifest|  1 -
 kde-apps/akregator/akregator-4.4.2016.01.ebuild| 22 ---
 kde-apps/blogilo/Manifest  |  1 -
 kde-apps/blogilo/blogilo-4.4.2016.01.ebuild| 21 --
 kde-apps/kabcclient/Manifest   |  1 -
 kde-apps/kabcclient/kabcclient-4.4.2016.01.ebuild  | 26 
 kde-apps/kaddressbook/Manifest |  1 -
 .../kaddressbook/kaddressbook-4.4.2016.01.ebuild   | 55 
 kde-apps/kalarm/Manifest   |  1 -
 .../files/kalarm-4.4.11.1-underlinking.patch   | 14 
 kde-apps/kalarm/kalarm-4.4.2016.01.ebuild  | 38 ---
 kde-apps/kdepim-kresources/Manifest|  1 -
 .../kdepim-kresources-4.4.2016.01.ebuild   | 48 --
 .../kdepim-meta/kdepim-meta-4.4.2016.01.ebuild | 41 
 kde-apps/kdepim-wizards/Manifest   |  1 -
 .../kdepim-wizards-4.4.2016.01.ebuild  | 41 
 kde-apps/kdepimlibs/Manifest   |  1 -
 kde-apps/kdepimlibs/kdepimlibs-4.14.10-r3.ebuild   | 64 ---
 kde-apps/kjots/Manifest|  1 -
 kde-apps/kjots/kjots-4.4.2016.01.ebuild| 19 --
 kde-apps/kleopatra/Manifest|  1 -
 kde-apps/kleopatra/kleopatra-4.4.2016.01-r1.ebuild | 52 ---
 kde-apps/kmail/Manifest|  1 -
 kde-apps/kmail/kmail-4.4.2016.01-r1.ebuild | 74 --
 kde-apps/knode/Manifest|  1 -
 kde-apps/knode/knode-4.4.2016.01.ebuild| 39 
 kde-apps/knotes/Manifest   |  1 -
 kde-apps/knotes/knotes-4.4.2016.01.ebuild  | 21 --
 kde-apps/konsolekalendar/Manifest  |  1 -
 .../konsolekalendar-4.4.2016.01.ebuild | 21 --
 kde-apps/kontact/Manifest  |  1 -
 kde-apps/kontact/kontact-4.4.2016.01.ebuild| 53 
 kde-apps/korganizer/Manifest   |  1 -
 .../files/korganizer-4.4.2015.06-handbook.patch| 18 --
 kde-apps/korganizer/korganizer-4.4.2016.01.ebuild  | 63 --
 kde-apps/ktimetracker/Manifest |  1 -
 .../ktimetracker/ktimetracker-4.4.2016.01.ebuild   | 37 ---
 kde-apps/libkdepim/Manifest|  1 -
 kde-apps/libkdepim/libkdepim-4.4.2016.01.ebuild| 38 ---
 kde-apps/libkleo/Manifest  |  1 -
 .../libkleo-4.4.2016.01-install_headers.patch  | 69 
 kde-apps/libkleo/libkleo-4.4.2016.01-r1.ebuild | 26 
 kde-apps/libkleo/libkleo-4.4.2016.01.ebuild| 24 ---
 kde-apps/libkpgp/Manifest  |  1 -
 kde-apps/libkpgp/libkpgp-4.4.2016.01.ebuild| 13 
 45 files changed, 957 deletions(-)

diff --git a/kde-apps/akregator/Manifest b/kde-apps/akregator/Manifest
index c80e3923fab..bccefa473e4 100644
--- a/kde-apps/akregator/Manifest
+++ b/kde-apps/akregator/Manifest
@@ -1,5 +1,4 @@
 DIST akregator-17.04.0.tar.xz 2254720 SHA256 
a5c6389d7a6f83a81b3cb062653c667272df596215650c6fbd817a3a42f7fbb6 SHA512 
6544fe124a6e82e6af06e66a8997f3cee3ae10fc993c9cad0a007b2c342d626a866794f4b060d0f019a5fbc345903c50a35ba9069b5de08cdd233ba46b4356b6
 WHIRLPOOL 
402e852db5cd2209782cee11625ec7d538ec6b63550144cbee3b33e091067e84da9dcb9db360d1871a308baeec8889051f15856db7a7ed9cd10d3862dbc687ca
 DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 
b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 
e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d
 WHIRLPOOL 
f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
 DIST kdepim-4.14.11_pre20160611.tar.xz 14805956 SHA256 
a9c3f5288efe0ccba3ffb88d4a63ac7b46a6b1ffe3c03b738ac6a53ef48e50b0 SHA512 
5ed0d2f814a7aac7f9977840bcda8ba98dc66c8ffe921d30430db07b06de2850d76140a5e5fa44db09e3cb4cac09fee0d8e0e4c208b752d52aecb453a4dc1b08
 WHIRLPOOL 
c6377c37b1a88a9d3958af5af081706e00437c3d0c28152a7e9353c49e376a3acdcdca0055d339f15287e6e101d6367a4d083b1a68162da9d4cc3d26178f62c5
-DIST kdepim-4.4.2016.01.tar.xz 8964248 SHA256 
19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512