gentoo auto-resync : 17:02:2025 - 00:13:57

5 files changed, 12 insertions, 95 deletions

diff --git a/app-text/xournalpp/Manifest b/app-text/xournalpp/Manifest
index 88dd60edc9d3..9abf8169b19d 100644
--- a/app-text/xournalpp/Manifest
+++ b/app-text/xournalpp/Manifest
@@ -1,12 +1,9 @@
-AUX xournalpp-1.1.1-nocompress.patch 2302 BLAKE2B 1f381d9cc89725aa2ab04c71ceb65c8bf3fad11979c4c689570c9153a9eff456644a38ddee89468f1de976c6e1d837ef46fbb88a771f7eabb1edfa784c51b7ff SHA512 f5222e7764fbbbf8fa20ee8b32609e3d001537c0ac6ef80ab44a8346f6b5545d1339577f4c4001b3516504d9dce45cf441317881a8ede8e331ede7060c197e48
 AUX xournalpp-1.1.1-nostrip.patch 1037 BLAKE2B 5016e48f6abd9368ae703f693efe3ae84d395c939f08e9244443c6aaee794729abbc52195816c7e21f08c751b8c953fef3ffda1c0f0ea73a0203f243f614e81d SHA512 5651db0248ad71967412d33cc2f39b8638c38c185635936e988ef7561dd7a51ebb0c7be803a69b7b4eb4cc548dfd237f2920b2b8c8dd779a38b90b4b28e322e1
-AUX xournalpp-1.1.3-gcc13.patch 245 BLAKE2B 32593e41947d39cc13b4012ef7f8b42d422d312f3df724bf29dfd90dacc8a3447dbdc214ec0339f94d98ae74971c45de19d4bd863123ab88256ed6e2952cd2c1 SHA512 8fe22b0d18e1be5add93642bcacac4d246e079bc4e52b6080ba2678d2017616170e1cdd3423a53ad4521a24a5b4631a28ef649b5293648d9ab3fc1048366f9b3
-AUX xournalpp-1.1.3-lua-5-4.patch 402 BLAKE2B fe257a01a3a42306cbded7311b9974db5f19d91a5e616aa9fc063747f3dca2f76e6c79ed7a1e9027fb2826b4064c4d6b28b7859cdc5e27f677faf411819bfff0 SHA512 94889468a810910bc955cdce7e0b4f6b52ae31bab36d7b9fdb03ef7221028e5fa0f3ceebf932c4fcbedb967240f70579a8a0bd6ee81936bdd183619d21cef1d4
 AUX xournalpp-1.2.3-lua-5-4.patch 533 BLAKE2B 66e408f4c78ede1f31d856a17c44c3f2ac0b61a7dbec5c552f906dff5daf8a1c59d514efcfe5d091774f5e90a8ffd9a4517642505f0d189bf26052319400e134 SHA512 97bde988494541610ed5f622ec3da432203f3e697125db08b1d27d58422596b46d62e531db636f73ad16eb7052b4b830df37f4161fffe0a35268a28b423325a8
 AUX xournalpp-1.2.3-nocompress.patch 1801 BLAKE2B 06abaa73e1641efae99acbbe3c3825743526d724c4f4446f3eed486628b03c86ad312823f55441cb8ce6b695ae771b8e50454b61c73085baeb7ff6766f8c7dd5 SHA512 99ce44fd4650fa72aab181590652ea04ac2bc2629e1523b02349bea96733606d8a8b323dda500e8825da8974766d338b9b7b2f89a7e675d6c92c4ed463779ff1
-DIST xournalpp-1.1.3.tgz 15096883 BLAKE2B 814aea3510f26f9478280d158cfa32bafd168df6a21e6776cc831f4d41a69b4dd596df3bac990d28851bba933b6c448f1e38109042bd02cd7454985aaac8d13b SHA512 7b3f1507a8f7b2b5ebef093e319008d4bc14b961ab528af490d133bc64176b85b14a4002753f5444f8fd96c326e7c6cf5d1bad443ad7ce2ea56e9f465aacae3d
 DIST xournalpp-1.2.3.tgz 16708613 BLAKE2B f631ec686846e3c00428f050c5ff5d72ebb51b5bfbb1e81b22bcf9416bedb8507c887d6f68d6031945ff107bbd82dfca6c5d4c2430943c17b1c0e9d55d288f73 SHA512 17303314d49001f492469d855155a019659cdafc67509d4e176f60a93322f4ee1d4b999e8a25a9a23bde27b878012c06aa11f15bc2a54a730098964053834d1f
-EBUILD xournalpp-1.1.3-r2.ebuild 1193 BLAKE2B 62a104f7866f2c059e7ab4daae88bbe51e62c61ddc9d4fc0292a9d282d75048bfb8f6a6248dbab0d20571d9f7517a4ce613c8e3f1f13c417e17bb6a7462b8723 SHA512 4afed7ca417c7e5cf56a08ed30b0cf87a856450c27d1434ffe01b2c224b30b07359a0bc7028142eabc8cb6b56e575c268236f5d25722ddcb66a61cb514383e75
+DIST xournalpp-1.2.5.tgz 16849377 BLAKE2B 8356b018f67f4b8a063b9e3bf20b6a6328f309a5093094b171686296f3143f2554ce4ff7602c892db84dcee470656592a6710c0fc8de4b22a88041f4e91d4fba SHA512 c95854b73b3b63fbb154e5c952a15fe94bfb8e71a52f0cf0b606a5be792c1375d540dd820bfbda182d38ad8627afc4eb10c9b636d1be0fe6e77a462e2e6b6b9f
 EBUILD xournalpp-1.2.3.ebuild 1201 BLAKE2B 271096724567ea459b4d64563f1bd41eea47117110e448af8f6d022a8864456f35e8a9d23c3beaee26a6e6ef07d3880a3bfa2e9aa2d007a1e836dca8a65a985e SHA512 794613b633f7cab56dfa8390741fff23c8b78e30777e79a78c387bd3cfe268f7aeeeb958ed6a1eb9c9c8d88bd06eac2a79518f9be2291c51c5d45b4892b2c77f
+EBUILD xournalpp-1.2.5.ebuild 1202 BLAKE2B 63a031934ac45d3e769c94ddf09ba6309d1f96e7590389dd63b10408189739a9227fb8daeeb05a60aa61d53dd785068b1b3f502d0a75db4d561e0f23ed6b1827 SHA512 11a9f8cc101912770c2cf2eb2a01a8e977f8c2380201fa528ddf7b2380003f689c0415189f701ac078044208b020e259fda89518b057c848624e7dae0f58a536
 EBUILD xournalpp-9999.ebuild 1202 BLAKE2B a61df5b8e482ca695c7d06508d1d09664a4422390e92a344afb7d3c28c2842a4f15e289c17bbf5274ce43c89c47945155d107331b5c2cd27333a2740bef20622 SHA512 4ce4e1f7bcc4696bff218775e380455de6fef3ba928e67f11919cdc6dbbc85b3caf4694d87234d35ff7c89efef6c5e5905d9c223191cb935f0613c855012420e
 MISC metadata.xml 305 BLAKE2B a0f91402d7c9940c0e0a6c6fd9d6785751734fddea3c57025889ef4037238e8f0db013b4d08d3398254936e83d17dd97aa011d23be3bae2853ac6954314b3ea8 SHA512 083227ced431d1b53984d271d76f1fc9c16f894c81355662aca8cb3545493cea7bcf9daa5e7a309c04a8006b5512edeadc0e969e76011c4f33f222c48dec57cb
diff --git a/app-text/xournalpp/files/xournalpp-1.1.1-nocompress.patch b/app-text/xournalpp/files/xournalpp-1.1.1-nocompress.patch
deleted file mode 100644
index dc3ecca1bad0..000000000000
--- a/app-text/xournalpp/files/xournalpp-1.1.1-nocompress.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 91319980ebddf80f797118fd67bf95b509b31725 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org>
-Date: Sat, 26 Feb 2022 19:05:39 +0100
-Subject: [PATCH 2/2] Do not compress manpages, this is done by the package
- manager
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
----
- man/CMakeLists.txt | 12 ++++--------
- 1 file changed, 4 insertions(+), 8 deletions(-)
-
-diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt
-index 499d9297..974aea4b 100644
---- a/man/CMakeLists.txt
-+++ b/man/CMakeLists.txt
-@@ -9,27 +9,23 @@ mark_as_advanced(HELP2MAN)
- if (HELP2MAN)
-   set(MAN_INCLUDE "${PROJECT_SOURCE_DIR}/man/extra.groff")
-   set(MAN_PAGE "${CMAKE_CURRENT_BINARY_DIR}/xournalpp.1")
--  set(MAN_FILE "${CMAKE_CURRENT_BINARY_DIR}/xournalpp.1.gz")
- 
-   add_custom_command(
--      OUTPUT ${MAN_FILE}
-+      OUTPUT ${MAN_PAGE}
-       COMMAND ${HELP2MAN} --no-info -i ${MAN_INCLUDE} -o ${MAN_PAGE} --version-string=${PROJECT_VERSION} --name="open-source hand note-taking program" ${CMAKE_BINARY_DIR}/src/xournalpp
--      COMMAND gzip -n -f -9 ${MAN_PAGE}
-       DEPENDS ${CMAKE_BINARY_DIR}/src/xournalpp
-   )
- 
-   set(MAN_PAGE_THUMBNAILER "${CMAKE_CURRENT_BINARY_DIR}/xournalpp-thumbnailer.1")
--  set(MAN_FILE_THUMBNAILER "${CMAKE_CURRENT_BINARY_DIR}/xournalpp-thumbnailer.1.gz")
- 
-   add_custom_command(
--      OUTPUT ${MAN_FILE_THUMBNAILER}
-+      OUTPUT ${MAN_PAGE_THUMBNAILER}
-       COMMAND ${HELP2MAN} --no-info  --no-discard-stderr -o ${MAN_PAGE_THUMBNAILER} --version-string=${PROJECT_VERSION} --name="creates thumbnails" ${CMAKE_BINARY_DIR}/src/xoj-preview-extractor/xournalpp-thumbnailer
--      COMMAND gzip -n -f -9 ${MAN_PAGE_THUMBNAILER}
-       DEPENDS ${CMAKE_BINARY_DIR}/src/xoj-preview-extractor/xournalpp-thumbnailer
-   )
- 
--  add_custom_target(manpage ALL DEPENDS ${MAN_FILE} ${MAN_FILE_THUMBNAILER})
--  install(FILES ${MAN_FILE} ${MAN_FILE_THUMBNAILER} DESTINATION "share/man/man1")
-+  add_custom_target(manpage ALL DEPENDS ${MAN_PAGE} ${MAN_PAGE_THUMBNAILER})
-+  install(FILES ${MAN_PAGE} ${MAN_PAGE_THUMBNAILER} DESTINATION "share/man/man1")
- else(HELP2MAN)
-   message("help2man is missing; no man pages will be generated")
- endif(HELP2MAN)
--- 
-2.34.1
-
diff --git a/app-text/xournalpp/files/xournalpp-1.1.3-gcc13.patch b/app-text/xournalpp/files/xournalpp-1.1.3-gcc13.patch
deleted file mode 100644
index 97f7fbc0d7f2..000000000000
--- a/app-text/xournalpp/files/xournalpp-1.1.3-gcc13.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-https://bugs.gentoo.org/894720
-https://bugs.gentoo.org/895536
---- a/src/view/background/BackgroundConfig.h
-+++ b/src/view/background/BackgroundConfig.h
-@@ -11,6 +11,7 @@
- 
- #pragma once
- 
-+#include <cstdint>
- #include <map>
- #include <string>
- 
diff --git a/app-text/xournalpp/files/xournalpp-1.1.3-lua-5-4.patch b/app-text/xournalpp/files/xournalpp-1.1.3-lua-5-4.patch
deleted file mode 100644
index c53b63588c43..000000000000
--- a/app-text/xournalpp/files/xournalpp-1.1.3-lua-5-4.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -148,9 +148,9 @@ if (ENABLE_CPPUNIT)
- endif (ENABLE_CPPUNIT)
- 
- # Plugins / scripting
--find_package (Lua 5.3 EXACT)
-+find_package (Lua ${LUA_VERSION} EXACT)
- if (NOT Lua_FOUND)
--	find_package (Lua 5.3) # Lua 5.4 is only supported with cmake >=3.18
-+	find_package (Lua ${LUA_VERSION}) # Lua 5.4 is only supported with cmake >=3.18
- endif()
- 
- if (Lua_FOUND)
diff --git a/app-text/xournalpp/xournalpp-1.1.3-r2.ebuild b/app-text/xournalpp/xournalpp-1.2.5.ebuild
index 77d1e2514686..5d137901c96a 100644
--- a/app-text/xournalpp/xournalpp-1.1.3-r2.ebuild
+++ b/app-text/xournalpp/xournalpp-1.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/xournalpp/xournalpp.git"
 else
 	SRC_URI="https://github.com/xournalpp/xournalpp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tgz"
-	KEYWORDS="amd64 ~ppc64"
+	KEYWORDS="~amd64 ~ppc64"
 fi
 
 DESCRIPTION="Handwriting notetaking software with PDF annotation support"
@@ -25,14 +25,14 @@ REQUIRED_USE="${LUA_REQUIRED_USE}"
 COMMON_DEPEND="
 	${LUA_DEPS}
 	app-text/poppler[cairo]
-	dev-libs/glib
+	>=dev-libs/glib-2.32.0
 	dev-libs/libxml2
-	dev-libs/libzip:=
-	gnome-base/librsvg
-	media-libs/portaudio[cxx]
-	media-libs/libsndfile
+	>=dev-libs/libzip-1.0.1:=
+	>=gnome-base/librsvg-2.40
+	>=media-libs/portaudio-12[cxx]
+	>=media-libs/libsndfile-1.0.25
 	sys-libs/zlib:=
-	x11-libs/gtk+:3
+	>=x11-libs/gtk+-3.18.9:3
 "
 RDEPEND="${COMMON_DEPEND}"
 DEPEND="${COMMON_DEPEND}"
@@ -43,9 +43,8 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.1.1-nostrip.patch"
-	"${FILESDIR}/${PN}-1.1.1-nocompress.patch"
-	"${FILESDIR}/${PN}-1.1.3-lua-5-4.patch"
-	"${FILESDIR}/${PN}-1.1.3-gcc13.patch"
+	"${FILESDIR}/${PN}-1.2.3-nocompress.patch"
+	"${FILESDIR}/${PN}-1.2.3-lua-5-4.patch"
 )
 
 src_configure() {