* [gentoo-commits] repo/gentoo:master commit in: app-text/xournalpp/, app-text/xournalpp/files/
@ 2022-02-26 18:26 Andreas K. Hüttel
0 siblings, 0 replies; 2+ messages in thread
From: Andreas K. Hüttel @ 2022-02-26 18:26 UTC (permalink / raw
To: gentoo-commits
commit: e836b0a51dbed966f373adea13fc3c3abb320c48
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 26 18:25:40 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Feb 26 18:25:55 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e836b0a5
app-text/xournalpp: QA fixes
Closes: https://bugs.gentoo.org/834064
Closes: https://bugs.gentoo.org/834065
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
.../files/xournalpp-1.1.1-nocompress.patch | 53 ++++++++++++++++++++++
.../xournalpp/files/xournalpp-1.1.1-nostrip.patch | 31 +++++++++++++
...nalpp-9999.ebuild => xournalpp-1.1.1-r1.ebuild} | 5 ++
app-text/xournalpp/xournalpp-9999.ebuild | 5 ++
4 files changed, 94 insertions(+)
diff --git a/app-text/xournalpp/files/xournalpp-1.1.1-nocompress.patch b/app-text/xournalpp/files/xournalpp-1.1.1-nocompress.patch
new file mode 100644
index 000000000000..dc3ecca1bad0
--- /dev/null
+++ b/app-text/xournalpp/files/xournalpp-1.1.1-nocompress.patch
@@ -0,0 +1,53 @@
+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.1-nostrip.patch b/app-text/xournalpp/files/xournalpp-1.1.1-nostrip.patch
new file mode 100644
index 000000000000..0698bc443fda
--- /dev/null
+++ b/app-text/xournalpp/files/xournalpp-1.1.1-nostrip.patch
@@ -0,0 +1,31 @@
+From 9686113b760cf5838a63ba6bee438ec3b7ab99e8 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:01:17 +0100
+Subject: [PATCH 1/2] Do not explicitly strip the thumbnailer (why?)
+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>
+---
+ src/xoj-preview-extractor/CMakeLists.txt | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/src/xoj-preview-extractor/CMakeLists.txt b/src/xoj-preview-extractor/CMakeLists.txt
+index 50d1b410..b653d983 100644
+--- a/src/xoj-preview-extractor/CMakeLists.txt
++++ b/src/xoj-preview-extractor/CMakeLists.txt
+@@ -41,10 +41,6 @@ target_include_directories (xournalpp-thumbnailer PRIVATE ${librsvg_INCLUDE_DIRS
+
+ set (THUMBNAILER_BIN "xournalpp-thumbnailer")
+
+-add_custom_command (TARGET xournalpp-thumbnailer POST_BUILD
+- COMMAND ${CMAKE_STRIP} ${THUMBNAILER_BIN}
+-)
+-
+ ## Install ##
+
+ install (TARGETS xournalpp-thumbnailer
+--
+2.34.1
+
diff --git a/app-text/xournalpp/xournalpp-9999.ebuild b/app-text/xournalpp/xournalpp-1.1.1-r1.ebuild
similarity index 90%
copy from app-text/xournalpp/xournalpp-9999.ebuild
copy to app-text/xournalpp/xournalpp-1.1.1-r1.ebuild
index 2c5a3a5f0527..8ce79e89fbf1 100644
--- a/app-text/xournalpp/xournalpp-9999.ebuild
+++ b/app-text/xournalpp/xournalpp-1.1.1-r1.ebuild
@@ -41,6 +41,11 @@ BDEPEND="
sys-apps/lsb-release
"
+PATCHES=(
+ "${FILESDIR}/${PN}-1.1.1-nostrip.patch"
+ "${FILESDIR}/${PN}-1.1.1-nocompress.patch"
+)
+
src_prepare() {
cmake_src_prepare
}
diff --git a/app-text/xournalpp/xournalpp-9999.ebuild b/app-text/xournalpp/xournalpp-9999.ebuild
index 2c5a3a5f0527..8ce79e89fbf1 100644
--- a/app-text/xournalpp/xournalpp-9999.ebuild
+++ b/app-text/xournalpp/xournalpp-9999.ebuild
@@ -41,6 +41,11 @@ BDEPEND="
sys-apps/lsb-release
"
+PATCHES=(
+ "${FILESDIR}/${PN}-1.1.1-nostrip.patch"
+ "${FILESDIR}/${PN}-1.1.1-nocompress.patch"
+)
+
src_prepare() {
cmake_src_prepare
}
^ permalink raw reply related [flat|nested] 2+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-text/xournalpp/, app-text/xournalpp/files/
@ 2024-04-27 13:46 Andreas K. Hüttel
0 siblings, 0 replies; 2+ messages in thread
From: Andreas K. Hüttel @ 2024-04-27 13:46 UTC (permalink / raw
To: gentoo-commits
commit: 293c4985ed00bfaca1004cf43d1b0a1f8e19ea04
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 27 13:45:32 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Apr 27 13:46:03 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=293c4985
app-text/xournalpp: add 1.2.3
Closes: https://bugs.gentoo.org/915485
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
app-text/xournalpp/Manifest | 1 +
.../xournalpp/files/xournalpp-1.2.3-lua-5-4.patch | 13 ++++++++
.../files/xournalpp-1.2.3-nocompress.patch | 36 ++++++++++++++++++++++
...ournalpp-9999.ebuild => xournalpp-1.2.3.ebuild} | 19 ++++++------
app-text/xournalpp/xournalpp-9999.ebuild | 19 ++++++------
5 files changed, 68 insertions(+), 20 deletions(-)
diff --git a/app-text/xournalpp/Manifest b/app-text/xournalpp/Manifest
index 01892e0da412..5a40251ff5b3 100644
--- a/app-text/xournalpp/Manifest
+++ b/app-text/xournalpp/Manifest
@@ -1 +1,2 @@
DIST xournalpp-1.1.3.tgz 15096883 BLAKE2B 814aea3510f26f9478280d158cfa32bafd168df6a21e6776cc831f4d41a69b4dd596df3bac990d28851bba933b6c448f1e38109042bd02cd7454985aaac8d13b SHA512 7b3f1507a8f7b2b5ebef093e319008d4bc14b961ab528af490d133bc64176b85b14a4002753f5444f8fd96c326e7c6cf5d1bad443ad7ce2ea56e9f465aacae3d
+DIST xournalpp-1.2.3.tgz 16708613 BLAKE2B f631ec686846e3c00428f050c5ff5d72ebb51b5bfbb1e81b22bcf9416bedb8507c887d6f68d6031945ff107bbd82dfca6c5d4c2430943c17b1c0e9d55d288f73 SHA512 17303314d49001f492469d855155a019659cdafc67509d4e176f60a93322f4ee1d4b999e8a25a9a23bde27b878012c06aa11f15bc2a54a730098964053834d1f
diff --git a/app-text/xournalpp/files/xournalpp-1.2.3-lua-5-4.patch b/app-text/xournalpp/files/xournalpp-1.2.3-lua-5-4.patch
new file mode 100644
index 000000000000..89784b96354f
--- /dev/null
+++ b/app-text/xournalpp/files/xournalpp-1.2.3-lua-5-4.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 453695c0..900c6cc3 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -146,7 +146,7 @@ find_package(ZLIB REQUIRED)
+ find_package(Threads REQUIRED)
+
+ option(ENABLE_PLUGINS "Compile with plugin support" ON)
+-find_package(Lua) # Lua 5.4 is only supported with cmake >=3.18
++find_package(Lua ${LUA_VERSION} EXACT) # Lua 5.4 is only supported with cmake >=3.18
+ message(STATUS "Found Lua: ${Lua_FOUND}")
+ if (Lua_FOUND AND ENABLE_PLUGINS)
+ # currently not fully supported by cmake
diff --git a/app-text/xournalpp/files/xournalpp-1.2.3-nocompress.patch b/app-text/xournalpp/files/xournalpp-1.2.3-nocompress.patch
new file mode 100644
index 000000000000..df77cc00f745
--- /dev/null
+++ b/app-text/xournalpp/files/xournalpp-1.2.3-nocompress.patch
@@ -0,0 +1,36 @@
+diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt
+index 1cb6bb5b..af069dca 100644
+--- a/man/CMakeLists.txt
++++ b/man/CMakeLists.txt
+@@ -12,27 +12,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}/xournalpp
+- COMMAND gzip -n -f -9 ${MAN_PAGE}
+ DEPENDS ${CMAKE_BINARY_DIR}/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)
diff --git a/app-text/xournalpp/xournalpp-9999.ebuild b/app-text/xournalpp/xournalpp-1.2.3.ebuild
similarity index 75%
copy from app-text/xournalpp/xournalpp-9999.ebuild
copy to app-text/xournalpp/xournalpp-1.2.3.ebuild
index 681bb9a2a3cf..df7aa6c945ea 100644
--- a/app-text/xournalpp/xournalpp-9999.ebuild
+++ b/app-text/xournalpp/xournalpp-1.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -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() {
diff --git a/app-text/xournalpp/xournalpp-9999.ebuild b/app-text/xournalpp/xournalpp-9999.ebuild
index 681bb9a2a3cf..df7aa6c945ea 100644
--- a/app-text/xournalpp/xournalpp-9999.ebuild
+++ b/app-text/xournalpp/xournalpp-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -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() {
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-04-27 13:46 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-02-26 18:26 [gentoo-commits] repo/gentoo:master commit in: app-text/xournalpp/, app-text/xournalpp/files/ Andreas K. Hüttel
-- strict thread matches above, loose matches on Subject: below --
2024-04-27 13:46 Andreas K. Hüttel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox