[gentoo-commits] repo/gentoo:master commit in: gnome-extra/gucharmap/, gnome-extra/gucharmap/files/
commit: 46ffbddbd7fa16d382e35ef145758bc91ccb0e78
Author: Mart Raudsepp gentoo org>
AuthorDate: Sat Apr 13 10:23:27 2024 +
Commit: Mart Raudsepp gentoo org>
CommitDate: Sat Apr 13 10:23:27 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46ffbddb
gnome-extra/gucharmap: drop 15.0.4, 15.1.1
Signed-off-by: Mart Raudsepp gentoo.org>
gnome-extra/gucharmap/Manifest | 2 -
.../files/15.0.1-fix-file-conflicts.patch | 11 ---
gnome-extra/gucharmap/gucharmap-15.0.4.ebuild | 77 -
gnome-extra/gucharmap/gucharmap-15.1.1.ebuild | 79 --
4 files changed, 169 deletions(-)
diff --git a/gnome-extra/gucharmap/Manifest b/gnome-extra/gucharmap/Manifest
index 6575b44f9a14..2df302162eeb 100644
--- a/gnome-extra/gucharmap/Manifest
+++ b/gnome-extra/gucharmap/Manifest
@@ -1,3 +1 @@
-DIST gucharmap-15.0.4.tar.bz2 1453197 BLAKE2B
718890e466e19934b012a79deefc2174edba6de59bd9a374dee5e8cf396fd0a06ae8e4db4cfb223d43284d59be87344310e4cb94e1e45ae158e0213e7bfa06f5
SHA512
280fb164f2d850f9b4a8e54c24d0bc461e0abe2e53f34a6f2f0098397c04856091c6f730cfa9451de5b676b569e2a43bcf2a9dfe160f916b00622ec5535c1e94
-DIST gucharmap-15.1.1.tar.bz2 1455226 BLAKE2B
c7dd7fc41dd938f040829ad4f6c29027441125c8d9c27e7539867230e2f1842039af02d52450cdc3be234a836d5f27cda90b565210c979c896abe1209e0695fa
SHA512
e6fd7a29ecec8b0d094396f86a0204bd1e9e09a02c71930f95f43f707ff46db4f92c87b00d2840739f3191f3ebc84dfdde1c879dc26dc1888d1085cb032927b5
DIST gucharmap-15.1.2.tar.bz2 1455600 BLAKE2B
991388c67451df701533d9935021644aa549a373d07dbdca47ee47e76b419533e5ecf16ddfb4603467f7750fe6934fbef37ecd88795ebf11e066a3f1d76e327b
SHA512
702276b0fd7804d4210b71e332a34206f27c0da5fefbf164a70881d97d0cbcd3cdb9f8b31e56ee449cb07688bdbbe6fa1d7fa8e7a5fe5c5b879a6ce828450e69
diff --git a/gnome-extra/gucharmap/files/15.0.1-fix-file-conflicts.patch
b/gnome-extra/gucharmap/files/15.0.1-fix-file-conflicts.patch
deleted file mode 100644
index 0664c9f0c546..
--- a/gnome-extra/gucharmap/files/15.0.1-fix-file-conflicts.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-Avoids file conficts with other API versions being installed on the system.
a/meson.build
-+++ b/meson.build
-@@ -78,6 +78,6 @@ libgucharmap_gtk4_soversion = '0'
-
- # i18n
-
--gucharmap_gettext_domain = gucharmap_name
-+gucharmap_gettext_domain = libgucharmap_gtk3_api_name
-
- # Directories
diff --git a/gnome-extra/gucharmap/gucharmap-15.0.4.ebuild
b/gnome-extra/gucharmap/gucharmap-15.0.4.ebuild
deleted file mode 100644
index b788ccd08f8a..
--- a/gnome-extra/gucharmap/gucharmap-15.0.4.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit flag-o-matic gnome2-utils meson python-any-r1 vala xdg
-
-DESCRIPTION="Unicode character map viewer and library"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gucharmap;
-SRC_URI="https://gitlab.gnome.org/GNOME/${PN}/-/archive/${PV}/${P}.tar.bz2;
-
-LICENSE="GPL-3+"
-SLOT="2.90"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
-
-UNICODE_VERSION="15.0"
-
-IUSE="+introspection gtk-doc vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND="media-libs/freetype:2
- >=dev-libs/glib-2.32:2
- >=x11-libs/gtk+-3.22:3[introspection?]
- >=dev-libs/libpcre2-10.21:=
- =app-i18n/unicode-data-${UNICODE_VERSION}*
- >=x11-libs/pango-1.42.4-r2[introspection?]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- ${PYTHON_DEPS}
- app-text/docbook-xml-dtd:4.1.2
- dev-util/itstool
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
- gtk-doc? ( >=dev-util/gtk-doc-1 )
- introspection? ( >=dev-libs/gobject-introspection-1.54:= )
- vala? ( $(vala_depend) )
-"
-
-PATCHES=(
- "${FILESDIR}"/14.0.1-install-user-help.patch
- "${FILESDIR}"/15.0.1-fix-file-conflicts.patch
-)
-
-src_prepare() {
- default
- use vala && vala_setup
- xdg_environment_reset
-}
-
-src_configure() {
- # Upstream don't support LTO & error out on it in meson.build (bug
#926250)
- filter-lto
-
- local emesonargs=(
- -Dcharmap=true
- -Ddbg=false # in 14.0.1 all this does is pass -ggdb3
- $(meson_use gtk-doc docs)
- $(meson_use introspection gir)
- -Dgtk3=true
- -Ducd_path="${EPREFIX}/usr/share/unicode-data"
- $(meson_use vala vapi)
- )
-
- meson_src_configure
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_schemas_update
-}
diff --git a/gnome-extra/gucharmap/gucharmap-15.1.1.ebuild
b/gnome-extra/gucharmap/gucharmap-15.1.1.ebuild
deleted file mode 100644
index 74d609904765..
--- a/gnome-extra/gucharmap/gucharmap-15.1.1.ebuild
+++
[gentoo-commits] repo/gentoo:master commit in: gnome-extra/gucharmap/, gnome-extra/gucharmap/files/
commit: 4506ae48b4e9014489f02ca253102b4f00a6b29e
Author: Mart Raudsepp gentoo org>
AuthorDate: Sat Jan 15 23:20:04 2022 +
Commit: Mart Raudsepp gentoo org>
CommitDate: Sat Jan 15 23:20:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4506ae48
gnome-extra/gucharmap: various packaging fixes
* Always install user help, not only with USE=gtk-doc; add missing
itstool dep for it
* Add missing docbook-xml-dtd dependency
* Drop USE=debug which ends up only adding -ggdb3 to CFLAGS
* Move gettext files back to have an API suffix to avoid conflicts
with old SLOT
* Drop redundant VALA_USE_DEPEND=vapigen
* Include upstream patch for meson-0.60 compatibility
* Be explicit with meson options
* Reorder dependencies back to gnome g.o style
Closes: https://bugs.gentoo.org/753449
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Mart Raudsepp gentoo.org>
.../files/14.0.1-fix-file-conflicts.patch | 26
.../gucharmap/files/14.0.1-install-user-help.patch | 28
.../gucharmap/files/14.0.1-meson-0.60-fix.patch| 32 +
gnome-extra/gucharmap/gucharmap-14.0.1-r1.ebuild | 75 ++
4 files changed, 161 insertions(+)
diff --git a/gnome-extra/gucharmap/files/14.0.1-fix-file-conflicts.patch
b/gnome-extra/gucharmap/files/14.0.1-fix-file-conflicts.patch
new file mode 100644
index ..55a346271880
--- /dev/null
+++ b/gnome-extra/gucharmap/files/14.0.1-fix-file-conflicts.patch
@@ -0,0 +1,26 @@
+From 92b5a40d2d84e1989cdd091a10660e14e66c4daf Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp
+Date: Sun, 16 Jan 2022 01:03:08 +0200
+Subject: [PATCH 3/3] build: Use API version in gettext domain
+
+Avoids file conficts with other API versions being installed on the system.
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 00cfbeec..db44e1dd 100644
+--- a/meson.build
b/meson.build
+@@ -78,7 +78,7 @@ libgucharmap_gtk4_soversion = '0'
+
+ # i18n
+
+-gucharmap_gettext_domain = gucharmap_name
++gucharmap_gettext_domain = libgucharmap_gtk3_api_name
+ po_dir = meson.current_source_dir() / 'po'
+
+ # Directories
+--
+2.32.0
+
diff --git a/gnome-extra/gucharmap/files/14.0.1-install-user-help.patch
b/gnome-extra/gucharmap/files/14.0.1-install-user-help.patch
new file mode 100644
index ..42507f865685
--- /dev/null
+++ b/gnome-extra/gucharmap/files/14.0.1-install-user-help.patch
@@ -0,0 +1,28 @@
+From 3193fe41561e6ddd99c1f5148089aa51c88236aa Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp
+Date: Sun, 16 Jan 2022 01:00:43 +0200
+Subject: [PATCH 2/3] build: Always build and install user help
+
+We need a separate knob for gtk-doc that wouldn't affect user help
+being installed. Just remove the docs option check for user help to
+always installed it for us.
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 9529f5d1..00cfbeec 100644
+--- a/meson.build
b/meson.build
+@@ -262,7 +262,7 @@ if get_option('docs')
+ subdir('docs' / 'reference')
+ endif
+
+-if get_option('docs') and get_option('charmap')
++if get_option('charmap')
+ subdir('help')
+ endif
+
+--
+2.32.0
+
diff --git a/gnome-extra/gucharmap/files/14.0.1-meson-0.60-fix.patch
b/gnome-extra/gucharmap/files/14.0.1-meson-0.60-fix.patch
new file mode 100644
index ..682f52a960c4
--- /dev/null
+++ b/gnome-extra/gucharmap/files/14.0.1-meson-0.60-fix.patch
@@ -0,0 +1,32 @@
+From 7e748fcf7e7459e3a0368f4d057d241adc71936b Mon Sep 17 00:00:00 2001
+From: Christian Persch
+Date: Wed, 15 Dec 2021 00:03:33 +0100
+Subject: [PATCH 1/3] build: Fix build with meson 0.60
+
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 11e4e8a6..4bd50014 100644
+--- a/data/meson.build
b/data/meson.build
+@@ -18,7 +18,6 @@
+ metainfodir = gucharmap_prefix / gucharmap_datadir / 'metainfo'
+
+ i18n.merge_file(
+- 'gucharmap.metainfo.xml',
+ input: 'gucharmap.metainfo.xml.in',
+ output: '@BASENAME@',
+ po_dir: po_dir,
+@@ -42,7 +41,6 @@ desktop_in = configure_file(
+ )
+
+ i18n.merge_file(
+- 'gucharmap.desktop',
+ input: desktop_in,
+ output: '@BASENAME@',
+ type: 'desktop',
+--
+2.32.0
+
diff --git a/gnome-extra/gucharmap/gucharmap-14.0.1-r1.ebuild
b/gnome-extra/gucharmap/gucharmap-14.0.1-r1.ebuild
new file mode 100644
index ..b276ab3b6f18
--- /dev/null
+++ b/gnome-extra/gucharmap/gucharmap-14.0.1-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+VALA_MIN_API_VERSION="0.26"
+
+inherit gnome2-utils meson python-any-r1 vala xdg
+
+DESCRIPTION="Unicode character map viewer and library"
+HOMEPAGE="https://wiki.gnome.org/Apps/Gucharmap;
[gentoo-commits] repo/gentoo:master commit in: gnome-extra/gucharmap/, gnome-extra/gucharmap/files/
commit: 089a1835c9c9a8afa8fd61886702b25aba12b067
Author: Rémi Cardona gentoo org>
AuthorDate: Fri Jan 17 08:11:55 2020 +
Commit: Rémi Cardona gentoo org>
CommitDate: Fri Jan 17 08:14:24 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=089a1835
gnome-extra/gucharmap: fix build with unicode-data 12.1.0
Closes: https://bugs.gentoo.org/705416
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Rémi Cardona gentoo.org>
.../files/gucharmap-update_to_unicode_12.1.patch | 25
gnome-extra/gucharmap/gucharmap-12.0.1-r1.ebuild | 72 ++
2 files changed, 97 insertions(+)
diff --git a/gnome-extra/gucharmap/files/gucharmap-update_to_unicode_12.1.patch
b/gnome-extra/gucharmap/files/gucharmap-update_to_unicode_12.1.patch
new file mode 100644
index 000..60dbb7af58c
--- /dev/null
+++ b/gnome-extra/gucharmap/files/gucharmap-update_to_unicode_12.1.patch
@@ -0,0 +1,25 @@
+diff -Naur gucharmap-12.0.1-orig/gucharmap/gucharmap-unicode-info.h
gucharmap-12.0.1/gucharmap/gucharmap-unicode-info.h
+--- gucharmap-12.0.1-orig/gucharmap/gucharmap-unicode-info.h 2019-03-07
21:21:27.0 +0100
gucharmap-12.0.1/gucharmap/gucharmap-unicode-info.h2019-11-14
17:43:55.007583238 +0100
+@@ -51,7 +51,8 @@
+ GUCHARMAP_UNICODE_VERSION_10_0,
+ GUCHARMAP_UNICODE_VERSION_11_0,
+ GUCHARMAP_UNICODE_VERSION_12_0,
+- GUCHARMAP_UNICODE_VERSION_LATEST = GUCHARMAP_UNICODE_VERSION_12_0 /*
private, will move forward with each revision */
++ GUCHARMAP_UNICODE_VERSION_12_1,
++ GUCHARMAP_UNICODE_VERSION_LATEST = GUCHARMAP_UNICODE_VERSION_12_1 /*
private, will move forward with each revision */
+ } GucharmapUnicodeVersion;
+
+ /* return values are read-only */
+diff -Naur gucharmap-12.0.1-orig/gucharmap/gucharmap-window.c
gucharmap-12.0.1/gucharmap/gucharmap-window.c
+--- gucharmap-12.0.1-orig/gucharmap/gucharmap-window.c 2019-03-07
21:21:27.0 +0100
gucharmap-12.0.1/gucharmap/gucharmap-window.c 2019-11-14
17:45:11.145809820 +0100
+@@ -454,7 +454,7 @@
+ gtk_show_about_dialog (GTK_WINDOW (guw),
+"program-name", _("GNOME Character Map"),
+"version", VERSION,
+- "comments", _("Based on the Unicode Character Database
12.0.0"),
++ "comments", _("Based on the Unicode Character Database
12.1.0"),
+"copyright", "Copyright © 2004 Noah Levitt\n"
+ "Copyright © 1991–2019 Unicode, Inc.\n"
+ "Copyright © 2007–2019 Christian Persch\n"
diff --git a/gnome-extra/gucharmap/gucharmap-12.0.1-r1.ebuild
b/gnome-extra/gucharmap/gucharmap-12.0.1-r1.ebuild
new file mode 100644
index 000..96e97ba7eec
--- /dev/null
+++ b/gnome-extra/gucharmap/gucharmap-12.0.1-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 vala
+
+DESCRIPTION="Unicode character map viewer and library"
+HOMEPAGE="https://wiki.gnome.org/Apps/Gucharmap;
+
+LICENSE="GPL-3+"
+SLOT="2.90"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+
+IUSE="debug +introspection test vala"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="vala? ( introspection )"
+
+UNICODE_VERSION="12.1"
+
+COMMON_DEPEND="
+ =app-i18n/unicode-data-${UNICODE_VERSION}*
+ >=dev-libs/glib-2.32:2
+ >=x11-libs/pango-1.2.1[introspection?]
+ >=x11-libs/gtk+-3.16:3[introspection?]
+ media-libs/freetype:2
+ introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
+"
+RDEPEND="${COMMON_DEPEND}
+ !https://bugzilla.gnome.org/show_bug.cgi?id=768210#c5
+ # https://gitlab.gnome.org/GNOME/gucharmap/issues/13
+ gnome2_src_configure \
+ --disable-static \
+ --with-unicode-data=/usr/share/unicode-data \
+ $(usex debug --enable-debug=yes ' ') \
+ $(use_enable introspection) \
+ $(use_enable vala)
+}
