Thu Jul 29 14:00:57 2021 UTC ()
filezilla: use upstream version of build fix


(wiz)
diff -r1.137 -r1.138 pkgsrc/net/filezilla/Makefile
diff -r1.61 -r1.62 pkgsrc/net/filezilla/distinfo
diff -r0 -r1.1 pkgsrc/net/filezilla/patches/patch-src_commonui_Makefile.am
diff -r1.1 -r0 pkgsrc/net/filezilla/patches/patch-src_commonui_Makefile.in
cvs diff -r1.137 -r1.138 pkgsrc/net/filezilla/Makefile (expand / switch to unified diff)

--- pkgsrc/net/filezilla/Makefile 2021/07/29 11:10:31 1.137
+++ pkgsrc/net/filezilla/Makefile 2021/07/29 14:00:57 1.138
@@ -1,33 +1,38 @@ @@ -1,33 +1,38 @@
1# $NetBSD: Makefile,v 1.137 2021/07/29 11:10:31 wiz Exp $ 1# $NetBSD: Makefile,v 1.138 2021/07/29 14:00:57 wiz Exp $
2 2
3VERSION= 3.55.0 3VERSION= 3.55.0
4DISTNAME= FileZilla_${VERSION}_src 4DISTNAME= FileZilla_${VERSION}_src
5PKGNAME= filezilla-${VERSION} 5PKGNAME= filezilla-${VERSION}
6CATEGORIES= net x11 6CATEGORIES= net x11
7MASTER_SITES= https://download.filezilla-project.org/client/ 7MASTER_SITES= https://download.filezilla-project.org/client/
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= https://filezilla-project.org/ 11HOMEPAGE= https://filezilla-project.org/
12COMMENT= FTP, FTPS, and SFTP client with intuitive GUI 12COMMENT= FTP, FTPS, and SFTP client with intuitive GUI
13LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
14 14
15GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes
16USE_LIBTOOL= yes 16USE_LIBTOOL= yes
17USE_LANGUAGES= c c++17 17USE_LANGUAGES= c c++17
18USE_TOOLS+= gmake pkg-config msgfmt msgmerge xgettext 18USE_TOOLS+= gmake pkg-config msgfmt msgmerge xgettext
19WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} 19WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
20 20
 21# remove on next update, when patch-src_commonui_Makefile.am is included
 22USE_TOOLS+= aclocal automake
 23pre-configure:
 24 cd ${WRKSRC} && aclocal && automake
 25
21CONFIGURE_ARGS+= --disable-autoupdatecheck 26CONFIGURE_ARGS+= --disable-autoupdatecheck
22# avoid xdg-utils dependency 27# avoid xdg-utils dependency
23CONFIGURE_ENV+= ac_cv_path_xdgopen=firefox 28CONFIGURE_ENV+= ac_cv_path_xdgopen=firefox
24 29
25GNU_CONFIGURE_WX_VERSION= no 30GNU_CONFIGURE_WX_VERSION= no
26 31
27# For C++17. 32# For C++17.
28GCC_REQD+= 7 33GCC_REQD+= 7
29 34
30.include "options.mk" 35.include "options.mk"
31.include "../../databases/sqlite3/buildlink3.mk" 36.include "../../databases/sqlite3/buildlink3.mk"
32.include "../../devel/libidn/buildlink3.mk" 37.include "../../devel/libidn/buildlink3.mk"
33.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 38.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
cvs diff -r1.61 -r1.62 pkgsrc/net/filezilla/distinfo (expand / switch to unified diff)

--- pkgsrc/net/filezilla/distinfo 2021/07/29 11:10:31 1.61
+++ pkgsrc/net/filezilla/distinfo 2021/07/29 14:00:57 1.62
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.61 2021/07/29 11:10:31 wiz Exp $ 1$NetBSD: distinfo,v 1.62 2021/07/29 14:00:57 wiz Exp $
2 2
3SHA1 (FileZilla_3.55.0_src.tar.bz2) = 887c04c430ed798b5d3048a29bf7fd4fdc37b30d 3SHA1 (FileZilla_3.55.0_src.tar.bz2) = 887c04c430ed798b5d3048a29bf7fd4fdc37b30d
4RMD160 (FileZilla_3.55.0_src.tar.bz2) = cd23b5e29692f3cfe034ece9c11408a6c19c63fc 4RMD160 (FileZilla_3.55.0_src.tar.bz2) = cd23b5e29692f3cfe034ece9c11408a6c19c63fc
5SHA512 (FileZilla_3.55.0_src.tar.bz2) = 8a1221e97719610be900d66f7feba90d1c5053a618b38084e93e8f2b11e51fc523336e11e110f51828eba3f17f60cea1fcd8060bd0cc5e7fdb3d24f35a4c1732 5SHA512 (FileZilla_3.55.0_src.tar.bz2) = 8a1221e97719610be900d66f7feba90d1c5053a618b38084e93e8f2b11e51fc523336e11e110f51828eba3f17f60cea1fcd8060bd0cc5e7fdb3d24f35a4c1732
6Size (FileZilla_3.55.0_src.tar.bz2) = 4910040 bytes 6Size (FileZilla_3.55.0_src.tar.bz2) = 4910040 bytes
7SHA1 (patch-src_commonui_Makefile.in) = d4e5133a621055dc9edc53a74b1a0a66c0ae3d4a 7SHA1 (patch-src_commonui_Makefile.am) = e70f467d2b5940a0a649db605cf198674bb4a1ab
File Added: pkgsrc/net/filezilla/patches/Attic/patch-src_commonui_Makefile.am
$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
File Deleted: pkgsrc/net/filezilla/patches/Attic/patch-src_commonui_Makefile.in