Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] glade3: update to 3.40.0.
@ 2024-04-12 14:21 sgn
  2024-04-13 10:22 ` [PR PATCH] [Merged]: " sgn
  0 siblings, 1 reply; 2+ messages in thread
From: sgn @ 2024-04-12 14:21 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1260 bytes --]

There is a new pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages glade3-final-update
https://github.com/void-linux/void-packages/pull/49812

glade3: update to 3.40.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/49812.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-glade3-final-update-49812.patch --]
[-- Type: text/x-diff, Size: 4102 bytes --]

From 3faaaadecb65e506b1294f59903b236e4a539fc5 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: Wed, 14 Feb 2024 15:13:10 +0700
Subject: [PATCH] glade3: update to 3.40.0.

---
 srcpkgs/glade3/patches/meson-0.61.patch | 57 -------------------------
 srcpkgs/glade3/template                 | 24 ++++-------
 2 files changed, 8 insertions(+), 73 deletions(-)
 delete mode 100644 srcpkgs/glade3/patches/meson-0.61.patch

diff --git a/srcpkgs/glade3/patches/meson-0.61.patch b/srcpkgs/glade3/patches/meson-0.61.patch
deleted file mode 100644
index 72f9c0e509badd..00000000000000
--- a/srcpkgs/glade3/patches/meson-0.61.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 61304b2e8bac8ded76643cb7c3e781f73881dd2b Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Thu, 20 Jan 2022 14:18:09 -0500
-Subject: [PATCH 1/2] meson: i18n.merge_file() does not take a positional
- argument
-
----
- data/meson.build | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index 9f244566..bfbc514c 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -2,7 +2,6 @@ desktop_conf = configuration_data()
- desktop_conf.set('VERSION', glade_version)
- 
- i18n.merge_file(
--  'desktop',
-   type: 'desktop',
-   input: configure_file(
-     input: 'org.gnome.Glade.desktop.in.in',
-@@ -18,7 +17,6 @@ i18n.merge_file(
- appdata = glade_name + '.appdata.xml'
- 
- i18n.merge_file(
--  'appdata',
-   input: 'org.gnome.Glade.appdata.xml.in',
-   output: '@BASENAME@',
-   po_dir: po_dir,
--- 
-GitLab
-
-
-From 04ba6f969f716fbfe3c7feb7e4bab8678cc1e9eb Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Thu, 20 Jan 2022 14:19:03 -0500
-Subject: [PATCH 2/2] Remove duplicate entry for 'da' from help/LINGUAS
-
----
- help/LINGUAS | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/help/LINGUAS b/help/LINGUAS
-index fc3cd4c3..d67e42c8 100644
---- a/help/LINGUAS
-+++ b/help/LINGUAS
-@@ -1,6 +1,5 @@
- # please keep this list sorted alphabetically
- #
--da
- bg
- ca
- cs
--- 
-GitLab
-
diff --git a/srcpkgs/glade3/template b/srcpkgs/glade3/template
index e2b93449a3861f..ff8d859648ad2a 100644
--- a/srcpkgs/glade3/template
+++ b/srcpkgs/glade3/template
@@ -1,13 +1,13 @@
 # Template file for 'glade3'
 pkgname=glade3
-version=3.38.2
-revision=4
+version=3.40.0
+revision=1
 build_style=meson
 build_helper="gir qemu"
-configure_args="-Dgtk_doc=true -Dman=true $(vopt_bool gir introspection)
+configure_args="-Dgtk_doc=true -Dman=true -Dintrospection=true
  -Dwebkit2gtk=enabled"
-hostmakedepends="glib-devel intltool itstool pkg-config
- gjs-devel yelp-tools gettext-devel gtk-doc"
+hostmakedepends="glib-devel itstool pkg-config
+ gjs-devel yelp-tools gettext gtk-doc"
 makedepends="gtk+3-devel python3-gobject-devel libwebkit2gtk41-devel gjs-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="User Interface Designer for GTK+3"
@@ -15,15 +15,11 @@ 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=98fc87647d88505c97dd2f30f2db2d3e9527515b3af11694787d62a8d28fbab7
+checksum=31c9adaea849972ab9517b564e19ac19977ca97758b109edc3167008f53e3d9c
 lib32disabled=yes
 # Requires running an xserver
 make_check=no
 
-# Package build options
-build_options="gir"
-build_options_default="gir"
-
 libgladeui3_package() {
 	depends="python3-gobject"
 	short_desc="GTK+ User Interface Build core library"
@@ -32,9 +28,7 @@ libgladeui3_package() {
 		vmove usr/lib/glade/modules
 		vmove usr/share/glade
 		vmove usr/share/locale
-		if [ "$build_option_gir" ]; then
-			vmove usr/lib/girepository-1.0
-		fi
+		vmove usr/lib/girepository-1.0
 	}
 }
 
@@ -44,9 +38,7 @@ glade3-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		if [ "$build_option_gir" ]; then
-			vmove usr/share/gir-1.0
-		fi
+		vmove usr/share/gir-1.0
 		vmove usr/share/gtk-doc
 		vmove "usr/lib/*.so"
 	}

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PR PATCH] [Merged]: glade3: update to 3.40.0.
  2024-04-12 14:21 [PR PATCH] glade3: update to 3.40.0 sgn
@ 2024-04-13 10:22 ` sgn
  0 siblings, 0 replies; 2+ messages in thread
From: sgn @ 2024-04-13 10:22 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1105 bytes --]

There's a merged pull request on the void-packages repository

glade3: update to 3.40.0.
https://github.com/void-linux/void-packages/pull/49812

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2024-04-13 10:22 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-04-12 14:21 [PR PATCH] glade3: update to 3.40.0 sgn
2024-04-13 10:22 ` [PR PATCH] [Merged]: " sgn

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).