From: ndowens <ndowens@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] gdk-pixbuf: update to 2.42.0
Date: Mon, 23 Nov 2020 19:04:35 +0100 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-26656@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 704 bytes --]
There is a new pull request by ndowens against master on the void-packages repository
https://github.com/ndowens/void-packages gdk-pixbuf
https://github.com/void-linux/void-packages/pull/26656
gdk-pixbuf: update to 2.42.0
Upstream has split gdk-pixbuf-xlib into it's own source. Created new gdk-pixbuf-xlib to reflect this.
gdk-pixbuf-xlib only containts /usr/include/* and /usr/lib/* files so unsure if I should leave it named as is or just possibly name it to gdk-pixbuf-xlib-devel ?
Rebuild packages that xbps-query -RX gdk-pixbuf-xlib reported with new gdk-pixbuf-xlib package added to hostmakedepends.
A patch file from https://github.com/void-linux/void-packages/pull/26656.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gdk-pixbuf-26656.patch --]
[-- Type: text/x-diff, Size: 6774 bytes --]
From f4ed010997b0057fa93c2f8b517fa38da10bd9d9 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Mon, 23 Nov 2020 11:41:49 -0600
Subject: [PATCH 1/5] icewm: revbump for new gdk-pixbuf-xlib
---
srcpkgs/icewm/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/icewm/template b/srcpkgs/icewm/template
index e039fc70099..cd084be34c1 100644
--- a/srcpkgs/icewm/template
+++ b/srcpkgs/icewm/template
@@ -1,12 +1,12 @@
# Template file for 'icewm'
pkgname=icewm
version=1.9.2
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_LTO=ON -DCONFIG_LIBRSVG=ON -DENABLE_ALSA=ON
-DCFGDIR=/etc/icewm"
hostmakedepends="asciidoc gettext-devel libtool mkfontdir perl
- pkg-config"
+ pkg-config gdk-pixbuf-xlib"
makedepends="libSM-devel libXft-devel libXinerama-devel libXpm-devel
libXrandr-devel libao-devel librsvg-devel libsndfile-devel
libXcomposite-devel libXdamage-devel fribidi-devel"
From 4e2bb40c208c0caa2074343974798c2199c1a506 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Mon, 23 Nov 2020 11:45:53 -0600
Subject: [PATCH 2/5] fbxkb: revbump for gdk-pixbuf-xlib
---
srcpkgs/fbxkb/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/fbxkb/template b/srcpkgs/fbxkb/template
index 1356d32df97..a52e83a543b 100644
--- a/srcpkgs/fbxkb/template
+++ b/srcpkgs/fbxkb/template
@@ -1,9 +1,9 @@
# Template file for 'fbxkb'
pkgname=fbxkb
version=0.6
-revision=2
+revision=3
build_style=configure
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config gdk-pixbuf-xlib"
makedepends="xorg-server-devel gtk+-devel"
short_desc="Lightweight X keyboard layout indicator, uses GTK+2"
maintainer="Pavel Kiselev <kispash@yandex.ru>"
From 7e184ae453590bad9862ae63dc4e9ac5bf2b049c Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Mon, 23 Nov 2020 11:53:29 -0600
Subject: [PATCH 3/5] xscreensaver: revbump for new gdk-pixbuf-xlib
---
srcpkgs/xscreensaver/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xscreensaver/template b/srcpkgs/xscreensaver/template
index 0039acbd307..0a7026379a0 100644
--- a/srcpkgs/xscreensaver/template
+++ b/srcpkgs/xscreensaver/template
@@ -1,14 +1,14 @@
# Template file for 'xscreensaver'
pkgname=xscreensaver
version=5.44
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-pam --with-login-manager
--with-x-app-defaults=/usr/share/X11/app-defaults
--includedir=${XBPS_CROSS_BASE}/include
--libdir=${XBPS_CROSS_BASE}/lib"
conf_files="/etc/pam.d/xscreensaver"
-hostmakedepends="bc intltool pkg-config"
+hostmakedepends="bc intltool pkg-config gdk-pixbuf-xlib"
makedepends="glu-devel libXinerama-devel libXmu-devel libXpm-devel
libXrandr-devel libglade-devel pam-devel"
short_desc="Screen saver and locker for the X Window System"
From 4c42700c5f089a5ff9a21e4980fdc24e14480b54 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Mon, 23 Nov 2020 11:23:42 -0600
Subject: [PATCH 4/5] gdk-pixbuf-xlib: upgrade to 2.40.2
Remove from gdk-pixbuf as source has been moved into it's own
source upstream
---
common/shlibs | 2 +-
srcpkgs/gdk-pixbuf-xlib | 1 -
srcpkgs/gdk-pixbuf-xlib/template | 13 +++++++++++++
3 files changed, 14 insertions(+), 2 deletions(-)
delete mode 120000 srcpkgs/gdk-pixbuf-xlib
create mode 100644 srcpkgs/gdk-pixbuf-xlib/template
diff --git a/common/shlibs b/common/shlibs
index 51c9ba0635a..db41f32f6f8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -98,7 +98,7 @@ libcairo-script-interpreter.so.2 cairo-1.8.6_1
libgdk-x11-2.0.so.0 gtk+-2.16.0_1
libgtk-x11-2.0.so.0 gtk+-2.16.0_1
libgdk_pixbuf-2.0.so.0 gdk-pixbuf-2.22.0_1
-libgdk_pixbuf_xlib-2.0.so.0 gdk-pixbuf-xlib-2.30.8_1
+libgdk_pixbuf_xlib-2.0.so.0 gdk-pixbuf-xlib-2.40.2_1
libgailutil.so.18 gtk+-2.16.0_1
libfreetype.so.6 freetype-2.3.9_1
libfontconfig.so.1 fontconfig-2.6.0_1
diff --git a/srcpkgs/gdk-pixbuf-xlib b/srcpkgs/gdk-pixbuf-xlib
deleted file mode 120000
index fa20dc708aa..00000000000
--- a/srcpkgs/gdk-pixbuf-xlib
+++ /dev/null
@@ -1 +0,0 @@
-gdk-pixbuf
\ No newline at end of file
diff --git a/srcpkgs/gdk-pixbuf-xlib/template b/srcpkgs/gdk-pixbuf-xlib/template
new file mode 100644
index 00000000000..7149d4a714f
--- /dev/null
+++ b/srcpkgs/gdk-pixbuf-xlib/template
@@ -0,0 +1,13 @@
+# Template file for 'gdk-pixbuf-xlib'
+pkgname=gdk-pixbuf-xlib
+version=2.40.2
+revision=1
+build_style=meson
+hostmakedepends="pkg-config"
+makedepends="gdk-pixbuf-devel"
+short_desc="Dedicated Xlib integration for GdkPixbuf"
+maintainer="Nathan Owens <ndowens@artixlinux.org>"
+license="MPL-1.1"
+homepage="https://gitlab.gnome.org/Archive/gdk-pixbuf-xlib"
+distfiles="https://gitlab.gnome.org/Archive/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
+checksum=e7d9b6a8ca53b6500a82ee8d5a1b3c17780740a6ca7bf04a5dabba0fe50bb7ff
From 4c088e05dd353c459e214e03553ff4cf57ba2dba Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Mon, 23 Nov 2020 11:10:25 -0600
Subject: [PATCH 5/5] gdk-pixbuf: update to 2.42.0
gdk-pixbuf-xlib is now a seperate repo source
---
srcpkgs/gdk-pixbuf/template | 17 +++++------------
1 file changed, 5 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/gdk-pixbuf/template b/srcpkgs/gdk-pixbuf/template
index 578dd04a7d3..e9685de90d0 100644
--- a/srcpkgs/gdk-pixbuf/template
+++ b/srcpkgs/gdk-pixbuf/template
@@ -1,7 +1,7 @@
# Template file for 'gdk-pixbuf'
pkgname=gdk-pixbuf
-version=2.40.0
-revision=2
+version=2.42.0
+revision=1
build_style=meson
build_helper="gir"
configure_args="-Dgir=$(vopt_if gir true false) -Djasper=false
@@ -15,7 +15,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/GdkPixbuf"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1582595099537ca8ff3b99c6804350b4c058bb8ad67411bbaae024ee7cead4e6
+checksum=73441338d1a901dc7a3940113cb0aac22776b2832f7eab8f8ec7ec5755adaec7
# Package build options
build_options="gir"
@@ -29,18 +29,11 @@ pre_configure() {
if [ "$CROSS_BUILD" ]; then
touch gdk-pixbuf/loaders.cache
fi
- sed -i "s|subdir('tests')||g" -i meson.build
-}
-
-gdk-pixbuf-xlib_package() {
- short_desc+=" - xlib rendering library"
- pkg_install() {
- vmove usr/lib/libgdk_pixbuf_xlib*.so.*
- }
+ vsed -i "s|subdir('tests')||g" -i meson.build
}
gdk-pixbuf-devel_package() {
- depends="${makedepends} ${sourcepkg}-xlib>=${version}_${revision} ${sourcepkg}>=${version}_${revision}"
+ depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove "usr/lib/*.so"
next reply other threads:[~2020-11-23 18:04 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-23 18:04 ndowens [this message]
2020-11-23 18:09 ` [PR PATCH] [Closed]: " ndowens
2020-11-23 18:48 ` [PR PATCH] [Updated] " ndowens
2020-11-23 19:03 ` ndowens
2022-01-22 8:53 ` biopsin
2022-01-27 20:20 ` [PR PATCH] [Updated] " Chocimier
2022-01-27 20:29 ` Chocimier
2022-01-27 20:29 ` [PR PATCH] [Merged]: " Chocimier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-26656@inbox.vuxu.org \
--to=ndowens@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).