* [PR PATCH] gettext: update to 0.20.2
@ 2020-04-29 14:10 rmccask
2020-04-29 16:45 ` [PR PATCH] [Updated] " rmccask
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: rmccask @ 2020-04-29 14:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 317 bytes --]
There is a new pull request by rmccask against master on the void-packages repository
https://github.com/rmccask/void-packages gettext-0.20.2
https://github.com/void-linux/void-packages/pull/21468
gettext: update to 0.20.2
A patch file from https://github.com/void-linux/void-packages/pull/21468.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gettext-0.20.2-21468.patch --]
[-- Type: text/x-diff, Size: 1767 bytes --]
From 3c11a35a4045cc8d8a364122093eb89a127b7b63 Mon Sep 17 00:00:00 2001
From: Randy McCaskill <randy@mccaskill.us>
Date: Wed, 29 Apr 2020 10:09:14 -0400
Subject: [PATCH] gettext: update to 0.20.2
---
common/shlibs | 4 ++--
srcpkgs/gettext/template | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index a208407b359..b236d3aa4f7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -192,8 +192,8 @@ libgdbm.so.6 gdbm-1.16_1
libgdbm_compat.so.4 gdbm-1.10_1_1
libintl.so.8 gettext-libs-0.19.2_1
libgnuintl.so.8 gettext-libs-0.19.2_1
-libgettextlib-0.20.1.so gettext-libs-0.20.1_1
-libgettextsrc-0.20.1.so gettext-libs-0.20.1_1
+libgettextlib-0.20.2.so gettext-libs-0.20.2_1
+libgettextsrc-0.20.2.so gettext-libs-0.20.2_1
libgettextpo.so.0 gettext-libs-0.17_1
libtextstyle.so.0 gettext-libs-0.20.1_1
libattr.so.1 attr-2.4.43_1
diff --git a/srcpkgs/gettext/template b/srcpkgs/gettext/template
index 63e438a8c7d..03a04cdbb64 100644
--- a/srcpkgs/gettext/template
+++ b/srcpkgs/gettext/template
@@ -1,7 +1,7 @@
# Template file for 'gettext'
pkgname=gettext
-version=0.20.1
-revision=2
+version=0.20.2
+revision=1
build_style=gnu-configure
configure_args="--disable-java --disable-native-java --disable-csharp
--disable-libasprintf --enable-threads=posix --disable-rpath --without-emacs
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://www.gnu.org/software/gettext/"
distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=66415634c6e8c3fa8b71362879ec7575e27da43da562c798a8a2f223e6e47f5c
+checksum=ecb9d0908ca41d5ca5fef974323b3bba6bec19eebba0b44f396de98cfcc089f1
case "$XBPS_TARGET_MACHINE" in
# force libintl
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] gettext: update to 0.20.2
2020-04-29 14:10 [PR PATCH] gettext: update to 0.20.2 rmccask
@ 2020-04-29 16:45 ` rmccask
2020-06-01 13:21 ` rmccask
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: rmccask @ 2020-04-29 16:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 322 bytes --]
There is an updated pull request by rmccask against master on the void-packages repository
https://github.com/rmccask/void-packages gettext-0.20.2
https://github.com/void-linux/void-packages/pull/21468
gettext: update to 0.20.2
A patch file from https://github.com/void-linux/void-packages/pull/21468.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gettext-0.20.2-21468.patch --]
[-- Type: text/x-diff, Size: 2029 bytes --]
From 7352db09b8a0801c480dee0484051a5a6a4b271c Mon Sep 17 00:00:00 2001
From: Randy McCaskill <randy@mccaskill.us>
Date: Wed, 29 Apr 2020 10:09:14 -0400
Subject: [PATCH] gettext: update to 0.20.2
---
common/shlibs | 4 ++--
srcpkgs/gettext/template | 9 +++++----
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index a208407b359..b236d3aa4f7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -192,8 +192,8 @@ libgdbm.so.6 gdbm-1.16_1
libgdbm_compat.so.4 gdbm-1.10_1_1
libintl.so.8 gettext-libs-0.19.2_1
libgnuintl.so.8 gettext-libs-0.19.2_1
-libgettextlib-0.20.1.so gettext-libs-0.20.1_1
-libgettextsrc-0.20.1.so gettext-libs-0.20.1_1
+libgettextlib-0.20.2.so gettext-libs-0.20.2_1
+libgettextsrc-0.20.2.so gettext-libs-0.20.2_1
libgettextpo.so.0 gettext-libs-0.17_1
libtextstyle.so.0 gettext-libs-0.20.1_1
libattr.so.1 attr-2.4.43_1
diff --git a/srcpkgs/gettext/template b/srcpkgs/gettext/template
index 63e438a8c7d..4495f83401f 100644
--- a/srcpkgs/gettext/template
+++ b/srcpkgs/gettext/template
@@ -1,7 +1,7 @@
# Template file for 'gettext'
pkgname=gettext
-version=0.20.1
-revision=2
+version=0.20.2
+revision=1
build_style=gnu-configure
configure_args="--disable-java --disable-native-java --disable-csharp
--disable-libasprintf --enable-threads=posix --disable-rpath --without-emacs
@@ -12,9 +12,10 @@ configure_args="--disable-java --disable-native-java --disable-csharp
short_desc="Internationalized Message Handling Library and tools"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
-homepage="http://www.gnu.org/software/gettext/"
+homepage="https://www.gnu.org/software/gettext/"
+changelog="https://git.savannah.gnu.org/cgit/gettext.git/plain/NEWS"
distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=66415634c6e8c3fa8b71362879ec7575e27da43da562c798a8a2f223e6e47f5c
+checksum=ecb9d0908ca41d5ca5fef974323b3bba6bec19eebba0b44f396de98cfcc089f1
case "$XBPS_TARGET_MACHINE" in
# force libintl
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] gettext: update to 0.20.2
2020-04-29 14:10 [PR PATCH] gettext: update to 0.20.2 rmccask
2020-04-29 16:45 ` [PR PATCH] [Updated] " rmccask
@ 2020-06-01 13:21 ` rmccask
2020-06-02 2:01 ` [PR PATCH] [Updated] [WIP] " rmccask
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: rmccask @ 2020-06-01 13:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 322 bytes --]
There is an updated pull request by rmccask against master on the void-packages repository
https://github.com/rmccask/void-packages gettext-0.20.2
https://github.com/void-linux/void-packages/pull/21468
gettext: update to 0.20.2
A patch file from https://github.com/void-linux/void-packages/pull/21468.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gettext-0.20.2-21468.patch --]
[-- Type: text/x-diff, Size: 2029 bytes --]
From 8705b11045c5f64ff78f7e02918e46488095d3d3 Mon Sep 17 00:00:00 2001
From: Randy McCaskill <randy@mccaskill.us>
Date: Wed, 29 Apr 2020 10:09:14 -0400
Subject: [PATCH] gettext: update to 0.20.2
---
common/shlibs | 4 ++--
srcpkgs/gettext/template | 9 +++++----
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 2ea912f8354..6febb5212aa 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -193,8 +193,8 @@ libgdbm.so.6 gdbm-1.16_1
libgdbm_compat.so.4 gdbm-1.10_1_1
libintl.so.8 gettext-libs-0.19.2_1
libgnuintl.so.8 gettext-libs-0.19.2_1
-libgettextlib-0.20.1.so gettext-libs-0.20.1_1
-libgettextsrc-0.20.1.so gettext-libs-0.20.1_1
+libgettextlib-0.20.2.so gettext-libs-0.20.2_1
+libgettextsrc-0.20.2.so gettext-libs-0.20.2_1
libgettextpo.so.0 gettext-libs-0.17_1
libtextstyle.so.0 gettext-libs-0.20.1_1
libattr.so.1 attr-2.4.43_1
diff --git a/srcpkgs/gettext/template b/srcpkgs/gettext/template
index 63e438a8c7d..4495f83401f 100644
--- a/srcpkgs/gettext/template
+++ b/srcpkgs/gettext/template
@@ -1,7 +1,7 @@
# Template file for 'gettext'
pkgname=gettext
-version=0.20.1
-revision=2
+version=0.20.2
+revision=1
build_style=gnu-configure
configure_args="--disable-java --disable-native-java --disable-csharp
--disable-libasprintf --enable-threads=posix --disable-rpath --without-emacs
@@ -12,9 +12,10 @@ configure_args="--disable-java --disable-native-java --disable-csharp
short_desc="Internationalized Message Handling Library and tools"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
-homepage="http://www.gnu.org/software/gettext/"
+homepage="https://www.gnu.org/software/gettext/"
+changelog="https://git.savannah.gnu.org/cgit/gettext.git/plain/NEWS"
distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=66415634c6e8c3fa8b71362879ec7575e27da43da562c798a8a2f223e6e47f5c
+checksum=ecb9d0908ca41d5ca5fef974323b3bba6bec19eebba0b44f396de98cfcc089f1
case "$XBPS_TARGET_MACHINE" in
# force libintl
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] gettext: update to 0.20.2
2020-04-29 14:10 [PR PATCH] gettext: update to 0.20.2 rmccask
2020-04-29 16:45 ` [PR PATCH] [Updated] " rmccask
2020-06-01 13:21 ` rmccask
@ 2020-06-02 2:01 ` rmccask
2020-06-02 2:03 ` rmccask
2020-06-02 2:14 ` rmccask
4 siblings, 0 replies; 6+ messages in thread
From: rmccask @ 2020-06-02 2:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 328 bytes --]
There is an updated pull request by rmccask against master on the void-packages repository
https://github.com/rmccask/void-packages gettext-0.20.2
https://github.com/void-linux/void-packages/pull/21468
[WIP] gettext: update to 0.20.2
A patch file from https://github.com/void-linux/void-packages/pull/21468.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gettext-0.20.2-21468.patch --]
[-- Type: text/x-diff, Size: 7598 bytes --]
From 0336a4f0d2a6625867f34422b4e3e79bebebdb68 Mon Sep 17 00:00:00 2001
From: Randy McCaskill <randy@mccaskill.us>
Date: Wed, 29 Apr 2020 10:09:14 -0400
Subject: [PATCH 1/5] gettext: update to 0.20.2
---
common/shlibs | 4 ++--
srcpkgs/gettext/template | 9 +++++----
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 2ea912f8354..6febb5212aa 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -193,8 +193,8 @@ libgdbm.so.6 gdbm-1.16_1
libgdbm_compat.so.4 gdbm-1.10_1_1
libintl.so.8 gettext-libs-0.19.2_1
libgnuintl.so.8 gettext-libs-0.19.2_1
-libgettextlib-0.20.1.so gettext-libs-0.20.1_1
-libgettextsrc-0.20.1.so gettext-libs-0.20.1_1
+libgettextlib-0.20.2.so gettext-libs-0.20.2_1
+libgettextsrc-0.20.2.so gettext-libs-0.20.2_1
libgettextpo.so.0 gettext-libs-0.17_1
libtextstyle.so.0 gettext-libs-0.20.1_1
libattr.so.1 attr-2.4.43_1
diff --git a/srcpkgs/gettext/template b/srcpkgs/gettext/template
index 63e438a8c7d..4495f83401f 100644
--- a/srcpkgs/gettext/template
+++ b/srcpkgs/gettext/template
@@ -1,7 +1,7 @@
# Template file for 'gettext'
pkgname=gettext
-version=0.20.1
-revision=2
+version=0.20.2
+revision=1
build_style=gnu-configure
configure_args="--disable-java --disable-native-java --disable-csharp
--disable-libasprintf --enable-threads=posix --disable-rpath --without-emacs
@@ -12,9 +12,10 @@ configure_args="--disable-java --disable-native-java --disable-csharp
short_desc="Internationalized Message Handling Library and tools"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
-homepage="http://www.gnu.org/software/gettext/"
+homepage="https://www.gnu.org/software/gettext/"
+changelog="https://git.savannah.gnu.org/cgit/gettext.git/plain/NEWS"
distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=66415634c6e8c3fa8b71362879ec7575e27da43da562c798a8a2f223e6e47f5c
+checksum=ecb9d0908ca41d5ca5fef974323b3bba6bec19eebba0b44f396de98cfcc089f1
case "$XBPS_TARGET_MACHINE" in
# force libintl
From 34c842eb1db92c7f5414f175b68811f88bff60d0 Mon Sep 17 00:00:00 2001
From: Randy McCaskill <randy@mccaskill.us>
Date: Mon, 1 Jun 2020 21:58:44 -0400
Subject: [PATCH 2/5] gtk4: add patch for meson for building
---
srcpkgs/gtk4/patches/meson.patch | 72 ++++++++++++++++++++++++++++++++
srcpkgs/gtk4/template | 2 +-
2 files changed, 73 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/gtk4/patches/meson.patch
diff --git a/srcpkgs/gtk4/patches/meson.patch b/srcpkgs/gtk4/patches/meson.patch
new file mode 100644
index 00000000000..d8b476848c2
--- /dev/null
+++ b/srcpkgs/gtk4/patches/meson.patch
@@ -0,0 +1,72 @@
+From 5df4d277527858481ca6eb7af0762c73d804f19d Mon Sep 17 00:00:00 2001
+From: Nirbheek Chauhan <nirbheek@centricular.com>
+Date: Mon, 23 Jul 2018 17:19:31 +0530
+Subject: [PATCH] meson: libgdk-broadway.a depends on broadwayjs.h
+
+Fixes https://gitlab.gnome.org/GNOME/gtk/issues/1218
+
+Also fix another dependency error I found.
+---
+ gdk/broadway/meson.build | 24 ++++++++++++------------
+ gdk/x11/meson.build | 2 +-
+ 2 files changed, 13 insertions(+), 13 deletions(-)
+
+diff --git gdk/broadway/meson.build gdk/broadway/meson.build
+index 0306770f3f..590440ace0 100644
+--- gdk/broadway/meson.build
++++ gdk/broadway/meson.build
+@@ -43,8 +43,19 @@ clienthtml_h = custom_target('clienthtml.h',
+ ],
+ )
+
++broadwayjs_h = custom_target('broadwayjs.h',
++ input : ['broadway.js'],
++ output : 'broadwayjs.h',
++ command : [
++ gen_c_array,
++ '--array-name=broadway_js',
++ '--output=@OUTPUT@',
++ '@INPUT0@',
++ ],
++)
++
+ libgdk_broadway = static_library('gdk-broadway',
+- clienthtml_h,
++ clienthtml_h, broadwayjs_h,
+ gdk_broadway_sources, gdkconfig, gdkenum_h,
+ include_directories: [confinc, gdkinc],
+ c_args: [
+@@ -58,17 +69,6 @@ libgdk_broadway = static_library('gdk-broadway',
+
+ broadwayd_syslib = os_win32 ? find_library('ws2_32') : shmlib
+
+-broadwayjs_h = custom_target('broadwayjs.h',
+- input : ['broadway.js'],
+- output : 'broadwayjs.h',
+- command : [
+- gen_c_array,
+- '--array-name=broadway_js',
+- '--output=@OUTPUT@',
+- '@INPUT0@',
+- ],
+-)
+-
+ executable('gtk4-broadwayd',
+ clienthtml_h, broadwayjs_h,
+ 'broadwayd.c', 'broadway-server.c', 'broadway-output.c',
+diff --git gdk/x11/meson.build gdk/x11/meson.build
+index 33e61c114a..03d314feef 100644
+--- gdk/x11/meson.build
++++ gdk/x11/meson.build
+@@ -70,7 +70,7 @@ gdk_x11_deps = [
+ xinerama_dep,
+ ]
+
+-libgdk_x11 = static_library('gdk-x11',
++libgdk_x11 = static_library('gdk-x11', gdkmarshal_h,
+ gdk_x11_sources, gdkconfig, gdkenum_h,
+ include_directories: [ confinc, gdkinc, ],
+ c_args: [
+--
+2.26.2
+
diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index 58388b515c0..346f0c218c7 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,7 +1,7 @@
# Template file for 'gtk4'
pkgname=gtk4
version=3.94.0
-revision=2
+revision=3
wrksrc="gtk+-${version}"
build_style=meson
build_helper="gir"
From ddf0769f6205bbca79459902efef9f7c7745c1c7 Mon Sep 17 00:00:00 2001
From: Randy McCaskill <randy@mccaskill.us>
Date: Mon, 1 Jun 2020 21:59:55 -0400
Subject: [PATCH 3/5] sdcv: add pkg-config to hostmakedepends
---
srcpkgs/sdcv/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sdcv/template b/srcpkgs/sdcv/template
index 8703886d878..5e8b56c713e 100644
--- a/srcpkgs/sdcv/template
+++ b/srcpkgs/sdcv/template
@@ -3,7 +3,7 @@ pkgname=sdcv
version=0.5.2
revision=2
build_style=cmake
-hostmakedepends="glib-devel"
+hostmakedepends="pkg-config glib-devel"
makedepends="zlib-devel readline-devel glib-devel"
short_desc="Console version of Stardict program"
maintainer="Casper Ti. Vector <caspervector@gmail.com>"
From 55ba19239471e0103ca2183993044c0611a4c362 Mon Sep 17 00:00:00 2001
From: Randy McCaskill <randy@mccaskill.us>
Date: Mon, 1 Jun 2020 22:00:34 -0400
Subject: [PATCH 4/5] sysexxer-ng: add gettext to hostmakedepends
---
srcpkgs/sysexxer-ng/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/sysexxer-ng/template b/srcpkgs/sysexxer-ng/template
index 3b7cea47138..18b2a6e776a 100644
--- a/srcpkgs/sysexxer-ng/template
+++ b/srcpkgs/sysexxer-ng/template
@@ -1,9 +1,9 @@
# Template file for 'sysexxer-ng'
pkgname=sysexxer-ng
version=1.0
-revision=1
+revision=2
build_style=cmake
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config gettext"
makedepends="boost-devel fltk-devel jack-devel libev-devel ncurses-devel rtmidi-devel"
short_desc="Universal tool to exchange MIDI system-exclusive data"
maintainer="bra1nwave <brainwave@openmailbox.org>"
From 36eece7dcdf6e2ba7927ee00d321826f694350f0 Mon Sep 17 00:00:00 2001
From: Randy McCaskill <randy@mccaskill.us>
Date: Mon, 1 Jun 2020 22:01:07 -0400
Subject: [PATCH 5/5] trackballs: add gettext to hostmakedepends
---
srcpkgs/trackballs/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/trackballs/template b/srcpkgs/trackballs/template
index 91e12fbddbf..32197aaebac 100644
--- a/srcpkgs/trackballs/template
+++ b/srcpkgs/trackballs/template
@@ -1,9 +1,9 @@
# Template file for 'trackballs'
pkgname=trackballs
version=1.3.1
-revision=1
+revision=2
build_style=cmake
-hostmakedepends="guile"
+hostmakedepends="guile gettext"
makedepends="zlib-devel SDL2_image-devel SDL2_mixer-devel SDL2_ttf-devel guile-devel"
depends="guile"
short_desc="Marble steering game"
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] gettext: update to 0.20.2
2020-04-29 14:10 [PR PATCH] gettext: update to 0.20.2 rmccask
` (2 preceding siblings ...)
2020-06-02 2:01 ` [PR PATCH] [Updated] [WIP] " rmccask
@ 2020-06-02 2:03 ` rmccask
2020-06-02 2:14 ` rmccask
4 siblings, 0 replies; 6+ messages in thread
From: rmccask @ 2020-06-02 2:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 328 bytes --]
There is an updated pull request by rmccask against master on the void-packages repository
https://github.com/rmccask/void-packages gettext-0.20.2
https://github.com/void-linux/void-packages/pull/21468
[WIP] gettext: update to 0.20.2
A patch file from https://github.com/void-linux/void-packages/pull/21468.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gettext-0.20.2-21468.patch --]
[-- Type: text/x-diff, Size: 7608 bytes --]
From adc0c71ca2646b26fec22a5689660e4326caac22 Mon Sep 17 00:00:00 2001
From: Randy McCaskill <randy@mccaskill.us>
Date: Wed, 29 Apr 2020 10:09:14 -0400
Subject: [PATCH 1/5] gettext: update to 0.20.2
[ci skip]
---
common/shlibs | 4 ++--
srcpkgs/gettext/template | 9 +++++----
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 2ea912f8354..6febb5212aa 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -193,8 +193,8 @@ libgdbm.so.6 gdbm-1.16_1
libgdbm_compat.so.4 gdbm-1.10_1_1
libintl.so.8 gettext-libs-0.19.2_1
libgnuintl.so.8 gettext-libs-0.19.2_1
-libgettextlib-0.20.1.so gettext-libs-0.20.1_1
-libgettextsrc-0.20.1.so gettext-libs-0.20.1_1
+libgettextlib-0.20.2.so gettext-libs-0.20.2_1
+libgettextsrc-0.20.2.so gettext-libs-0.20.2_1
libgettextpo.so.0 gettext-libs-0.17_1
libtextstyle.so.0 gettext-libs-0.20.1_1
libattr.so.1 attr-2.4.43_1
diff --git a/srcpkgs/gettext/template b/srcpkgs/gettext/template
index 63e438a8c7d..4495f83401f 100644
--- a/srcpkgs/gettext/template
+++ b/srcpkgs/gettext/template
@@ -1,7 +1,7 @@
# Template file for 'gettext'
pkgname=gettext
-version=0.20.1
-revision=2
+version=0.20.2
+revision=1
build_style=gnu-configure
configure_args="--disable-java --disable-native-java --disable-csharp
--disable-libasprintf --enable-threads=posix --disable-rpath --without-emacs
@@ -12,9 +12,10 @@ configure_args="--disable-java --disable-native-java --disable-csharp
short_desc="Internationalized Message Handling Library and tools"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
-homepage="http://www.gnu.org/software/gettext/"
+homepage="https://www.gnu.org/software/gettext/"
+changelog="https://git.savannah.gnu.org/cgit/gettext.git/plain/NEWS"
distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=66415634c6e8c3fa8b71362879ec7575e27da43da562c798a8a2f223e6e47f5c
+checksum=ecb9d0908ca41d5ca5fef974323b3bba6bec19eebba0b44f396de98cfcc089f1
case "$XBPS_TARGET_MACHINE" in
# force libintl
From 05dcc752b28c889314d05a7edfded3f93f9e297e Mon Sep 17 00:00:00 2001
From: Randy McCaskill <randy@mccaskill.us>
Date: Mon, 1 Jun 2020 21:58:44 -0400
Subject: [PATCH 2/5] gtk4: add patch for meson for building
---
srcpkgs/gtk4/patches/meson.patch | 72 ++++++++++++++++++++++++++++++++
srcpkgs/gtk4/template | 2 +-
2 files changed, 73 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/gtk4/patches/meson.patch
diff --git a/srcpkgs/gtk4/patches/meson.patch b/srcpkgs/gtk4/patches/meson.patch
new file mode 100644
index 00000000000..d8b476848c2
--- /dev/null
+++ b/srcpkgs/gtk4/patches/meson.patch
@@ -0,0 +1,72 @@
+From 5df4d277527858481ca6eb7af0762c73d804f19d Mon Sep 17 00:00:00 2001
+From: Nirbheek Chauhan <nirbheek@centricular.com>
+Date: Mon, 23 Jul 2018 17:19:31 +0530
+Subject: [PATCH] meson: libgdk-broadway.a depends on broadwayjs.h
+
+Fixes https://gitlab.gnome.org/GNOME/gtk/issues/1218
+
+Also fix another dependency error I found.
+---
+ gdk/broadway/meson.build | 24 ++++++++++++------------
+ gdk/x11/meson.build | 2 +-
+ 2 files changed, 13 insertions(+), 13 deletions(-)
+
+diff --git gdk/broadway/meson.build gdk/broadway/meson.build
+index 0306770f3f..590440ace0 100644
+--- gdk/broadway/meson.build
++++ gdk/broadway/meson.build
+@@ -43,8 +43,19 @@ clienthtml_h = custom_target('clienthtml.h',
+ ],
+ )
+
++broadwayjs_h = custom_target('broadwayjs.h',
++ input : ['broadway.js'],
++ output : 'broadwayjs.h',
++ command : [
++ gen_c_array,
++ '--array-name=broadway_js',
++ '--output=@OUTPUT@',
++ '@INPUT0@',
++ ],
++)
++
+ libgdk_broadway = static_library('gdk-broadway',
+- clienthtml_h,
++ clienthtml_h, broadwayjs_h,
+ gdk_broadway_sources, gdkconfig, gdkenum_h,
+ include_directories: [confinc, gdkinc],
+ c_args: [
+@@ -58,17 +69,6 @@ libgdk_broadway = static_library('gdk-broadway',
+
+ broadwayd_syslib = os_win32 ? find_library('ws2_32') : shmlib
+
+-broadwayjs_h = custom_target('broadwayjs.h',
+- input : ['broadway.js'],
+- output : 'broadwayjs.h',
+- command : [
+- gen_c_array,
+- '--array-name=broadway_js',
+- '--output=@OUTPUT@',
+- '@INPUT0@',
+- ],
+-)
+-
+ executable('gtk4-broadwayd',
+ clienthtml_h, broadwayjs_h,
+ 'broadwayd.c', 'broadway-server.c', 'broadway-output.c',
+diff --git gdk/x11/meson.build gdk/x11/meson.build
+index 33e61c114a..03d314feef 100644
+--- gdk/x11/meson.build
++++ gdk/x11/meson.build
+@@ -70,7 +70,7 @@ gdk_x11_deps = [
+ xinerama_dep,
+ ]
+
+-libgdk_x11 = static_library('gdk-x11',
++libgdk_x11 = static_library('gdk-x11', gdkmarshal_h,
+ gdk_x11_sources, gdkconfig, gdkenum_h,
+ include_directories: [ confinc, gdkinc, ],
+ c_args: [
+--
+2.26.2
+
diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index 58388b515c0..346f0c218c7 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,7 +1,7 @@
# Template file for 'gtk4'
pkgname=gtk4
version=3.94.0
-revision=2
+revision=3
wrksrc="gtk+-${version}"
build_style=meson
build_helper="gir"
From 5bcc311b2fa708d8687dcba66e2682ba90bfc84f Mon Sep 17 00:00:00 2001
From: Randy McCaskill <randy@mccaskill.us>
Date: Mon, 1 Jun 2020 21:59:55 -0400
Subject: [PATCH 3/5] sdcv: add pkg-config to hostmakedepends
---
srcpkgs/sdcv/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sdcv/template b/srcpkgs/sdcv/template
index 8703886d878..5e8b56c713e 100644
--- a/srcpkgs/sdcv/template
+++ b/srcpkgs/sdcv/template
@@ -3,7 +3,7 @@ pkgname=sdcv
version=0.5.2
revision=2
build_style=cmake
-hostmakedepends="glib-devel"
+hostmakedepends="pkg-config glib-devel"
makedepends="zlib-devel readline-devel glib-devel"
short_desc="Console version of Stardict program"
maintainer="Casper Ti. Vector <caspervector@gmail.com>"
From e0468a3ac08f2cc5238dd687e80e3c6a56556c60 Mon Sep 17 00:00:00 2001
From: Randy McCaskill <randy@mccaskill.us>
Date: Mon, 1 Jun 2020 22:00:34 -0400
Subject: [PATCH 4/5] sysexxer-ng: add gettext to hostmakedepends
---
srcpkgs/sysexxer-ng/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/sysexxer-ng/template b/srcpkgs/sysexxer-ng/template
index 3b7cea47138..18b2a6e776a 100644
--- a/srcpkgs/sysexxer-ng/template
+++ b/srcpkgs/sysexxer-ng/template
@@ -1,9 +1,9 @@
# Template file for 'sysexxer-ng'
pkgname=sysexxer-ng
version=1.0
-revision=1
+revision=2
build_style=cmake
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config gettext"
makedepends="boost-devel fltk-devel jack-devel libev-devel ncurses-devel rtmidi-devel"
short_desc="Universal tool to exchange MIDI system-exclusive data"
maintainer="bra1nwave <brainwave@openmailbox.org>"
From 14ee20a70f56c60849028495d9cb2a7ee1407486 Mon Sep 17 00:00:00 2001
From: Randy McCaskill <randy@mccaskill.us>
Date: Mon, 1 Jun 2020 22:01:07 -0400
Subject: [PATCH 5/5] trackballs: add gettext to hostmakedepends
---
srcpkgs/trackballs/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/trackballs/template b/srcpkgs/trackballs/template
index 91e12fbddbf..32197aaebac 100644
--- a/srcpkgs/trackballs/template
+++ b/srcpkgs/trackballs/template
@@ -1,9 +1,9 @@
# Template file for 'trackballs'
pkgname=trackballs
version=1.3.1
-revision=1
+revision=2
build_style=cmake
-hostmakedepends="guile"
+hostmakedepends="guile gettext"
makedepends="zlib-devel SDL2_image-devel SDL2_mixer-devel SDL2_ttf-devel guile-devel"
depends="guile"
short_desc="Marble steering game"
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] gettext: update to 0.20.2
2020-04-29 14:10 [PR PATCH] gettext: update to 0.20.2 rmccask
` (3 preceding siblings ...)
2020-06-02 2:03 ` rmccask
@ 2020-06-02 2:14 ` rmccask
4 siblings, 0 replies; 6+ messages in thread
From: rmccask @ 2020-06-02 2:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 328 bytes --]
There is an updated pull request by rmccask against master on the void-packages repository
https://github.com/rmccask/void-packages gettext-0.20.2
https://github.com/void-linux/void-packages/pull/21468
[WIP] gettext: update to 0.20.2
A patch file from https://github.com/void-linux/void-packages/pull/21468.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gettext-0.20.2-21468.patch --]
[-- Type: text/x-diff, Size: 7865 bytes --]
From adc0c71ca2646b26fec22a5689660e4326caac22 Mon Sep 17 00:00:00 2001
From: Randy McCaskill <randy@mccaskill.us>
Date: Wed, 29 Apr 2020 10:09:14 -0400
Subject: [PATCH 1/5] gettext: update to 0.20.2
[ci skip]
---
common/shlibs | 4 ++--
srcpkgs/gettext/template | 9 +++++----
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 2ea912f8354..6febb5212aa 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -193,8 +193,8 @@ libgdbm.so.6 gdbm-1.16_1
libgdbm_compat.so.4 gdbm-1.10_1_1
libintl.so.8 gettext-libs-0.19.2_1
libgnuintl.so.8 gettext-libs-0.19.2_1
-libgettextlib-0.20.1.so gettext-libs-0.20.1_1
-libgettextsrc-0.20.1.so gettext-libs-0.20.1_1
+libgettextlib-0.20.2.so gettext-libs-0.20.2_1
+libgettextsrc-0.20.2.so gettext-libs-0.20.2_1
libgettextpo.so.0 gettext-libs-0.17_1
libtextstyle.so.0 gettext-libs-0.20.1_1
libattr.so.1 attr-2.4.43_1
diff --git a/srcpkgs/gettext/template b/srcpkgs/gettext/template
index 63e438a8c7d..4495f83401f 100644
--- a/srcpkgs/gettext/template
+++ b/srcpkgs/gettext/template
@@ -1,7 +1,7 @@
# Template file for 'gettext'
pkgname=gettext
-version=0.20.1
-revision=2
+version=0.20.2
+revision=1
build_style=gnu-configure
configure_args="--disable-java --disable-native-java --disable-csharp
--disable-libasprintf --enable-threads=posix --disable-rpath --without-emacs
@@ -12,9 +12,10 @@ configure_args="--disable-java --disable-native-java --disable-csharp
short_desc="Internationalized Message Handling Library and tools"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
-homepage="http://www.gnu.org/software/gettext/"
+homepage="https://www.gnu.org/software/gettext/"
+changelog="https://git.savannah.gnu.org/cgit/gettext.git/plain/NEWS"
distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=66415634c6e8c3fa8b71362879ec7575e27da43da562c798a8a2f223e6e47f5c
+checksum=ecb9d0908ca41d5ca5fef974323b3bba6bec19eebba0b44f396de98cfcc089f1
case "$XBPS_TARGET_MACHINE" in
# force libintl
From 05dcc752b28c889314d05a7edfded3f93f9e297e Mon Sep 17 00:00:00 2001
From: Randy McCaskill <randy@mccaskill.us>
Date: Mon, 1 Jun 2020 21:58:44 -0400
Subject: [PATCH 2/5] gtk4: add patch for meson for building
---
srcpkgs/gtk4/patches/meson.patch | 72 ++++++++++++++++++++++++++++++++
srcpkgs/gtk4/template | 2 +-
2 files changed, 73 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/gtk4/patches/meson.patch
diff --git a/srcpkgs/gtk4/patches/meson.patch b/srcpkgs/gtk4/patches/meson.patch
new file mode 100644
index 00000000000..d8b476848c2
--- /dev/null
+++ b/srcpkgs/gtk4/patches/meson.patch
@@ -0,0 +1,72 @@
+From 5df4d277527858481ca6eb7af0762c73d804f19d Mon Sep 17 00:00:00 2001
+From: Nirbheek Chauhan <nirbheek@centricular.com>
+Date: Mon, 23 Jul 2018 17:19:31 +0530
+Subject: [PATCH] meson: libgdk-broadway.a depends on broadwayjs.h
+
+Fixes https://gitlab.gnome.org/GNOME/gtk/issues/1218
+
+Also fix another dependency error I found.
+---
+ gdk/broadway/meson.build | 24 ++++++++++++------------
+ gdk/x11/meson.build | 2 +-
+ 2 files changed, 13 insertions(+), 13 deletions(-)
+
+diff --git gdk/broadway/meson.build gdk/broadway/meson.build
+index 0306770f3f..590440ace0 100644
+--- gdk/broadway/meson.build
++++ gdk/broadway/meson.build
+@@ -43,8 +43,19 @@ clienthtml_h = custom_target('clienthtml.h',
+ ],
+ )
+
++broadwayjs_h = custom_target('broadwayjs.h',
++ input : ['broadway.js'],
++ output : 'broadwayjs.h',
++ command : [
++ gen_c_array,
++ '--array-name=broadway_js',
++ '--output=@OUTPUT@',
++ '@INPUT0@',
++ ],
++)
++
+ libgdk_broadway = static_library('gdk-broadway',
+- clienthtml_h,
++ clienthtml_h, broadwayjs_h,
+ gdk_broadway_sources, gdkconfig, gdkenum_h,
+ include_directories: [confinc, gdkinc],
+ c_args: [
+@@ -58,17 +69,6 @@ libgdk_broadway = static_library('gdk-broadway',
+
+ broadwayd_syslib = os_win32 ? find_library('ws2_32') : shmlib
+
+-broadwayjs_h = custom_target('broadwayjs.h',
+- input : ['broadway.js'],
+- output : 'broadwayjs.h',
+- command : [
+- gen_c_array,
+- '--array-name=broadway_js',
+- '--output=@OUTPUT@',
+- '@INPUT0@',
+- ],
+-)
+-
+ executable('gtk4-broadwayd',
+ clienthtml_h, broadwayjs_h,
+ 'broadwayd.c', 'broadway-server.c', 'broadway-output.c',
+diff --git gdk/x11/meson.build gdk/x11/meson.build
+index 33e61c114a..03d314feef 100644
+--- gdk/x11/meson.build
++++ gdk/x11/meson.build
+@@ -70,7 +70,7 @@ gdk_x11_deps = [
+ xinerama_dep,
+ ]
+
+-libgdk_x11 = static_library('gdk-x11',
++libgdk_x11 = static_library('gdk-x11', gdkmarshal_h,
+ gdk_x11_sources, gdkconfig, gdkenum_h,
+ include_directories: [ confinc, gdkinc, ],
+ c_args: [
+--
+2.26.2
+
diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index 58388b515c0..346f0c218c7 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,7 +1,7 @@
# Template file for 'gtk4'
pkgname=gtk4
version=3.94.0
-revision=2
+revision=3
wrksrc="gtk+-${version}"
build_style=meson
build_helper="gir"
From a0884c52cb6686e3a89aa1ba5eead9e575a6df82 Mon Sep 17 00:00:00 2001
From: Randy McCaskill <randy@mccaskill.us>
Date: Mon, 1 Jun 2020 21:59:55 -0400
Subject: [PATCH 3/5] sdcv: add pkg-config to hostmakedepends; correct license
---
srcpkgs/sdcv/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/sdcv/template b/srcpkgs/sdcv/template
index 8703886d878..f7b9ecfbc77 100644
--- a/srcpkgs/sdcv/template
+++ b/srcpkgs/sdcv/template
@@ -3,11 +3,11 @@ pkgname=sdcv
version=0.5.2
revision=2
build_style=cmake
-hostmakedepends="glib-devel"
+hostmakedepends="pkg-config glib-devel"
makedepends="zlib-devel readline-devel glib-devel"
short_desc="Console version of Stardict program"
maintainer="Casper Ti. Vector <caspervector@gmail.com>"
-license="GPL-2"
+license="GPL-2.0-only"
homepage="https://dushistov.github.io/sdcv/"
distfiles="https://github.com/Dushistov/sdcv/archive/v$version.tar.gz"
checksum=ec08dc084a0748d5a89df01a20bbf294f09b0366295cd418000f15d2e043c4f7
From 0cd8828e95f370c685c2cad7737c6ced6d01cf7b Mon Sep 17 00:00:00 2001
From: Randy McCaskill <randy@mccaskill.us>
Date: Mon, 1 Jun 2020 22:00:34 -0400
Subject: [PATCH 4/5] sysexxer-ng: add gettext to hostmakedepends
---
srcpkgs/sysexxer-ng/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/sysexxer-ng/template b/srcpkgs/sysexxer-ng/template
index 3b7cea47138..18b2a6e776a 100644
--- a/srcpkgs/sysexxer-ng/template
+++ b/srcpkgs/sysexxer-ng/template
@@ -1,9 +1,9 @@
# Template file for 'sysexxer-ng'
pkgname=sysexxer-ng
version=1.0
-revision=1
+revision=2
build_style=cmake
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config gettext"
makedepends="boost-devel fltk-devel jack-devel libev-devel ncurses-devel rtmidi-devel"
short_desc="Universal tool to exchange MIDI system-exclusive data"
maintainer="bra1nwave <brainwave@openmailbox.org>"
From cd2f09bfca4afee2120877f04a79da75fe3e0cbb Mon Sep 17 00:00:00 2001
From: Randy McCaskill <randy@mccaskill.us>
Date: Mon, 1 Jun 2020 22:01:07 -0400
Subject: [PATCH 5/5] trackballs: add gettext to hostmakedepends
---
srcpkgs/trackballs/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/trackballs/template b/srcpkgs/trackballs/template
index 91e12fbddbf..32197aaebac 100644
--- a/srcpkgs/trackballs/template
+++ b/srcpkgs/trackballs/template
@@ -1,9 +1,9 @@
# Template file for 'trackballs'
pkgname=trackballs
version=1.3.1
-revision=1
+revision=2
build_style=cmake
-hostmakedepends="guile"
+hostmakedepends="guile gettext"
makedepends="zlib-devel SDL2_image-devel SDL2_mixer-devel SDL2_ttf-devel guile-devel"
depends="guile"
short_desc="Marble steering game"
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-06-02 2:14 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-29 14:10 [PR PATCH] gettext: update to 0.20.2 rmccask
2020-04-29 16:45 ` [PR PATCH] [Updated] " rmccask
2020-06-01 13:21 ` rmccask
2020-06-02 2:01 ` [PR PATCH] [Updated] [WIP] " rmccask
2020-06-02 2:03 ` rmccask
2020-06-02 2:14 ` rmccask
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).