diff options
| author | gusi <gusi@df743ca5-7f9a-e211-a948-0013205c9059> | 2014-04-03 18:27:31 +0800 |
|---|---|---|
| committer | gusi <gusi@df743ca5-7f9a-e211-a948-0013205c9059> | 2014-04-03 18:27:31 +0800 |
| commit | cda4e93597649258e1036bdcec9ba99dc95f8807 (patch) | |
| tree | 47a2ea69d3c8a131f1d18d03189ab0a40503d16b | |
| parent | b5d49c379e5e3d30a630aa1ead06ebdd6c28a933 (diff) | |
| download | marcuscom-ports-cda4e93597649258e1036bdcec9ba99dc95f8807.tar marcuscom-ports-cda4e93597649258e1036bdcec9ba99dc95f8807.tar.gz marcuscom-ports-cda4e93597649258e1036bdcec9ba99dc95f8807.tar.bz2 marcuscom-ports-cda4e93597649258e1036bdcec9ba99dc95f8807.tar.lz marcuscom-ports-cda4e93597649258e1036bdcec9ba99dc95f8807.tar.xz marcuscom-ports-cda4e93597649258e1036bdcec9ba99dc95f8807.tar.zst marcuscom-ports-cda4e93597649258e1036bdcec9ba99dc95f8807.zip | |
Fix x11-fm/nemo to build with glib-2.40.0, since with 2.39 g_memmove got
deprecated.
While here, instead of disabling tracker make it optional. Use the new option style
in brief mode.
Finaly, do some cosmetic changes.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@19447 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | x11-fm/nemo/Makefile | 14 | ||||
| -rw-r--r-- | x11-fm/nemo/files/patch-eel_eel-editable-label.c | 14 |
2 files changed, 26 insertions, 2 deletions
diff --git a/x11-fm/nemo/Makefile b/x11-fm/nemo/Makefile index 52d42fd19..91252686f 100644 --- a/x11-fm/nemo/Makefile +++ b/x11-fm/nemo/Makefile @@ -22,24 +22,34 @@ LIB_DEPENDS= libexif.so:${PORTSDIR}/graphics/libexif \ RUN_DEPENDS= ${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme \ ${LOCALBASE}/libdata/pkgconfig/gsettings-desktop-schemas.pc:${PORTSDIR}/devel/gsettings-desktop-schemas -INSTALLS_ICONS= yes USES= desktop-file-utils gettext gmake pathfix \ pkgconfig shared-mime-info USE_GNOME= gnomeprefix intlhack gnomedesktop3 libxml2 \ introspection:build +INSTALLS_ICONS= yes USE_LDCONFIG= yes USE_AUTOTOOLS= libtool autoconf automake CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -CONFIGURE_ARGS= --enable-static --disable-packagekit --disable-tracker +CONFIGURE_ARGS= --enable-static --disable-packagekit GLIB_SCHEMAS= org.nemo.gschema.xml +OPTIONS_SUB= yes +OPTIONS_DEFINE= TRACKER +OPTIONS_DEFAULT= TRACKER +TRACKER_CONFIGURE_ENABLE= tracker +TRACKER_LIB_DEPENDS= libtracker-sparql-1.0.so:${PORTSDIR}/sysutils/tracker +TRACKER_DESC= Integration with tracker + post-patch: @${MKDIR} ${WRKSRC}/files${PREFIX} @${MV} ${WRKSRC}/files/usr/share ${WRKSRC}/files${PREFIX} + @${REINPLACE_CMD} -e 's|0.16|1.0|g' \ + ${WRKSRC}/configure.in + @${REINPLACE_CMD} -e 's|find|find ${WRKSRC}/files|g' \ ${WRKSRC}/files/Makefile.in diff --git a/x11-fm/nemo/files/patch-eel_eel-editable-label.c b/x11-fm/nemo/files/patch-eel_eel-editable-label.c new file mode 100644 index 000000000..4818520a4 --- /dev/null +++ b/x11-fm/nemo/files/patch-eel_eel-editable-label.c @@ -0,0 +1,14 @@ +--- eel/eel-editable-label.c.orig 2014-04-03 11:36:31.849369101 +0000 ++++ eel/eel-editable-label.c 2014-04-03 11:37:01.819371871 +0000 +@@ -36,6 +36,11 @@ + #include <gtk/gtk.h> + #include <gdk/gdkkeysyms.h> + ++/* g_memmove is removed in glib 2.40 */ ++#if GLIB_CHECK_VERSION (2, 39, 0) ++#define g_memmove memmove ++#endif ++ + enum { + MOVE_CURSOR, + POPULATE_POPUP, |