hello ports@,
in attachment the patch that bump tilda to 1.3.3 version.
I did some changes:
- update HOMEPAGE
- the project moves to github so I use GH_*
- re-check of WANTLIB with port-lib-depends-check
- use of vte3
- autoconf/automake to build
- deleted patches/{patch-Makefile_in,patch-src_key_grabber_c,\
patch-src_tomboykeybinder_h,patch-src_wizard_c}
because many of those all already included in upstream
I update the port because with i3 (and maybe others) the windows are not
displayed correctly.
tested on amd64 only.
Comments?
kind regards,
/davide
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/tilda/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- Makefile 27 Aug 2016 18:04:44 -0000 1.21
+++ Makefile 13 Oct 2016 11:17:39 -0000
@@ -2,35 +2,47 @@
COMMENT= drop-down terminal emulator
-DISTNAME= tilda-0.9.6
-REVISION= 9
+DISTNAME= tilda-1.3.3
CATEGORIES= x11
-HOMEPAGE= http://tilda.sourceforge.net/
+HOMEPAGE= https://github.com/lanoxx/tilda
-# GPL
+# GPLv2+
PERMIT_PACKAGE_CDROM= Yes
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tilda/}
-
-WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
-WANTLIB += Xrandr Xrender atk-1.0 c cairo confuse fontconfig freetype
-WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glade-2.0 glib-2.0
-WANTLIB += gobject-2.0 gthread-2.0 gtk-x11-2.0 iconv intl pango-1.0
-WANTLIB += pangocairo-1.0 pangoft2-1.0 pthread vte xml2 z
-
+GH_ACCOUNT= lanoxx
+GH_PROJECT= tilda
+GH_TAGNAME= ${DISTNAME}
+
+WANTLIB += X11 c confuse gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0
+WANTLIB += gobject-2.0 gtk-3 intl pango-1.0 vte-2.91
+
RUN_DEPENDS= devel/desktop-file-utils
LIB_DEPENDS= devel/gettext \
devel/libconfuse \
- devel/libglade2 \
- devel/vte
+ devel/vte3 \
+
+# autogen.sh needs autopoint (gettext)
+BUILD_DEPENDS= ${MODGNU_AUTOCONF_DEPENDS} \
+ ${MODGNU_AUTOMAKE_DEPENDS} \
+ devel/gettext-tools
+
+AUTOCONF_VERSION= 2.69
+AUTOMAKE_VERSION= 1.15
USE_GMAKE= Yes
CONFIGURE_STYLE= gnu
+post-patch:
+ @cd ${WRKSRC} && env AUTOCONF_VERSION=${AUTOCONF_VERSION} \
+ AUTOMAKE_VERSION=${AUTOMAKE_VERSION} ./autogen.sh --disable-rpath
+
+# done by autogen.sh
+do-configure:
+
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tilda
- ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/tilda
+ ${INSTALL_DATA} ${WRKSRC}/README.md ${PREFIX}/share/doc/tilda
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/tilda/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo 18 Jan 2015 03:16:02 -0000 1.4
+++ distinfo 13 Oct 2016 11:17:39 -0000
@@ -1,2 +1,2 @@
-SHA256 (tilda-0.9.6.tar.gz) = s70PY+uDpQAe8mBWyhFuX4AF1FT4+CqU8zSGiGIGhBE=
-SIZE (tilda-0.9.6.tar.gz) = 307517
+SHA256 (tilda-1.3.3.tar.gz) = cbqlVyxJjls+lPW1foEYwe8P2uommlskJSCOGt7ChLE=
+SIZE (tilda-1.3.3.tar.gz) = 671222
Index: patches/patch-Makefile_in
===================================================================
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- patches/patch-Makefile_in 28 Apr 2008 14:50:20 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.2 2008/04/28 14:50:20 jasper Exp $
---- Makefile.in.orig Mon Apr 28 12:41:33 2008
-+++ Makefile.in Mon Apr 28 15:15:40 2008
-@@ -319,12 +319,12 @@ uninstall-PixmapsDATA:
- done
- install-dataDATA: $(data_DATA)
- @$(NORMAL_INSTALL)
-- test -z "$(datadir)" || $(MKDIR_P) "$(DESTDIR)$(datadir)"
-+ test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
- @list='$(data_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
-- echo " $(dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(datadir)/$$f'"; \
-- $(dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(datadir)/$$f"; \
-+ echo " $(dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgdatadir)/$$f'"; \
-+ $(dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \
- done
-
- uninstall-dataDATA:
Index: patches/patch-src-tilda_c
===================================================================
RCS file: /cvs/ports/x11/tilda/patches/patch-src-tilda_c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src-tilda_c
--- patches/patch-src-tilda_c 11 Feb 2008 09:03:31 -0000 1.2
+++ patches/patch-src-tilda_c 13 Oct 2016 11:17:39 -0000
@@ -10,3 +10,13 @@ $OpenBSD: patch-src-tilda_c,v 1.2 2008/0
gchar buf[16]; /* Really shouldn't need more than 6 */
if ((ps_output = popen (ps_command, "r")) == NULL)
+--- src/tilda.c.orig 2015-12-16 12:11:58 UTC
++++ src/tilda.c
+@@ -12,6 +12,7 @@
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library. If not, see
<http://www.gnu.org/licenses/>.
+ */
++#include <fcntl.h>
+ #define _POSIX_SOURCE /* feature test macro for signal functions */
+ #define _XOPEN_SOURCE /* feature test macro for popen */
+
Index: patches/patch-src_key_grabber_c
===================================================================
RCS file: patches/patch-src_key_grabber_c
diff -N patches/patch-src_key_grabber_c
--- patches/patch-src_key_grabber_c 4 Mar 2011 10:18:13 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_key_grabber_c,v 1.1 2011/03/04 10:18:13 giovanni Exp $
---- src/key_grabber.c.orig Fri Feb 18 14:42:08 2011
-+++ src/key_grabber.c Fri Feb 18 14:42:29 2011
-@@ -190,7 +190,7 @@ void pull (struct tilda_window_ *tw, enum pull_state s
- * Overriding the user time here seems to work a lot better than
calling
- * gtk_window_present_with_time() here, or at the end of the
function. I have
- * no idea why, they should do the same thing. */
-- gdk_x11_window_set_user_time (GTK_WIDGET(tw->window)->window,
-+ gdk_x11_window_set_user_time (GTK_WIDGET(tw->window),
-
tomboy_keybinder_get_current_event_time());
- gtk_window_move (GTK_WINDOW(tw->window), config_getint ("x_pos"),
config_getint ("y_pos"));
- gtk_widget_show (GTK_WIDGET(tw->window));
Index: patches/patch-src_tomboykeybinder_h
===================================================================
RCS file: patches/patch-src_tomboykeybinder_h
diff -N patches/patch-src_tomboykeybinder_h
--- patches/patch-src_tomboykeybinder_h 23 Mar 2012 13:28:25 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-src_tomboykeybinder_h,v 1.1 2012/03/23 13:28:25 ajacoutot Exp $
-
-error: #error "Only <glib.h> can be included directly."
-
---- src/tomboykeybinder.h.orig Sun Mar 18 19:58:07 2012
-+++ src/tomboykeybinder.h Sun Mar 18 19:58:13 2012
-@@ -2,7 +2,7 @@
- #ifndef __TOMBOY_KEY_BINDER_H__
- #define __TOMBOY_KEY_BINDER_H__
-
--#include <glib/gtypes.h>
-+#include <glib.h>
-
- G_BEGIN_DECLS
-
Index: patches/patch-src_wizard_c
===================================================================
RCS file: patches/patch-src_wizard_c
diff -N patches/patch-src_wizard_c
--- patches/patch-src_wizard_c 11 Feb 2008 09:03:31 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_wizard_c,v 1.1 2008/02/11 09:03:31 jasper Exp $
---- src/wizard.c.orig Mon Feb 11 00:34:30 2008
-+++ src/wizard.c Mon Feb 11 00:34:44 2008
-@@ -67,7 +67,7 @@ gint wizard (tilda_window *ltw)
- DEBUG_ASSERT (ltw != NULL);
-
- gchar *window_title;
-- const gchar *glade_file = g_build_filename (DATADIR, "tilda.glade", NULL);
-+ const gchar *glade_file = g_build_filename (DATADIR, "tilda",
"tilda.glade", NULL);
- GtkWidget *wizard_window;
-
- /* Make sure that there isn't already a wizard showing */
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/tilda/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- pkg/PLIST 21 Dec 2009 20:46:03 -0000 1.5
+++ pkg/PLIST 13 Oct 2016 11:17:39 -0000
@@ -1,19 +1,21 @@
@comment $OpenBSD: PLIST,v 1.5 2009/12/21 20:46:03 ajacoutot Exp $
-bin/tilda
+@bin bin/tilda
+share/appdata/
+share/appdata/tilda.appdata.xml
share/applications/tilda.desktop
share/doc/tilda/
-share/doc/tilda/README
+share/doc/tilda/README.md
+share/locale/bg/LC_MESSAGES/tilda.mo
share/locale/ca/LC_MESSAGES/tilda.mo
share/locale/cs/LC_MESSAGES/tilda.mo
share/locale/de/LC_MESSAGES/tilda.mo
share/locale/el/LC_MESSAGES/tilda.mo
-share/locale/en_GB/
-share/locale/en_GB/LC_MESSAGES/
share/locale/en_GB/LC_MESSAGES/tilda.mo
share/locale/es/LC_MESSAGES/tilda.mo
share/locale/fr/LC_MESSAGES/tilda.mo
share/locale/hu/LC_MESSAGES/tilda.mo
share/locale/it/LC_MESSAGES/tilda.mo
+share/locale/lt/LC_MESSAGES/tilda.mo
share/locale/pl/LC_MESSAGES/tilda.mo
share/locale/pt/LC_MESSAGES/tilda.mo
share/locale/pt_BR/LC_MESSAGES/tilda.mo
@@ -25,7 +27,5 @@ share/locale/tr/LC_MESSAGES/tilda.mo
share/locale/zh_CN/LC_MESSAGES/tilda.mo
share/pixmaps/
share/pixmaps/tilda.png
-share/tilda/
-share/tilda/tilda.glade
@exec %D/bin/update-desktop-database
@unexec-delete %D/bin/update-desktop-database
