Page MenuHomeFreeBSD
Files F160040369

D33764.diff
No OneTemporary
Actions

D33764.diff
View Options

Index: archivers/Makefile
===================================================================
--- archivers/Makefile
+++ archivers/Makefile
@@ -88,6 +88,7 @@
SUBDIR += mar
SUBDIR += maxcso
SUBDIR += minizip
+ SUBDIR += minizip-ng
SUBDIR += mscompress
SUBDIR += mtf
SUBDIR += nfpm
@@ -265,6 +266,7 @@
SUBDIR += zip-ada
SUBDIR += zipmix
SUBDIR += zipper
+ SUBDIR += zlib-ng
SUBDIR += zoo
SUBDIR += zopfli
SUBDIR += zstd
Index: archivers/minizip-ng/Makefile
===================================================================
--- /dev/null
+++ archivers/minizip-ng/Makefile
@@ -0,0 +1,20 @@
+PORTNAME= minizip-ng
+PORTVERSION= 3.0.4
+CATEGORIES= archivers
+
+MAINTAINER= lbartoletti@FreeBSD.org
+COMMENT= Fork of the popular minizip found in the zlib distribution
+
+LICENSE= ZLIB
+
+LIB_DEPENDS= libzstd.so:archivers/zstd
+
+USES= cmake:testing iconv
+USE_LDCONFIG= yes
+USE_GITHUB= yes
+GH_ACCOUNT= zlib-ng
+
+CMAKE_ON= BUILD_SHARED_LIBS
+CMAKE_TESTING_ON= MZ_BUILD_TEST MZ_BUILD_UNIT_TEST
+
+.include <bsd.port.mk>
Index: archivers/minizip-ng/distinfo
===================================================================
--- /dev/null
+++ archivers/minizip-ng/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1641396331
+SHA256 (zlib-ng-minizip-ng-3.0.4_GH0.tar.gz) = 2ab219f651901a337a7d3c268128711b80330a99ea36bdc528c76b591a624c3c
+SIZE (zlib-ng-minizip-ng-3.0.4_GH0.tar.gz) = 638956
Index: archivers/minizip-ng/files/patch-CMakeLists.txt
===================================================================
--- /dev/null
+++ archivers/minizip-ng/files/patch-CMakeLists.txt
@@ -0,0 +1,11 @@
+--- CMakeLists.txt.orig 2022-01-05 16:21:06 UTC
++++ CMakeLists.txt
+@@ -81,7 +81,7 @@ include(FeatureSummary)
+
+ set(INSTALL_BIN_DIR ${CMAKE_INSTALL_BINDIR} CACHE PATH "Installation directory for executables")
+ set(INSTALL_LIB_DIR ${CMAKE_INSTALL_LIBDIR} CACHE PATH "Installation directory for libraries")
+-set(INSTALL_INC_DIR ${CMAKE_INSTALL_INCLUDEDIR} CACHE PATH "Installation directory for headers")
++set(INSTALL_INC_DIR ${CMAKE_INSTALL_INCLUDEDIR}/minizip CACHE PATH "Installation directory for headers")
+ set(INSTALL_MAN_DIR ${CMAKE_INSTALL_MANDIR} CACHE PATH "Installation directory for manual pages")
+
+ set(STDLIB_DEF)
Index: archivers/minizip-ng/pkg-descr
===================================================================
--- /dev/null
+++ archivers/minizip-ng/pkg-descr
@@ -0,0 +1,14 @@
+Minizip was originally developed in 1998. It was first included in the zlib
+distribution as an additional code contribution starting in zlib 1.1.2. Since
+that time, it has been continually improved upon and contributed to by many
+people.
+
++ Creating and extracting zip archives.
++ Adding and removing entries from zip archives.
++ Read and write raw zip entry data.
++ Reading and writing zip archives from memory.
++ Zlib, BZIP2, LZMA, and ZSTD compression methods.
++ Password protection through Traditional PKWARE and WinZIP AES encryption.
++ Buffered streaming for improved I/O performance.
+
+WWW: https://github.com/zlib-ng/minizip-ng
Index: archivers/minizip-ng/pkg-plist
===================================================================
--- /dev/null
+++ archivers/minizip-ng/pkg-plist
@@ -0,0 +1,26 @@
+include/minizip/mz.h
+include/minizip/mz_compat.h
+include/minizip/mz_crypt.h
+include/minizip/mz_os.h
+include/minizip/mz_strm.h
+include/minizip/mz_strm_buf.h
+include/minizip/mz_strm_bzip.h
+include/minizip/mz_strm_lzma.h
+include/minizip/mz_strm_mem.h
+include/minizip/mz_strm_os.h
+include/minizip/mz_strm_pkcrypt.h
+include/minizip/mz_strm_split.h
+include/minizip/mz_strm_wzaes.h
+include/minizip/mz_strm_zlib.h
+include/minizip/mz_zip.h
+include/minizip/mz_zip_rw.h
+include/minizip/unzip.h
+include/minizip/zip.h
+lib/cmake/minizip/minizip-config-version.cmake
+lib/cmake/minizip/minizip-config.cmake
+lib/cmake/minizip/minizip-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/minizip/minizip.cmake
+lib/libminizip.so
+lib/libminizip.so.3
+lib/libminizip.so.3.0.4
+libdata/pkgconfig/minizip.pc
Index: archivers/zlib-ng/Makefile
===================================================================
--- /dev/null
+++ archivers/zlib-ng/Makefile
@@ -0,0 +1,16 @@
+PORTNAME= zlib-ng
+PORTVERSION= 2.0.6
+CATEGORIES= archivers
+
+MAINTAINER= lbartoletti@FreeBSD.org
+COMMENT= Fork of the zlib data compression library
+
+LICENSE= ZLIB
+
+USES= cmake:testing
+USE_LDCONFIG= yes
+USE_GITHUB= yes
+
+CMAKE_TESTING_ON= ZLIB_ENABLE_TESTS
+
+.include <bsd.port.mk>
Index: archivers/zlib-ng/distinfo
===================================================================
--- /dev/null
+++ archivers/zlib-ng/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1641394914
+SHA256 (zlib-ng-zlib-ng-2.0.6_GH0.tar.gz) = 8258b75a72303b661a238047cb348203d88d9dddf85d480ed885f375916fcab6
+SIZE (zlib-ng-zlib-ng-2.0.6_GH0.tar.gz) = 817951
Index: archivers/zlib-ng/pkg-descr
===================================================================
--- /dev/null
+++ archivers/zlib-ng/pkg-descr
@@ -0,0 +1,13 @@
+Zlib replacement with optimizations for next generation systems.
+
+The motivation for this fork came after seeing several 3rd party contributions
+containing new optimizations not getting implemented into the official zlib
+repository.
+
+Mark Adler has been maintaining zlib for a very long time, and he has done a
+great job and hopefully he will continue for a long time yet.
+
+The idea of zlib-ng is not to replace zlib, but to co-exist as a drop-in
+replacement with a lower threshold for code change.
+
+WWW: https://github.com/zlib-ng/zlib-ng
Index: archivers/zlib-ng/pkg-plist
===================================================================
--- /dev/null
+++ archivers/zlib-ng/pkg-plist
@@ -0,0 +1,7 @@
+include/zconf-ng.h
+include/zlib-ng.h
+lib/libz-ng.a
+lib/libz-ng.so
+lib/libz-ng.so.2
+lib/libz-ng.so.2.0.6
+libdata/pkgconfig/zlib-ng.pc
Index: databases/spatialite-tools/Makefile
===================================================================
--- databases/spatialite-tools/Makefile
+++ databases/spatialite-tools/Makefile
@@ -14,7 +14,7 @@
libexpat.so:textproc/expat2 \
libspatialite.so:databases/spatialite \
libreadosm.so:astro/readosm \
- libminizip.so:archivers/minizip
+ libminizip.so:archivers/minizip-ng
GNU_CONFIGURE= yes
USES= gmake gnome pkgconfig iconv sqlite
Index: databases/spatialite/Makefile
===================================================================
--- databases/spatialite/Makefile
+++ databases/spatialite/Makefile
@@ -15,7 +15,7 @@
LIB_DEPENDS= libgeos_c.so:graphics/geos \
libproj.so:graphics/proj \
libfreexl.so:textproc/freexl \
- libminizip.so:archivers/minizip \
+ libminizip.so:archivers/minizip-ng \
librttopo.so:devel/librttopo
GNU_CONFIGURE= yes
Index: deskutils/anydesk/Makefile
===================================================================
--- deskutils/anydesk/Makefile
+++ deskutils/anydesk/Makefile
@@ -19,7 +19,7 @@
libinotify.so:devel/libinotify \
libpolkit-gobject-1.so:sysutils/polkit \
libxkbfile.so:x11/libxkbfile \
- libminizip.so:archivers/minizip \
+ libminizip.so:archivers/minizip-ng
USES= cpe gl gnome xorg
Index: devel/axmldec/Makefile
===================================================================
--- devel/axmldec/Makefile
+++ devel/axmldec/Makefile
@@ -12,7 +12,7 @@
LICENSE= ISCL
LICENSE_FILE= ${WRKSRC}/LICENSE.md
-LIB_DEPENDS= libminizip.so:archivers/minizip \
+LIB_DEPENDS= libminizip.so:archivers/minizip-ng \
libboost_system.so:devel/boost-libs
USES= cmake compiler:c++14-lang cpe pkgconfig
Index: devel/axmldec/files/patch-main.cpp
===================================================================
--- /dev/null
+++ devel/axmldec/files/patch-main.cpp
@@ -0,0 +1,11 @@
+--- main.cpp.orig 2022-01-05 17:16:25 UTC
++++ main.cpp
+@@ -26,7 +26,7 @@
+ #include <boost/program_options.hpp>
+
+ #ifdef ENABLE_APK_LOADING
+-#include <unzip.h>
++#include <minizip/unzip.h>
+ #endif
+
+ namespace boost_pt = boost::property_tree;
Index: devel/collada-dom/Makefile
===================================================================
--- devel/collada-dom/Makefile
+++ devel/collada-dom/Makefile
@@ -9,8 +9,7 @@
LICENSE= MIT
-LIB_DEPENDS= libminizip.so:archivers/minizip \
- libpcre.so:devel/pcre \
+LIB_DEPENDS= libpcre.so:devel/pcre \
libboost_filesystem.so:devel/boost-libs \
libboost_system.so:devel/boost-libs
Index: devel/collada-dom/files/patch-CMakeLists.txt
===================================================================
--- devel/collada-dom/files/patch-CMakeLists.txt
+++ devel/collada-dom/files/patch-CMakeLists.txt
@@ -1,4 +1,4 @@
---- CMakeLists.txt.orig 2019-05-09 19:44:01 UTC
+--- CMakeLists.txt.orig 2022-01-05 17:23:18 UTC
+++ CMakeLists.txt
@@ -2,6 +2,8 @@ cmake_minimum_required (VERSION 2.6.0)
project (collada-dom)
@@ -18,3 +18,13 @@
set(COLLADA_DOM_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/dom/include)
set(COLLADA_DOM_LINK_DIRS "")
+@@ -220,7 +222,8 @@ else()
+ endif()
+ endif()
+
+-pkg_check_modules(minizip minizip)
++# make sure we dont pickup minizip from ports as its not the same
++#pkg_check_modules(minizip minizip)
+ if(minizip_FOUND)
+ set(MINIZIP_INCLUDE_DIR ${minizip_INCLUDE_DIRS})
+ else()
Index: devel/collada-dom/files/patch-dom_src_modules_LIBXMLPlugin_daeLIBXMLPlugin.cpp
===================================================================
--- devel/collada-dom/files/patch-dom_src_modules_LIBXMLPlugin_daeLIBXMLPlugin.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- dom/src/modules/LIBXMLPlugin/daeLIBXMLPlugin.cpp.orig 2019-05-09 19:36:39 UTC
-+++ dom/src/modules/LIBXMLPlugin/daeLIBXMLPlugin.cpp
-@@ -32,7 +32,7 @@
- #include <iomanip>
- using namespace std;
-
--#include <zip.h> // for saving compressed files
-+#include <minizip/zip.h> // for saving compressed files
- #ifdef _WIN32
- #include <iowin32.h>
- #else
Index: games/mrboom/Makefile
===================================================================
--- games/mrboom/Makefile
+++ games/mrboom/Makefile
@@ -12,7 +12,7 @@
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-LIB_DEPENDS= libminizip.so:archivers/minizip \
+LIB_DEPENDS= libminizip.so:archivers/minizip-ng \
libmodplug.so:audio/libmodplug
USES= compiler:c++11-lang gmake sdl
Index: games/mrboom/files/patch-common.cpp
===================================================================
--- /dev/null
+++ games/mrboom/files/patch-common.cpp
@@ -0,0 +1,11 @@
+--- common.cpp.orig 2022-01-05 19:56:57 UTC
++++ common.cpp
+@@ -4,6 +4,8 @@
+ #define NO_NETWORK
+ #endif
+
++typedef unsigned long uLong;
++
+ #ifdef _WIN32
+ #include <direct.h>
+ #else
Index: games/oolite/Makefile
===================================================================
--- games/oolite/Makefile
+++ games/oolite/Makefile
@@ -19,7 +19,7 @@
libnspr4.so:devel/nspr \
libvorbisfile.so:audio/libvorbis \
libpng.so:graphics/png \
- libminizip.so:archivers/minizip
+ libminizip.so:archivers/minizip-ng
USES= gl gnustep openal:al perl5 python:3.5+,build sdl \
tar:bzip2 xorg
Index: graphics/comical/Makefile
===================================================================
--- graphics/comical/Makefile
+++ graphics/comical/Makefile
@@ -12,8 +12,7 @@
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
-LIB_DEPENDS= libminizip.so:archivers/minizip \
- libunrar.so.6:archivers/libunrar6
+LIB_DEPENDS= libunrar.so.6:archivers/libunrar6
USES= compiler:c++11-lang gmake
USE_WX= 2.8+
Index: graphics/comical/files/patch-Makefile
===================================================================
--- graphics/comical/files/patch-Makefile
+++ graphics/comical/files/patch-Makefile
@@ -4,7 +4,7 @@
-CC = `wx-config --cxx`
-LDFLAGS = `wx-config --libs` -Lunrar -lunrar -Lunzip -lminiunzip
+CC = ${CXX}
-+LDFLAGS += `${WX_CONFIG} --libs` -L${LOCALBASE}/lib -lunrar -lminizip -lz
++LDFLAGS += `${WX_CONFIG} --libs` -L${LOCALBASE}/lib -Lunrar -lunrar -Lunzip -lminiunzip -lz
INSTALL = install
INSTALL_PROGRAM = $(INSTALL)
-prefix = /usr/local
@@ -12,12 +12,3 @@
exec_prefix = $(prefix)
bindir = $(exec_prefix)/bin
-@@ -12,7 +12,7 @@ OBJS = $(patsubst %.cpp,%.o,$(wildcard s
-
- all: comical
-
--comical: $(OBJS) unrar/libunrar.a unzip/libminiunzip.a
-+comical: $(OBJS)
- $(CC) -o $@ $(OBJS) $(LDFLAGS)
-
- $(OBJS):
Index: graphics/comical/files/patch-src_Makefile
===================================================================
--- graphics/comical/files/patch-src_Makefile
+++ graphics/comical/files/patch-src_Makefile
@@ -1,10 +1,9 @@
--- src/Makefile.orig 2006-03-05 03:27:10 UTC
+++ src/Makefile
@@ -1,6 +1,6 @@
--INCLUDE = -I../unrar -I../unzip
+ INCLUDE = -I../unrar -I../unzip
-CFLAGS = -O2 -Wall -pipe
-CPPFLAGS = `wx-config --cxxflags` $(CFLAGS) -D_UNIX $(INCLUDE)
-+INCLUDE = -I${LOCALBASE}/include/libunrar6 -I${LOCALBASE}/include/minizip
+CFLAGS += -Wall -Wno-unused-local-typedef -pipe ${CXXFLAGS}
+CPPFLAGS += `${WX_CONFIG} --cxxflags` $(CFLAGS) -D_UNIX -DwxUSE_UNICODE $(INCLUDE)
Index: graphics/comical/files/patch-unrar_makefile.linux
===================================================================
--- /dev/null
+++ graphics/comical/files/patch-unrar_makefile.linux
@@ -0,0 +1,11 @@
+--- unrar/makefile.linux.orig 2006-02-11 16:15:09 UTC
++++ unrar/makefile.linux
+@@ -6,7 +6,7 @@
+ #
+
+ # Linux using GCC
+-CXX=g++
++#CXX=g++
+ CXXFLAGS=-O2 -fPIC
+ DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+ STRIP=strip
Index: graphics/comical/files/patch-unzip_Makefile
===================================================================
--- /dev/null
+++ graphics/comical/files/patch-unzip_Makefile
@@ -0,0 +1,11 @@
+--- unzip/Makefile.orig 2006-02-21 01:28:36 UTC
++++ unzip/Makefile
+@@ -3,7 +3,7 @@
+ # Unix-like systems
+ #
+
+-CC=gcc
++CC=`${WX_CONFIG} --cc`
+ CFLAGS=-Os
+
+ ##########################
Index: misc/xiphos/Makefile
===================================================================
--- misc/xiphos/Makefile
+++ misc/xiphos/Makefile
@@ -22,7 +22,7 @@
libdbus-glib-1.so:devel/dbus-glib \
libenchant.so:textproc/enchant \
libicui18n.so:devel/icu \
- libminizip.so:archivers/minizip \
+ libminizip.so:archivers/minizip-ng \
libsoup-2.4.so:devel/libsoup \
libsword.so:misc/sword \
libuuid.so:misc/e2fsprogs-libuuid \
Index: misc/xiphos/files/patch-src_gtk_utilities.c
===================================================================
--- /dev/null
+++ misc/xiphos/files/patch-src_gtk_utilities.c
@@ -0,0 +1,11 @@
+--- src/gtk/utilities.c.orig 2022-01-05 16:53:00 UTC
++++ src/gtk/utilities.c
+@@ -38,7 +38,7 @@
+ #include <gdk-pixbuf/gdk-pixbuf.h>
+
+ #include <gtk/gtk.h>
+-#include <zip.h>
++#include <minizip/zip.h>
+ #include <zlib.h>
+
+ #include "gui/utilities.h"
Index: multimedia/assimp/Makefile
===================================================================
--- multimedia/assimp/Makefile
+++ multimedia/assimp/Makefile
@@ -9,13 +9,13 @@
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-LIB_DEPENDS= libminizip.so:archivers/minizip
-
USES= cmake:testing compiler:c++11-lib localbase:ldflags pkgconfig
USE_GITHUB= yes
USE_LDCONFIG= yes
+# make sure we dont pickup minizip from ports as its not the same
+CMAKE_ON= ASSIMP_BUILD_MINIZIP
CMAKE_OFF= ASSIMP_BUILD_TESTS
CMAKE_TESTING_ON= ASSIMP_BUILD_TESTS
Index: multimedia/vlc/Makefile
===================================================================
--- multimedia/vlc/Makefile
+++ multimedia/vlc/Makefile
@@ -300,7 +300,7 @@
CONFIGURE_ARGS+= --disable-sid
SKINS_USE= XORG=xext,xinerama,xpm
-SKINS_LIB_DEPENDS= libminizip.so:archivers/minizip \
+SKINS_LIB_DEPENDS= libminizip.so:archivers/minizip-ng \
libtar.so:devel/libtar
SKINS_CONFIGURE_ENABLE= skins2 libtar
SKINS_IMPLIES= QT5
Index: net-im/psi/Makefile
===================================================================
--- net-im/psi/Makefile
+++ net-im/psi/Makefile
@@ -11,7 +11,7 @@
LICENSE= GPLv2+
LIB_DEPENDS= libidn.so:dns/libidn \
- libminizip.so:archivers/minizip
+ libminizip.so:archivers/minizip-ng
USES= cmake compiler:c++11-lang desktop-file-utils pkgconfig \
qca qt:5 tar:xz xorg
Index: net-im/psi/files/patch-src_libpsi_tools_zip_CMakeLists.txt
===================================================================
--- /dev/null
+++ net-im/psi/files/patch-src_libpsi_tools_zip_CMakeLists.txt
@@ -0,0 +1,12 @@
+--- src/libpsi/tools/zip/CMakeLists.txt.orig 2022-01-05 17:32:17 UTC
++++ src/libpsi/tools/zip/CMakeLists.txt
+@@ -11,7 +11,8 @@ find_package(ZLIB REQUIRED)
+
+ include_directories(${ZLIB_INCLUDE_DIRS})
+
+-find_package(MINIZIP QUIET)
++# make sure we dont pickup minizip from ports as its not the same
++#find_package(MINIZIP QUIET)
+
+ set(DEPLIBS
+ ${ZLIB_LIBRARIES}
Index: net-im/telegram-desktop/Makefile
===================================================================
--- net-im/telegram-desktop/Makefile
+++ net-im/telegram-desktop/Makefile
@@ -32,7 +32,6 @@
libhunspell-1.7.so:textproc/hunspell \
libjpeg.so:graphics/jpeg-turbo \
liblz4.so:archivers/liblz4 \
- libminizip.so:archivers/minizip \
librnnoise.so:audio/rnnoise \
libopenal.so:audio/openal-soft \
libopenh264.so:multimedia/openh264 \
@@ -44,6 +43,8 @@
libxkbcommon.so:x11/libxkbcommon \
libxxhash.so:devel/xxhash \
libvpx.so:multimedia/libvpx
+ # make sure we dont pickup minizip from ports as its not the same
+ # libminizip.so:archivers/minizip-ng
USES= cmake compiler:c++17-lang desktop-file-utils gl \
gnome pkgconfig python:3.7+,build qt:5 ssl xorg
Index: science/libkml/Makefile
===================================================================
--- science/libkml/Makefile
+++ science/libkml/Makefile
@@ -17,7 +17,7 @@
LIB_DEPENDS= libboost_thread.so:devel/boost-libs \
libexpat.so:textproc/expat2 \
libgtest.so:devel/googletest \
- libminizip.so:archivers/minizip \
+ libminizip.so:archivers/minizip-ng \
liburiparser.so:net/uriparser
OPTIONS_DEFINE= EXAMPLES
Index: textproc/sigil/Makefile
===================================================================
--- textproc/sigil/Makefile
+++ textproc/sigil/Makefile
@@ -13,8 +13,7 @@
DEPRECATED= Uses EOL Python 2.7 via www/qt5-webengine
EXPIRATION_DATE=2021-06-23
-LIB_DEPENDS= libminizip.so:archivers/minizip \
- libpcre.so:devel/pcre \
+LIB_DEPENDS= libpcre.so:devel/pcre \
libhunspell-1.7.so:textproc/hunspell
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dulwich>=0.15.0:devel/dulwich@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR}
Index: textproc/sigil/files/patch-3rdparty_minizip_ioapi.c
===================================================================
--- /dev/null
+++ textproc/sigil/files/patch-3rdparty_minizip_ioapi.c
@@ -0,0 +1,29 @@
+--- 3rdparty/minizip/ioapi.c.orig 2022-01-05 19:26:08 UTC
++++ 3rdparty/minizip/ioapi.c
+@@ -112,7 +112,7 @@ static voidpf ZCALLBACK fopen64_file_func (voidpf opaq
+ mode_fopen = "wb";
+
+ if ((filename!=NULL) && (mode_fopen != NULL))
+- file = fopen64((const char*)filename, mode_fopen);
++ file = fopen((const char*)filename, mode_fopen);
+ return file;
+ }
+
+@@ -142,7 +142,7 @@ static long ZCALLBACK ftell_file_func (voidpf opaque,
+ static ZPOS64_T ZCALLBACK ftell64_file_func (voidpf opaque, voidpf stream)
+ {
+ ZPOS64_T ret;
+- ret = ftello64((FILE *)stream);
++ ret = ftello((FILE *)stream);
+ return ret;
+ }
+
+@@ -188,7 +188,7 @@ static long ZCALLBACK fseek64_file_func (voidpf opaqu
+ }
+ ret = 0;
+
+- if(fseeko64((FILE *)stream, offset, fseek_origin) != 0)
++ if(fseeko((FILE *)stream, offset, fseek_origin) != 0)
+ ret = -1;
+
+ return ret;
Index: textproc/sigil/files/patch-CMakeLists.txt
===================================================================
--- /dev/null
+++ textproc/sigil/files/patch-CMakeLists.txt
@@ -0,0 +1,12 @@
+--- CMakeLists.txt.orig 2022-01-05 17:18:53 UTC
++++ CMakeLists.txt
+@@ -91,7 +91,8 @@ if (USE_SYSTEM_LIBS)
+ MESSAGE(STATUS "Trying to use System Libraries...")
+ find_package( ZLIB )
+ find_package( PkgConfig )
+- find_package( MiniZip )
++# make sure we dont pickup minizip from ports as its not the same
++# find_package( MiniZip )
+ pkg_check_modules( HUNSPELL hunspell )
+ if ( NOT APPLE )
+ pkg_check_modules( PCRE libpcre16 )
Index: www/domoticz/Makefile
===================================================================
--- www/domoticz/Makefile
+++ www/domoticz/Makefile
@@ -10,7 +10,7 @@
LICENSE_FILE= ${WRKSRC}/License.txt
LIB_DEPENDS= libcurl.so:ftp/curl libboost_system.so:devel/boost-libs \
- libminizip.so:archivers/minizip libjsoncpp.so:devel/jsoncpp
+ libminizip.so:archivers/minizip-ng libjsoncpp.so:devel/jsoncpp
BUILD_DEPENDS= cereal>=1.2.2:devel/cereal
USES= cmake compiler:c++11-lang cpe pkgconfig ssl lua:53 sqlite

File Metadata

Mime Type
text/plain
Expires
Sun, Jun 21, 8:07 PM (9 h, 30 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
34160744
Default Alt Text
D33764.diff (20 KB)

Event Timeline