cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to tilda-1.3.3

Browse Source 
Tweaked diff from Davide Gerhard.
This commit is contained in:
jca 2016-11-06 06:54:54 +00:00
parent fe6ebb178a
commit 7038aa3ffd
8 changed files with 48 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
x11/tilda/Makefile
View File

@ -1,36 +1,45 @@
# $OpenBSD: Makefile,v 1.21 2016/08/27 18:04:44 jca Exp $
# $OpenBSD: Makefile,v 1.22 2016/11/06 06:54:54 jca Exp $
COMMENT= drop-down terminal emulator
DISTNAME= tilda-0.9.6
REVISION= 9
GH_ACCOUNT= lanoxx
GH_PROJECT= tilda
GH_TAGNAME= tilda-1.3.3
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 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
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
RUN_DEPENDS= devel/desktop-file-utils
# autogen.sh needs autopoint (gettext)
BUILD_DEPENDS= ${MODGNU_AUTOCONF_DEPENDS} \
${MODGNU_AUTOMAKE_DEPENDS} \
devel/gettext-tools
LIB_DEPENDS= devel/gettext \
devel/libconfuse \
devel/libglade2 \
devel/vte
devel/vte3
RUN_DEPENDS= devel/desktop-file-utils
USE_GMAKE= Yes
AUTOCONF_VERSION= 2.69
AUTOMAKE_VERSION= 1.15
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= --disable-rpath
post-patch:
cd ${WRKSRC} && env AUTOCONF_VERSION=${AUTOCONF_VERSION} \
AUTOMAKE_VERSION=${AUTOMAKE_VERSION} NOCONFIGURE=1 \
./autogen.sh
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>

4
x11/tilda/distinfo
View File

@ -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

19
x11/tilda/patches/patch-Makefile_in
View File

@ -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:

19
x11/tilda/patches/patch-src-tilda_c
View File

@ -1,12 +1,21 @@
$OpenBSD: patch-src-tilda_c,v 1.2 2008/02/11 09:03:31 jasper Exp $
--- src/tilda.c.orig Mon Feb 11 00:07:47 2008
+++ src/tilda.c Mon Feb 11 00:08:14 2008
@@ -206,7 +206,7 @@ static gint remove_stale_lock_files (gchar *home_direc
$OpenBSD: patch-src-tilda_c,v 1.3 2016/11/06 06:54:54 jca Exp $
--- src/tilda.c.orig Mon Apr 18 14:09:55 2016
+++ src/tilda.c Sun Nov 6 07:43:00 2016
@@ -12,8 +12,6 @@
* 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/>.
*/
-#define _POSIX_SOURCE /* feature test macro for signal functions */
-#define _XOPEN_SOURCE /* feature test macro for popen */
/*
* This message is shown in a modal dialog when tilda starts and there is a problem parsing the configuration file.
@@ -230,7 +228,7 @@ nomatch:
static GSList *getPids() {
GSList *pids = NULL;
FILE *ps_output;
- const gchar ps_command[] = "ps -C tilda -o pid=";
+ const gchar ps_command[] = "/usr/bin/pgrep tilda";
gchar buf[16]; /* Really shouldn't need more than 6 */
if ((ps_output = popen (ps_command, "r")) == NULL)
if ((ps_output = popen (ps_command, "r")) == NULL) {

12
x11/tilda/patches/patch-src_key_grabber_c
View File

@ -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));

15
x11/tilda/patches/patch-src_tomboykeybinder_h
View File

@ -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

12
x11/tilda/patches/patch-src_wizard_c
View File

@ -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 */

14
x11/tilda/pkg/PLIST
View File

@ -1,19 +1,21 @@
@comment $OpenBSD: PLIST,v 1.5 2009/12/21 20:46:03 ajacoutot Exp $
bin/tilda
@comment $OpenBSD: PLIST,v 1.6 2016/11/06 06:54:54 jca Exp $
@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