forked from pool/zziplib
Compare commits
2 Commits
Author | SHA256 | Date | |
---|---|---|---|
0b5a4dc511 | |||
00667b9ce0 |
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:3a1076436ea372bfc161596710e0cb7e74660e0007c81742bdb902be2dea49df
|
||||
size 1214404
|
3
zziplib-0.13.80.tar.gz
Normal file
3
zziplib-0.13.80.tar.gz
Normal file
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ea29a1d31134f5232154fcd54f4027c1e6d6913deceea20e097f8c7532d19150
|
||||
size 5120000
|
@@ -1,53 +0,0 @@
|
||||
From 4c82735049c6a4e5c2e3b1cb02b7d0bdfbd3b546 Mon Sep 17 00:00:00 2001
|
||||
From: Guido Draheim <guidod@gmx.de>
|
||||
Date: Wed, 23 Apr 2025 00:09:17 +0200
|
||||
Subject: [PATCH] move pc to share/pkgconfig #177
|
||||
|
||||
---
|
||||
SDL/CMakeLists.txt | 2 +-
|
||||
SDL/Makefile.am | 2 +-
|
||||
SDL/Makefile.in | 2 +-
|
||||
3 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/SDL/CMakeLists.txt b/SDL/CMakeLists.txt
|
||||
index e46f7a4..e48226c 100644
|
||||
--- a/SDL/CMakeLists.txt
|
||||
+++ b/SDL/CMakeLists.txt
|
||||
@@ -71,7 +71,7 @@ add_custom_command(OUTPUT SDL_rwops_zzip.pc
|
||||
add_custom_target(pkgconfig-sdl ALL DEPENDS SDL_rwops_zzip.pc)
|
||||
|
||||
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/SDL_rwops_zzip.pc
|
||||
- DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig" )
|
||||
+ DESTINATION "${CMAKE_INSTALL_DATADIR}/pkgconfig" )
|
||||
endif(ZZIP_PKGCONFIG)
|
||||
endif(SDL_FOUND)
|
||||
|
||||
diff --git a/SDL/Makefile.am b/SDL/Makefile.am
|
||||
index c66d443..ef3992f 100644
|
||||
--- a/SDL/Makefile.am
|
||||
+++ b/SDL/Makefile.am
|
||||
@@ -33,7 +33,7 @@ install-sdl : install-data # and not the binary
|
||||
CLEANFILES = *.pc *.omf
|
||||
# ----------------------------------------------------------------------
|
||||
# we do not install a library, so this about equivalent to some SDL.pc
|
||||
-pkgconfigdir=$(libdir)/pkgconfig
|
||||
+pkgconfigdir=$(datarootdir)/pkgconfig
|
||||
pkgconfig_HEADERS= SDL_rwops_zzip.pc
|
||||
ERRNULL= 2>/dev/null
|
||||
|
||||
diff --git a/SDL/Makefile.in b/SDL/Makefile.in
|
||||
index 1eff3ea..3c107a5 100644
|
||||
--- a/SDL/Makefile.in
|
||||
+++ b/SDL/Makefile.in
|
||||
@@ -370,7 +370,7 @@ pkgconfig_libdir = @pkgconfig_libdir@
|
||||
pkgconfig_libfile = @pkgconfig_libfile@
|
||||
# ----------------------------------------------------------------------
|
||||
# we do not install a library, so this about equivalent to some SDL.pc
|
||||
-pkgconfigdir = $(libdir)/pkgconfig
|
||||
+pkgconfigdir = $(datarootdir)/pkgconfig
|
||||
prefix = @prefix@
|
||||
program_transform_name = @program_transform_name@
|
||||
psdir = @psdir@
|
||||
--
|
||||
2.49.0
|
||||
|
@@ -1,57 +0,0 @@
|
||||
From 59c0d0c48389219455950298c4e33aa23d659e3a Mon Sep 17 00:00:00 2001
|
||||
From: vlefebvre <valentin.lefebvre@suse.com>
|
||||
Date: Tue, 22 Apr 2025 07:45:30 +0000
|
||||
Subject: [PATCH] move zzipwrap's .pc from $libdir to $datadir
|
||||
|
||||
* zzip's .pc files has been moved from $libdir/pkgconfig to
|
||||
$datadir/pkgconfig. Do the same for zzipwrap.
|
||||
|
||||
Signed-off-by: vlefebvre <valentin.lefebvre@suse.com>
|
||||
---
|
||||
zzipwrap/CMakeLists.txt | 2 +-
|
||||
zzipwrap/Makefile.am | 2 +-
|
||||
zzipwrap/Makefile.in | 2 +-
|
||||
3 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/zzipwrap/CMakeLists.txt b/zzipwrap/CMakeLists.txt
|
||||
index a9f1088..cff1732 100644
|
||||
--- a/zzipwrap/CMakeLists.txt
|
||||
+++ b/zzipwrap/CMakeLists.txt
|
||||
@@ -84,7 +84,7 @@ set(outdir ${CMAKE_CURRENT_BINARY_DIR})
|
||||
|
||||
if(ZZIP_PKGCONFIG)
|
||||
install(FILES ${outdir}/zzipwrap.pc
|
||||
- DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig" )
|
||||
+ DESTINATION "${CMAKE_INSTALL_DATADIR}/pkgconfig" )
|
||||
endif()
|
||||
|
||||
install(FILES ${libzzipwrap_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/zzip )
|
||||
diff --git a/zzipwrap/Makefile.am b/zzipwrap/Makefile.am
|
||||
index 2c5b471..6f83125 100644
|
||||
--- a/zzipwrap/Makefile.am
|
||||
+++ b/zzipwrap/Makefile.am
|
||||
@@ -35,7 +35,7 @@ zzipwrap_LDFLAGS = @ZZIPLIB_LDFLAGS@
|
||||
zzipwrap_LDADD = libzzipwrap.la @RESOLVES@ ../zzip/libzzip.la -lz
|
||||
|
||||
# ----------------------------------------------------------------------
|
||||
-pkgconfigdir=$(libdir)/pkgconfig
|
||||
+pkgconfigdir=$(datarootdir)/pkgconfig
|
||||
pkgconfig_HEADERS= zzipwrap.pc
|
||||
|
||||
zzipwrap.pc : Makefile
|
||||
diff --git a/zzipwrap/Makefile.in b/zzipwrap/Makefile.in
|
||||
index 95f869f..8823f73 100644
|
||||
--- a/zzipwrap/Makefile.in
|
||||
+++ b/zzipwrap/Makefile.in
|
||||
@@ -381,7 +381,7 @@ pkgconfig_libdir = @pkgconfig_libdir@
|
||||
pkgconfig_libfile = @pkgconfig_libfile@
|
||||
|
||||
# ----------------------------------------------------------------------
|
||||
-pkgconfigdir = $(libdir)/pkgconfig
|
||||
+pkgconfigdir = $(datarootdir)/pkgconfig
|
||||
prefix = @prefix@
|
||||
program_transform_name = @program_transform_name@
|
||||
psdir = @psdir@
|
||||
--
|
||||
2.49.0
|
||||
|
@@ -1,3 +1,22 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 21 10:30:27 UTC 2025 - Valentin Lefebvre <valentin.lefebvre@suse.com>
|
||||
|
||||
- Release to 0.13.80:
|
||||
* '.pc' files back to $libdir
|
||||
* add conanfile.py and tests to support c++ package manager
|
||||
* add vcpkg.json and tests to support c++ package manager
|
||||
* switch from setup.cfg to pyproject.toml to python wheels
|
||||
* rename to zzipdoctools to prepare actual pypi distribution
|
||||
* drop unused '.cdtproject' and '.pydevproject'
|
||||
* switch to lintcheck.yml to extend support for vscode development
|
||||
* fix afl warnings, specifically maxint check ((A & MAXINT) == MAXINT)
|
||||
* refer dependency to sdl2 instead of sdl (to not get sdl3)
|
||||
- Remove patches fixed upstream:
|
||||
[- zziplib-move-zzipwrap-pc-from-libdir-to-datadir.patch]
|
||||
[- zziplib-move-pc-to-share-pkgconfig.patch]
|
||||
- Keep pc files into libdir.
|
||||
- Readme filename has been changed.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 23 09:18:04 UTC 2025 - Valentin Lefebvre <valentin.lefebvre@suse.com>
|
||||
|
||||
|
@@ -18,7 +18,7 @@
|
||||
|
||||
%define lname libzzip-0-13
|
||||
Name: zziplib
|
||||
Version: 0.13.79
|
||||
Version: 0.13.80
|
||||
Release: 0
|
||||
Summary: ZIP Compression Library
|
||||
License: LGPL-2.1-or-later
|
||||
@@ -26,9 +26,6 @@ Group: Development/Libraries/C and C++
|
||||
URL: http://zziplib.sourceforge.net
|
||||
Source0: https://github.com/gdraheim/zziplib/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
||||
Source2: baselibs.conf
|
||||
# PATCHES-FIX-UPSTREAM: Move pkgconfig file from libdir to datadir
|
||||
Patch0: zziplib-move-zzipwrap-pc-from-libdir-to-datadir.patch
|
||||
Patch1: zziplib-move-pc-to-share-pkgconfig.patch
|
||||
|
||||
BuildRequires: cmake >= 3.5
|
||||
BuildRequires: pkgconfig
|
||||
@@ -86,13 +83,13 @@ rm -rf %{buildroot}%{_libdir}/cmake
|
||||
%{_libdir}/libzzip*.so.*
|
||||
|
||||
%files devel
|
||||
%doc docs/README.SDL ChangeLog README TODO
|
||||
%doc docs/README.MD ChangeLog TODO
|
||||
%{_bindir}/unzzip*
|
||||
%{_bindir}/zz*
|
||||
%{_bindir}/unzip-mem
|
||||
%{_libdir}/libzzip*.so
|
||||
%{_includedir}/*
|
||||
%{_datadir}/pkgconfig/*.pc
|
||||
%{_libdir}/pkgconfig/*.pc
|
||||
%{_datadir}/aclocal/*.m4
|
||||
%{_mandir}/man3/__zzip_*.3%{?ext_man}
|
||||
%{_mandir}/man3/zzip_*.3%{?ext_man}
|
||||
|
Reference in New Issue
Block a user