--as-needed works fine here.
Regen patches while here.
This commit is contained in:
ajacoutot
parent
1787d32062
commit
67e61769d5
@ -1,9 +1,9 @@
|
||||
# $OpenBSD: Makefile,v 1.19 2011/09/21 07:49:16 giovanni Exp $
|
||||
# $OpenBSD: Makefile,v 1.20 2012/09/03 09:34:59 ajacoutot Exp $
|
||||
|
||||
COMMENT = GTK+2 file manager
|
||||
|
||||
DISTNAME = emelfm2-0.7.3
|
||||
REVISION= 1
|
||||
REVISION= 2
|
||||
|
||||
CATEGORIES = x11
|
||||
HOMEPAGE = http://emelfm2.net/
|
||||
@ -14,25 +14,17 @@ PERMIT_PACKAGE_FTP = Yes
|
||||
PERMIT_DISTFILES_CDROM =Yes
|
||||
PERMIT_DISTFILES_FTP = Yes
|
||||
|
||||
WANTLIB += 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 pthread-stubs
|
||||
|
||||
MASTER_SITES = ${HOMEPAGE}rel/
|
||||
EXTRACT_SUFX = .tar.bz2
|
||||
|
||||
LIB_DEPENDS = x11/gtk+2 \
|
||||
devel/atk \
|
||||
devel/pango \
|
||||
graphics/cairo \
|
||||
graphics/png
|
||||
LIB_DEPENDS = x11/gtk+2
|
||||
|
||||
MODULES = devel/gettext
|
||||
|
||||
WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
|
||||
WANTLIB += Xi Xinerama Xrandr Xrender c expat fontconfig freetype
|
||||
WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
|
||||
WANTLIB += m pixman-1 pthread pthread-stubs xcb xcb-render z
|
||||
WANTLIB += GL Xxf86vm drm xcb-shm atk-1.0 cairo pango-1.0 png
|
||||
WANTLIB += pangoft2-1.0 pangocairo-1.0 gdk-x11-2.0
|
||||
WANTLIB += gdk_pixbuf-2.0 gtk-x11-2.0
|
||||
|
||||
BUILD_DEPENDS = devel/libmagic
|
||||
RUN_DEPENDS = devel/desktop-file-utils \
|
||||
devel/xdg-utils
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-Makefile,v 1.6 2010/10/08 17:12:58 jasper Exp $
|
||||
--- Makefile.orig Wed Mar 3 12:57:22 2010
|
||||
+++ Makefile Fri Oct 8 19:08:52 2010
|
||||
$OpenBSD: patch-Makefile,v 1.7 2012/09/03 09:34:59 ajacoutot 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
|
||||
LIBS_XDEP_FILES = $(LIBS_XSOURCES:%.c=$(OBJECTS_DIR)/%.deps)
|
||||
|
||||
@ -38,16 +38,7 @@ $OpenBSD: patch-Makefile,v 1.6 2010/10/08 17:12:58 jasper Exp $
|
||||
# @bzip2 -f $(MAN_DIR)/$(TARGET).1;
|
||||
|
||||
@if [ "`grep "#define E2_XDG" $(BUILD_FILE)`" = "#define E2_XDG" ]; then \
|
||||
@@ -336,7 +335,7 @@ clean_plugins:
|
||||
|
||||
$(TARGET): $(OBJECTS)
|
||||
@echo "linking binary '$(TARGET)'"
|
||||
- @$(CC) $(LDFLAGS) $(OBJECTS) -o $(TARGET) -Wl,--as-needed $(lLIBS)
|
||||
+ $(CC) $(LDFLAGS) $(OBJECTS) -o $(TARGET) $(lLIBS)
|
||||
ifeq ($(STRIP), 1)
|
||||
ifneq ($(DEBUG), 1)
|
||||
@echo "stripping binary '$(TARGET)'"
|
||||
@@ -346,11 +345,11 @@ endif
|
||||
@@ -348,11 +347,11 @@ endif
|
||||
|
||||
$(OBJECTS): $(OBJECTS_DIR)/%.o: %.c
|
||||
@echo "compiling '$*.c'"
|
||||
@ -61,43 +52,7 @@ $OpenBSD: patch-Makefile,v 1.6 2010/10/08 17:12:58 jasper Exp $
|
||||
ifeq ($(STRIP), 1)
|
||||
ifneq ($(DEBUG), 1)
|
||||
@strip -g $@
|
||||
@@ -359,7 +358,7 @@ endif
|
||||
|
||||
$(THUMBS_OBJECTS): $(OBJECTS_DIR)/%.so: %.c
|
||||
@echo "compiling '$*.c'"
|
||||
- @$(CC) $(lCFLAGS) $(lLIBS_CFLAGS) $(THUMBS_FLAGS) $(LDFLAGS) -o $@ $*.c -Wl,--as-needed $(THUMBS_LIBS)
|
||||
+ $(CC) $(lCFLAGS) $(lLIBS_CFLAGS) $(THUMBS_FLAGS) $(LDFLAGS) -o $@ $*.c $(THUMBS_LIBS)
|
||||
ifeq ($(STRIP), 1)
|
||||
ifneq ($(DEBUG), 1)
|
||||
@strip -g $@
|
||||
@@ -368,7 +367,7 @@ endif
|
||||
|
||||
$(ACL_OBJECTS): $(OBJECTS_DIR)/%.so: %.c
|
||||
@echo "compiling '$*.c'"
|
||||
- @$(CC) $(lCFLAGS) $(lLIBS_CFLAGS) $(ACL_FLAGS) $(LDFLAGS) -o $@ $*.c -Wl,--as-needed $(ACL_LIBS)
|
||||
+ $(CC) $(lCFLAGS) $(lLIBS_CFLAGS) $(ACL_FLAGS) $(LDFLAGS) -o $@ $*.c $(ACL_LIBS)
|
||||
ifeq ($(STRIP), 1)
|
||||
ifneq ($(DEBUG), 1)
|
||||
@strip -g $@
|
||||
@@ -377,7 +376,7 @@ endif
|
||||
|
||||
$(TRACKER_OBJECTS): $(OBJECTS_DIR)/%.so: %.c
|
||||
@echo "compiling '$*.c'"
|
||||
- @$(CC) $(lCFLAGS) $(lLIBS_CFLAGS) $(TRACKER_FLAGS) $(LDFLAGS) -o $@ $*.c -Wl,--as-needed $(TRACKER_LIBS)
|
||||
+ $(CC) $(lCFLAGS) $(lLIBS_CFLAGS) $(TRACKER_FLAGS) $(LDFLAGS) -o $@ $*.c $(TRACKER_LIBS)
|
||||
ifeq ($(STRIP), 1)
|
||||
ifneq ($(DEBUG), 1)
|
||||
@strip -g $@
|
||||
@@ -386,7 +385,7 @@ endif
|
||||
|
||||
$(VFS_OBJECTS): $(OBJECTS_DIR)/%.so: %.c
|
||||
@echo "compiling '$*.c'"
|
||||
- @$(CC) $(lCFLAGS) $(lLIBS_CFLAGS) $(VFS_FLAGS) $(LDFLAGS) -o $@ $*.c -Wl,--as-needed $(VFS_LIBS)
|
||||
+ $(CC) $(lCFLAGS) $(lLIBS_CFLAGS) $(VFS_FLAGS) $(LDFLAGS) -o $@ $*.c $(VFS_LIBS)
|
||||
ifeq ($(STRIP), 1)
|
||||
ifneq ($(DEBUG), 1)
|
||||
@strip -g $@
|
||||
@@ -398,27 +397,27 @@ $(DEP_FILES): $(OBJECTS_DIR)
|
||||
@@ -400,27 +399,27 @@ $(DEP_FILES): $(OBJECTS_DIR)
|
||||
$(DEP_FILES): $(BUILD_FILE)
|
||||
$(DEP_FILES): $(OBJECTS_DIR)/%.deps: %.c
|
||||
@echo "generating '$@'"
|
||||
@ -130,7 +85,7 @@ $OpenBSD: patch-Makefile,v 1.6 2010/10/08 17:12:58 jasper Exp $
|
||||
-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) \
|
||||
@@ -478,7 +477,7 @@ help:
|
||||
@@ -480,7 +479,7 @@ help:
|
||||
|
||||
$(OBJECTS_DIR):
|
||||
@echo "creating object directories in '$(OBJECTS_DIR)'"
|
||||
|
||||
@ -1,8 +1,10 @@
|
||||
$OpenBSD: patch-src_dialogs_e2_file_info_dialog_c,v 1.2 2009/08/17 12:14:52 giovanni Exp $
|
||||
$OpenBSD: patch-src_dialogs_e2_file_info_dialog_c,v 1.3 2012/09/03 09:34:59 ajacoutot Exp $
|
||||
|
||||
Our file(1) doesn't have all that fancy options.
|
||||
--- src/dialogs/e2_file_info_dialog.c.orig Wed Jul 1 08:07:34 2009
|
||||
+++ src/dialogs/e2_file_info_dialog.c Fri Aug 14 10:43:58 2009
|
||||
@@ -134,7 +134,7 @@ static gboolean _e2_file_info_dialog_get_file_type (VP
|
||||
|
||||
--- 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
|
||||
#else
|
||||
//tag E2_BADQUOTES
|
||||
gchar *qp = e2_utils_quote_string (VPCSTR (localpath));
|
||||
@ -11,7 +13,7 @@ Our file(1) doesn't have all that fancy options.
|
||||
gpointer results;
|
||||
if (!e2_fs_get_command_output (command, &results))
|
||||
{
|
||||
@@ -150,23 +150,6 @@ static gboolean _e2_file_info_dialog_get_file_type (VP
|
||||
@@ -173,23 +173,6 @@ static gboolean _e2_file_info_dialog_get_file_type (VP
|
||||
|
||||
*mime_type = e2_utils_get_mimetype (localpath);
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-src_e2_fileview_h,v 1.1.1.1 2008/10/30 19:32:32 landry Exp $
|
||||
--- src/e2_fileview.h.orig Mon Oct 27 21:41:00 2008
|
||||
+++ src/e2_fileview.h Mon Oct 27 21:42:50 2008
|
||||
@@ -22,6 +22,7 @@ Foundation, 51 Franklin Street, Fifth Floor, Boston, M
|
||||
$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
|
||||
#define __E2_FILEVIEW_H__
|
||||
|
||||
#include "emelfm2.h"
|
||||
|
||||
@ -1,8 +1,10 @@
|
||||
$OpenBSD: patch-src_e2_output_c,v 1.4 2010/05/04 07:25:54 giovanni Exp $
|
||||
$OpenBSD: patch-src_e2_output_c,v 1.5 2012/09/03 09:34:59 ajacoutot Exp $
|
||||
|
||||
Don't include ctype, _C macro conflicts. Use glib func instead.
|
||||
--- src/e2_output.c.orig Thu Nov 19 20:41:28 2009
|
||||
+++ src/e2_output.c Mon Apr 12 19:47:33 2010
|
||||
@@ -40,7 +40,6 @@ ToDo
|
||||
|
||||
--- 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
|
||||
#include "emelfm2.h"
|
||||
#include <string.h>
|
||||
#include <pthread.h>
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-src_filesystem_e2_fs_c,v 1.5 2010/05/04 07:25:54 giovanni Exp $
|
||||
--- src/filesystem/e2_fs.c.orig Sun Dec 20 00:52:08 2009
|
||||
+++ src/filesystem/e2_fs.c Mon Apr 12 19:47:33 2010
|
||||
@@ -58,7 +58,7 @@ Not implemented yet.
|
||||
$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
|
||||
@@ -57,7 +57,7 @@ Not implemented yet.
|
||||
#ifdef E2_VFS
|
||||
#include "e2_plugins.h"
|
||||
#endif
|
||||
@ -10,7 +10,7 @@ $OpenBSD: patch-src_filesystem_e2_fs_c,v 1.5 2010/05/04 07:25:54 giovanni Exp $
|
||||
#include "e2_complete.h"
|
||||
#endif
|
||||
|
||||
@@ -2676,7 +2676,7 @@ gboolean e2_fs_copy_file (VPATH *src, const struct sta
|
||||
@@ -2668,7 +2668,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)
|
||||
|
||||
@ -1,8 +1,10 @@
|
||||
$OpenBSD: patch-src_utils_e2_utils_c,v 1.5 2010/05/04 07:25:54 giovanni Exp $
|
||||
$OpenBSD: patch-src_utils_e2_utils_c,v 1.6 2012/09/03 09:34:59 ajacoutot Exp $
|
||||
|
||||
Our file(1) doesn't have all that fancy options.
|
||||
--- src/utils/e2_utils.c.orig Wed Oct 7 23:37:51 2009
|
||||
+++ src/utils/e2_utils.c Mon Apr 12 19:47:33 2010
|
||||
@@ -545,7 +545,7 @@ gchar *e2_utils_get_mimetype (VPATH *localpath)
|
||||
|
||||
--- 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)
|
||||
}
|
||||
#else
|
||||
g_free (command);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user