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

* galago is gone, so remove useless CONFIGURE_ARGS.

Browse Source 
* Rename tomboy.desktop to Tomboy.desktop to please session managers
looking for corresponding excutable <-> desktop.
* Really disable WebDavSyncService so that it doesn't come back into PLIST
* Merge patch from upstream to stop using gdk_display as it's deprecated
in GDK 2.22
This commit is contained in:
ajacoutot 2010-12-03 14:55:23 +00:00
parent e59a4bda19
commit ea6c0c9e74
4 changed files with 41 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
x11/gnome/tomboy/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.41 2010/11/29 17:18:49 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.42 2010/12/03 14:55:23 ajacoutot Exp $
COMMENT= desktop note-taking application written in C\#
@ -50,9 +50,6 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
# needs galago-sharp
CONFIGURE_ARGS+= --enable-galago=no
USE_GROFF = Yes
# this is *.config.in on purpose (and not *.config)
@ -60,4 +57,10 @@ DLLMAP_FILES= Tomboy/Tomboy.exe.config.in \
Tomboy/Addins/Bugzilla/BugzillaNoteAddin.cs \
Tomboy/Addins/Evolution/EvolutionNoteAddin.cs
# XXX ** (gnome-session:7425): WARNING **: Unable to find desktop file
# 'Tomboy.desktop': Valid key file could not be found in search dirs
post-install:
mv ${PREFIX}/share/applications/tomboy.desktop \
${PREFIX}/share/applications/Tomboy.desktop
.include <bsd.port.mk>

14
x11/gnome/tomboy/patches/patch-Tomboy_Addins_Makefile_in Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-Tomboy_Addins_Makefile_in,v 1.1 2010/12/03 14:55:23 ajacoutot Exp $
WebDavSyncService needs fuse.
--- Tomboy/Addins/Makefile.in.orig Fri Dec 3 14:39:48 2010
+++ Tomboy/Addins/Makefile.in Fri Dec 3 14:39:55 2010
@@ -280,7 +280,6 @@ SUBDIRS = \
Tasque \
NoteDirectoryWatcher \
Underline \
- WebDavSyncService \
WebSyncService
all: all-recursive

18
x11/gnome/tomboy/patches/patch-libtomboy_tomboykeybinder_c Normal file
View File

@ -0,0 +1,18 @@
$OpenBSD: patch-libtomboy_tomboykeybinder_c,v 1.1 2010/12/03 14:55:23 ajacoutot Exp $
From 102b1e07bcfa5e51556a29dbe505f7900ec63ef6 Mon Sep 17 00:00:00 2001
From: Sandy Armstrong <sanfordarmstrong@gmail.com>
Date: Sun, 03 Oct 2010 00:40:06 +0000
Subject: [libtomboy] Stop using gdk_display, deprecated in GDK 2.22
--- libtomboy/tomboykeybinder.c.orig Fri Dec 3 14:30:08 2010
+++ libtomboy/tomboykeybinder.c Fri Dec 3 14:30:24 2010
@@ -313,7 +313,7 @@ tomboy_keybinder_is_modifier (guint keycode)
XModifierKeymap *mod_keymap;
gboolean retval = FALSE;
- mod_keymap = XGetModifierMapping (gdk_display);
+ mod_keymap = XGetModifierMapping (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()));
map_size = 8 * mod_keymap->max_keypermod;

4
x11/gnome/tomboy/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.17 2010/11/29 17:18:50 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.18 2010/12/03 14:55:23 ajacoutot Exp $
bin/tomboy
bin/tomboy-panel
lib/bonobo/
@ -43,7 +43,7 @@ lib/tomboy/libtomboy.a
lib/tomboy/libtomboy.la
lib/tomboy/libtomboy.so
@man man/man1/tomboy.1
share/applications/tomboy.desktop
share/applications/Tomboy.desktop
share/dbus-1/services/org.gnome.Tomboy.service
share/gnome/help/tomboy/
share/gnome/help/tomboy/C/