* [gentoo-commits] repo/gentoo:master commit in: app-text/pdfpc/files/, app-text/pdfpc/
@ 2023-05-22 21:30 Ulrich Müller
0 siblings, 0 replies; 2+ messages in thread
From: Ulrich Müller @ 2023-05-22 21:30 UTC (permalink / raw
To: gentoo-commits
commit: 39eb41deb8fb2b686bd820445f185c3745903872
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon May 22 18:54:25 2023 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon May 22 21:29:51 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39eb41de
app-text/pdfpc: Migrate to webkit-gtk:4.1
Closes: https://bugs.gentoo.org/893674
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
.../pdfpc/files/pdfpc-4.6.0-webkit2gtk-4.1.patch | 22 ++++++
app-text/pdfpc/pdfpc-4.6.0-r2.ebuild | 92 ++++++++++++++++++++++
2 files changed, 114 insertions(+)
diff --git a/app-text/pdfpc/files/pdfpc-4.6.0-webkit2gtk-4.1.patch b/app-text/pdfpc/files/pdfpc-4.6.0-webkit2gtk-4.1.patch
new file mode 100644
index 000000000000..2428314dd2fe
--- /dev/null
+++ b/app-text/pdfpc/files/pdfpc-4.6.0-webkit2gtk-4.1.patch
@@ -0,0 +1,22 @@
+--- pdfpc-4.6.0/src/CMakeLists.txt
++++ pdfpc-4.6.0/src/CMakeLists.txt
+@@ -30,8 +30,8 @@
+ endif ()
+
+ if (MDVIEW)
+- pkg_check_modules(WEBKIT REQUIRED webkit2gtk-4.0)
+- set(MDVIEW_PACKAGES webkit2gtk-4.0)
++ pkg_check_modules(WEBKIT REQUIRED webkit2gtk-4.1)
++ set(MDVIEW_PACKAGES webkit2gtk-4.1)
+ set(EXTRA_VALA_OPTIONS ${EXTRA_VALA_OPTIONS} -D MDVIEW)
+ endif ()
+
+@@ -136,7 +136,7 @@
+ vala_precompile(VALA_C
+ ${VALA_SRC}
+ PACKAGES
+- webkit2gtk-4.0
++ webkit2gtk-4.1
+ json-glib-1.0
+ gio-2.0
+ gee-0.8
diff --git a/app-text/pdfpc/pdfpc-4.6.0-r2.ebuild b/app-text/pdfpc/pdfpc-4.6.0-r2.ebuild
new file mode 100644
index 000000000000..889520d13a25
--- /dev/null
+++ b/app-text/pdfpc/pdfpc-4.6.0-r2.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VALA_MAX_API_VERSION="0.56" # append versions in sed line if increased
+
+#COMMIT_ID=""
+
+inherit cmake vala
+
+DESCRIPTION="Presenter console with multi-monitor support for PDF files"
+HOMEPAGE="https://pdfpc.github.io https://github.com/pdfpc/pdfpc"
+
+if [[ ${PV} == *9999 ]]; then
+ EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+ inherit git-r3
+elif [[ ${PV} == *_p* ]]; then
+ SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
+ S="${WORKDIR}/${PN}-${COMMIT_ID}"
+else
+ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+gstreamer soup webkit"
+
+RDEPEND="
+ app-text/discount:=
+ app-text/poppler:=[cairo]
+ dev-libs/glib:2
+ dev-libs/json-glib
+ dev-libs/libgee:0.8=
+ gnome-base/librsvg
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf:2
+ x11-libs/gtk+:3
+ x11-libs/libX11
+ x11-libs/pango
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ media-libs/gst-plugins-good:1.0
+ media-plugins/gst-plugins-gtk:1.0=
+ media-plugins/gst-plugins-cairo:1.0=
+ )
+ webkit? ( net-libs/webkit-gtk:4.1= )
+ !webkit? ( soup? (
+ media-gfx/qrencode
+ net-libs/libsoup:2.4
+ ) )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="$(vala_depend)"
+
+DOCS=(
+ CHANGELOG.rst
+ FAQ.rst
+ README.rst
+ SUPPORT.rst
+)
+
+src_prepare() {
+ eapply "${FILESDIR}/${P}-no-movies.patch"
+ eapply "${FILESDIR}/${P}-vala-0.56.7.patch"
+ use webkit && eapply "${FILESDIR}/${P}-webkit2gtk-4.1.patch"
+
+ cmake_src_prepare
+ vala_setup
+ sed -i -e "/find_program/s/valac/& &-0.56 &-0.54 &-0.52 &-0.50/" \
+ cmake/vala/FindVala.cmake || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DMOVIES=$(usex gstreamer on off)
+ -DMDVIEW=$(usex webkit on off)
+ -DCMAKE_VERBOSE_MAKEFILE=TRUE
+ )
+
+ if use webkit; then
+ use soup && ewarn \
+ "USE flag \"webkit\" overrides \"soup\"; disabling REST support."
+ mycmakeargs+=( -DREST=off )
+ else
+ mycmakeargs+=( -DREST=$(usex soup on off) )
+ fi
+
+ cmake_src_configure
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/pdfpc/files/, app-text/pdfpc/
@ 2025-02-12 8:37 Ulrich Müller
0 siblings, 0 replies; 2+ messages in thread
From: Ulrich Müller @ 2025-02-12 8:37 UTC (permalink / raw
To: gentoo-commits
commit: 8ab0ae2c596e4d1a115cf207b0c06fbaad8b203f
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 12 08:35:42 2025 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 12 08:37:09 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ab0ae2c
app-text/pdfpc: drop 4.6.0-r2
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
app-text/pdfpc/Manifest | 1 -
app-text/pdfpc/files/pdfpc-4.6.0-no-movies.patch | 59 --------------
app-text/pdfpc/files/pdfpc-4.6.0-vala-0.56.7.patch | 31 --------
.../pdfpc/files/pdfpc-4.6.0-webkit2gtk-4.1.patch | 22 ------
app-text/pdfpc/pdfpc-4.6.0-r2.ebuild | 92 ----------------------
5 files changed, 205 deletions(-)
diff --git a/app-text/pdfpc/Manifest b/app-text/pdfpc/Manifest
index 71ac0ca4b176..2bd27556f23d 100644
--- a/app-text/pdfpc/Manifest
+++ b/app-text/pdfpc/Manifest
@@ -1,2 +1 @@
-DIST pdfpc-4.6.0.tar.gz 7766521 BLAKE2B 3e8914333a0781d3d750ab71d58c8af1451ce5ab321ecc0639ddcf377cae9a0c62290696455516ce1d70f4ae3ffc5889fe910ced0399787e6a40c8ae76e1f75e SHA512 4ec69cbe21fb8bbb3e381229c391133f92e76b610e1fdf1cffa2c9fa9997ccc879eaef2a6837b34d1e635cdd07c4d0ce98de03fd7ece431a8f35493f0f7d7651
DIST pdfpc-4.7.0.tar.gz 7768713 BLAKE2B 7c4a0c318a191125fcc9e9b13c25265e8018e76eb72186bc079b10eb50f3c29ed4f364d65ae09059b757e221ddbb8865a4a5a15e38f476d66b5fd41b85a392d0 SHA512 2ee0bec8ed1d6c330042a0fd296511e73d88bd1bba153fd3f19ca43135662c8d93670e503c1db1822f927c67097a5c5112f783545063f47c29f3c7160d07be49
diff --git a/app-text/pdfpc/files/pdfpc-4.6.0-no-movies.patch b/app-text/pdfpc/files/pdfpc-4.6.0-no-movies.patch
deleted file mode 100644
index 9767dc2a8093..000000000000
--- a/app-text/pdfpc/files/pdfpc-4.6.0-no-movies.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-https://github.com/pdfpc/pdfpc/issues/672
-https://bugs.gentoo.org/904241
-
-commit a6501085b3e94eb4a01db18fe9dc15d51fcde3a3
-Author: Evgeny Stambulchik <fnevgeny@gmail.com>
-Date: Sat, 11 Feb 2023 23:04:19 +0200
-
- Skip MOVIE actions when configured with -DMOVIES
-
---- a/src/classes/action/link_action.vala
-+++ b/src/classes/action/link_action.vala
-@@ -47,6 +47,7 @@
- this.action = mapping.action.copy();
- }
-
-+#if MOVIES
- /**
- * Find movie on the current slide by its filename; there seems to be
- * no better way with the current Glib Poppler bindings.
-@@ -71,6 +72,7 @@
-
- return null;
- }
-+#endif
-
- /**
- * Create from the LinkMapping if the link is an internal link to a named
-@@ -91,6 +93,7 @@
- return new_obj as ActionMapping;
- }
- break;
-+#if MOVIES
- case Poppler.ActionType.MOVIE:
- unowned var movie_action = (Poppler.ActionMovie*) mapping.action;
- var movie = movie_action.movie;
-@@ -100,6 +103,7 @@
- return new_obj as ActionMapping;
- }
- break;
-+#endif
- default:
- break;
- }
-@@ -167,6 +171,7 @@
- this.controller.switch_to_slide_number(slide_number);
-
- break;
-+#if MOVIES
- case Poppler.ActionType.MOVIE:
- unowned var action = (Poppler.ActionMovie*) this.action;
- var movie = action.movie;
-@@ -192,6 +197,7 @@
- }
- }
- break;
-+#endif
- default:
- return false;
- }
diff --git a/app-text/pdfpc/files/pdfpc-4.6.0-vala-0.56.7.patch b/app-text/pdfpc/files/pdfpc-4.6.0-vala-0.56.7.patch
deleted file mode 100644
index 9aff761b471f..000000000000
--- a/app-text/pdfpc/files/pdfpc-4.6.0-vala-0.56.7.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-https://github.com/pdfpc/pdfpc/issues/686
-https://bugs.gentoo.org/904970
-
-commit 18beaecbbcc066e0d4c889b3aa3ecaa7351f7768
-Author: Evgeny Stambulchik <fnevgeny@gmail.com>
-Date: Tue, 25 Apr 2023 16:11:25 +0300
-
- Create Lists of nullable types
-
---- a/src/classes/drawings/drawing_commands.vala
-+++ b/src/classes/drawings/drawing_commands.vala
-@@ -54,8 +54,8 @@
- }
-
- public void clear() {
-- this.drawing_commands = new List<DrawingCommand>();
-- this.redo_commands = new List<DrawingCommand>();
-+ this.drawing_commands = new List<DrawingCommand?>();
-+ this.redo_commands = new List<DrawingCommand?>();
- }
-
- public void add_line(bool is_eraser,
-@@ -70,7 +70,7 @@
-
- // After adding a new line you can no longer redo the old
- // path.
-- this.redo_commands = new List<DrawingCommand>(); // clear
-+ this.redo_commands = new List<DrawingCommand?>(); // clear
-
- bool new_path = true;
- double epsilon = 1e-4; // Less than 0.1 pixel for a 1000x1000 img
diff --git a/app-text/pdfpc/files/pdfpc-4.6.0-webkit2gtk-4.1.patch b/app-text/pdfpc/files/pdfpc-4.6.0-webkit2gtk-4.1.patch
deleted file mode 100644
index 2428314dd2fe..000000000000
--- a/app-text/pdfpc/files/pdfpc-4.6.0-webkit2gtk-4.1.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- pdfpc-4.6.0/src/CMakeLists.txt
-+++ pdfpc-4.6.0/src/CMakeLists.txt
-@@ -30,8 +30,8 @@
- endif ()
-
- if (MDVIEW)
-- pkg_check_modules(WEBKIT REQUIRED webkit2gtk-4.0)
-- set(MDVIEW_PACKAGES webkit2gtk-4.0)
-+ pkg_check_modules(WEBKIT REQUIRED webkit2gtk-4.1)
-+ set(MDVIEW_PACKAGES webkit2gtk-4.1)
- set(EXTRA_VALA_OPTIONS ${EXTRA_VALA_OPTIONS} -D MDVIEW)
- endif ()
-
-@@ -136,7 +136,7 @@
- vala_precompile(VALA_C
- ${VALA_SRC}
- PACKAGES
-- webkit2gtk-4.0
-+ webkit2gtk-4.1
- json-glib-1.0
- gio-2.0
- gee-0.8
diff --git a/app-text/pdfpc/pdfpc-4.6.0-r2.ebuild b/app-text/pdfpc/pdfpc-4.6.0-r2.ebuild
deleted file mode 100644
index f06648747739..000000000000
--- a/app-text/pdfpc/pdfpc-4.6.0-r2.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VALA_MAX_API_VERSION="0.56" # append versions in sed line if increased
-
-#COMMIT_ID=""
-
-inherit cmake vala
-
-DESCRIPTION="Presenter console with multi-monitor support for PDF files"
-HOMEPAGE="https://pdfpc.github.io https://github.com/pdfpc/pdfpc"
-
-if [[ ${PV} == *9999 ]]; then
- EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
- inherit git-r3
-elif [[ ${PV} == *_p* ]]; then
- SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/${PN}-${COMMIT_ID}"
-else
- SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+gstreamer soup webkit"
-
-RDEPEND="
- app-text/discount:=
- app-text/poppler:=[cairo]
- dev-libs/glib:2
- dev-libs/json-glib
- dev-libs/libgee:0.8=
- gnome-base/librsvg
- x11-libs/cairo
- x11-libs/gdk-pixbuf:2
- x11-libs/gtk+:3
- x11-libs/libX11
- x11-libs/pango
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- media-libs/gst-plugins-good:1.0
- media-plugins/gst-plugins-gtk:1.0=
- media-plugins/gst-plugins-cairo:1.0=
- )
- webkit? ( net-libs/webkit-gtk:4.1= )
- !webkit? ( soup? (
- media-gfx/qrencode
- net-libs/libsoup:2.4
- ) )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="$(vala_depend)"
-
-DOCS=(
- CHANGELOG.rst
- FAQ.rst
- README.rst
- SUPPORT.rst
-)
-
-src_prepare() {
- eapply "${FILESDIR}/${P}-no-movies.patch"
- eapply "${FILESDIR}/${P}-vala-0.56.7.patch"
- use webkit && eapply "${FILESDIR}/${P}-webkit2gtk-4.1.patch"
-
- cmake_src_prepare
- vala_setup
- sed -i -e "/find_program/s/valac/& &-0.56 &-0.54 &-0.52 &-0.50/" \
- cmake/vala/FindVala.cmake || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -DMOVIES=$(usex gstreamer on off)
- -DMDVIEW=$(usex webkit on off)
- -DCMAKE_VERBOSE_MAKEFILE=TRUE
- )
-
- if use webkit; then
- use soup && ewarn \
- "USE flag \"webkit\" overrides \"soup\"; disabling REST support."
- mycmakeargs+=( -DREST=off )
- else
- mycmakeargs+=( -DREST=$(usex soup on off) )
- fi
-
- cmake_src_configure
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-02-12 8:37 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-02-12 8:37 [gentoo-commits] repo/gentoo:master commit in: app-text/pdfpc/files/, app-text/pdfpc/ Ulrich Müller
-- strict thread matches above, loose matches on Subject: below --
2023-05-22 21:30 Ulrich Müller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox