diff options
author | khorben <khorben@pkgsrc.org> | 2015-10-05 23:43:55 +0000 |
---|---|---|
committer | khorben <khorben@pkgsrc.org> | 2015-10-05 23:43:55 +0000 |
commit | 9cd979197c6f4410ca17e8bbfcf3b1d08e4a524b (patch) | |
tree | 92ad92298d76569f851f99b5c5d4589103bd4983 /sysutils | |
parent | 55262b1cc099303ca90da8f33852ef7f8011d438 (diff) | |
download | pkgsrc-9cd979197c6f4410ca17e8bbfcf3b1d08e4a524b.tar.gz |
Package DeforaOS Browser 0.4.14
This first release in almost two years brings:
- more complete VFS abstraction
- new plug-in to manage Gtk+ bookmarks
- improved CVS, Git, Make, Preview, SVN, and Volumes plug-ins
- new plug-in to track the current selection
- new experimental plug-in for the XDG trash
- improvements to the view(1) helper binary
- re-usable library, libBrowser
- Spanish translation
- support for building outside of the source tree
- further improvements to the build system
- portability fixes (SunOS)
- support for drawing the desktop as a window
- improved support for Gtk+ 3
- introduction of a test suite
- additional bugfixes and improvements (UI, performance...)
Diffstat (limited to 'sysutils')
-rw-r--r-- | sysutils/deforaos-browser/Makefile | 20 | ||||
-rw-r--r-- | sysutils/deforaos-browser/PLIST | 31 | ||||
-rw-r--r-- | sysutils/deforaos-browser/buildlink3.mk | 8 | ||||
-rw-r--r-- | sysutils/deforaos-browser/distinfo | 14 | ||||
-rw-r--r-- | sysutils/deforaos-browser/patches/patch-data_pkgconfig.sh | 16 | ||||
-rw-r--r-- | sysutils/deforaos-browser/patches/patch-src_callbacks.c | 15 | ||||
-rw-r--r-- | sysutils/deforaos-browser/patches/patch-src_plugins_Makefile | 17 | ||||
-rw-r--r-- | sysutils/deforaos-browser/patches/patch-src_plugins_dirtree.c | 39 | ||||
-rw-r--r-- | sysutils/deforaos-browser/patches/patch-src_vfs.c | 16 | ||||
-rw-r--r-- | sysutils/deforaos-browser/patches/patch-tools_dirtree.c | 43 |
10 files changed, 42 insertions, 177 deletions
diff --git a/sysutils/deforaos-browser/Makefile b/sysutils/deforaos-browser/Makefile index 72f6f2dee52..0b8de643fdd 100644 --- a/sysutils/deforaos-browser/Makefile +++ b/sysutils/deforaos-browser/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.18 2015/08/25 22:52:25 khorben Exp $ +# $NetBSD: Makefile,v 1.19 2015/10/05 23:43:55 khorben Exp $ # -DISTNAME= Browser-0.4.13 -PKGNAME= deforaos-browser-0.4.13 -PKGREVISION= 2 +DISTNAME= Browser-0.4.14 +PKGNAME= deforaos-browser-0.4.14 CATEGORIES= sysutils -MASTER_SITES= http://www.defora.org/os/download/download/4310/ +MASTER_SITES= http://www.defora.org/os/download/download/4377/ MAINTAINER= khorben@defora.org HOMEPAGE= http://www.defora.org/ @@ -22,12 +21,22 @@ BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl MAKE_FLAGS+= DESTDIR=${DESTDIR} MAKE_FLAGS+= PREFIX=${PREFIX} MAKE_FLAGS+= CFLAGS=${CFLAGS:Q} +MAKE_FLAGS+= LDFLAGS=${LDFLAGS:Q} AUTO_MKDIRS= yes .include "../../mk/bsd.prefs.mk" .if ${PKGMANDIR} != "share/man" post-install: + ${MV} ${DESTDIR}${PREFIX}/share/man/html1/browser.html ${DESTDIR}${PREFIX}/${PKGMANDIR}/html1/browser.html + ${MV} ${DESTDIR}${PREFIX}/share/man/html1/copy.html ${DESTDIR}${PREFIX}/${PKGMANDIR}/html1/copy.html + ${MV} ${DESTDIR}${PREFIX}/share/man/html1/delete.html ${DESTDIR}${PREFIX}/${PKGMANDIR}/html1/delete.html + ${MV} ${DESTDIR}${PREFIX}/share/man/html1/desktop.html ${DESTDIR}${PREFIX}/${PKGMANDIR}/html1/desktop.html + ${MV} ${DESTDIR}${PREFIX}/share/man/html1/desktopctl.html ${DESTDIR}${PREFIX}/${PKGMANDIR}/html1/desktopctl.html + ${MV} ${DESTDIR}${PREFIX}/share/man/html1/move.html ${DESTDIR}${PREFIX}/${PKGMANDIR}/html1/move.html + ${MV} ${DESTDIR}${PREFIX}/share/man/html1/open.html ${DESTDIR}${PREFIX}/${PKGMANDIR}/html1/open.html + ${MV} ${DESTDIR}${PREFIX}/share/man/html1/properties.html ${DESTDIR}${PREFIX}/${PKGMANDIR}/html1/properties.html + ${MV} ${DESTDIR}${PREFIX}/share/man/html1/view.html ${DESTDIR}${PREFIX}/${PKGMANDIR}/html1/view.html ${MV} ${DESTDIR}${PREFIX}/share/man/man1/browser.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/browser.1 ${MV} ${DESTDIR}${PREFIX}/share/man/man1/copy.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/copy.1 ${MV} ${DESTDIR}${PREFIX}/share/man/man1/delete.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/delete.1 @@ -37,6 +46,7 @@ post-install: ${MV} ${DESTDIR}${PREFIX}/share/man/man1/open.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/open.1 ${MV} ${DESTDIR}${PREFIX}/share/man/man1/properties.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/properties.1 ${MV} ${DESTDIR}${PREFIX}/share/man/man1/view.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/view.1 + ${RMDIR} ${DESTDIR}${PREFIX}/share/man/html1 ${RMDIR} ${DESTDIR}${PREFIX}/share/man/man1 ${RMDIR} ${DESTDIR}${PREFIX}/share/man .endif diff --git a/sysutils/deforaos-browser/PLIST b/sysutils/deforaos-browser/PLIST index 473e9a3e38a..180a5b17174 100644 --- a/sysutils/deforaos-browser/PLIST +++ b/sysutils/deforaos-browser/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2014/01/11 21:11:53 khorben Exp $ +@comment $NetBSD: PLIST,v 1.6 2015/10/05 23:43:55 khorben Exp $ bin/browser bin/copy bin/delete @@ -11,6 +11,7 @@ bin/view include/Desktop/Browser.h include/Desktop/Browser/desktop.h include/Desktop/Browser/plugin.h +include/Desktop/Browser/vfs.h lib/Browser/plugins/cvs.so lib/Browser/plugins/dirtree.so lib/Browser/plugins/favorites.so @@ -18,9 +19,24 @@ lib/Browser/plugins/git.so lib/Browser/plugins/make.so lib/Browser/plugins/preview.so lib/Browser/plugins/properties.so +lib/Browser/plugins/selection.so lib/Browser/plugins/subversion.so +lib/Browser/plugins/trash.so lib/Browser/plugins/volumes.so +lib/libBrowser.a +lib/libBrowser.so +lib/libBrowser.so.0 +lib/libBrowser.so.0.0 lib/pkgconfig/Browser.pc +man/html1/browser.html +man/html1/copy.html +man/html1/delete.html +man/html1/desktop.html +man/html1/desktopctl.html +man/html1/move.html +man/html1/open.html +man/html1/properties.html +man/html1/view.html man/man1/browser.1 man/man1/copy.1 man/man1/delete.1 @@ -30,17 +46,8 @@ man/man1/move.1 man/man1/open.1 man/man1/properties.1 man/man1/view.1 -share/applications/browser.desktop -share/applications/desktop-settings.desktop -share/doc/html/Browser/browser.html -share/doc/html/Browser/copy.html -share/doc/html/Browser/delete.html -share/doc/html/Browser/desktop.html -share/doc/html/Browser/desktopctl.html -share/doc/html/Browser/move.html -share/doc/html/Browser/open.html -share/doc/html/Browser/properties.html -share/doc/html/Browser/view.html +share/applications/deforaos-browser.desktop +share/applications/deforaos-desktop-settings.desktop share/icons/hicolor/16x16/apps/browser-view-details.png share/icons/hicolor/16x16/apps/browser-view-icons.png share/icons/hicolor/16x16/apps/browser-view-list.png diff --git a/sysutils/deforaos-browser/buildlink3.mk b/sysutils/deforaos-browser/buildlink3.mk index d7cf8411fd5..38afecaa262 100644 --- a/sysutils/deforaos-browser/buildlink3.mk +++ b/sysutils/deforaos-browser/buildlink3.mk @@ -1,15 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.10 2015/04/25 14:24:51 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2015/10/05 23:43:55 khorben Exp $ BUILDLINK_TREE+= deforaos-browser .if !defined(DEFORAOS_BROWSER_BUILDLINK3_MK) DEFORAOS_BROWSER_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.deforaos-browser+= deforaos-browser>=0.4.5 -BUILDLINK_ABI_DEPENDS.deforaos-browser?= deforaos-browser>=0.4.13nb2 +BUILDLINK_API_DEPENDS.deforaos-browser+= deforaos-browser>=0.4.14 +BUILDLINK_ABI_DEPENDS.deforaos-browser?= deforaos-browser>=0.4.14 BUILDLINK_PKGSRCDIR.deforaos-browser?= ../../sysutils/deforaos-browser -.include "../../x11/gtk2/buildlink3.mk" +.include "../../x11/deforaos-libdesktop/buildlink3.mk" .endif # DEFORAOS_BROWSER_BUILDLINK3_MK BUILDLINK_TREE+= -deforaos-browser diff --git a/sysutils/deforaos-browser/distinfo b/sysutils/deforaos-browser/distinfo index 2f6c110d810..84900840f66 100644 --- a/sysutils/deforaos-browser/distinfo +++ b/sysutils/deforaos-browser/distinfo @@ -1,11 +1,5 @@ -$NetBSD: distinfo,v 1.7 2015/08/25 22:52:25 khorben Exp $ +$NetBSD: distinfo,v 1.8 2015/10/05 23:43:55 khorben Exp $ -SHA1 (Browser-0.4.13.tar.gz) = 2a7eec2032bc224864000a149ba0afc2b8562cbd -RMD160 (Browser-0.4.13.tar.gz) = 0cee3c24a8bc40a513aab6bd794bbd9865ac73f7 -Size (Browser-0.4.13.tar.gz) = 129587 bytes -SHA1 (patch-data_pkgconfig.sh) = 4d331028b647bcd671fadeda613ecc29d56d3017 -SHA1 (patch-src_callbacks.c) = 81cc77f99c58a1c0de61f4096808d77d99cce4fd -SHA1 (patch-src_plugins_Makefile) = 3a275dfcda3a8acc0e87daa8953ffd3ad3fb5181 -SHA1 (patch-src_plugins_dirtree.c) = 9abeac0ad6947d19435276708aefe0c9235e9b92 -SHA1 (patch-src_vfs.c) = e604b316be270e210c95b889d2c853aefd8bbc46 -SHA1 (patch-tools_dirtree.c) = 1c404e749464d30773360a43485117010d1cbd15 +SHA1 (Browser-0.4.14.tar.gz) = 3cdc454e6fe4bdbf571cd757158ffedf5a7927f5 +RMD160 (Browser-0.4.14.tar.gz) = 3d909527398371f5c5310f359ffb1400af96654a +Size (Browser-0.4.14.tar.gz) = 157693 bytes diff --git a/sysutils/deforaos-browser/patches/patch-data_pkgconfig.sh b/sysutils/deforaos-browser/patches/patch-data_pkgconfig.sh deleted file mode 100644 index 67794135aed..00000000000 --- a/sysutils/deforaos-browser/patches/patch-data_pkgconfig.sh +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-data_pkgconfig.sh,v 1.1 2014/03/21 14:19:31 jperkin Exp $ - -Use correct rpath flag on SunOS. - ---- data/pkgconfig.sh.orig 2013-01-12 02:44:39.000000000 +0000 -+++ data/pkgconfig.sh -@@ -114,6 +114,9 @@ while [ $# -gt 0 ]; do - Darwin) - RPATH="-Wl,-rpath,\${libdir}" - ;; -+ SunOS) -+ RPATH="-Wl,-R\${libdir}" -+ ;; - esac - fi - diff --git a/sysutils/deforaos-browser/patches/patch-src_callbacks.c b/sysutils/deforaos-browser/patches/patch-src_callbacks.c deleted file mode 100644 index a14cadbbc8c..00000000000 --- a/sysutils/deforaos-browser/patches/patch-src_callbacks.c +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-src_callbacks.c,v 1.1 2014/03/21 14:19:31 jperkin Exp $ - -Support unmount() on SunOS. - ---- src/callbacks.c.orig 2013-03-11 01:38:09.000000000 +0000 -+++ src/callbacks.c -@@ -18,7 +18,7 @@ - #include <sys/param.h> - #ifndef __GNU__ /* XXX hurd portability */ - # include <sys/mount.h> --# if defined(__linux__) || defined(__CYGWIN__) -+# if defined(__linux__) || defined(__CYGWIN__) || defined(__sun) - # define unmount(a, b) umount(a) - # endif - # ifndef unmount diff --git a/sysutils/deforaos-browser/patches/patch-src_plugins_Makefile b/sysutils/deforaos-browser/patches/patch-src_plugins_Makefile deleted file mode 100644 index 57bb213b996..00000000000 --- a/sysutils/deforaos-browser/patches/patch-src_plugins_Makefile +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-src_plugins_Makefile,v 1.1 2015/08/25 22:52:26 khorben Exp $ - -Fix build when setting CFLAGS - ---- src/plugins/Makefile.orig 2013-10-06 13:34:26.000000000 +0000 -+++ src/plugins/Makefile -@@ -5,8 +5,8 @@ LIBDIR = $(PREFIX)/lib - CC = cc - CPPFLAGSF= -I ../../include - CPPFLAGS= --CFLAGSF = -W `pkg-config --cflags libDesktop` --CFLAGS = -Wall -g -O2 -pedantic -fPIC -+CFLAGSF = `pkg-config --cflags libDesktop` -fPIC -+CFLAGS = -W -Wall -g -O2 -pedantic - LDFLAGSF= `pkg-config --libs libDesktop` - AR = ar - RANLIB = ranlib diff --git a/sysutils/deforaos-browser/patches/patch-src_plugins_dirtree.c b/sysutils/deforaos-browser/patches/patch-src_plugins_dirtree.c deleted file mode 100644 index 87b094affad..00000000000 --- a/sysutils/deforaos-browser/patches/patch-src_plugins_dirtree.c +++ /dev/null @@ -1,39 +0,0 @@ -$NetBSD: patch-src_plugins_dirtree.c,v 1.1 2014/03/21 14:19:31 jperkin Exp $ - -Portable directory tests. - ---- src/plugins/dirtree.c.orig 2013-02-28 01:03:34.000000000 +0000 -+++ src/plugins/dirtree.c -@@ -232,6 +232,9 @@ static gboolean _dirtree_refresh_folder( - gboolean ret = FALSE; - DIR * dir; - struct dirent * de; -+#ifdef __sun -+ struct stat st; -+#endif - GtkTreeModel * model = GTK_TREE_MODEL(dirtree->store); - GtkTreeIter iter; - GtkTreePath * s; -@@ -256,14 +259,22 @@ static gboolean _dirtree_refresh_folder( - path = ""; - while((de = readdir(dir)) != NULL) - { -+#ifdef __sun -+ stat(de->d_name, &st); -+#endif - /* skip hidden folders except if we traverse it */ - if(basename != NULL && strcmp(de->d_name, basename) == 0) - ret = TRUE; - else if(de->d_name[0] == '.') - continue; -+#ifdef __sun -+ else if (!(st.st_mode & S_IFDIR)) -+ continue; -+#else - /* XXX d_type is not portable */ - else if(de->d_type != DT_DIR) - continue; -+#endif - q = string_new_append(path, "/", de->d_name, NULL); - /* FIXME check if the node already exists */ - r = (q != NULL) ? g_filename_display_basename(q) : NULL; diff --git a/sysutils/deforaos-browser/patches/patch-src_vfs.c b/sysutils/deforaos-browser/patches/patch-src_vfs.c deleted file mode 100644 index a41f404cc43..00000000000 --- a/sysutils/deforaos-browser/patches/patch-src_vfs.c +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-src_vfs.c,v 1.1 2014/03/21 14:19:31 jperkin Exp $ - -Need sys/fcntl.h for O_RDONLY on SunOS. - ---- src/vfs.c.orig 2013-10-04 23:47:17.000000000 +0000 -+++ src/vfs.c -@@ -18,6 +18,9 @@ - #include <stdlib.h> - #include <string.h> - #include <libgen.h> -+#ifdef __sun -+#include <sys/fcntl.h> -+#endif - #include "vfs.h" - - diff --git a/sysutils/deforaos-browser/patches/patch-tools_dirtree.c b/sysutils/deforaos-browser/patches/patch-tools_dirtree.c deleted file mode 100644 index 7240ba3b80f..00000000000 --- a/sysutils/deforaos-browser/patches/patch-tools_dirtree.c +++ /dev/null @@ -1,43 +0,0 @@ -$NetBSD: patch-tools_dirtree.c,v 1.1 2014/03/21 14:19:31 jperkin Exp $ - -Portable directory tests. - ---- tools/dirtree.c.orig 2013-01-02 03:37:28.000000000 +0000 -+++ tools/dirtree.c -@@ -22,6 +22,9 @@ - #include <string.h> - #include <libgen.h> - #include <gtk/gtk.h> -+#ifdef __sun -+#include <sys/stat.h> -+#endif - - - /* dirtree */ -@@ -111,6 +114,9 @@ static int _dirtree_add(GtkTreeStore * s - char * str; - DIR * dir; - struct dirent * de; -+#ifdef __sun -+ struct stat st; -+#endif - char * q; - GtkTreeIter iter2; - -@@ -128,9 +134,16 @@ static int _dirtree_add(GtkTreeStore * s - snprintf(str, len + 1, "%s/", p); - while((de = readdir(dir)) != NULL) - { -+#ifdef __sun -+ stat(de->d_name, &st); -+ if(!(st.st_mode & S_IFDIR) -+ || strcmp(".", de->d_name) == 0 -+ || strcmp("..", de->d_name) == 0) -+#else - if(!(de->d_type & DT_DIR) - || strcmp(".", de->d_name) == 0 - || strcmp("..", de->d_name) == 0) -+#endif - continue; - if((q = realloc(str, len + strlen(de->d_name) + 1)) == NULL) - continue; |