xmoji: update to 0.7

[Thomas Klausner <wiz%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Fri Aug 16 13:02:26 2024 +0200
Changeset:	ac2a94f6bd50494f60f2de7392b01f273038b4d3

Modified Files:
	xmoji/Makefile
	xmoji/PLIST
	xmoji/distinfo
Removed Files:
	xmoji/patches/patch-src_bin_xmoji_filewatcher.c
	xmoji/patches/patch-src_bin_xmoji_unistr.h
	xmoji/patches/patch-src_bin_xmoji_unistrbuilder.h
	xmoji/patches/patch-tools_emojigen_src_emojigen.c

Log Message:
xmoji: update to 0.7

Proper NetBSD support!

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=ac2a94f6bd50494f60f2de7392b01f273038b4d3

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 xmoji/Makefile                                    | 12 ++++--------
 xmoji/PLIST                                       |  6 ++++++
 xmoji/distinfo                                    | 10 +++-------
 xmoji/patches/patch-src_bin_xmoji_filewatcher.c   | 23 -----------------------
 xmoji/patches/patch-src_bin_xmoji_unistr.h        | 19 -------------------
 xmoji/patches/patch-src_bin_xmoji_unistrbuilder.h | 19 -------------------
 xmoji/patches/patch-tools_emojigen_src_emojigen.c | 17 -----------------
 7 files changed, 13 insertions(+), 93 deletions(-)

diffs:
diff --git a/xmoji/Makefile b/xmoji/Makefile
index bff8fd7c50..7aa78c7728 100644
--- a/xmoji/Makefile
+++ b/xmoji/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-DISTNAME=	xmoji-0.6
+DISTNAME=	xmoji-0.7
 CATEGORIES=	inputmethod
 MASTER_SITES=	${MASTER_SITE_GITHUB:=Zirias/}
 GITHUB_RELEASE=	v${PKGVERSION_NOREV}
@@ -17,20 +17,16 @@ MAKE_FLAGS+=	SH=${CONFIG_SHELL}
 USE_TOOLS+=	gmake pkg-config
 
 USE_CC_FEATURES+=	c11
-LDFLAGS+=		-L${WRKSRC}/lib/x86_64--netbsd/release
-INSTALLATION_DIRS=	bin
-#MAKE_FLAGS+=	TRACE=on
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/*/release/xmoji ${DESTDIR}${PREFIX}/bin
+# pkgsrc passes in its own LDFLAGS, and this part is lost (as of 0.7)
+LDFLAGS+=		-L$$(LIBDIR)
 
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../fonts/harfbuzz/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../x11/libxcb/buildlink3.mk"
 .include "../../x11/libxkbcommon/buildlink3.mk"
 .include "../../x11/xcb-util-cursor/buildlink3.mk"
 .include "../../x11/xcb-util-image/buildlink3.mk"
-#.include "../../x11/xcb-util-xkb/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/xmoji/PLIST b/xmoji/PLIST
index 4fd901952b..aea733ae69 100644
--- a/xmoji/PLIST
+++ b/xmoji/PLIST
@@ -1,2 +1,8 @@
 @comment $NetBSD$
 bin/xmoji
+share/applications/xmoji.desktop
+share/doc/xmoji/README.md
+share/icons/hicolor/16x16/apps/xmoji.png
+share/icons/hicolor/256x256/apps/xmoji.png
+share/icons/hicolor/32x32/apps/xmoji.png
+share/icons/hicolor/48x48/apps/xmoji.png
diff --git a/xmoji/distinfo b/xmoji/distinfo
index c163dab8fe..01d1654947 100644
--- a/xmoji/distinfo
+++ b/xmoji/distinfo
@@ -1,9 +1,5 @@
 $NetBSD$
 
-BLAKE2s (xmoji-0.6.tar.xz) = c2c1034ab8cb0c79e9c4465acf5a80881b3a4973c2ade438cbbd9438cec0bcf3
-SHA512 (xmoji-0.6.tar.xz) = d31ea1021bc9b19649305ba718064fe350b8f5b427ceb9663b736e396b5e2120ea9b3211c7c255aa26543f12e674ed4ecd86b60651a4e8eb6ef67780b152aa93
-Size (xmoji-0.6.tar.xz) = 276164 bytes
-SHA1 (patch-src_bin_xmoji_filewatcher.c) = c952ab0ab4231b6dfffda37d4f87ee125e6d4578
-SHA1 (patch-src_bin_xmoji_unistr.h) = 762d23e74e9e017ea8b6f1a33cfc144273acb43d
-SHA1 (patch-src_bin_xmoji_unistrbuilder.h) = 8daab2e893b12b9ad682a6b63a9d92f8bf0675bf
-SHA1 (patch-tools_emojigen_src_emojigen.c) = 6b3db9bbef5e8621195392459bf2a33133776838
+BLAKE2s (xmoji-0.7.tar.xz) = e113796956809c63948c752f1910607e8e74bfce3a119af077bd170d18ec40e3
+SHA512 (xmoji-0.7.tar.xz) = 7dccf344ba9850f201feef2ceced7461e14e7e05dce8f86eb60a5dc0f567673be5d0bd64ce73c8066c232165ade17db3569be3fb56605fd90bc71437a9f02747
+Size (xmoji-0.7.tar.xz) = 277636 bytes
diff --git a/xmoji/patches/patch-src_bin_xmoji_filewatcher.c b/xmoji/patches/patch-src_bin_xmoji_filewatcher.c
deleted file mode 100644
index 018d221a47..0000000000
--- a/xmoji/patches/patch-src_bin_xmoji_filewatcher.c
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD$
-
-https://github.com/Zirias/xmoji/pull/6
-
---- src/bin/xmoji/filewatcher.c.orig	2024-08-12 16:29:36.000000000 +0000
-+++ src/bin/xmoji/filewatcher.c
-@@ -1,4 +1,6 @@
-+#ifdef __linux__
- #define _POSIX_C_SOURCE 200809L
-+#endif
- 
- /* Feature test hack ahead!
-  *
-@@ -17,6 +19,9 @@
- #    define _BSD_SOURCE
- #  endif
- #endif
-+#ifdef __NetBSD__
-+#define statfs statvfs
-+#endif
- 
- #include "filewatcher.h"
- 
diff --git a/xmoji/patches/patch-src_bin_xmoji_unistr.h b/xmoji/patches/patch-src_bin_xmoji_unistr.h
deleted file mode 100644
index e8705719be..0000000000
--- a/xmoji/patches/patch-src_bin_xmoji_unistr.h
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD$
-
-https://github.com/Zirias/xmoji/pull/6
-
---- src/bin/xmoji/unistr.h.orig	2024-08-02 06:42:32.000000000 +0000
-+++ src/bin/xmoji/unistr.h
-@@ -4,7 +4,11 @@
- #include "macros.h"
- 
- #include <poser/decl.h>
--#include <uchar.h>
-+#include <stddef.h>
-+#include <stdint.h>
-+#ifndef char32_t
-+#define char32_t uint32_t
-+#endif
- 
- C_CLASS_DECL(PSC_List);
- 
diff --git a/xmoji/patches/patch-src_bin_xmoji_unistrbuilder.h b/xmoji/patches/patch-src_bin_xmoji_unistrbuilder.h
deleted file mode 100644
index 22beb7c14e..0000000000
--- a/xmoji/patches/patch-src_bin_xmoji_unistrbuilder.h
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD$
-
-https://github.com/Zirias/xmoji/pull/6
-
---- src/bin/xmoji/unistrbuilder.h.orig	2024-08-07 16:44:35.604855277 +0000
-+++ src/bin/xmoji/unistrbuilder.h
-@@ -2,7 +2,11 @@
- #define XMOJI_UNISTRBUILDER_H
- 
- #include <poser/decl.h>
--#include <uchar.h>
-+#include <stddef.h>
-+#include <stdint.h>
-+#ifndef char32_t
-+#define char32_t uint32_t
-+#endif
- 
- C_CLASS_DECL(UniStr);
- C_CLASS_DECL(UniStrBuilder);
diff --git a/xmoji/patches/patch-tools_emojigen_src_emojigen.c b/xmoji/patches/patch-tools_emojigen_src_emojigen.c
deleted file mode 100644
index 682b433571..0000000000
--- a/xmoji/patches/patch-tools_emojigen_src_emojigen.c
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-https://github.com/Zirias/xmoji/pull/6
-
---- tools/emojigen/src/emojigen.c.orig	2024-08-07 16:40:05.656695985 +0000
-+++ tools/emojigen/src/emojigen.c
-@@ -2,7 +2,9 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
--#include <uchar.h>
-+#ifndef char32_t
-+#define char32_t uint32_t
-+#endif
- 
- typedef struct Emoji Emoji;
- typedef struct EmojiGroup EmojiGroup;