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

Unbreak, reported by espie@

Browse Source
This commit is contained in:
ajacoutot 2012-06-18 11:30:50 +00:00
parent 1a28efb5ae
commit 3575a88b58
5 changed files with 38 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
x11/gnome/controlcenter/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.67 2012/06/15 08:30:19 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.68 2012/06/18 11:30:50 ajacoutot Exp $
# XXX Binary files patch-panels_info_hostnames-test_txt and
# patch-panels_info_hostnames-test_txt.new differ
@ -10,7 +10,7 @@ COMMENT= GNOME control center
GNOME_PROJECT= gnome-control-center
GNOME_VERSION= 3.4.2
REVISION= 2
REVISION= 3
CATEGORIES= x11
@ -37,7 +37,7 @@ WANTLIB += pixman-1 png polkit-gobject-1 pthread pthread-stubs
WANTLIB += pulse pulse-mainloop-glib rest-0.7 sndfile soup-2.4
WANTLIB += soup-gnome-2.4 sqlite3 ssl stdc++ upower-glib vorbis
WANTLIB += vorbisfile webkitgtk-3.0 xcb xcb-render xcb-shm xkbfile
WANTLIB += xklavier xml2 xslt z
WANTLIB += xklavier xml2 xslt z lcms2
MODULES= devel/gettext \
x11/gnome

12
x11/gnome/controlcenter/patches/patch-panels_common_Makefile_am Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-panels_common_Makefile_am,v 1.1 2012/06/18 11:30:50 ajacoutot Exp $
--- panels/common/Makefile.am.orig Mon Jun 18 13:05:59 2012
+++ panels/common/Makefile.am Mon Jun 18 13:06:17 2012
@@ -9,7 +9,7 @@ AM_CPPFLAGS = \
$(LIBLANGUAGE_CFLAGS) \
-DDATADIR=\""$(datadir)"\" \
-DUIDIR=\""$(pkgdatadir)/ui"\" \
- -DLIBLOCALEDIR=\""$(prefix)/lib/locale"\" \
+ -DLIBLOCALEDIR=\""/usr/share/locale"\" \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-DUM_PIXMAP_DIR=\""$(pkgdatadir)/pixmaps"\"

12
x11/gnome/controlcenter/patches/patch-panels_common_Makefile_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-panels_common_Makefile_in,v 1.5 2012/05/15 14:31:18 ajacoutot Exp $
--- panels/common/Makefile.in.orig Tue May 15 12:20:17 2012
+++ panels/common/Makefile.in Tue May 15 16:22:04 2012
@@ -350,7 +350,7 @@ AM_CPPFLAGS = \
$(LIBLANGUAGE_CFLAGS) \
-DDATADIR=\""$(datadir)"\" \
-DUIDIR=\""$(pkgdatadir)/ui"\" \
- -DLIBLOCALEDIR=\""$(prefix)/lib/locale"\" \
+ -DLIBLOCALEDIR=\""/usr/share/locale"\" \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-DUM_PIXMAP_DIR=\""$(pkgdatadir)/pixmaps"\"

23
x11/gnome/controlcenter/patches/patch-panels_user-accounts_Makefile_am Normal file
View File

@ -0,0 +1,23 @@
$OpenBSD: patch-panels_user-accounts_Makefile_am,v 1.1 2012/06/18 11:30:50 ajacoutot Exp $
On OpenBSD, crypt() is part of libc.
--- panels/user-accounts/Makefile.am.orig Mon Jun 18 13:05:02 2012
+++ panels/user-accounts/Makefile.am Mon Jun 18 13:05:29 2012
@@ -10,7 +10,7 @@ ccpanels_LTLIBRARIES = libuser-accounts.la
AM_CPPFLAGS = \
-DDATADIR=\""$(datadir)"\" \
-DUIDIR=\""$(pkgdatadir)/ui/user-accounts"\" \
- -DLIBLOCALEDIR=\""$(prefix)/lib/locale"\" \
+ -DLIBLOCALEDIR=\""/usr/share/locale"\" \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-DUM_PIXMAP_DIR=\""$(pkgdatadir)/pixmaps"\" \
-I$(srcdir)/../common/ \
@@ -56,7 +56,6 @@ libuser_accounts_la_LIBADD = \
$(PANEL_LIBS) \
$(USER_ACCOUNTS_PANEL_LIBS) \
$(top_builddir)/panels/common/liblanguage.la \
- -lcrypt \
-lm
if BUILD_CHEESE

24
x11/gnome/controlcenter/patches/patch-panels_user-accounts_Makefile_in
View File

@ -1,24 +0,0 @@
$OpenBSD: patch-panels_user-accounts_Makefile_in,v 1.7 2012/05/15 14:31:18 ajacoutot Exp $
On OpenBSD, crypt() is part of libc.
--- panels/user-accounts/Makefile.in.orig Tue May 15 12:20:23 2012
+++ panels/user-accounts/Makefile.in Tue May 15 16:22:04 2012
@@ -384,7 +384,7 @@ ccpanelsdir = $(PANELS_DIR)
ccpanels_LTLIBRARIES = libuser-accounts.la
AM_CPPFLAGS = -DDATADIR=\""$(datadir)"\" \
-DUIDIR=\""$(pkgdatadir)/ui/user-accounts"\" \
- -DLIBLOCALEDIR=\""$(prefix)/lib/locale"\" \
+ -DLIBLOCALEDIR=\""/usr/share/locale"\" \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-DUM_PIXMAP_DIR=\""$(pkgdatadir)/pixmaps"\" \
-I$(srcdir)/../common/ -I$(srcdir)/../../shell/ \
@@ -420,7 +420,7 @@ libuser_accounts_la_SOURCES = \
um-user-module.c
libuser_accounts_la_LIBADD = $(PANEL_LIBS) $(USER_ACCOUNTS_PANEL_LIBS) \
- $(top_builddir)/panels/common/liblanguage.la -lcrypt -lm \
+ $(top_builddir)/panels/common/liblanguage.la -lm \
$(am__append_2)
libuser_accounts_la_LDFLAGS = $(PANEL_LDFLAGS)
CLEANFILES = \