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

Update to emelfm2 0.9.1, switches to gtk+3.

Browse Source
This commit is contained in:
landry 2015-09-20 08:39:35 +00:00
parent 38eae16287
commit 55640e9541
10 changed files with 71 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
x11/emelfm2/Makefile
View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.24 2015/08/17 19:10:12 sthen Exp $
# $OpenBSD: Makefile,v 1.25 2015/09/20 08:39:35 landry Exp $
COMMENT = GTK+2 file manager
DISTNAME = emelfm2-0.7.3
REVISION = 5
DISTNAME = emelfm2-0.9.1
CATEGORIES = x11
HOMEPAGE = http://emelfm2.net/
@ -11,14 +10,13 @@ HOMEPAGE = http://emelfm2.net/
# GPLv3
PERMIT_PACKAGE_CDROM = Yes
WANTLIB += X11 c cairo gdk-x11-2.0 gdk_pixbuf-2.0 glib-2.0 gmodule-2.0
WANTLIB += gobject-2.0 gthread-2.0 gtk-x11-2.0 m pango-1.0 pangocairo-1.0
WANTLIB += pthread
WANTLIB += c cairo gdk-3 gtk-3 glib-2.0 gmodule-2.0 gdk_pixbuf-2.0
WANTLIB += gobject-2.0 m pango-1.0 pangocairo-1.0 pthread
MASTER_SITES = ${HOMEPAGE}rel/
EXTRACT_SUFX = .tar.bz2
LIB_DEPENDS = x11/gtk+2
LIB_DEPENDS = x11/gtk+3
MODULES = devel/gettext
@ -26,7 +24,7 @@ BUILD_DEPENDS = devel/libmagic
RUN_DEPENDS = devel/desktop-file-utils \
devel/xdg-utils
MAKE_ENV = CC=${CC} lCFLAGS="${CFLAGS} -I${LOCALBASE}/include"
MAKE_ENV = MAN_DIR=${DESTDIR}/$(PREFIX)/man/man1 CC=${CC} lCFLAGS="${CFLAGS} -I${LOCALBASE}/include"
USE_GMAKE = Yes
NO_TEST = Yes

4
x11/emelfm2/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (emelfm2-0.7.3.tar.bz2) = HlqzRYRyHmm2WhNghWXnX3ANWfCMltFy20+xNkQz+kA=
SIZE (emelfm2-0.7.3.tar.bz2) = 1060580
SHA256 (emelfm2-0.9.1.tar.bz2) = v7lP9OQMCpwNKmrrDvoi4Xesy/ar0wliJtk9rs0jZC8=
SIZE (emelfm2-0.9.1.tar.bz2) = 1217126

99
x11/emelfm2/patches/patch-Makefile
View File

@ -1,25 +1,25 @@
$OpenBSD: patch-Makefile,v 1.9 2014/03/23 18:17:35 kili Exp $
--- Makefile.orig Wed Jun 16 23:56:54 2010
+++ Makefile Mon Sep 3 11:03:01 2012
@@ -140,7 +140,7 @@ LIBS_XOBJECTS = $(LIBS_XSOURCES:%.c=$(OBJECTS_DIR)/%.s
$OpenBSD: patch-Makefile,v 1.10 2015/09/20 08:39:35 landry Exp $
--- Makefile.orig Fri Jan 24 22:07:36 2014
+++ Makefile Sun Sep 20 10:02:41 2015
@@ -163,7 +163,7 @@ LIBS_XOBJECTS = $(LIBS_XSOURCES:%.c=$(OBJECTS_DIR)/%.s
LIBS_XDEP_FILES = $(LIBS_XSOURCES:%.c=$(OBJECTS_DIR)/%.deps)
# set up flags
-lCFLAGS = $(CFLAGS)
+lCFLAGS ?= ${CFLAGS}
ifeq ($(USE_LATEST), 1)
+lCFLAGS ?= $(CFLAGS)
#ifeq ($(WITH_LATEST), 1)
#these are redundant now
#lCFLAGS += -DGTK_DISABLE_DEPRECATED
@@ -228,7 +228,7 @@ lLIBS_CFLAGS = -shared -fPIC -DPIC
#setup linking
# -lrt needed for clock_gettime()
-lLIBS = $(shell pkg-config --libs gtk+-2.0 gthread-2.0 gmodule-2.0) -lrt
+lLIBS = $(shell pkg-config --libs gtk+-2.0 gthread-2.0 gmodule-2.0)
ifeq ($(USE_FAM),1)
lLIBS += -lfam
@@ -292,7 +292,7 @@ else
lLIBS += $(shell pkg-config --libs gmodule-2.0)
endif
@@ -258,7 +258,7 @@ all: $(OBJECTS_DIR) $(BUILD_FILE) $(TARGET) $(LIBS) $(
# -lrt needed for clock_gettime(), explicit -lm, -ldl needed for some arch-linux distros
-lLIBS += -lrt -lm -ldl
+lLIBS += -lm
ifeq ($(USE_GAMIN), 1)
#gamin code is a superset of FAM code, so gamin needs fam as well
lLIBS += -lfam
@@ -329,7 +329,7 @@ all: $(OBJECTS_DIR) $(BUILD_FILE) $(TARGET) $(LIBS) $(
plugins: $(OBJECTS_DIR)/$(LIBS) $(LIBS_OBJECTS) $(LIBS_XOBJECTS)
@ -28,69 +28,12 @@ $OpenBSD: patch-Makefile,v 1.9 2014/03/23 18:17:35 kili Exp $
@echo "installing $(TARGET) to prefix '$(PREFIX)'"
@install -d -m 755 $(BIN_DIR)
@install -m 755 $(TARGET) $(BIN_DIR)
@@ -270,8 +270,7 @@ install: all install_plugins
@for file in `ls $(DOCS)/ |grep -v svn |grep -v desktop_environment |grep -v api |grep -v $(TARGET).1`; do \
install -m 644 $(DOCS)/$$file $(DOC_DIR); \
done
- @install -d $(MAN_DIR)
- @install -m 644 $(DOCS)/$(TARGET).1 $(MAN_DIR);
+ @install -m 644 $(DOCS)/$(TARGET).1 $(PREFIX)/man/man1;
# @bzip2 -f $(MAN_DIR)/$(TARGET).1;
@@ -356,7 +356,7 @@ endif
@if [ "`grep "#define E2_XDG" $(BUILD_FILE)`" = "#define E2_XDG" ]; then \
@@ -348,11 +347,11 @@ endif
install -d $(XDG_DESKTOP_DIR); \
- install -m 644 -T $(DOCS)/desktop_environment/$(TARGET).desktop $(XDG_DESKTOP_DIR)/$(TARGET).desktop; \
+ install -m 644 $(DOCS)/desktop_environment/$(TARGET).desktop $(XDG_DESKTOP_DIR)/$(TARGET).desktop; \
fi
$(OBJECTS): $(OBJECTS_DIR)/%.o: %.c
@echo "compiling '$*.c'"
- @$(CC) $(lCFLAGS) -c -o $@ $*.c
+ $(CC) $(lCFLAGS) -c -o $@ $*.c
$(LIBS_OBJECTS): $(OBJECTS_DIR)/%.so: %.c
@echo "compiling '$*.c'"
- @$(CC) $(lCFLAGS) $(lLIBS_CFLAGS) $(LDFLAGS) -o $@ $*.c
+ $(CC) $(lCFLAGS) $(lLIBS_CFLAGS) $(LDFLAGS) -o $@ $*.c
ifeq ($(STRIP), 1)
ifneq ($(DEBUG), 1)
@strip -g $@
@@ -400,27 +399,27 @@ $(DEP_FILES): $(OBJECTS_DIR)
$(DEP_FILES): $(BUILD_FILE)
$(DEP_FILES): $(OBJECTS_DIR)/%.deps: %.c
@echo "generating '$@'"
- @$(CC) $(lCFLAGS) -MM -o $@ $*.c
+ $(CC) $(lCFLAGS) -MM -o $@ $*.c
#$(LIB_DEP_FILES): $(OBJECTS_DIR)
#$(LIB_DEP_FILES): $(BUILD_FILE)
#$(LIB_DEP_FILES): $(OBJECTS_DIR)/%.deps: %.c
# @echo "generating LIB '$@'"
-# @$(CC) $(lCFLAGS) $(lLIBS_CFLAGS) $(lLIB_LIBS) -MM -o $@ $*.c
+# $(CC) $(lCFLAGS) $(lLIBS_CFLAGS) $(lLIB_LIBS) -MM -o $@ $*.c
$(DEPS_FILE): $(BUILD_FILE)
@echo "generating dependencies: '$(DEPS_FILE)'"
@touch $(DEPS_FILE)
- @makedepend -s "# generated dependencies" -f $(DEPS_FILE) -- $(lCFLAGS) -- $(SOURCES)
+ makedepend -s "# generated dependencies" -f $(DEPS_FILE) -- $(lCFLAGS) -- $(SOURCES)
@rm $(DEPS_FILE).bak
$(MO): $(PO_DIR)/%.mo: $(PO_DIR)/%.po
@echo "formatting '$*.po'"
- @$(BIN_MSGFMT) $(PO_DIR)/$*.po -o $@
+ $(BIN_MSGFMT) $(PO_DIR)/$*.po -o $@
#gettext:
i18n:
- @$(BIN_XGETTEXT) $(foreach dir, $(DIRS) $(LIBS) $(OPTLIBS), -D $(dir)) \
+ $(BIN_XGETTEXT) $(foreach dir, $(DIRS) $(LIBS) $(OPTLIBS), -D $(dir)) \
-p ./$(PO_DIR) --from-code=UTF-8 --no-wrap --omit-header -i -F \
--copyright-holder="$(COPYRIGHT)" --keyword=_ --keyword=N_ \
$(foreach file, $(SOURCES) $(HEADERS) $(LIBS_SOURCES) $(LIBS_HEADERS) \
@@ -480,7 +479,7 @@ help:
$(OBJECTS_DIR):
@echo "creating object directories in '$(OBJECTS_DIR)'"
- @mkdir -p $(MKOBJDIRS)
+ mkdir -p $(MKOBJDIRS)
$(OBJECTS_DIR)/$(LIBS):
@echo "creating plugin-object directories in '$(OBJECTS_DIR)'"
# no i18n install unless specific target used

10
x11/emelfm2/patches/patch-src_dialogs_e2_file_info_dialog_c
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-src_dialogs_e2_file_info_dialog_c,v 1.3 2012/09/03 09:34:59 ajacoutot Exp $
$OpenBSD: patch-src_dialogs_e2_file_info_dialog_c,v 1.4 2015/09/20 08:39:35 landry Exp $
Our file(1) doesn't have all that fancy options.
--- src/dialogs/e2_file_info_dialog.c.orig Tue Jun 1 00:19:01 2010
+++ src/dialogs/e2_file_info_dialog.c Mon Sep 3 11:03:01 2012
@@ -157,7 +157,7 @@ static gboolean _e2_file_info_dialog_get_file_type (VP
--- src/dialogs/e2_file_info_dialog.c.orig Fri Jan 10 03:55:23 2014
+++ src/dialogs/e2_file_info_dialog.c Sun Sep 20 09:24:15 2015
@@ -175,7 +175,7 @@ static gboolean _e2_file_info_dialog_get_file_type (VP
#else
//tag E2_BADQUOTES
gchar *qp = e2_utils_quote_string (VPCSTR (localpath));
@ -13,7 +13,7 @@ Our file(1) doesn't have all that fancy options.
gpointer results;
if (!e2_fs_get_command_output (command, &results))
{
@@ -173,23 +173,6 @@ static gboolean _e2_file_info_dialog_get_file_type (VP
@@ -191,23 +191,6 @@ static gboolean _e2_file_info_dialog_get_file_type (VP
*mime_type = e2_utils_get_mimetype (localpath);

8
x11/emelfm2/patches/patch-src_e2_fileview_h
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_e2_fileview_h,v 1.2 2012/09/03 09:34:59 ajacoutot Exp $
--- src/e2_fileview.h.orig Fri May 28 02:10:27 2010
+++ src/e2_fileview.h Mon Sep 3 11:03:01 2012
@@ -21,6 +21,7 @@ along with emelFM2; see the file GPL. If not, see http
$OpenBSD: patch-src_e2_fileview_h,v 1.3 2015/09/20 08:39:35 landry Exp $
--- src/e2_fileview.h.orig Tue Jan 21 22:50:16 2014
+++ src/e2_fileview.h Sun Sep 20 09:24:15 2015
@@ -20,6 +20,7 @@ along with emelFM2; see the file GPL. If not, see http
#define __E2_FILEVIEW_H__
#include "emelfm2.h"

20
x11/emelfm2/patches/patch-src_e2_output_c
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-src_e2_output_c,v 1.5 2012/09/03 09:34:59 ajacoutot Exp $
$OpenBSD: patch-src_e2_output_c,v 1.6 2015/09/20 08:39:35 landry Exp $
Don't include ctype, _C macro conflicts. Use glib func instead.
--- src/e2_output.c.orig Mon May 31 01:44:12 2010
+++ src/e2_output.c Mon Sep 3 11:03:01 2012
@@ -39,7 +39,6 @@ ToDo
--- src/e2_output.c.orig Sun Nov 17 12:05:54 2013
+++ src/e2_output.c Sun Sep 20 09:26:07 2015
@@ -38,7 +38,6 @@ ToDo
#include "emelfm2.h"
#include <string.h>
#include <pthread.h>
@ -12,12 +12,12 @@ Don't include ctype, _C macro conflicts. Use glib func instead.
#include "e2_output.h"
#include "e2_dialog.h"
//for pane-text activation
@@ -635,7 +634,7 @@ nextchar:
@@ -1605,7 +1604,7 @@ nextchar:
break;
else if (g_unichar_isspace (d))
else if (sepcount > 0 && _e2_output_unistrchr (bounds, sepcount, d) != NULL)
break;
- else if (ispunct ((guchar)d))
+ else if (g_ascii_ispunct ((guchar)d))
- else if (ispunct ((guchar) d))
+ else if (g_ascii_ispunct ((guchar) d))
{
if (!gtk_text_iter_forward_char (&iter))
break;
if (gtk_text_iter_forward_char (&iter))
goto nextchar;

8
x11/emelfm2/patches/patch-src_filesystem_e2_fs_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_filesystem_e2_fs_c,v 1.6 2012/09/03 09:34:59 ajacoutot Exp $
--- src/filesystem/e2_fs.c.orig Sun May 30 02:52:20 2010
+++ src/filesystem/e2_fs.c Mon Sep 3 11:03:01 2012
$OpenBSD: patch-src_filesystem_e2_fs_c,v 1.7 2015/09/20 08:39:35 landry Exp $
--- src/filesystem/e2_fs.c.orig Sat Feb 15 01:47:18 2014
+++ src/filesystem/e2_fs.c Sun Sep 20 09:24:15 2015
@@ -57,7 +57,7 @@ Not implemented yet.
#ifdef E2_VFS
#include "e2_plugins.h"
@ -10,7 +10,7 @@ $OpenBSD: patch-src_filesystem_e2_fs_c,v 1.6 2012/09/03 09:34:59 ajacoutot Exp $
#include "e2_complete.h"
#endif
@@ -2668,7 +2668,7 @@ gboolean e2_fs_copy_file (VPATH *src, const struct sta
@@ -2917,7 +2917,7 @@ gboolean e2_fs_copy_file (VPATH *src, const struct sta
// blksize_t buf_size = 1048576;
//find a buffer up to 16 times dest block
//(compromise between accesses and multi-tasking latency)

10
x11/emelfm2/patches/patch-src_utils_e2_utils_c
View File

@ -1,15 +1,15 @@
$OpenBSD: patch-src_utils_e2_utils_c,v 1.6 2012/09/03 09:34:59 ajacoutot Exp $
$OpenBSD: patch-src_utils_e2_utils_c,v 1.7 2015/09/20 08:39:35 landry Exp $
Our file(1) doesn't have all that fancy options.
--- src/utils/e2_utils.c.orig Fri Mar 12 14:19:31 2010
+++ src/utils/e2_utils.c Mon Sep 3 11:03:01 2012
@@ -544,7 +544,7 @@ gchar *e2_utils_get_mimetype (VPATH *localpath)
--- src/utils/e2_utils.c.orig Tue Nov 19 00:05:55 2013
+++ src/utils/e2_utils.c Sun Sep 20 09:24:15 2015
@@ -549,7 +549,7 @@ gchar *e2_utils_get_mimetype (VPATH *localpath)
}
#else
g_free (command);
- command = e2_utils_strcat ("file -bhprs --mime-type ", qp);
+ command = e2_utils_strcat ("file -bNs ", qp);
+ command = e2_utils_strcat ("file -bs ", qp);
if (e2_fs_get_command_output (command, (gpointer *) &mime))
{
g_strstrip (mime); //strip trailing \n and any whitespace

15
x11/emelfm2/pkg/PFRAG.shared
View File

@ -1,22 +1,23 @@
@comment $OpenBSD: PFRAG.shared,v 1.3 2009/05/06 16:20:01 giovanni Exp $
@comment $OpenBSD: PFRAG.shared,v 1.4 2015/09/20 08:39:35 landry Exp $
lib/emelfm2/plugins/
lib/emelfm2/plugins/e2p_clipnames.so
lib/emelfm2/plugins/e2p_clone.so
lib/emelfm2/plugins/e2p_config.so
lib/emelfm2/plugins/e2p_cpbar.so
lib/emelfm2/plugins/e2p_copy.so
lib/emelfm2/plugins/e2p_crypt.so
lib/emelfm2/plugins/e2p_dircmp.so
lib/emelfm2/plugins/e2p_du.so
lib/emelfm2/plugins/e2p_extsort.so
lib/emelfm2/plugins/e2p_find.so
lib/emelfm2/plugins/e2p_for_each.so
lib/emelfm2/plugins/e2p_foreach.so
lib/emelfm2/plugins/e2p_glob.so
lib/emelfm2/plugins/e2p_mvbar.so
lib/emelfm2/plugins/e2p_names_clip.so
lib/emelfm2/plugins/e2p_move.so
lib/emelfm2/plugins/e2p_pack.so
lib/emelfm2/plugins/e2p_rename.so
lib/emelfm2/plugins/e2p_selmatch.so
lib/emelfm2/plugins/e2p_sort_by_ext.so
lib/emelfm2/plugins/e2p_shred.so
lib/emelfm2/plugins/e2p_tag.so
lib/emelfm2/plugins/e2p_times.so
lib/emelfm2/plugins/e2p_timeset.so
lib/emelfm2/plugins/e2p_unpack.so
lib/emelfm2/plugins/e2p_upgrade.so
lib/emelfm2/plugins/e2p_view.so

10
x11/emelfm2/pkg/PLIST
View File

@ -1,15 +1,14 @@
@comment $OpenBSD: PLIST,v 1.5 2009/12/21 20:46:01 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.6 2015/09/20 08:39:35 landry Exp $
%%SHARED%%
@bin bin/emelfm2
lib/emelfm2/
@man man/man1/emelfm2.1
share/application-registry/
share/application-registry/emelfm2.applications
share/applications/emelfm2.desktop
share/doc/emelfm2/
share/doc/emelfm2/ACTIONS
share/doc/emelfm2/CONFIGURATION
share/doc/emelfm2/CREDITS
share/doc/emelfm2/EBUILD
share/doc/emelfm2/GPL
share/doc/emelfm2/HACKING
share/doc/emelfm2/INSTALL
@ -25,6 +24,7 @@ share/locale/fr/LC_MESSAGES/emelfm2.mo
share/locale/ja/LC_MESSAGES/emelfm2.mo
share/locale/pl/LC_MESSAGES/emelfm2.mo
share/locale/ru/LC_MESSAGES/emelfm2.mo
share/locale/zh_CN/LC_MESSAGES/emelfm2.mo
share/pixmaps/
share/pixmaps/emelfm2/
share/pixmaps/emelfm2/add_mark_bottom_48.png
@ -40,7 +40,6 @@ share/pixmaps/emelfm2/emelfm2_32.png
share/pixmaps/emelfm2/emelfm2_48.png
share/pixmaps/emelfm2/filter_48.png
share/pixmaps/emelfm2/filter_off_48.png
share/pixmaps/emelfm2/gtk-discard_20.png
share/pixmaps/emelfm2/hidden_noshow_48.png
share/pixmaps/emelfm2/hidden_show_48.png
share/pixmaps/emelfm2/mirror_horiz_48.png
@ -68,6 +67,7 @@ share/pixmaps/emelfm2/plugin_move_48.png
share/pixmaps/emelfm2/plugin_pack_48.png
share/pixmaps/emelfm2/plugin_rename_48.png
share/pixmaps/emelfm2/plugin_selmatch_48.png
share/pixmaps/emelfm2/plugin_shred_48.png
share/pixmaps/emelfm2/plugin_tag_48.png
share/pixmaps/emelfm2/plugin_timeset_48.png
share/pixmaps/emelfm2/plugin_unpack_48.png
@ -76,6 +76,8 @@ share/pixmaps/emelfm2/ps_48.png
share/pixmaps/emelfm2/save_selection_32.png
share/pixmaps/emelfm2/split_horiz_48.png
share/pixmaps/emelfm2/split_vert_48.png
share/pixmaps/emelfm2/stock/
share/pixmaps/emelfm2/stock/gtk-discard_20.png
share/pixmaps/emelfm2/su_48.png
share/pixmaps/emelfm2/switch_48.png
share/pixmaps/emelfm2/symlink_48.png