From f809d27d00677997adac74dc1422d8a42ec69b0c Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Mon, 13 Jan 2020 05:05:43 +0000
Subject: user/*: Modernise / fix syntax / deps / metadata / code

---
 user/gucharmap/APKBUILD           | 12 ++++++------
 user/gucharmap/unicode-12.1.patch | 25 +++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 6 deletions(-)
 create mode 100644 user/gucharmap/unicode-12.1.patch

(limited to 'user/gucharmap')

diff --git a/user/gucharmap/APKBUILD b/user/gucharmap/APKBUILD
index 913d4f749..b3575c955 100644
--- a/user/gucharmap/APKBUILD
+++ b/user/gucharmap/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
 pkgname=gucharmap
 pkgver=12.0.1
-_unicode=12.0.0
+_unicode=12.1.0
 pkgrel=0
 pkgdesc="Unicode utility for the Gnome desktop environment"
 url="https://gnome.org"
@@ -12,10 +12,11 @@ depends=""
 makedepends="desktop-file-utils gobject-introspection-dev gtk+3.0-dev intltool
 	itstool libxml2-utils unicode-data"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-source="https://download.gnome.org/sources/gucharmap/${pkgver%.*}/gucharmap-$pkgver.tar.xz"
+source="https://download.gnome.org/sources/gucharmap/${pkgver%.*}/gucharmap-$pkgver.tar.xz
+	unicode-12.1.patch
+	"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -28,13 +29,12 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="989034350c73c3f1857167f434aa4a5c140ef7574cb799b874e421a8d0c2bf520dfcee85bc0cf8e52f439fb7d30e0db5172a25c107c80b38ce6da4e703a3ffc2  gucharmap-12.0.1.tar.xz"
+sha512sums="989034350c73c3f1857167f434aa4a5c140ef7574cb799b874e421a8d0c2bf520dfcee85bc0cf8e52f439fb7d30e0db5172a25c107c80b38ce6da4e703a3ffc2  gucharmap-12.0.1.tar.xz
+aac3a9b95985b1fd2122f1a759a0c571116a94cc429c4e9736a4f2a36e257241e7bdc4e6ba7badaeebca79bd8cca275ff66b6e9f933c707342b8872ab78dbe7f  unicode-12.1.patch"
diff --git a/user/gucharmap/unicode-12.1.patch b/user/gucharmap/unicode-12.1.patch
new file mode 100644
index 000000000..60dbb7af5
--- /dev/null
+++ b/user/gucharmap/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.000000000 +0100
++++ gucharmap-12.0.1/gucharmap/gucharmap-unicode-info.h	2019-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.000000000 +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"
-- 
cgit v1.2.3-70-g09d2