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

- fix PLIST and install gnome-default-applications.pc where it belongs

Browse Source 
spotted by kili@, thanks!
- while here, fix some hardcoded paths
- tweak diff_args
This commit is contained in:
ajacoutot 2009-06-09 17:21:10 +00:00
parent e40ac7cd6c
commit ef98243329
4 changed files with 40 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
x11/gnome/controlcenter2/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.65 2009/06/08 17:59:14 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.66 2009/06/09 17:21:10 ajacoutot Exp $
COMMENT= GNOME control center
GNOME_PROJECT= gnome-control-center
GNOME_VERSION= 2.24.0.1
PKGNAME= ${DISTNAME}p18
PKGNAME= ${DISTNAME}p19
SHARED_LIBS += gnome-window-settings 2.0 # .1.0
CATEGORIES= x11
@ -30,6 +30,9 @@ WANTLIB= ICE ORBit-2 ORBitCosNaming-2 SM X11 Xau Xcomposite \
soup-2.4 sqlite3 ssl ssl3 startup-notification-1 tasn1 util \
vorbis vorbisfile xkbfile xml2 z
# po/ta.po (patch-po_ta_po) is seen as binary
DIFF_ARGS= -a
MODULES= devel/gettext \
x11/gnome \
devel/gconf2

21
x11/gnome/controlcenter2/patches/patch-capplets_common_gnome-theme-info_c Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-capplets_common_gnome-theme-info_c,v 1.1 2009/06/09 17:21:10 ajacoutot Exp $
--- capplets/common/gnome-theme-info.c.orig Tue Jun 9 19:04:02 2009
+++ capplets/common/gnome-theme-info.c Tue Jun 9 19:04:43 2009
@@ -1853,7 +1853,7 @@ gnome_theme_init ()
g_object_unref (top_theme_dir);
/* The weird /usr/share/icons */
- top_theme_dir = g_file_new_for_path ("/usr/share/icons");
+ top_theme_dir = g_file_new_for_path ("${PREFIX}/share/icons");
add_top_icon_theme_dir_monitor (top_theme_dir, 2, NULL);
g_object_unref (top_theme_dir);
@@ -1867,7 +1867,7 @@ gnome_theme_init ()
#ifdef XCURSOR_ICONDIR
/* if there's a separate xcursors dir, add that as well */
if (strcmp (XCURSOR_ICONDIR, top_theme_dir_string) &&
- strcmp (XCURSOR_ICONDIR, "/usr/share/icons")) {
+ strcmp (XCURSOR_ICONDIR, "${PREFIX}/share/icons")) {
top_theme_dir = g_file_new_for_path (XCURSOR_ICONDIR);
if (g_file_query_exists (top_theme_dir, NULL))
add_top_icon_theme_dir_monitor (top_theme_dir, 1, NULL);

12
x11/gnome/controlcenter2/patches/patch-capplets_default-applications_Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-capplets_default-applications_Makefile_in,v 1.1 2009/06/09 17:21:10 ajacoutot Exp $
--- capplets/default-applications/Makefile.in.orig Tue Jun 9 18:57:15 2009
+++ capplets/default-applications/Makefile.in Tue Jun 9 18:57:34 2009
@@ -346,7 +346,7 @@ dist_glade_DATA = gnome-default-applications-propertie
desktopdir = $(datadir)/applications
Desktop_in_files = default-applications.desktop.in
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
-pkgconfigdir = $(datadir)/pkgconfig
+pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = gnome-default-applications.pc
autostartdir = $(sysconfdir)/xdg/autostart
autostart_in_files = gnome-at-session.desktop.in

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

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.30 2009/06/07 10:47:38 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.31 2009/06/09 17:21:10 ajacoutot Exp $
@conflict control-center-1*
@conflict control-center2-*
@pkgpath x11/gnome/controlcenter2
@ -23,6 +23,7 @@ include/gnome-window-settings-2.0/gnome-window-manager.h
include/gnome-window-settings-2.0/gnome-wm-manager.h
lib/libgnome-window-settings.a
lib/libgnome-window-settings.la
lib/pkgconfig/gnome-default-applications.pc
lib/pkgconfig/gnome-keybindings.pc
lib/pkgconfig/gnome-window-settings-2.0.pc
lib/window-manager-settings/
@ -292,7 +293,6 @@ share/omf/control-center/control-center-uk.omf
share/omf/control-center/control-center-vi.omf
share/omf/control-center/control-center-zh_CN.omf
@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/${SCHEMAS_INSTDIR}/*.schemas > /dev/null
${SCHEMAS_INSTDIR}/gnome-default-applications.pc
${SCHEMAS_INSTDIR}/control-center.schemas
@exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-install-rule %D/${SCHEMAS_INSTDIR}/*.schemas > /dev/null
@exec %D/bin/update-desktop-database