CVS commit: pkgsrc/net/filezilla

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Jul 29 14:00:57 UTC 2021

Modified Files:
        pkgsrc/net/filezilla: Makefile distinfo
Added Files:
        pkgsrc/net/filezilla/patches: patch-src_commonui_Makefile.am
Removed Files:
        pkgsrc/net/filezilla/patches: patch-src_commonui_Makefile.in

Log Message:
filezilla: use upstream version of build fix


To generate a diff of this commit:
cvs rdiff -u -r1.137 -r1.138 pkgsrc/net/filezilla/Makefile
cvs rdiff -u -r1.61 -r1.62 pkgsrc/net/filezilla/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/net/filezilla/patches/patch-src_commonui_Makefile.am
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/net/filezilla/patches/patch-src_commonui_Makefile.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/filezilla/Makefile
diff -u pkgsrc/net/filezilla/Makefile:1.137 pkgsrc/net/filezilla/Makefile:1.138
--- pkgsrc/net/filezilla/Makefile:1.137 Thu Jul 29 11:10:31 2021
+++ pkgsrc/net/filezilla/Makefile       Thu Jul 29 14:00:57 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.137 2021/07/29 11:10:31 wiz Exp $
+# $NetBSD: Makefile,v 1.138 2021/07/29 14:00:57 wiz Exp $
 
 VERSION=       3.55.0
 DISTNAME=      FileZilla_${VERSION}_src
@@ -18,6 +18,11 @@ USE_LANGUAGES=       c c++17
 USE_TOOLS+=    gmake pkg-config msgfmt msgmerge xgettext
 WRKSRC=                ${WRKDIR}/${PKGNAME_NOREV}
 
+# remove on next update, when patch-src_commonui_Makefile.am is included
+USE_TOOLS+=    aclocal automake
+pre-configure:
+       cd ${WRKSRC} && aclocal && automake
+
 CONFIGURE_ARGS+=       --disable-autoupdatecheck
 # avoid xdg-utils dependency
 CONFIGURE_ENV+=                ac_cv_path_xdgopen=firefox

Index: pkgsrc/net/filezilla/distinfo
diff -u pkgsrc/net/filezilla/distinfo:1.61 pkgsrc/net/filezilla/distinfo:1.62
--- pkgsrc/net/filezilla/distinfo:1.61  Thu Jul 29 11:10:31 2021
+++ pkgsrc/net/filezilla/distinfo       Thu Jul 29 14:00:57 2021
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.61 2021/07/29 11:10:31 wiz Exp $
+$NetBSD: distinfo,v 1.62 2021/07/29 14:00:57 wiz Exp $
 
 SHA1 (FileZilla_3.55.0_src.tar.bz2) = 887c04c430ed798b5d3048a29bf7fd4fdc37b30d
 RMD160 (FileZilla_3.55.0_src.tar.bz2) = cd23b5e29692f3cfe034ece9c11408a6c19c63fc
 SHA512 (FileZilla_3.55.0_src.tar.bz2) = 8a1221e97719610be900d66f7feba90d1c5053a618b38084e93e8f2b11e51fc523336e11e110f51828eba3f17f60cea1fcd8060bd0cc5e7fdb3d24f35a4c1732
 Size (FileZilla_3.55.0_src.tar.bz2) = 4910040 bytes
-SHA1 (patch-src_commonui_Makefile.in) = d4e5133a621055dc9edc53a74b1a0a66c0ae3d4a
+SHA1 (patch-src_commonui_Makefile.am) = e70f467d2b5940a0a649db605cf198674bb4a1ab

Added files:

Index: pkgsrc/net/filezilla/patches/patch-src_commonui_Makefile.am
diff -u /dev/null pkgsrc/net/filezilla/patches/patch-src_commonui_Makefile.am:1.1
--- /dev/null   Thu Jul 29 14:00:57 2021
+++ pkgsrc/net/filezilla/patches/patch-src_commonui_Makefile.am Thu Jul 29 14:00:57 2021
@@ -0,0 +1,32 @@
+$NetBSD: patch-src_commonui_Makefile.am,v 1.1 2021/07/29 14:00:57 wiz Exp $
+
+libtool: link: unable to infer tagged configuration
+libtool: error: specify a tag with '--tag'
+
+https://trac.filezilla-project.org/ticket/12499
+
+--- src/commonui/Makefile.am.orig      2021-05-27 11:11:47.000000000 +0000
++++ src/commonui/Makefile.am
+@@ -60,9 +60,20 @@ endif
+ 
+ if MACAPPBUNDLE
+ 
+-libfzclient_commonui_private_la_SOURCES += \
++noinst_LTLIBRARIES = libfzclient-commonui-private-mac.la
++
++libfzclient_commonui_private_mac_la_CPPFLAGS = -I$(top_builddir)/config
++libfzclient_commonui_private_mac_la_CPPFLAGS += $(LIBFILEZILLA_CFLAGS)
++libfzclient_commonui_private_mac_la_CPPFLAGS += -DBUILDING_FZ_COMMONUI
++
++libfzclient_commonui_private_mac_la_CXXFLAGS = -fvisibility=hidden
++
++libfzclient_commonui_private_mac_la_SOURCES = \
+       fz_paths_osx.mm
+ 
+-libfzclient_commonui_private_la_LDFLAGS += -framework Cocoa
++libfzclient_commonui_private_mac_la_LDFLAGS = -framework Cocoa
++
++libfzclient_commonui_private_la_LIBADD = libfzclient-commonui-private-mac.la
++libfzclient_commonui_private_la_DEPENDENCIES += libfzclient-commonui-private-mac.la
+ 
+ endif