Index | Thread | Search

From:
Martin Ziemer <horrad@horrad.de>
Subject:
Re: [maintainer update] remind 4.2.9 -> 4.3.1
To:
ports@openbsd.org
Cc:
Stuart Henderson <stu@spacehopper.org>
Date:
Fri, 1 Mar 2024 13:56:48 +0100

Download raw body.

Thread
Am Fri, Mar 01, 2024 at 10:46:02AM +0000 schrieb Stuart Henderson:
> On 2024/03/01 11:30, Martin Ziemer wrote:
> > @@ -1,9 +1,13 @@
> > +applications/
> > +applications/tkremind.desktop
> ..
> > +icons/
> > +icons/tkremind.png
> 
> Wrong paths for those..

The patch below changes the paths to share/applications and
share/icons/tkremind.

After adjusting those paths, there were tags added which needed new
dependencies.

I hope this is the right way. (I have not used this desktop-things
before)

Index: Makefile
===================================================================
RCS file: /cvs/ports/misc/remind/Makefile,v
retrieving revision 1.70
diff -u -p -r1.70 Makefile
--- Makefile	5 Feb 2024 11:59:07 -0000	1.70
+++ Makefile	1 Mar 2024 12:52:13 -0000
@@ -1,7 +1,7 @@
 COMMENT=	scripting language for reminders, with a Tk front end
 
-DISTNAME=	remind-04.02.09
-PKGNAME=	remind-4.2.9
+DISTNAME=	remind-04.03.01
+PKGNAME=	remind-4.3.1
 
 CATEGORIES=	misc
 
@@ -31,7 +31,9 @@ RUN_DEPENDS=		${MODTK_RUN_DEPENDS} \
 			devel/tcllib \
 			converters/p5-JSON-MaybeXS \
 			graphics/p5-Cairo \
-			devel/p5-Pango
+			devel/p5-Pango \
+			x11/gtk+4 \
+			devel/desktop-file-utils
 
 CONFIGURE_STYLE=	gnu
 
Index: distinfo
===================================================================
RCS file: /cvs/ports/misc/remind/distinfo,v
retrieving revision 1.39
diff -u -p -r1.39 distinfo
--- distinfo	5 Feb 2024 11:59:07 -0000	1.39
+++ distinfo	1 Mar 2024 12:52:13 -0000
@@ -1,2 +1,2 @@
-SHA256 (remind-04.02.09.tar.gz) = ZEaEYLQFpwXfp7ONsUt4I/ENqPADruooFRfdtJhrhyo=
-SIZE (remind-04.02.09.tar.gz) = 515231
+SHA256 (remind-04.03.01.tar.gz) = thmjcNWa1t4sHQTUu6NotbThTJ6scqrd/UWBqELe1NM=
+SIZE (remind-04.03.01.tar.gz) = 523564
Index: patches/patch-src_Makefile_in
===================================================================
RCS file: patches/patch-src_Makefile_in
diff -N patches/patch-src_Makefile_in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_Makefile_in	1 Mar 2024 12:52:13 -0000
@@ -0,0 +1,25 @@
+# Fix install Path for .desktop-file and icons
+Index: src/Makefile.in
+--- src/Makefile.in.orig
++++ src/Makefile.in
+@@ -63,14 +63,14 @@ install: all
+ 	done
+ 	-mkdir -p $(DESTDIR)$(datarootdir)/remind || true
+ 	cp -R ../include/* $(DESTDIR)$(datarootdir)/remind
+-	-mkdir -p $(DESTDIR)$(prefix)/icons
+-	-mkdir -p $(DESTDIR)$(prefix)/applications
+-	$(INSTALL_DATA) $(srcdir)/../resources/tkremind.png $(DESTDIR)$(prefix)/icons
+-	$(INSTALL_PROGRAM) $(srcdir)/../resources/tkremind.desktop $(DESTDIR)$(prefix)/applications
++	-mkdir -p $(DESTDIR)$(datarootdir)/icons/tkremind
++	-mkdir -p $(DESTDIR)$(datarootdir)/applications
++	$(INSTALL_DATA) $(srcdir)/../resources/tkremind.png $(DESTDIR)$(datarootdir)/icons/tkremind
++	$(INSTALL_PROGRAM) $(srcdir)/../resources/tkremind.desktop $(DESTDIR)$(datarootdir)/applications
+ 	-if test "$(DESTDIR)" = ""; then \
+ 	    update-desktop-database < /dev/null > /dev/null 2>&1 ; \
+-	    xdg-icon-resource install --novendor --size 64 $(DESTDIR)$(prefix)/icons/tkremind.png < /dev/null > /dev/null 2>&1; \
+-	    xdg-desktop-menu install --novendor $(DESTDIR)$(prefix)/applications/tkremind.desktop < /dev/null > /dev/null 2>&1 ; \
++	    xdg-icon-resource install --novendor --size 64 $(DESTDIR)$(datarootdir)/icons/tkremind.png < /dev/null > /dev/null 2>&1; \
++	    xdg-desktop-menu install --novendor $(DESTDIR)$(datarootdir)/applications/tkremind.desktop < /dev/null > /dev/null 2>&1 ; \
+         fi
+ 
+ install-stripped: install
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/misc/remind/pkg/PLIST,v
retrieving revision 1.15
diff -u -p -r1.15 PLIST
--- pkg/PLIST	13 Sep 2023 09:36:32 -0000	1.15
+++ pkg/PLIST	1 Mar 2024 12:52:13 -0000
@@ -16,12 +16,15 @@ libdata/perl5/site_perl/Remind/PDF/Entry
 @man man/man1/tkremind.1
 @man man/man3p/Remind::PDF.3p
 @man man/man3p/Remind::PDF::Entry.3p
+share/applications/tkremind.desktop
 share/examples/remind/
 share/examples/remind/alignment.rem
 share/examples/remind/ansitext
 share/examples/remind/astro
 share/examples/remind/defs.rem
 share/examples/remind/remind.vim
+share/icons/tkremind/
+share/icons/tkremind/tkremind.png
 share/remind/
 share/remind/ansitext.rem
 share/remind/holidays/
@@ -33,6 +36,7 @@ share/remind/holidays/jewish.rem
 share/remind/holidays/us.rem
 share/remind/lang/
 share/remind/lang/auto.rem
+share/remind/lang/ca.rem
 share/remind/lang/da.rem
 share/remind/lang/de.rem
 share/remind/lang/en.rem
@@ -50,3 +54,5 @@ share/remind/lang/ro.rem
 share/remind/seasons.rem
 share/remind/site/
 share/remind/site/README
+@tag update-desktop-database
+@tag gtk-update-icon-cache %D/share/icons/tkremind