From: sgn <sgn@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] glade3 3.36
Date: Wed, 26 Aug 2020 16:35:02 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-24487@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 536 bytes --]
There is a new pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages glade3-3.36
https://github.com/void-linux/void-packages/pull/24487
glade3 3.36
- Do not merge yet, waiting for GNOME 3.38
- libhandy can't be built with glade3-3.36 -> new package glade3-3-22
- Move `Glade-2.0.typelib` to devel to avoid conflict with glade3-3.36, things seems to work, I used this as the base for #24470
A patch file from https://github.com/void-linux/void-packages/pull/24487.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-glade3-3.36-24487.patch --]
[-- Type: text/x-diff, Size: 22006 bytes --]
From ffa37e9cfbb99ca1f079370c81abccf4cf480959 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 23 Aug 2020 17:46:41 +0700
Subject: [PATCH 1/8] glade3: update to 3.36.0.
---
common/shlibs | 2 +-
srcpkgs/glade3/patches/autogen-autoconf.patch | 98 -------------------
srcpkgs/glade3/template | 4 +-
3 files changed, 3 insertions(+), 101 deletions(-)
delete mode 100644 srcpkgs/glade3/patches/autogen-autoconf.patch
diff --git a/common/shlibs b/common/shlibs
index b28d158df83..12bb930d2e8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -772,7 +772,7 @@ liborc-test-0.4.so.0 orc-0.4.11_1
libgmime-2.6.so.0 gmime-2.6.4_1
libtotem-plparser.so.18 totem-pl-parser-3.26.1_1
libtotem-plparser-mini.so.18 libtotem-plparser-mini-3.26.1_1
-libgladeui-2.so.6 libgladeui3-3.10.0_1
+libgladeui-2.so.12 libgladeui3-3.36.0_1
libtdb.so.1 libtdb-1.2.2_1
libgssdp-1.2.so.0 gssdp-1.2.0_1
libgupnp-1.2.so.0 gupnp-1.2.0_1
diff --git a/srcpkgs/glade3/patches/autogen-autoconf.patch b/srcpkgs/glade3/patches/autogen-autoconf.patch
deleted file mode 100644
index f1dfc342b47..00000000000
--- a/srcpkgs/glade3/patches/autogen-autoconf.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From 8341cf78bc6879cb2d50e12b5886ee7dca3d09f2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
-Date: Sat, 9 Feb 2019 13:15:17 +0000
-Subject: [PATCH] Use autoreconf instead deprecated gnome-common
-
-See https://wiki.gnome.org/Projects/GnomeCommon/Migration
----
- autogen.sh | 47 +++++++++++++++++++++++++++++++++--------------
- configure.ac | 6 ++----
- 2 files changed, 35 insertions(+), 18 deletions(-)
-
-diff --git autogen.sh autogen.sh
-index 1d8cd840..fd35663b 100755
---- autogen.sh
-+++ autogen.sh
-@@ -1,22 +1,41 @@
- #!/bin/sh
- # Run this to generate all the initial makefiles, etc.
-+test -n "$srcdir" || srcdir=$(dirname "$0")
-+test -n "$srcdir" || srcdir=.
-
--srcdir=`dirname $0`
--test -z "$srcdir" && srcdir=.
-+olddir=$(pwd)
-
--PKG_NAME="glade"
-+cd $srcdir
-
--(test -f $srcdir/configure.ac \
-- && test -f $srcdir/autogen.sh) || {
-- echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
-- echo " top-level $PKG_NAME directory"
-- exit 1
-+(test -f configure.ac) || {
-+ echo "*** ERROR: Directory '$srcdir' does not look like the top-level project directory ***"
-+ exit 1
- }
-
--which gnome-autogen.sh || {
-- echo "You need to install gnome-common module and make"
-- echo "sure the gnome-autogen.sh script is in your \$PATH."
-- exit 1
--}
-+# shellcheck disable=SC2016
-+PKG_NAME=$(autoconf --trace 'AC_INIT:$1' configure.ac)
-+
-+if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then
-+ echo "*** WARNING: I am going to run 'configure' with no arguments." >&2
-+ echo "*** If you wish to pass any to it, please specify them on the" >&2
-+ echo "*** '$0' command line." >&2
-+ echo "" >&2
-+fi
-+
-+aclocal --install || exit 1
-+gtkdocize --copy || exit 1
-+intltoolize --force --copy --automake || exit 1
-+autoreconf --verbose --force --install || exit 1
-+
-+cd "$olddir"
-+if [ "$NOCONFIGURE" = "" ]; then
-+ $srcdir/configure "$@" || exit 1
-
--. gnome-autogen.sh
-+ if [ "$1" = "--help" ]; then
-+ exit 0
-+ else
-+ echo "Now type 'make' to compile $PKG_NAME" || exit 1
-+ fi
-+else
-+ echo "Skipping configure process."
-+fi
-diff --git configure.ac configure.ac
-index a3524656..638e7801 100644
---- configure.ac
-+++ configure.ac
-@@ -33,6 +33,8 @@ AM_MAINTAINER_MODE([enable])
- # to make
- AM_SILENT_RULES([yes])
-
-+AX_CHECK_ENABLE_DEBUG([yes],[GNOME_ENABLE_DEBUG])
-+
- # Checks for programs
- AC_PROG_CC
- AC_PROG_INSTALL
-@@ -79,10 +81,6 @@ AM_CONDITIONAL(GLADE_UNSTABLE, test "x$GLADE_UNSTABLE" = "xyes")
-
- # ================================================================
-
--GNOME_DEBUG_CHECK
--GNOME_COMPILE_WARNINGS([maximum])
--GNOME_MAINTAINER_MODE_DEFINES
--
- # For the plugins, we don't use the warning flags defined by GNOME_COMPILE_WARNINGS.
- # These flags include -Wmissing-prototypes, which we prefer not to use.
- if test "x$GCC" = "xyes"; then
---
-2.24.1
-
diff --git a/srcpkgs/glade3/template b/srcpkgs/glade3/template
index 910c138df6a..1d5a5971415 100644
--- a/srcpkgs/glade3/template
+++ b/srcpkgs/glade3/template
@@ -1,6 +1,6 @@
# Template file for 'glade3'
pkgname=glade3
-version=3.22.2
+version=3.36.0
revision=1
wrksrc="glade-${version}"
build_style=gnu-configure
@@ -16,7 +16,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="http://glade.gnome.org/"
distfiles="${GNOME_SITE}/glade/${version%.*}/glade-${version}.tar.xz"
-checksum=edefa6eb24b4d15bd52589121dc109bc08c286157c41288deb74dd9cc3f26a21
+checksum=19b546b527cc46213ccfc8022d49ec57e618fe2caa9aa51db2d2862233ea6f08
lib32disabled=yes
# Package build options
From 39aebce59b3410686f7923797c5553dfb21aff43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sat, 22 Aug 2020 22:23:03 +0700
Subject: [PATCH 2/8] anjuta: rebuild against glade3-3.36.0
---
srcpkgs/anjuta/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/anjuta/template b/srcpkgs/anjuta/template
index c21c927cd12..b46d58aeafe 100644
--- a/srcpkgs/anjuta/template
+++ b/srcpkgs/anjuta/template
@@ -1,7 +1,7 @@
# Template file for 'anjuta'
pkgname=anjuta
version=3.34.0
-revision=3
+revision=4
build_style=gnu-configure
build_helper="gir qemu"
configure_args="--disable-compile-warnings --disable-schemas-compile
From 57497f6f9ffb31d49ad77431a321bcc62b050710 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sat, 22 Aug 2020 22:23:03 +0700
Subject: [PATCH 3/8] gnome-builder: rebuild against glade3-3.36.0
---
srcpkgs/gnome-builder/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index 8c8c015d8a3..5462003b644 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-builder'
pkgname=gnome-builder
version=3.34.1
-revision=6
+revision=7
build_style=meson
build_helper=qemu
configure_args="-Dwith_webkit=true -Dwith_sysprof=true -Dhelp=true"
From 0d777f1041fdc6ec3ef8042e5a9d720f8f7ea6eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sat, 22 Aug 2020 22:23:03 +0700
Subject: [PATCH 4/8] libxfce4ui: rebuild against glade3-3.36.0
---
srcpkgs/libxfce4ui/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libxfce4ui/template b/srcpkgs/libxfce4ui/template
index 25a5c479955..0a62ad182b4 100644
--- a/srcpkgs/libxfce4ui/template
+++ b/srcpkgs/libxfce4ui/template
@@ -1,7 +1,7 @@
# Template file for 'libxfce4ui'
pkgname=libxfce4ui
version=4.14.1
-revision=4
+revision=5
build_style=gnu-configure
build_helper="gir"
configure_args="--disable-static"
From eb9e1bd274f238de37111bd7f221137c466d996c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 23 Aug 2020 14:00:34 +0700
Subject: [PATCH 5/8] libhandy1: rebuild against glade3-3.36.0
---
srcpkgs/libhandy1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libhandy1/template b/srcpkgs/libhandy1/template
index 191e698b0d6..bcc842037da 100644
--- a/srcpkgs/libhandy1/template
+++ b/srcpkgs/libhandy1/template
@@ -1,7 +1,7 @@
# Template file for 'libhandy1'
pkgname=libhandy1
version=0.90.0
-revision=1
+revision=2
wrksrc="libhandy-${version}"
build_style=meson
build_helper="gir"
From 7b82a87e3da21eeca244496b66c8e15d235eec9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 23 Aug 2020 13:56:37 +0700
Subject: [PATCH 6/8] New package: libgladeui-3-22-3.22.2
---
common/shlibs | 1 +
srcpkgs/libgladeui-3-22-devel | 1 +
.../patches/autogen-autoconf.patch | 98 +++++++++++++++++++
.../patches/configure-shell-quote.patch | 11 +++
srcpkgs/libgladeui-3-22/patches/cross.patch | 40 ++++++++
.../patches/rename-package.patch | 14 +++
srcpkgs/libgladeui-3-22/template | 55 +++++++++++
7 files changed, 220 insertions(+)
create mode 120000 srcpkgs/libgladeui-3-22-devel
create mode 100644 srcpkgs/libgladeui-3-22/patches/autogen-autoconf.patch
create mode 100644 srcpkgs/libgladeui-3-22/patches/configure-shell-quote.patch
create mode 100644 srcpkgs/libgladeui-3-22/patches/cross.patch
create mode 100644 srcpkgs/libgladeui-3-22/patches/rename-package.patch
create mode 100644 srcpkgs/libgladeui-3-22/template
diff --git a/common/shlibs b/common/shlibs
index 12bb930d2e8..85990a62455 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -772,6 +772,7 @@ liborc-test-0.4.so.0 orc-0.4.11_1
libgmime-2.6.so.0 gmime-2.6.4_1
libtotem-plparser.so.18 totem-pl-parser-3.26.1_1
libtotem-plparser-mini.so.18 libtotem-plparser-mini-3.26.1_1
+libgladeui-2.so.6 libgladeui-3-22-3.22.2_1
libgladeui-2.so.12 libgladeui3-3.36.0_1
libtdb.so.1 libtdb-1.2.2_1
libgssdp-1.2.so.0 gssdp-1.2.0_1
diff --git a/srcpkgs/libgladeui-3-22-devel b/srcpkgs/libgladeui-3-22-devel
new file mode 120000
index 00000000000..8358b8f6e97
--- /dev/null
+++ b/srcpkgs/libgladeui-3-22-devel
@@ -0,0 +1 @@
+libgladeui-3-22
\ No newline at end of file
diff --git a/srcpkgs/libgladeui-3-22/patches/autogen-autoconf.patch b/srcpkgs/libgladeui-3-22/patches/autogen-autoconf.patch
new file mode 100644
index 00000000000..f1dfc342b47
--- /dev/null
+++ b/srcpkgs/libgladeui-3-22/patches/autogen-autoconf.patch
@@ -0,0 +1,98 @@
+From 8341cf78bc6879cb2d50e12b5886ee7dca3d09f2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
+Date: Sat, 9 Feb 2019 13:15:17 +0000
+Subject: [PATCH] Use autoreconf instead deprecated gnome-common
+
+See https://wiki.gnome.org/Projects/GnomeCommon/Migration
+---
+ autogen.sh | 47 +++++++++++++++++++++++++++++++++--------------
+ configure.ac | 6 ++----
+ 2 files changed, 35 insertions(+), 18 deletions(-)
+
+diff --git autogen.sh autogen.sh
+index 1d8cd840..fd35663b 100755
+--- autogen.sh
++++ autogen.sh
+@@ -1,22 +1,41 @@
+ #!/bin/sh
+ # Run this to generate all the initial makefiles, etc.
++test -n "$srcdir" || srcdir=$(dirname "$0")
++test -n "$srcdir" || srcdir=.
+
+-srcdir=`dirname $0`
+-test -z "$srcdir" && srcdir=.
++olddir=$(pwd)
+
+-PKG_NAME="glade"
++cd $srcdir
+
+-(test -f $srcdir/configure.ac \
+- && test -f $srcdir/autogen.sh) || {
+- echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
+- echo " top-level $PKG_NAME directory"
+- exit 1
++(test -f configure.ac) || {
++ echo "*** ERROR: Directory '$srcdir' does not look like the top-level project directory ***"
++ exit 1
+ }
+
+-which gnome-autogen.sh || {
+- echo "You need to install gnome-common module and make"
+- echo "sure the gnome-autogen.sh script is in your \$PATH."
+- exit 1
+-}
++# shellcheck disable=SC2016
++PKG_NAME=$(autoconf --trace 'AC_INIT:$1' configure.ac)
++
++if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then
++ echo "*** WARNING: I am going to run 'configure' with no arguments." >&2
++ echo "*** If you wish to pass any to it, please specify them on the" >&2
++ echo "*** '$0' command line." >&2
++ echo "" >&2
++fi
++
++aclocal --install || exit 1
++gtkdocize --copy || exit 1
++intltoolize --force --copy --automake || exit 1
++autoreconf --verbose --force --install || exit 1
++
++cd "$olddir"
++if [ "$NOCONFIGURE" = "" ]; then
++ $srcdir/configure "$@" || exit 1
+
+-. gnome-autogen.sh
++ if [ "$1" = "--help" ]; then
++ exit 0
++ else
++ echo "Now type 'make' to compile $PKG_NAME" || exit 1
++ fi
++else
++ echo "Skipping configure process."
++fi
+diff --git configure.ac configure.ac
+index a3524656..638e7801 100644
+--- configure.ac
++++ configure.ac
+@@ -33,6 +33,8 @@ AM_MAINTAINER_MODE([enable])
+ # to make
+ AM_SILENT_RULES([yes])
+
++AX_CHECK_ENABLE_DEBUG([yes],[GNOME_ENABLE_DEBUG])
++
+ # Checks for programs
+ AC_PROG_CC
+ AC_PROG_INSTALL
+@@ -79,10 +81,6 @@ AM_CONDITIONAL(GLADE_UNSTABLE, test "x$GLADE_UNSTABLE" = "xyes")
+
+ # ================================================================
+
+-GNOME_DEBUG_CHECK
+-GNOME_COMPILE_WARNINGS([maximum])
+-GNOME_MAINTAINER_MODE_DEFINES
+-
+ # For the plugins, we don't use the warning flags defined by GNOME_COMPILE_WARNINGS.
+ # These flags include -Wmissing-prototypes, which we prefer not to use.
+ if test "x$GCC" = "xyes"; then
+--
+2.24.1
+
diff --git a/srcpkgs/libgladeui-3-22/patches/configure-shell-quote.patch b/srcpkgs/libgladeui-3-22/patches/configure-shell-quote.patch
new file mode 100644
index 00000000000..b3c60ccf365
--- /dev/null
+++ b/srcpkgs/libgladeui-3-22/patches/configure-shell-quote.patch
@@ -0,0 +1,11 @@
+--- configure.ac
++++ configure.ac
+@@ -279,7 +279,7 @@
+ dnl Check for GDK Quartz and MacOSX integration package
+ dnl ================================================================
+ _gdk_tgt=`$PKG_CONFIG --variable=targets gdk-3.0`
+-AM_CONDITIONAL([GDK_TARGET_QUARTZ], [test x$_gdk_tgt = xquartz])
++AM_CONDITIONAL([GDK_TARGET_QUARTZ], [test "x$_gdk_tgt" = xquartz])
+ if test "x$_gdk_tgt" = xquartz; then
+ PKG_CHECK_MODULES(GTK_MAC, gtk-mac-integration-gtk3)
+
diff --git a/srcpkgs/libgladeui-3-22/patches/cross.patch b/srcpkgs/libgladeui-3-22/patches/cross.patch
new file mode 100644
index 00000000000..03b1d7e846e
--- /dev/null
+++ b/srcpkgs/libgladeui-3-22/patches/cross.patch
@@ -0,0 +1,40 @@
+--- m4/python.m4
++++ m4/python.m4
+@@ -43,17 +43,9 @@
+ [AC_REQUIRE([AM_PATH_PYTHON])
+ AC_MSG_CHECKING(for headers required to compile python extensions)
+ dnl deduce PYTHON_INCLUDES
+-am_python_print_includes="\
+-from distutils import sysconfig as sc
+-incldirs = [[]]
+-
+-for d in sc.get_config_var('INCLDIRSTOMAKE').split():
+- incldirs.append('-I' + d)
+-
+-print(' '.join(incldirs))
+-"
++xbps_sysroot=`$CC --print-sysroot`
+ if test "x$PYTHON_INCLUDES" == x; then
+- PYTHON_INCLUDES=`$PYTHON -c "$am_python_print_includes"`
++ PYTHON_INCLUDES=`"$xbps_sysroot/$PYTHON-config" --includes`
+ fi
+ AC_SUBST(PYTHON_INCLUDES)
+ dnl check if the headers exist:
+@@ -74,16 +66,11 @@
+ [AC_REQUIRE([AM_CHECK_PYTHON_HEADERS])
+ AC_MSG_CHECKING(for libraries required to embed python)
+ dnl deduce PYTHON_LIBS
+-am_python_print_libs="\
+-from distutils import sysconfig as sc
+-libs = '-L' + sc.get_config_var('LIBDIR').strip()
+-libs += ' ' + sc.get_config_var('BLDLIBRARY')
+-print(libs)"
+ am_python_print_lib_loc="\
+ from distutils import sysconfig as sc
+ print(sc.get_config_var('LIBDIR'))"
+ if test "x$PYTHON_LIBS" == x; then
+- PYTHON_LIBS=`$PYTHON -c "$am_python_print_libs"`
++ PYTHON_LIBS=`"$xbps_sysroot/$PYTHON-config" --ldflags --embed`
+ fi
+ if test "x$PYTHON_LIB_LOC" == x; then
+ PYTHON_LIB_LOC=`$PYTHON -c "$am_python_print_lib_loc"`
diff --git a/srcpkgs/libgladeui-3-22/patches/rename-package.patch b/srcpkgs/libgladeui-3-22/patches/rename-package.patch
new file mode 100644
index 00000000000..09fc0c66a9a
--- /dev/null
+++ b/srcpkgs/libgladeui-3-22/patches/rename-package.patch
@@ -0,0 +1,14 @@
+--- configure.ac.orig 2020-08-23 14:55:15.618666782 +0700
++++ configure.ac 2020-08-23 14:55:26.055797925 +0700
+@@ -7,9 +7,9 @@
+ m4_define(glade_micro_version, 2)
+ m4_define(glade_version, glade_major_version.glade_minor_version.glade_micro_version)
+
+-AC_INIT([glade], [glade_version],
++AC_INIT([glade-3-22], [glade_version],
+ [http://bugzilla.gnome.org/enter_bug.cgi?product=glade],
+- [glade],
++ [glade-3-22],
+ [http://glade.gnome.org/])
+
+ AC_CONFIG_HEADERS([config.h])
diff --git a/srcpkgs/libgladeui-3-22/template b/srcpkgs/libgladeui-3-22/template
new file mode 100644
index 00000000000..6ccab234345
--- /dev/null
+++ b/srcpkgs/libgladeui-3-22/template
@@ -0,0 +1,55 @@
+# Template file for 'libgladeui-3-22'
+pkgname=libgladeui-3-22
+version=3.22.2
+revision=1
+wrksrc="glade-${version}"
+build_style=gnu-configure
+build_helper="gir"
+configure_args="--disable-static --enable-debug=info PYTHON=/usr/bin/python3
+ --enable-gladeui --disable-man-pages $(vopt_enable gir introspection)"
+hostmakedepends="glib-devel gnome-doc-utils intltool itstool pkg-config
+ automake autoconf-archive libtool yelp-tools gettext-devel gtk-doc"
+makedepends="gtk+3-devel python3-gobject-devel webkit2gtk-devel"
+depends="desktop-file-utils hicolor-icon-theme"
+short_desc="User Interface Designer for GTK+3 - version 3.22"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later, LGPL-2.1-or-later"
+homepage="http://glade.gnome.org/"
+distfiles="${GNOME_SITE}/glade/${version%.*}/glade-${version}.tar.xz"
+checksum=edefa6eb24b4d15bd52589121dc109bc08c286157c41288deb74dd9cc3f26a21
+lib32disabled=yes
+
+build_options="gir"
+build_options_default="gir"
+
+pre_configure() {
+ NOCONFIGURE=1 ./autogen.sh
+}
+
+do_check() {
+ : requires xserver
+}
+
+post_install() {
+ rm -rf $DESTDIR/usr/bin
+ for _dir in applications help icons metainfo
+ do
+ rm -rf $DESTDIR/usr/share/$_dir
+ done
+}
+
+libgladeui-3-22-devel_package() {
+ depends="gtk+3-devel libxml2-devel libgladeui-3-22>=${version}_${revision}"
+ short_desc+=" - development files"
+ conflicts="glade3-devel>=0"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ if [ "$build_option_gir" ]; then
+ vmove usr/lib/girepository-1.0
+ vmove usr/share/gir-1.0
+ fi
+ vmove usr/share/gtk-doc
+ vmove "usr/lib/*.so"
+ }
+}
From d6a0f5b068cd891207e55ae62c593b20a8ff39c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 23 Aug 2020 13:59:21 +0700
Subject: [PATCH 7/8] libhandy: build with old glade3
---
srcpkgs/libhandy/template | 23 +++++++++++++----------
1 file changed, 13 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/libhandy/template b/srcpkgs/libhandy/template
index 38672f1fb6e..2066c0245fb 100644
--- a/srcpkgs/libhandy/template
+++ b/srcpkgs/libhandy/template
@@ -1,16 +1,17 @@
# Template file for 'libhandy'
pkgname=libhandy
version=0.0.13
-revision=1
+revision=2
wrksrc="libhandy-v${version}"
build_style=meson
build_helper="gir"
# tests need X anyway, so no need to build them
-configure_args="-Dexamples=false -Dtests=false $(vopt_bool vala vapi)
+configure_args="-Dexamples=false -Dtests=false $(vopt_bool gir vapi)
-Dglade_catalog=$(vopt_if glade enabled disabled)
-Dintrospection=$(vopt_if gir enabled disabled)"
-hostmakedepends="glib-devel pkg-config $(vopt_if vala vala-devel)"
-makedepends="gtk+3-devel libglib-devel $(vopt_if glade glade3-devel)"
+hostmakedepends="glib-devel pkg-config $(vopt_if gir vala-devel)"
+makedepends="gtk+3-devel libglib-devel
+ $(vopt_if glade libgladeui-3-22-devel)"
short_desc="Library full of GTK+ widgets for mobile phones"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.0-or-later"
@@ -18,25 +19,27 @@ homepage="https://source.puri.sm/Librem5/libhandy"
distfiles="https://source.puri.sm/Librem5/libhandy/-/archive/v${version}/libhandy-v${version}.tar.gz"
checksum=138bec94e66d15a7a19350b65845d4529bcd969ea913ab3eb438f56fe47d5d37
-build_options="gir vala glade"
+build_options="gir glade"
desc_option_glade="Generate glade modules and catalog files"
-build_options_default="gir vala glade"
+build_options_default="gir glade"
+
+post_patch() {
+ vsed -i "s/'glade'/'glade-3-22'/" glade/meson.build
+}
libhandy-devel_package() {
depends="${sourcepkg}>=${version}_${revision} gtk+3-devel"
+ conflicts="libhandy1-devel"
short_desc+=" - development files"
pkg_install() {
vmove "usr/lib/*.so"
vmove usr/include
vmove usr/lib/pkgconfig
if [ "$build_option_glade" ]; then
- vmove usr/lib/glade
- vmove usr/share/glade
+ vmove usr/share/glade-3-22
fi
if [ "$build_option_gir" ]; then
vmove usr/share/gir-1.0
- fi
- if [ "$build_option_vala" ]; then
vmove usr/share/vala
fi
}
From d261c84907354a65b5b8fbace2baac312392eb00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 23 Aug 2020 12:11:59 +0700
Subject: [PATCH 8/8] bijiben: update to 3.36.3.
---
srcpkgs/bijiben/template | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/bijiben/template b/srcpkgs/bijiben/template
index 730053b5d1c..1bfc6f8990f 100644
--- a/srcpkgs/bijiben/template
+++ b/srcpkgs/bijiben/template
@@ -1,12 +1,12 @@
# Template file for 'bijiben'
pkgname=bijiben
-version=3.36.1
+version=3.36.3
revision=1
build_helper="gir"
build_style=meson
hostmakedepends="itstool pkg-config gettext"
makedepends="clutter-gtk-devel evolution-devel tracker-devel webkit2gtk-devel
- zeitgeist-devel libhandy-devel"
+ zeitgeist-devel libhandy1-devel"
depends="desktop-file-utils tracker zeitgeist"
short_desc="Intuitive note editor with strong GNOME desktop integration"
maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -14,5 +14,9 @@ license="GPL-3.0-or-later"
homepage="https://wiki.gnome.org/Apps/Notes"
changelog="https://raw.githubusercontent.com/GNOME/bijiben/gnome-${version%.*}/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=212f66a3d2c717dfb3d37220426178089395da23ef9f3d051713aaf6597a4110
+checksum=70e9b621e11bf7af6c6248f8c99830f6ffbff605fb43a848d26880e7e1b52dd6
nocross="evolution-data-server cross"
+
+post_patch() {
+ vsed -i 's/libhandy-0\.0/libhandy-1/' meson.build
+}
next reply other threads:[~2020-08-26 14:35 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-26 14:35 sgn [this message]
2020-09-15 1:58 ` [PR PATCH] [Updated] " sgn
2020-09-15 2:01 ` sgn
2020-09-15 2:15 ` [PR PATCH] [Updated] glade3 3.38 sgn
2020-09-15 11:17 ` q66
2020-09-15 14:26 ` [PR PATCH] [Updated] " sgn
2020-09-15 14:31 ` sgn
2020-09-15 14:33 ` [PR PATCH] [Updated] " sgn
2020-09-15 14:49 ` q66
2020-09-16 23:24 ` q66
2020-09-16 23:24 ` [PR PATCH] [Closed]: " q66
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-24487@inbox.vuxu.org \
--to=sgn@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).