diff --git a/sources/libs/lilv-static/debian/changelog b/sources/libs/lilv-static/debian/changelog index 7b15dbf..9ab221b 100644 --- a/sources/libs/lilv-static/debian/changelog +++ b/sources/libs/lilv-static/debian/changelog @@ -1,3 +1,9 @@ +lilv-static (6:0.24.26-1kxstudio1) focal; urgency=medium + + * Update + + -- falkTX Sun, 08 Jun 2025 13:50:34 +0200 + lilv-static (6:0.24.14-1kxstudio3) focal; urgency=medium * Update diff --git a/sources/libs/lilv-static/debian/clean b/sources/libs/lilv-static/debian/clean deleted file mode 100644 index 72de718..0000000 --- a/sources/libs/lilv-static/debian/clean +++ /dev/null @@ -1,13 +0,0 @@ -.lock-waf_linux_build -.lock-waf_linux2_build -build/.lock-waf_linux_build -build/.lock-waf_linux2_build -build/.wafpickle-* -build/c4che/_cache.py -build/c4che/build.config.py -build/config.log -__pycache__/*.pyc -waflib/*.pyc -waflib/*/*.pyc -waflib/__pycache__/*.pyc -waflib/*/__pycache__/*.pyc diff --git a/sources/libs/lilv-static/debian/control b/sources/libs/lilv-static/debian/control index ff87b74..093eb0f 100644 --- a/sources/libs/lilv-static/debian/control +++ b/sources/libs/lilv-static/debian/control @@ -6,10 +6,9 @@ Build-Depends: debhelper-compat (= 13), kxstudio-build-scripts (>= 5), python3, pkg-config, - libsndfile-static (>= 6:1.1.0-2kxstudio3), - libsratom-static (>= 6:0.6.10-1kxstudio1) + libsndfile-static (>= 6:1.2.2-1kxstudio3), + libsratom-static (>= 6:0.6.18-1kxstudio1) Standards-Version: 4.5.0 -Homepage: http://drobilla.net/software/lilv/ Rules-Requires-Root: no Package: liblilv-static diff --git a/sources/libs/lilv-static/debian/lilv-utils.install b/sources/libs/lilv-static/debian/lilv-utils.install index f4fb17c..f659637 100644 --- a/sources/libs/lilv-static/debian/lilv-utils.install +++ b/sources/libs/lilv-static/debian/lilv-utils.install @@ -1,3 +1,3 @@ +/etc/bash_completion.d/ /usr/share/man/man1/ -debian/tmp/opt/kxstudio/bin/* usr/bin/ -debian/tmp/opt/kxstudio/etc/bash_completion.d/* usr/share/bash-completion/completions/ +debian/tmp/opt/kxstudio/bin/* usr/bin/ diff --git a/sources/libs/lilv-static/debian/patches/01_dont-run-ldconfig.patch b/sources/libs/lilv-static/debian/patches/01_dont-run-ldconfig.patch deleted file mode 100644 index 8cbbfda..0000000 --- a/sources/libs/lilv-static/debian/patches/01_dont-run-ldconfig.patch +++ /dev/null @@ -1,20 +0,0 @@ -Description: Don't run ldconfig after calling the install target - and save a bit of time. -Author: Alessio Treglia -Forwarded: David Robillard ---- - wscript | 1 - - 1 file changed, 1 deletion(-) - -Index: lilv/wscript -=================================================================== ---- lilv.orig/wscript -+++ lilv/wscript -@@ -560,7 +560,6 @@ def build(bld): - bld.install_as('${SYSCONFDIR}/bash_completion.d/lilv', - 'utils/lilv.bash_completion') - -- bld.add_post_fun(autowaf.run_ldconfig) - - - def test(tst): diff --git a/sources/libs/lilv-static/debian/patches/01_hidden-lilv-api.patch b/sources/libs/lilv-static/debian/patches/01_hidden-lilv-api.patch new file mode 100644 index 0000000..4118870 --- /dev/null +++ b/sources/libs/lilv-static/debian/patches/01_hidden-lilv-api.patch @@ -0,0 +1,24 @@ +diff --git a/include/lilv/lilv.h b/include/lilv/lilv.h +index 9f52925..e6b7a80 100644 +--- a/include/lilv/lilv.h ++++ b/include/lilv/lilv.h +@@ -14,18 +14,7 @@ + #include + #include + +-// LILV_API must be used to decorate things in the public API +-#ifndef LILV_API +-# if defined(_WIN32) && !defined(LILV_STATIC) && defined(LILV_INTERNAL) +-# define LILV_API __declspec(dllexport) +-# elif defined(_WIN32) && !defined(LILV_STATIC) +-# define LILV_API __declspec(dllimport) +-# elif defined(__GNUC__) +-# define LILV_API __attribute__((visibility("default"))) +-# else +-# define LILV_API +-# endif +-#endif ++#define LILV_API + + #if defined(__GNUC__) && \ + (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)) diff --git a/sources/libs/lilv-static/debian/patches/02_hidden-lilv-api.patch b/sources/libs/lilv-static/debian/patches/02_hidden-lilv-api.patch deleted file mode 100644 index ceb9f22..0000000 --- a/sources/libs/lilv-static/debian/patches/02_hidden-lilv-api.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/include/lilv/lilv.h b/include/lilv/lilv.h -index 5fd7a9f..368df82 100644 ---- a/include/lilv/lilv.h -+++ b/include/lilv/lilv.h -@@ -27,15 +27,7 @@ - #include - #include - --#if defined(_WIN32) && !defined(LILV_STATIC) && defined(LILV_INTERNAL) --# define LILV_API __declspec(dllexport) --#elif defined(_WIN32) && !defined(LILV_STATIC) --# define LILV_API __declspec(dllimport) --#elif defined(__GNUC__) --# define LILV_API __attribute__((visibility("default"))) --#else --# define LILV_API --#endif -+#define LILV_API - - #if defined(__GNUC__) && \ - (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)) diff --git a/sources/libs/lilv-static/debian/patches/03_fix-static-build.patch b/sources/libs/lilv-static/debian/patches/03_fix-static-build.patch deleted file mode 100644 index c23f6d2..0000000 --- a/sources/libs/lilv-static/debian/patches/03_fix-static-build.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/wscript b/wscript -index f6780d0..fa513a4 100644 ---- a/wscript -+++ b/wscript -@@ -300,9 +300,10 @@ def build_util(bld, name, defines, libs=''): - install_path = '${BINDIR}') - if not bld.env.BUILD_SHARED or bld.env.STATIC_PROGS: - obj.use = 'liblilv_static' -+ obj.lib = ['dl'] - if bld.env.STATIC_PROGS: - if not bld.env.MSVC_COMPILER: -- obj.lib = ['m'] -+ obj.lib = ['dl', 'm'] - obj.env.SHLIB_MARKER = obj.env.STLIB_MARKER - obj.linkflags = ['-static', '-Wl,--start-group'] - return obj -@@ -543,7 +544,7 @@ def build(bld): - not bld.env.STATIC_PROGS): - obj = build_util(bld, 'utils/lv2bench', defines) - if bld.env.DEST_OS != 'darwin': -- obj.lib = ['rt'] -+ obj.lib = ['dl', 'rt'] - - # Documentation - if bld.env.DOCS: diff --git a/sources/libs/lilv-static/debian/patches/04_force-libs.patch b/sources/libs/lilv-static/debian/patches/04_force-libs.patch deleted file mode 100644 index 6a22e2e..0000000 --- a/sources/libs/lilv-static/debian/patches/04_force-libs.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- lilv-static-0.18.0.orig/lilv.pc.in -+++ lilv-static-0.18.0/lilv.pc.in -@@ -7,5 +7,5 @@ Name: Lilv - Version: @LILV_VERSION@ - Description: Simple C library for hosting LV2 plugins - Requires: @LILV_PKG_DEPS@ --Libs: -L${libdir} -l@LIB_LILV@ @LILV_PKG_LIBS@ -+Libs: -L${libdir} -l@LIB_LILV@ @LILV_PKG_LIBS@ -lsratom-0 -lsord-0 -lserd-0 -lm -ldl - Cflags: -I${includedir}/lilv-@LILV_MAJOR_VERSION@ diff --git a/sources/libs/lilv-static/debian/patches/series b/sources/libs/lilv-static/debian/patches/series index e3105fb..2ad36db 100644 --- a/sources/libs/lilv-static/debian/patches/series +++ b/sources/libs/lilv-static/debian/patches/series @@ -1,4 +1 @@ -01_dont-run-ldconfig.patch -02_hidden-lilv-api.patch -03_fix-static-build.patch -04_force-libs.patch +01_hidden-lilv-api.patch diff --git a/sources/libs/lilv-static/debian/rules b/sources/libs/lilv-static/debian/rules index 0b05365..6d20355 100755 --- a/sources/libs/lilv-static/debian/rules +++ b/sources/libs/lilv-static/debian/rules @@ -3,30 +3,12 @@ KXSTUDIO_NO_FASTMATH = y include /usr/share/dpkg/kxstudio.mk -WAF = python3 ./waf - override_dh_auto_configure: - $(WAF) configure \ - --static \ - --no-shared \ - --no-bindings \ - --prefix=/opt/kxstudio \ - --default-lv2-path='~/.lv2:/usr/lib/$(DEB_HOST_MULTIARCH)/lv2:/usr/lib/lv2:/usr/local/lib/lv2' \ - --mandir=/usr/share/man \ - --strict \ - --test - -override_dh_auto_build: - $(WAF) - -override_dh_auto_clean: - $(WAF) clean || true - -override_dh_auto_install: - $(WAF) install --destdir=$(CURDIR)/debian/tmp - -override_dh_auto_test: - $(WAF) test + dh_auto_configure -- --prefix=/opt/kxstudio --libdir=lib --mandir=/usr/share/man --sysconfdir=/etc \ + -Ddefault_library=static \ + -Dbindings_py=disabled \ + -Ddefault_lv2_path='~/.lv2:/usr/lib/$(DEB_HOST_MULTIARCH)/lv2:/usr/lib/lv2:/usr/local/lib/lv2' \ + -Ddocs=disabled %: dh $@ diff --git a/sources/libs/serd-static/debian/changelog b/sources/libs/serd-static/debian/changelog index 9ccefea..6240166 100644 --- a/sources/libs/serd-static/debian/changelog +++ b/sources/libs/serd-static/debian/changelog @@ -1,3 +1,9 @@ +serd-static (6:0.32.4-1kxstudio1) focal; urgency=medium + + * Update + + -- falkTX Sun, 08 Jun 2025 13:31:00 +0200 + serd-static (6:0.30.12-1kxstudio1) focal; urgency=medium * Update diff --git a/sources/libs/serd-static/debian/clean b/sources/libs/serd-static/debian/clean index 72de718..0748206 100644 --- a/sources/libs/serd-static/debian/clean +++ b/sources/libs/serd-static/debian/clean @@ -1,13 +1 @@ -.lock-waf_linux_build -.lock-waf_linux2_build -build/.lock-waf_linux_build -build/.lock-waf_linux2_build -build/.wafpickle-* -build/c4che/_cache.py -build/c4che/build.config.py -build/config.log -__pycache__/*.pyc -waflib/*.pyc -waflib/*/*.pyc -waflib/__pycache__/*.pyc -waflib/*/__pycache__/*.pyc +test/serd_test_util/__pycache__/* diff --git a/sources/libs/serd-static/debian/control b/sources/libs/serd-static/debian/control index 7c4d353..adf2d7e 100644 --- a/sources/libs/serd-static/debian/control +++ b/sources/libs/serd-static/debian/control @@ -4,7 +4,8 @@ Priority: optional Maintainer: falkTX Build-Depends: debhelper-compat (= 13), kxstudio-build-scripts (>= 5), - python3 + python3, + libzix-static (>= 6:0.6.2-1kxstudio1) Standards-Version: 4.5.0 Homepage: http://drobilla.net/software/serd/ Rules-Requires-Root: no diff --git a/sources/libs/serd-static/debian/patches/01_dont-run-ldconfig.patch b/sources/libs/serd-static/debian/patches/01_dont-run-ldconfig.patch deleted file mode 100644 index 06a2450..0000000 --- a/sources/libs/serd-static/debian/patches/01_dont-run-ldconfig.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/wscript b/wscript -index 088ea0b..819c7d1 100644 ---- a/wscript -+++ b/wscript -@@ -173,8 +173,6 @@ def build(bld): - # Man page - bld.install_files('${MANDIR}/man1', 'doc/serdi.1') - -- bld.add_post_fun(autowaf.run_ldconfig) -- - - class LintContext(Build.BuildContext): - fun = cmd = 'lint' diff --git a/sources/libs/serd-static/debian/patches/01_hidden-serd-api.patch b/sources/libs/serd-static/debian/patches/01_hidden-serd-api.patch new file mode 100644 index 0000000..fd2a2b4 --- /dev/null +++ b/sources/libs/serd-static/debian/patches/01_hidden-serd-api.patch @@ -0,0 +1,24 @@ +diff --git a/include/serd/serd.h b/include/serd/serd.h +index 2e7a13e..fb99b48 100644 +--- a/include/serd/serd.h ++++ b/include/serd/serd.h +@@ -12,18 +12,7 @@ + #include + #include + +-// SERD_API must be used to decorate things in the public API +-#ifndef SERD_API +-# if defined(_WIN32) && !defined(SERD_STATIC) && defined(SERD_INTERNAL) +-# define SERD_API __declspec(dllexport) +-# elif defined(_WIN32) && !defined(SERD_STATIC) +-# define SERD_API __declspec(dllimport) +-# elif defined(__GNUC__) +-# define SERD_API __attribute__((visibility("default"))) +-# else +-# define SERD_API +-# endif +-#endif ++#define SERD_API + + #ifdef __GNUC__ + # define SERD_PURE_FUNC __attribute__((pure)) diff --git a/sources/libs/serd-static/debian/patches/02_hidden-serd-api.patch b/sources/libs/serd-static/debian/patches/02_hidden-serd-api.patch deleted file mode 100644 index 4be992f..0000000 --- a/sources/libs/serd-static/debian/patches/02_hidden-serd-api.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/include/serd/serd.h b/include/serd/serd.h -index e550541..c2ee87d 100644 ---- a/include/serd/serd.h -+++ b/include/serd/serd.h -@@ -25,15 +25,7 @@ - #include - #include - --#if defined(_WIN32) && !defined(SERD_STATIC) && defined(SERD_INTERNAL) --# define SERD_API __declspec(dllexport) --#elif defined(_WIN32) && !defined(SERD_STATIC) --# define SERD_API __declspec(dllimport) --#elif defined(__GNUC__) --# define SERD_API __attribute__((visibility("default"))) --#else --# define SERD_API --#endif -+#define SERD_API - - #ifdef __GNUC__ - # define SERD_PURE_FUNC __attribute__((pure)) diff --git a/sources/libs/serd-static/debian/patches/03_force-libs.patch b/sources/libs/serd-static/debian/patches/03_force-libs.patch deleted file mode 100644 index 81e439c..0000000 --- a/sources/libs/serd-static/debian/patches/03_force-libs.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- serd-0.18.2.orig/serd.pc.in -+++ serd-0.18.2/serd.pc.in -@@ -6,6 +6,6 @@ includedir=@INCLUDEDIR@ - Name: Serd - Version: @SERD_VERSION@ - Description: Lightweight RDF syntax library --Libs: -L${libdir} -l@LIB_SERD@ -+Libs: -L${libdir} -l@LIB_SERD@ -lm - Libs.private: -lm - Cflags: -I${includedir}/serd-@SERD_MAJOR_VERSION@ diff --git a/sources/libs/serd-static/debian/patches/series b/sources/libs/serd-static/debian/patches/series index 2421932..9a99645 100644 --- a/sources/libs/serd-static/debian/patches/series +++ b/sources/libs/serd-static/debian/patches/series @@ -1,3 +1 @@ -01_dont-run-ldconfig.patch -02_hidden-serd-api.patch -03_force-libs.patch +01_hidden-serd-api.patch diff --git a/sources/libs/serd-static/debian/rules b/sources/libs/serd-static/debian/rules index c88a920..20a545f 100755 --- a/sources/libs/serd-static/debian/rules +++ b/sources/libs/serd-static/debian/rules @@ -3,27 +3,8 @@ KXSTUDIO_NO_FASTMATH = y include /usr/share/dpkg/kxstudio.mk -WAF = python3 ./waf - override_dh_auto_configure: - $(WAF) configure \ - --static \ - --no-shared \ - --prefix=/opt/kxstudio \ - --strict \ - --test - -override_dh_auto_build: - $(WAF) - -override_dh_auto_clean: - $(WAF) clean || true - -override_dh_auto_install: - $(WAF) install --destdir=$(CURDIR)/debian/tmp - -override_dh_auto_test: - $(WAF) test + dh_auto_configure -- --prefix=/opt/kxstudio --libdir lib -Ddefault_library=static -Ddocs=disabled %: dh $@ diff --git a/sources/libs/sord-static/debian/changelog b/sources/libs/sord-static/debian/changelog index 75b2394..69e1bb0 100644 --- a/sources/libs/sord-static/debian/changelog +++ b/sources/libs/sord-static/debian/changelog @@ -1,3 +1,9 @@ +sord-static (6:0.16.18-1kxstudio1) focal; urgency=medium + + * Update + + -- falkTX Sun, 08 Jun 2025 13:36:54 +0200 + sord-static (6:0.16.10-1kxstudio1) focal; urgency=medium * Update diff --git a/sources/libs/sord-static/debian/clean b/sources/libs/sord-static/debian/clean deleted file mode 100644 index 72de718..0000000 --- a/sources/libs/sord-static/debian/clean +++ /dev/null @@ -1,13 +0,0 @@ -.lock-waf_linux_build -.lock-waf_linux2_build -build/.lock-waf_linux_build -build/.lock-waf_linux2_build -build/.wafpickle-* -build/c4che/_cache.py -build/c4che/build.config.py -build/config.log -__pycache__/*.pyc -waflib/*.pyc -waflib/*/*.pyc -waflib/__pycache__/*.pyc -waflib/*/__pycache__/*.pyc diff --git a/sources/libs/sord-static/debian/control b/sources/libs/sord-static/debian/control index ce8663d..4fafcad 100644 --- a/sources/libs/sord-static/debian/control +++ b/sources/libs/sord-static/debian/control @@ -7,7 +7,7 @@ Build-Depends: debhelper-compat (= 13), python3, pkg-config, libpcre3-static (>= 6:8.39-1kxstudio2), - libserd-static (>= 6:0.30.12-1kxstudio1) + libserd-static (>= 6:0.32.4-1kxstudio1) Standards-Version: 4.5.0 Homepage: http://drobilla.net/software/sord/ Rules-Requires-Root: no diff --git a/sources/libs/sord-static/debian/patches/01_dont-run-ldconfig.patch b/sources/libs/sord-static/debian/patches/01_dont-run-ldconfig.patch deleted file mode 100644 index 45b67d7..0000000 --- a/sources/libs/sord-static/debian/patches/01_dont-run-ldconfig.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/wscript b/wscript -index 4e8ebde..41e784c 100644 ---- a/wscript -+++ b/wscript -@@ -231,7 +231,6 @@ def build(bld): - # Man pages - bld.install_files('${MANDIR}/man1', bld.path.ant_glob('doc/*.1')) - -- bld.add_post_fun(autowaf.run_ldconfig) - - def lint(ctx): - "checks code for style issues" diff --git a/sources/libs/sord-static/debian/patches/01_hidden-sord-api.patch b/sources/libs/sord-static/debian/patches/01_hidden-sord-api.patch new file mode 100644 index 0000000..89936b5 --- /dev/null +++ b/sources/libs/sord-static/debian/patches/01_hidden-sord-api.patch @@ -0,0 +1,24 @@ +diff --git a/include/sord/sord.h b/include/sord/sord.h +index 93f9c07..3e37b0d 100644 +--- a/include/sord/sord.h ++++ b/include/sord/sord.h +@@ -14,18 +14,7 @@ + #include + #include + +-// SORD_API must be used to decorate things in the public API +-#ifndef SORD_API +-# if defined(_WIN32) && !defined(SORD_STATIC) && defined(SORD_INTERNAL) +-# define SORD_API __declspec(dllexport) +-# elif defined(_WIN32) && !defined(SORD_STATIC) +-# define SORD_API __declspec(dllimport) +-# elif defined(__GNUC__) +-# define SORD_API __attribute__((visibility("default"))) +-# else +-# define SORD_API +-# endif +-#endif ++#define SORD_API + + #ifdef __cplusplus + extern "C" { diff --git a/sources/libs/sord-static/debian/patches/02_hidden-sord-api.patch b/sources/libs/sord-static/debian/patches/02_hidden-sord-api.patch deleted file mode 100644 index ddd97a0..0000000 --- a/sources/libs/sord-static/debian/patches/02_hidden-sord-api.patch +++ /dev/null @@ -1,21 +0,0 @@ -Index: sord-static/include/sord/sord.h -=================================================================== ---- sord-static.orig/include/sord/sord.h -+++ sord-static/include/sord/sord.h -@@ -27,15 +27,7 @@ - #include - #include - --#if defined(_WIN32) && !defined(SORD_STATIC) && defined(SORD_INTERNAL) --# define SORD_API __declspec(dllexport) --#elif defined(_WIN32) && !defined(SORD_STATIC) --# define SORD_API __declspec(dllimport) --#elif defined(__GNUC__) --# define SORD_API __attribute__((visibility("default"))) --#else --# define SORD_API --#endif -+#define SORD_API - - #ifdef __cplusplus - extern "C" { diff --git a/sources/libs/sord-static/debian/patches/03_force-libs.patch b/sources/libs/sord-static/debian/patches/03_force-libs.patch deleted file mode 100644 index 58b9f9b..0000000 --- a/sources/libs/sord-static/debian/patches/03_force-libs.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- sord-static-0.12.0.orig/sord.pc.in -+++ sord-static-0.12.0/sord.pc.in -@@ -7,5 +7,5 @@ Name: Sord - Version: @SORD_VERSION@ - Description: A lightweight C library for storing RDF statements in memory. - Requires: @SORD_PKG_DEPS@ --Libs: -L${libdir} -l@LIB_SORD@ -+Libs: -L${libdir} -l@LIB_SORD@ -lserd-0 -lm - Cflags: -I${includedir}/sord-@SORD_MAJOR_VERSION@ diff --git a/sources/libs/sord-static/debian/patches/series b/sources/libs/sord-static/debian/patches/series index 2d75f3d..b1da26d 100644 --- a/sources/libs/sord-static/debian/patches/series +++ b/sources/libs/sord-static/debian/patches/series @@ -1,3 +1 @@ -01_dont-run-ldconfig.patch -02_hidden-sord-api.patch -03_force-libs.patch +01_hidden-sord-api.patch diff --git a/sources/libs/sord-static/debian/rules b/sources/libs/sord-static/debian/rules index c88a920..20a545f 100755 --- a/sources/libs/sord-static/debian/rules +++ b/sources/libs/sord-static/debian/rules @@ -3,27 +3,8 @@ KXSTUDIO_NO_FASTMATH = y include /usr/share/dpkg/kxstudio.mk -WAF = python3 ./waf - override_dh_auto_configure: - $(WAF) configure \ - --static \ - --no-shared \ - --prefix=/opt/kxstudio \ - --strict \ - --test - -override_dh_auto_build: - $(WAF) - -override_dh_auto_clean: - $(WAF) clean || true - -override_dh_auto_install: - $(WAF) install --destdir=$(CURDIR)/debian/tmp - -override_dh_auto_test: - $(WAF) test + dh_auto_configure -- --prefix=/opt/kxstudio --libdir lib -Ddefault_library=static -Ddocs=disabled %: dh $@ diff --git a/sources/libs/sratom-static/debian/changelog b/sources/libs/sratom-static/debian/changelog index d8d20bc..98d1601 100644 --- a/sources/libs/sratom-static/debian/changelog +++ b/sources/libs/sratom-static/debian/changelog @@ -1,3 +1,9 @@ +sratom-static (6:0.6.18-1kxstudio1) focal; urgency=medium + + * Update + + -- falkTX Sun, 08 Jun 2025 13:43:13 +0200 + sratom-static (6:0.6.10-1kxstudio1) focal; urgency=medium * Update diff --git a/sources/libs/sratom-static/debian/clean b/sources/libs/sratom-static/debian/clean deleted file mode 100644 index 72de718..0000000 --- a/sources/libs/sratom-static/debian/clean +++ /dev/null @@ -1,13 +0,0 @@ -.lock-waf_linux_build -.lock-waf_linux2_build -build/.lock-waf_linux_build -build/.lock-waf_linux2_build -build/.wafpickle-* -build/c4che/_cache.py -build/c4che/build.config.py -build/config.log -__pycache__/*.pyc -waflib/*.pyc -waflib/*/*.pyc -waflib/__pycache__/*.pyc -waflib/*/__pycache__/*.pyc diff --git a/sources/libs/sratom-static/debian/control b/sources/libs/sratom-static/debian/control index 32bdb45..f351f53 100644 --- a/sources/libs/sratom-static/debian/control +++ b/sources/libs/sratom-static/debian/control @@ -6,10 +6,9 @@ Build-Depends: debhelper-compat (= 13), kxstudio-build-scripts (>= 5), python3, pkg-config, - libsord-static (>= 6:0.16.10-1kxstudio1), + libsord-static (>= 6:0.16.18-1kxstudio1), lv2-dev (>= 6:1.18.4-1kxstudio1) Standards-Version: 4.5.0 -Homepage: http://drobilla.net/software/sratom/ Rules-Requires-Root: no Package: libsratom-static diff --git a/sources/libs/sratom-static/debian/libsratom-static.install b/sources/libs/sratom-static/debian/libsratom-static.install deleted file mode 100644 index d426c92..0000000 --- a/sources/libs/sratom-static/debian/libsratom-static.install +++ /dev/null @@ -1,2 +0,0 @@ -/opt/kxstudio/include -/opt/kxstudio/lib diff --git a/sources/libs/sratom-static/debian/patches/01_dont-run-ldconfig.patch b/sources/libs/sratom-static/debian/patches/01_dont-run-ldconfig.patch deleted file mode 100644 index bfc0ed9..0000000 --- a/sources/libs/sratom-static/debian/patches/01_dont-run-ldconfig.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/wscript b/wscript -index 4e8ebde..41e784c 100644 ---- a/wscript -+++ b/wscript -@@ -231,7 +231,6 @@ def build(bld): - if bld.env.DOCS: - bld.recurse('doc/c') - -- bld.add_post_fun(autowaf.run_ldconfig) - - - def test(tst): diff --git a/sources/libs/sratom-static/debian/patches/02_hidden-sratom-api.patch b/sources/libs/sratom-static/debian/patches/01_hidden-sratom-api.patch similarity index 100% rename from sources/libs/sratom-static/debian/patches/02_hidden-sratom-api.patch rename to sources/libs/sratom-static/debian/patches/01_hidden-sratom-api.patch diff --git a/sources/libs/sratom-static/debian/patches/03_fix-libs.patch b/sources/libs/sratom-static/debian/patches/03_fix-libs.patch deleted file mode 100644 index 57bde11..0000000 --- a/sources/libs/sratom-static/debian/patches/03_fix-libs.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- sratom-static-0.4.4.orig/sratom.pc.in -+++ sratom-static-0.4.4/sratom.pc.in -@@ -7,5 +7,5 @@ Name: Sratom - Version: @SRATOM_VERSION@ - Description: LV2 Atom RDF serialisation library - Requires: @SRATOM_PKG_DEPS@ --Libs: -L${libdir} -l@LIB_SRATOM@ -+Libs: -L${libdir} -l@LIB_SRATOM@ -lsord-0 -lserd-0 -lm - Cflags: -I${includedir}/sratom-@SRATOM_MAJOR_VERSION@ diff --git a/sources/libs/sratom-static/debian/patches/series b/sources/libs/sratom-static/debian/patches/series index 24885ac..71d993a 100644 --- a/sources/libs/sratom-static/debian/patches/series +++ b/sources/libs/sratom-static/debian/patches/series @@ -1,3 +1 @@ -01_dont-run-ldconfig.patch -02_hidden-sratom-api.patch -03_fix-libs.patch +01_hidden-sratom-api.patch diff --git a/sources/libs/sratom-static/debian/rules b/sources/libs/sratom-static/debian/rules index c88a920..20a545f 100755 --- a/sources/libs/sratom-static/debian/rules +++ b/sources/libs/sratom-static/debian/rules @@ -3,27 +3,8 @@ KXSTUDIO_NO_FASTMATH = y include /usr/share/dpkg/kxstudio.mk -WAF = python3 ./waf - override_dh_auto_configure: - $(WAF) configure \ - --static \ - --no-shared \ - --prefix=/opt/kxstudio \ - --strict \ - --test - -override_dh_auto_build: - $(WAF) - -override_dh_auto_clean: - $(WAF) clean || true - -override_dh_auto_install: - $(WAF) install --destdir=$(CURDIR)/debian/tmp - -override_dh_auto_test: - $(WAF) test + dh_auto_configure -- --prefix=/opt/kxstudio --libdir lib -Ddefault_library=static -Ddocs=disabled %: dh $@ diff --git a/sources/libs/zix-static/debian/changelog b/sources/libs/zix-static/debian/changelog new file mode 100644 index 0000000..8bd4ac4 --- /dev/null +++ b/sources/libs/zix-static/debian/changelog @@ -0,0 +1,5 @@ +zix-static (6:0.6.2-1kxstudio1) focal; urgency=medium + + * Initial package + + -- falkTX Sun, 17 Apr 2022 15:05:47 +0100 diff --git a/sources/libs/zix-static/debian/control b/sources/libs/zix-static/debian/control new file mode 100644 index 0000000..a3ee810 --- /dev/null +++ b/sources/libs/zix-static/debian/control @@ -0,0 +1,18 @@ +Source: zix-static +Section: devel +Priority: optional +Maintainer: falkTX +Build-Depends: debhelper-compat (= 13), + kxstudio-build-scripts (>= 5), + meson +Standards-Version: 4.5.0 +Rules-Requires-Root: no + +Package: libzix-static +Architecture: any +Depends: ${misc:Depends} +Description: lightweight RDF syntax library (static) + Serd is a lightweight C library for RDF syntax which supports reading + and writing Turtle and NTriples. + . + This package provides the static library used in KXStudio builds. diff --git a/sources/libs/zix-static/debian/patches/01_hidden-zix-api.patch b/sources/libs/zix-static/debian/patches/01_hidden-zix-api.patch new file mode 100644 index 0000000..e403635 --- /dev/null +++ b/sources/libs/zix-static/debian/patches/01_hidden-zix-api.patch @@ -0,0 +1,24 @@ +diff --git a/include/zix/attributes.h b/include/zix/attributes.h +index 518e5fb..c3a5633 100644 +--- a/include/zix/attributes.h ++++ b/include/zix/attributes.h +@@ -19,18 +19,7 @@ + # define ZIX_END_DECLS ///< End public API definitions + #endif + +-// ZIX_API must be used to decorate things in the public API +-#ifndef ZIX_API +-# if defined(_WIN32) && !defined(ZIX_STATIC) && defined(ZIX_INTERNAL) +-# define ZIX_API __declspec(dllexport) +-# elif defined(_WIN32) && !defined(ZIX_STATIC) +-# define ZIX_API __declspec(dllimport) +-# elif defined(__GNUC__) +-# define ZIX_API __attribute__((visibility("default"))) +-# else +-# define ZIX_API +-# endif +-#endif ++#define ZIX_API + + // GCC function attributes + #ifdef __GNUC__ diff --git a/sources/libs/zix-static/debian/patches/series b/sources/libs/zix-static/debian/patches/series new file mode 100644 index 0000000..cbf75cd --- /dev/null +++ b/sources/libs/zix-static/debian/patches/series @@ -0,0 +1 @@ +01_hidden-zix-api.patch diff --git a/sources/libs/zix-static/debian/rules b/sources/libs/zix-static/debian/rules new file mode 100755 index 0000000..1d71198 --- /dev/null +++ b/sources/libs/zix-static/debian/rules @@ -0,0 +1,10 @@ +#!/usr/bin/make -f + +KXSTUDIO_NO_FASTMATH = y +include /usr/share/dpkg/kxstudio.mk + +override_dh_auto_configure: + dh_auto_configure -- --prefix=/opt/kxstudio --libdir lib -Dbenchmarks=disabled -Ddefault_library=static -Ddocs=disabled + +%: + dh $@ diff --git a/sources/libs/zix-static/debian/source/format b/sources/libs/zix-static/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/sources/libs/zix-static/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt)