From 1046dcdad8f205965c43dfbb54a1a974e5fe3fab Mon Sep 17 00:00:00 2001 From: Anthony Thompson Date: Sun, 25 Sep 2022 19:47:39 +1000 Subject: [PATCH 01/30] yabridge initial template --- srcpkgs/yabridge/template | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 srcpkgs/yabridge/template diff --git a/srcpkgs/yabridge/template b/srcpkgs/yabridge/template new file mode 100644 index 000000000000..d4dafa03c5ae --- /dev/null +++ b/srcpkgs/yabridge/template @@ -0,0 +1,23 @@ +# Template file for 'yabridge' +pkgname=yabridge +version=4.0.2 +revision=1 +#archs="x86_64" +#wrksrc= +#create_wrksrc=yes +build_style=meson +#configure_args="" +#make_build_args="" +#make_install_args="" +#conf_files="" +#make_dirs="/var/log/dir 0755 root root" +hostmakedepends="" +makedepends="" +depends="wine wine-32bit" +short_desc="Run Windows 32bit and 64bit VST2 and VST3 plugins in Linux 64bit host" +maintainer="Anthony Thompson " +license="GPL-3.0-or-later" +homepage="https://github.com/robbert-vdh/yabridge" +#changelog="" +distfiles="https://github.com/robbert-vdh/yabridge/archive/refs/tags/4.0.2.tar.gz" +checksum=badbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadb From b15e9c3678d78edfb5f1210c50b6514158b77af4 Mon Sep 17 00:00:00 2001 From: Anthony Thompson Date: Sun, 25 Sep 2022 20:03:59 +1000 Subject: [PATCH 02/30] template file added --- srcpkgs/yabridge/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/yabridge/template b/srcpkgs/yabridge/template index d4dafa03c5ae..3bdf33b8b891 100644 --- a/srcpkgs/yabridge/template +++ b/srcpkgs/yabridge/template @@ -20,4 +20,4 @@ license="GPL-3.0-or-later" homepage="https://github.com/robbert-vdh/yabridge" #changelog="" distfiles="https://github.com/robbert-vdh/yabridge/archive/refs/tags/4.0.2.tar.gz" -checksum=badbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadb +checksum= From ae6ca20c9f650133c47837b62e10eff6006ea938 Mon Sep 17 00:00:00 2001 From: Anthony Thompson Date: Sun, 25 Sep 2022 20:32:06 +1000 Subject: [PATCH 03/30] checksum added --- srcpkgs/yabridge/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/yabridge/template b/srcpkgs/yabridge/template index 3bdf33b8b891..2d342cbbfbd7 100644 --- a/srcpkgs/yabridge/template +++ b/srcpkgs/yabridge/template @@ -20,4 +20,4 @@ license="GPL-3.0-or-later" homepage="https://github.com/robbert-vdh/yabridge" #changelog="" distfiles="https://github.com/robbert-vdh/yabridge/archive/refs/tags/4.0.2.tar.gz" -checksum= +checksum=86fcd65b6f3dd5cf60c2afa476f63959a2cc4ef4d4629810916739d7af645f01 From 41d8f0798ae9b6e8439a09eba0a927be47c355b6 Mon Sep 17 00:00:00 2001 From: Anthony Thompson Date: Sun, 25 Sep 2022 21:42:16 +1000 Subject: [PATCH 04/30] cleanup after xlint --- etc/defaults.conf | 2 +- srcpkgs/yabridge/template | 18 ++++++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/etc/defaults.conf b/etc/defaults.conf index d69b4a454087..bfbfc4f48e5e 100644 --- a/etc/defaults.conf +++ b/etc/defaults.conf @@ -66,7 +66,7 @@ XBPS_SUCMD="sudo /bin/sh -c" # Number of parallel jobs to execute when building packages that # use make(1) or alike commands. # -#XBPS_MAKEJOBS=4 +XBPS_MAKEJOBS=7 # [OPTIONAL] # Enable recording git revisions in final binary packages; enable this diff --git a/srcpkgs/yabridge/template b/srcpkgs/yabridge/template index 2d342cbbfbd7..a04bfbc71a12 100644 --- a/srcpkgs/yabridge/template +++ b/srcpkgs/yabridge/template @@ -2,7 +2,7 @@ pkgname=yabridge version=4.0.2 revision=1 -#archs="x86_64" +archs="x86_64" #wrksrc= #create_wrksrc=yes build_style=meson @@ -11,13 +11,19 @@ build_style=meson #make_install_args="" #conf_files="" #make_dirs="/var/log/dir 0755 root root" -hostmakedepends="" -makedepends="" -depends="wine wine-32bit" +hostmakedepends="ninja" +makedepends="wine-tools" +depends="wine" short_desc="Run Windows 32bit and 64bit VST2 and VST3 plugins in Linux 64bit host" -maintainer="Anthony Thompson " +maintainer="Anthony Thompson " license="GPL-3.0-or-later" homepage="https://github.com/robbert-vdh/yabridge" #changelog="" -distfiles="https://github.com/robbert-vdh/yabridge/archive/refs/tags/4.0.2.tar.gz" +distfiles="https://github.com/robbert-vdh/yabridge/archive/refs/tags/${version}.tar.gz" checksum=86fcd65b6f3dd5cf60c2afa476f63959a2cc4ef4d4629810916739d7af645f01 +do_configure() { + # configures yabridge to use 32bit bitbridge for compatibility with 32bit VST's on 64bit host. + # without -Dbitbridge only 64bit VST files will work + echo "Working Source dir = " +# meson setup build --buildtype=release --cross-file cross-wine.conf --unity=on --unity-size=1000 -Dbitbridge=true +} From d1773916afd95f7560155359e5a7344ac4a5c3a2 Mon Sep 17 00:00:00 2001 From: Anthony Thompson Date: Sun, 25 Sep 2022 14:14:55 +1000 Subject: [PATCH 05/30] make depends added --- srcpkgs/yabridge/template | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/srcpkgs/yabridge/template b/srcpkgs/yabridge/template index a04bfbc71a12..268a0eeadec8 100644 --- a/srcpkgs/yabridge/template +++ b/srcpkgs/yabridge/template @@ -3,27 +3,20 @@ pkgname=yabridge version=4.0.2 revision=1 archs="x86_64" -#wrksrc= -#create_wrksrc=yes build_style=meson -#configure_args="" -#make_build_args="" -#make_install_args="" -#conf_files="" -#make_dirs="/var/log/dir 0755 root root" hostmakedepends="ninja" -makedepends="wine-tools" -depends="wine" +#makedepends="" +#depends="wine" short_desc="Run Windows 32bit and 64bit VST2 and VST3 plugins in Linux 64bit host" maintainer="Anthony Thompson " license="GPL-3.0-or-later" homepage="https://github.com/robbert-vdh/yabridge" -#changelog="" distfiles="https://github.com/robbert-vdh/yabridge/archive/refs/tags/${version}.tar.gz" checksum=86fcd65b6f3dd5cf60c2afa476f63959a2cc4ef4d4629810916739d7af645f01 + + do_configure() { - # configures yabridge to use 32bit bitbridge for compatibility with 32bit VST's on 64bit host. - # without -Dbitbridge only 64bit VST files will work - echo "Working Source dir = " -# meson setup build --buildtype=release --cross-file cross-wine.conf --unity=on --unity-size=1000 -Dbitbridge=true + echo "do configure" ${pkgname} ${wrksrc} + cd ${wrksrc} + meson setup build --buildtype=release --cross-file=cross-wine.conf --unity=on --unity-size=1000 -Dbitbridge=true } From 4a1c8140b7f5b6ced32ce7988b52ba084e9caf57 Mon Sep 17 00:00:00 2001 From: Anthony Thompson Date: Sun, 25 Sep 2022 14:15:32 +1000 Subject: [PATCH 06/30] make depends added --- srcpkgs/yabridge/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/yabridge/template b/srcpkgs/yabridge/template index 268a0eeadec8..a1b0b0c51acd 100644 --- a/srcpkgs/yabridge/template +++ b/srcpkgs/yabridge/template @@ -4,8 +4,9 @@ version=4.0.2 revision=1 archs="x86_64" build_style=meson +configure_args="" hostmakedepends="ninja" -#makedepends="" +makedepends="wine wine-32bit pkg-config cmake wine-tools wine-devel wine-devel-32bit libxcb libxcb-32bit" #depends="wine" short_desc="Run Windows 32bit and 64bit VST2 and VST3 plugins in Linux 64bit host" maintainer="Anthony Thompson " From de6918c8786d367bd51ea12426b8967437dd7b81 Mon Sep 17 00:00:00 2001 From: Anthony Thompson Date: Sun, 25 Sep 2022 14:37:53 +1000 Subject: [PATCH 07/30] build template working --- srcpkgs/yabridgectl/template | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 srcpkgs/yabridgectl/template diff --git a/srcpkgs/yabridgectl/template b/srcpkgs/yabridgectl/template new file mode 100644 index 000000000000..e682d1373530 --- /dev/null +++ b/srcpkgs/yabridgectl/template @@ -0,0 +1,23 @@ +# Template file for 'yabridgectl' +pkgname=yabridgectl +version=4.0.2 +revision=1 +archs="x86_64" +wrksrc="yabridge-4.0.2/tools/yabridgectl" +#create_wrksrc=yes +build_style=cargo +#configure_args="" +#make_build_args="" +#make_install_args="" +#conf_files="" +#make_dirs="/var/log/dir 0755 root root" +hostmakedepends="" +makedepends="" +depends="" +short_desc="Yabridgectl oontrols yabridge configurations" +maintainer="Anthony Thompson " +license="GPL-3.0-or-later" +homepage="https://github.com/robbert-vdh/yabridge" +#changelog="" +distfiles="https://github.com/robbert-vdh/yabridge/archive/refs/tags/${version}.tar.gz" +checksum=86fcd65b6f3dd5cf60c2afa476f63959a2cc4ef4d4629810916739d7af645f01 From f7ae4d401668b2b621a07518927aa4c3e3ad96d9 Mon Sep 17 00:00:00 2001 From: Anthony Thompson Date: Sun, 25 Sep 2022 20:25:54 +1000 Subject: [PATCH 08/30] ignore file added --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 958f644eee94..05dde1831f6f 100644 --- a/.gitignore +++ b/.gitignore @@ -10,5 +10,6 @@ hostdir*/ etc/conf etc/conf.* etc/virtual +**/etc etc/xbps.d/custom .xbps-checkvers*.plist From 9fb9311cc27304f9b84f2d2586d812d2bfd49cc0 Mon Sep 17 00:00:00 2001 From: Anthony Thompson Date: Mon, 26 Sep 2022 14:44:16 +1000 Subject: [PATCH 09/30] package created and working --- etc/defaults.conf | 2 +- srcpkgs/yabridge/template | 26 +++++++++++++++++++++----- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/etc/defaults.conf b/etc/defaults.conf index bfbfc4f48e5e..e8e0ee2b630d 100644 --- a/etc/defaults.conf +++ b/etc/defaults.conf @@ -66,7 +66,7 @@ XBPS_SUCMD="sudo /bin/sh -c" # Number of parallel jobs to execute when building packages that # use make(1) or alike commands. # -XBPS_MAKEJOBS=7 +#XBPS_MAKEJOBS=7 # [OPTIONAL] # Enable recording git revisions in final binary packages; enable this diff --git a/srcpkgs/yabridge/template b/srcpkgs/yabridge/template index a1b0b0c51acd..36e7a99d828a 100644 --- a/srcpkgs/yabridge/template +++ b/srcpkgs/yabridge/template @@ -4,10 +4,8 @@ version=4.0.2 revision=1 archs="x86_64" build_style=meson -configure_args="" -hostmakedepends="ninja" -makedepends="wine wine-32bit pkg-config cmake wine-tools wine-devel wine-devel-32bit libxcb libxcb-32bit" -#depends="wine" +hostmakedepends="ninja pkg-config cmake grep git gcc-multilib" +makedepends="wine-tools wine-devel wine-devel-32bit libxcb-devel libxcb-devel-32bit" short_desc="Run Windows 32bit and 64bit VST2 and VST3 plugins in Linux 64bit host" maintainer="Anthony Thompson " license="GPL-3.0-or-later" @@ -17,7 +15,25 @@ checksum=86fcd65b6f3dd5cf60c2afa476f63959a2cc4ef4d4629810916739d7af645f01 do_configure() { - echo "do configure" ${pkgname} ${wrksrc} cd ${wrksrc} + export LIBRARY_PATH=/usr/lib32/:$LIBRARY_PATH + echo " LIBRARY PATH = " $LIBRARY_PATH meson setup build --buildtype=release --cross-file=cross-wine.conf --unity=on --unity-size=1000 -Dbitbridge=true } + +do_build() { + ninja -C build/ +} + +do_install() { + cd ${wrksrc}/build + vbin yabridge-host.exe + vbin yabridge-host.exe.so + vbin yabridge-host-32.exe.so + vbin yabridge-host-32.exe + vmkdir usr/lib + vcopy libyabridge-chainloader-vst2.so /usr/lib + vcopy libyabridge-vst2.so /usr/lib + vcopy libyabridge-chainloader-vst3.so /usr/lib + vcopy libyabridge-vst3.so /usr/lib +} From 7cff4c2f24cadc92459cccce608407e46a7bdb56 Mon Sep 17 00:00:00 2001 From: Anthony Thompson Date: Mon, 26 Sep 2022 14:50:06 +1000 Subject: [PATCH 10/30] comments added re: grep --- srcpkgs/yabridge/template | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/srcpkgs/yabridge/template b/srcpkgs/yabridge/template index 36e7a99d828a..536a3c8b2b3d 100644 --- a/srcpkgs/yabridge/template +++ b/srcpkgs/yabridge/template @@ -4,9 +4,12 @@ version=4.0.2 revision=1 archs="x86_64" build_style=meson +## grep added due to void chroot grep being v3.7 which doesnt support +## perl regex. grep package is v3.8 which supports the software maintainers +## scripts. hostmakedepends="ninja pkg-config cmake grep git gcc-multilib" makedepends="wine-tools wine-devel wine-devel-32bit libxcb-devel libxcb-devel-32bit" -short_desc="Run Windows 32bit and 64bit VST2 and VST3 plugins in Linux 64bit host" +short_desc="Use Windows 32bit and 64bit VST2 and VST3 plugins in Linux 64bit host" maintainer="Anthony Thompson " license="GPL-3.0-or-later" homepage="https://github.com/robbert-vdh/yabridge" From 7f1b3ad8a21f30eb63fdae410b7bb8ee95eb0dfa Mon Sep 17 00:00:00 2001 From: Anthony Thompson Date: Mon, 26 Sep 2022 16:53:29 +1000 Subject: [PATCH 11/30] comments added re: xlint --- srcpkgs/yabridgectl/template | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/srcpkgs/yabridgectl/template b/srcpkgs/yabridgectl/template index e682d1373530..c3e3126e66b9 100644 --- a/srcpkgs/yabridgectl/template +++ b/srcpkgs/yabridgectl/template @@ -3,21 +3,14 @@ pkgname=yabridgectl version=4.0.2 revision=1 archs="x86_64" -wrksrc="yabridge-4.0.2/tools/yabridgectl" -#create_wrksrc=yes +## software developer has this package source as part of the yabridge source tree. +## Yabridgectl is several levels down. unable to comply with xlint for top level directory +wrksrc="yabridge-${version}/tools/yabridgectl" build_style=cargo -#configure_args="" -#make_build_args="" -#make_install_args="" -#conf_files="" -#make_dirs="/var/log/dir 0755 root root" -hostmakedepends="" -makedepends="" -depends="" +hostmakedepends="grep" short_desc="Yabridgectl oontrols yabridge configurations" maintainer="Anthony Thompson " license="GPL-3.0-or-later" homepage="https://github.com/robbert-vdh/yabridge" -#changelog="" distfiles="https://github.com/robbert-vdh/yabridge/archive/refs/tags/${version}.tar.gz" -checksum=86fcd65b6f3dd5cf60c2afa476f63959a2cc4ef4d4629810916739d7af645f01 +checksum="86fcd65b6f3dd5cf60c2afa476f63959a2cc4ef4d4629810916739d7af645f01" From 59a9ff2574b4d058e7a9dedba8a18d2e526885de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 25 Sep 2022 09:44:23 +0700 Subject: [PATCH 12/30] sip4: fix memleaks with Python 3.11 --- srcpkgs/sip4/patches/python-3.11.patch | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/srcpkgs/sip4/patches/python-3.11.patch b/srcpkgs/sip4/patches/python-3.11.patch index 6d60a5b239c9..9fdc9acf35fe 100644 --- a/srcpkgs/sip4/patches/python-3.11.patch +++ b/srcpkgs/sip4/patches/python-3.11.patch @@ -1,5 +1,7 @@ ---- a/siplib/sip.h -+++ b/siplib/sip.h +Index: sip-4.19.25/siplib/sip.h +=================================================================== +--- sip-4.19.25.orig/siplib/sip.h ++++ sip-4.19.25/siplib/sip.h @@ -1799,7 +1799,7 @@ typedef struct _sipAPIDef { int (*api_get_time)(PyObject *, sipTimeDef *); PyObject *(*api_from_time)(const sipTimeDef *); @@ -9,8 +11,10 @@ int (*api_check_plugin_for_type)(const sipTypeDef *, const char *); PyObject *(*api_unicode_new)(SIP_SSIZE_T, unsigned, int *, void **); void (*api_unicode_write)(int, void *, int, unsigned); ---- a/siplib/siplib.c -+++ b/siplib/siplib.c +Index: sip-4.19.25/siplib/siplib.c +=================================================================== +--- sip-4.19.25.orig/siplib/siplib.c ++++ sip-4.19.25/siplib/siplib.c @@ -448,7 +448,7 @@ static PyObject *sip_api_from_datetime(c static int sip_api_get_time(PyObject *obj, sipTimeDef *time); static PyObject *sip_api_from_time(const sipTimeDef *time); @@ -20,7 +24,7 @@ static int sip_api_check_plugin_for_type(const sipTypeDef *td, const char *name); static PyObject *sip_api_unicode_new(SIP_SSIZE_T len, unsigned maxchar, -@@ -13741,13 +13741,16 @@ static int sip_api_is_user_type(const si +@@ -13741,15 +13741,19 @@ static int sip_api_is_user_type(const si /* * Return a frame from the execution stack. */ @@ -39,4 +43,7 @@ + Py_DECREF(oframe); --depth; } ++ Py_XDECREF(frame); + return frame; + } From 4a70d1bff77de9aaedd62d9e94da0d854d691b45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 25 Sep 2022 09:49:21 +0700 Subject: [PATCH 13/30] wxPython4: patch for Python 3.11 --- srcpkgs/wxPython4/patches/python-3.11.patch | 84 +++++++++++++++++++++ srcpkgs/wxPython4/patches/syntax.patch | 32 ++++++++ srcpkgs/wxPython4/template | 10 ++- 3 files changed, 125 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/wxPython4/patches/python-3.11.patch create mode 100644 srcpkgs/wxPython4/patches/syntax.patch diff --git a/srcpkgs/wxPython4/patches/python-3.11.patch b/srcpkgs/wxPython4/patches/python-3.11.patch new file mode 100644 index 000000000000..904a398bedad --- /dev/null +++ b/srcpkgs/wxPython4/patches/python-3.11.patch @@ -0,0 +1,84 @@ +Index: wxPython-4.0.7/bin/.waf3/waflib/ConfigSet.py +=================================================================== +--- wxPython-4.0.7.orig/bin/.waf3/waflib/ConfigSet.py ++++ wxPython-4.0.7/bin/.waf3/waflib/ConfigSet.py +@@ -146,7 +146,7 @@ class ConfigSet(object): + Utils.writef(filename,''.join(buf)) + def load(self,filename): + tbl=self.table +- code=Utils.readf(filename,m='rU') ++ code=Utils.readf(filename,m='r') + for m in re_imp.finditer(code): + g=m.group + tbl[g(2)]=eval(g(3)) +Index: wxPython-4.0.7/bin/.waf3/waflib/Context.py +=================================================================== +--- wxPython-4.0.7.orig/bin/.waf3/waflib/Context.py ++++ wxPython-4.0.7/bin/.waf3/waflib/Context.py +@@ -106,7 +106,7 @@ class Context(ctx): + cache[node]=True + self.pre_recurse(node) + try: +- function_code=node.read('rU',encoding) ++ function_code=node.read('r',encoding) + exec(compile(function_code,node.abspath(),'exec'),self.exec_dict) + finally: + self.post_recurse(node) +@@ -346,7 +346,7 @@ def load_module(path,encoding=None): + pass + module=imp.new_module(WSCRIPT_FILE) + try: +- code=Utils.readf(path,m='rU',encoding=encoding) ++ code=Utils.readf(path,m='r',encoding=encoding) + except EnvironmentError: + raise Errors.WafError('Could not read the file %r'%path) + module_dir=os.path.dirname(path) +Index: wxPython-4.0.7/sip/siplib/sip.h +=================================================================== +--- wxPython-4.0.7.orig/sip/siplib/sip.h ++++ wxPython-4.0.7/sip/siplib/sip.h +@@ -1794,7 +1794,7 @@ typedef struct _sipAPIDef { + int (*api_get_time)(PyObject *, sipTimeDef *); + PyObject *(*api_from_time)(const sipTimeDef *); + int (*api_is_user_type)(const sipWrapperType *); +- struct _frame *(*api_get_frame)(int); ++ PyFrameObject *(*api_get_frame)(int); + int (*api_check_plugin_for_type)(const sipTypeDef *, const char *); + PyObject *(*api_unicode_new)(SIP_SSIZE_T, unsigned, int *, void **); + void (*api_unicode_write)(int, void *, int, unsigned); +Index: wxPython-4.0.7/sip/siplib/siplib.c +=================================================================== +--- wxPython-4.0.7.orig/sip/siplib/siplib.c ++++ wxPython-4.0.7/sip/siplib/siplib.c +@@ -439,7 +439,7 @@ static PyObject *sip_api_from_datetime(c + static int sip_api_get_time(PyObject *obj, sipTimeDef *time); + static PyObject *sip_api_from_time(const sipTimeDef *time); + static int sip_api_is_user_type(const sipWrapperType *wt); +-static struct _frame *sip_api_get_frame(int); ++static PyFrameObject *sip_api_get_frame(int); + static int sip_api_check_plugin_for_type(const sipTypeDef *td, + const char *name); + static PyObject *sip_api_unicode_new(SIP_SSIZE_T len, unsigned maxchar, +@@ -13688,15 +13688,19 @@ static int sip_api_is_user_type(const si + /* + * Return a frame from the execution stack. + */ +-static struct _frame *sip_api_get_frame(int depth) ++static PyFrameObject *sip_api_get_frame(int depth) + { +- struct _frame *frame = PyEval_GetFrame(); ++ PyFrameObject *frame = PyEval_GetFrame(); ++ Py_XINCREF(frame); + + while (frame != NULL && depth > 0) + { +- frame = frame->f_back; ++ PyFrameObject *oframe = frame; ++ frame = PyFrame_GetBack(frame); ++ Py_DECREF(oframe); + --depth; + } ++ Py_XDECREF(frame); + + return frame; + } diff --git a/srcpkgs/wxPython4/patches/syntax.patch b/srcpkgs/wxPython4/patches/syntax.patch new file mode 100644 index 000000000000..862934f99615 --- /dev/null +++ b/srcpkgs/wxPython4/patches/syntax.patch @@ -0,0 +1,32 @@ +Index: wxPython-4.0.7/wx/lib/masked/maskededit.py +=================================================================== +--- wxPython-4.0.7.orig/wx/lib/masked/maskededit.py ++++ wxPython-4.0.7/wx/lib/masked/maskededit.py +@@ -2645,7 +2645,7 @@ class MaskedEditMixin: + raise ve + elif replace_to > end: + #### dbg(indent=0) +- ve = ValueError('"%s" will not fit into field %d of control "%s"' (choice, index, self.name)) ++ ve = ValueError('"%s" will not fit into field %d of control "%s"' % (choice, index, self.name)) + ve.value = choice + ve.index = index + raise ve +Index: wxPython-4.0.7/wx/lib/plot/plotcanvas.py +=================================================================== +--- wxPython-4.0.7.orig/wx/lib/plot/plotcanvas.py ++++ wxPython-4.0.7/wx/lib/plot/plotcanvas.py +@@ -1852,12 +1852,12 @@ class PlotCanvas(wx.Panel): + # Get ticks and textExtents for axis if required + xticks = yticks = None + xTextExtent = yTextExtent = (0, 0) # No text for ticks +- if self._xSpec is not 'none': ++ if self._xSpec != 'none': + xticks = self._xticks(xAxis[0], xAxis[1]) + # w h of x axis text last number on axis + xTextExtent = dc.GetTextExtent(xticks[-1][1]) + +- if self._ySpec is not 'none': ++ if self._ySpec != 'none': + yticks = self._yticks(yAxis[0], yAxis[1]) + if self.logScale[1]: + # make sure we have enough room to display SI notation. diff --git a/srcpkgs/wxPython4/template b/srcpkgs/wxPython4/template index 554174105a36..318ab078b4de 100644 --- a/srcpkgs/wxPython4/template +++ b/srcpkgs/wxPython4/template @@ -1,7 +1,7 @@ # Template file for 'wxPython4' pkgname=wxPython4 version=4.0.7 -revision=4 +revision=5 wrksrc="wxPython-${version}" build_style=python3-module make_build_args="--skip-build" @@ -21,6 +21,14 @@ if [ "$CROSS_BUILD" ]; then CFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc} -I${XBPS_CROSS_BASE}/usr/include" fi +post_extract() { + # need to patch for Python 3.11, extract them now. + cd bin + sed '/__name__.*__main__/i sys.exit(0)' waf-* >tmp-waf + python3 tmp-waf + ln -s .waf3-* .waf3 +} + pre_build() { chmod -R go+rX $wrksrc if [ "$CROSS_BUILD" ]; then From f24c33bb07312d00d2f275a2b1861da54fb6814f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 25 Sep 2022 11:52:20 +0700 Subject: [PATCH 14/30] wxPython4: fix cross build after python3-module change In build-helper 'python3', we've set _PYTHON_SYSCONFIGDATA_NAME on cross-build, but that module could be found only inside sysroot. --- srcpkgs/wxPython4/patches/cross.patch | 12 ++++++++++++ srcpkgs/wxPython4/template | 1 + 2 files changed, 13 insertions(+) create mode 100644 srcpkgs/wxPython4/patches/cross.patch diff --git a/srcpkgs/wxPython4/patches/cross.patch b/srcpkgs/wxPython4/patches/cross.patch new file mode 100644 index 000000000000..4f343de201cb --- /dev/null +++ b/srcpkgs/wxPython4/patches/cross.patch @@ -0,0 +1,12 @@ +Index: wxPython-4.0.7/build.py +=================================================================== +--- wxPython-4.0.7.orig/build.py ++++ wxPython-4.0.7/build.py +@@ -169,7 +169,6 @@ def main(args): + setPythonVersion(args) + setDevModeOptions(args) + +- os.environ['PYTHONPATH'] = phoenixDir() + os.environ['PYTHONUNBUFFERED'] = 'yes' + os.environ['WXWIN'] = wxDir() + diff --git a/srcpkgs/wxPython4/template b/srcpkgs/wxPython4/template index 318ab078b4de..6fe82717aca2 100644 --- a/srcpkgs/wxPython4/template +++ b/srcpkgs/wxPython4/template @@ -31,6 +31,7 @@ post_extract() { pre_build() { chmod -R go+rX $wrksrc + PYTHONPATH="${PYTHONPATH:+${PYTHONPATH}:}$wrksrc" if [ "$CROSS_BUILD" ]; then PYPREFIX="$XBPS_CROSS_BASE" LDFLAGS+=" -L${XBPS_CROSS_BASE}/${py3_lib} -L${XBPS_CROSS_BASE}/usr/lib" From 8160188a347cd9f575d9dea2cdd4181228e6b56b Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 25 Sep 2022 14:31:50 +0200 Subject: [PATCH 15/30] libfido2: update to 1.12.0. --- srcpkgs/libfido2/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libfido2/template b/srcpkgs/libfido2/template index 85f27e57bfa2..bb68556787ef 100644 --- a/srcpkgs/libfido2/template +++ b/srcpkgs/libfido2/template @@ -1,6 +1,6 @@ # Template file for 'libfido2' pkgname=libfido2 -version=1.11.0 +version=1.12.0 revision=1 build_style=cmake configure_args="-DUDEV_RULES_DIR=/usr/lib/udev/rules.d" @@ -11,7 +11,8 @@ maintainer="Leah Neukirchen " license="BSD-2-Clause" homepage="https://github.com/Yubico/libfido2" distfiles="https://github.com/Yubico/libfido2/archive/${version}.tar.gz" -checksum=0830c5853e3b44099a97166e0cec54a65b54b7faaac07071872f77b8e4d7b302 +changelog="https://github.com/Yubico/libfido2/blob/main/NEWS" +checksum=813d6d25116143d16d2e96791718a74825da16b774a8d093d96f06ae1730d9c5 # udev rules used to be shipped by libu2f-host conf_files="/usr/lib/udev/rules.d/70-u2f.rules" conflicts="libu2f-host<=1.1.10_3" From d8310d2273ac8566e3196f3e3f1ea80a30e98cb1 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 25 Sep 2022 14:35:08 +0200 Subject: [PATCH 16/30] python3-pipenv: update to 2022.9.24. --- srcpkgs/python3-pipenv/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-pipenv/template b/srcpkgs/python3-pipenv/template index 7784608490f3..c7ecf68ee2e7 100644 --- a/srcpkgs/python3-pipenv/template +++ b/srcpkgs/python3-pipenv/template @@ -1,6 +1,6 @@ # Template file for 'python3-pipenv' pkgname=python3-pipenv -version=2022.9.20 +version=2022.9.24 revision=1 wrksrc="pipenv-${version}" build_style=python3-pep517 @@ -12,7 +12,7 @@ license="MIT" homepage="https://github.com/pypa/pipenv" changelog="https://github.com/pypa/pipenv/blob/main/CHANGELOG.rst" distfiles="${PYPI_SITE}/p/pipenv/pipenv-${version}.tar.gz" -checksum=e08a6ca060ae4d232147f4fb1e6d50b21517640399b49f57cda71cbfbac093bd +checksum=d682375d6a6edd2f1ed2f76085b7191de149ff8381bce6c1aaf7f55061b04457 conflicts="python-pipenv>=0" make_check=no # tests are not contained in release tarball From f4253087477b0ac8176ff2c4aba48858d5ceb7bd Mon Sep 17 00:00:00 2001 From: q66 Date: Sat, 24 Sep 2022 15:20:32 +0000 Subject: [PATCH 17/30] firefox: fix on ppc64le with clang, fix flac-no-ffvpx.patch --- srcpkgs/firefox/patches/flac-no-ffvpx.patch | 2 +- srcpkgs/firefox/patches/sqlite-ppc.patch | 55 +++++++++++++++++++++ 2 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/firefox/patches/sqlite-ppc.patch diff --git a/srcpkgs/firefox/patches/flac-no-ffvpx.patch b/srcpkgs/firefox/patches/flac-no-ffvpx.patch index ebf48deb9720..643d186f3ad7 100644 --- a/srcpkgs/firefox/patches/flac-no-ffvpx.patch +++ b/srcpkgs/firefox/patches/flac-no-ffvpx.patch @@ -19,7 +19,7 @@ index 53fc3c9937f7..b23771ab80fa 100644 +#elif defined(MOZ_FFMPEG) + RefPtr platform = new PDMFactory(); + return StaticPrefs::media_flac_enabled() && -+ platform->SupportsMimeType("audio/flac"_ns); ++ platform->SupportsMimeType("audio/flac"_ns) != media::DecodeSupport::Unsupported; #else // Until bug 1295886 is fixed. return false; diff --git a/srcpkgs/firefox/patches/sqlite-ppc.patch b/srcpkgs/firefox/patches/sqlite-ppc.patch new file mode 100644 index 000000000000..51f7faa618dd --- /dev/null +++ b/srcpkgs/firefox/patches/sqlite-ppc.patch @@ -0,0 +1,55 @@ +From 67157b1aa7da0a146b7d2d5abb9237eea1f434ec Mon Sep 17 00:00:00 2001 +From: Daniel Kolesa +Date: Fri, 23 Sep 2022 02:38:29 +0200 +Subject: [PATCH] fix sqlite3 on ppc with clang + +The __ppc__ macro is always defined on clang but not gcc, which +results in sqlite mistakenly thinking that ppc64le with clang +is big endian. + +Also disable some inline assembly stuff on ppc that is never used +with gcc and probably was never tested with modern machines. +--- + third_party/sqlite3/src/sqlite3.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/third_party/sqlite3/src/sqlite3.c b/third_party/sqlite3/src/sqlite3.c +index 4f3dc68..9017062 100644 +--- a/third_party/sqlite3/src/sqlite3.c ++++ b/third_party/sqlite3/src/sqlite3.c +@@ -14317,9 +14317,9 @@ typedef INT16_TYPE LogEst; + # if defined(i386) || defined(__i386__) || defined(_M_IX86) || \ + defined(__x86_64) || defined(__x86_64__) || defined(_M_X64) || \ + defined(_M_AMD64) || defined(_M_ARM) || defined(__x86) || \ +- defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) ++ defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) || defined(__LITTLE_ENDIAN__) + # define SQLITE_BYTEORDER 1234 +-# elif defined(sparc) || defined(__ppc__) || \ ++# elif defined(sparc) || defined(__BIG_ENDIAN__) || \ + defined(__ARMEB__) || defined(__AARCH64EB__) + # define SQLITE_BYTEORDER 4321 + # else +@@ -20713,7 +20713,7 @@ SQLITE_PRIVATE const char **sqlite3CompileOptions(int *pnOpt); + return val; + } + +-#elif !defined(__STRICT_ANSI__) && (defined(__GNUC__) && defined(__ppc__)) ++#elif 0 + + __inline__ sqlite_uint64 sqlite3Hwtime(void){ + unsigned long long retval; +@@ -196385,9 +196385,9 @@ struct RtreeMatchArg { + #if defined(i386) || defined(__i386__) || defined(_M_IX86) || \ + defined(__x86_64) || defined(__x86_64__) || defined(_M_X64) || \ + defined(_M_AMD64) || defined(_M_ARM) || defined(__x86) || \ +- defined(__arm__) ++ defined(__arm__) || defined(__LITTLE_ENDIAN__) + # define SQLITE_BYTEORDER 1234 +-#elif defined(sparc) || defined(__ppc__) ++#elif defined(sparc) || defined(__BIG_ENDIAN__) + # define SQLITE_BYTEORDER 4321 + #else + # define SQLITE_BYTEORDER 0 /* 0 means "unknown at compile-time" */ +-- +2.37.3 + From dce9d0fa0875c13a59ec2a4c8f363302a4dba0cd Mon Sep 17 00:00:00 2001 From: q66 Date: Sun, 25 Sep 2022 13:39:09 +0000 Subject: [PATCH 18/30] gtklock: fix and rebuild for glib 2.72 --- ...7d5083b28ae955352710a2daf30d3497d229.patch | 31 +++++++++++++++++++ srcpkgs/gtklock/template | 2 +- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/gtklock/patches/45877d5083b28ae955352710a2daf30d3497d229.patch diff --git a/srcpkgs/gtklock/patches/45877d5083b28ae955352710a2daf30d3497d229.patch b/srcpkgs/gtklock/patches/45877d5083b28ae955352710a2daf30d3497d229.patch new file mode 100644 index 000000000000..0f117cf02e04 --- /dev/null +++ b/srcpkgs/gtklock/patches/45877d5083b28ae955352710a2daf30d3497d229.patch @@ -0,0 +1,31 @@ +From 45877d5083b28ae955352710a2daf30d3497d229 Mon Sep 17 00:00:00 2001 +From: Jovan Lanik +Date: Thu, 22 Sep 2022 00:33:01 +0200 +Subject: [PATCH] fix old glib2 versions + +--- + src/gtklock.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/src/gtklock.c b/src/gtklock.c +index cc047ce..2faf66d 100644 +--- a/src/gtklock.c ++++ b/src/gtklock.c +@@ -94,10 +94,16 @@ void gtklock_idle_show(struct GtkLock *gtklock) { + gtklock->idle_hide_source = g_timeout_add_seconds(gtklock->idle_timeout, gtklock_idle_handler, gtklock); + } + ++#if GLIB_CHECK_VERSION(2, 74, 0) ++ #define GTKLOCK_FLAGS G_APPLICATION_DEFAULT_FLAGS ++#else ++ #define GTKLOCK_FLAGS G_APPLICATION_FLAGS_NONE ++#endif ++ + struct GtkLock* create_gtklock(void) { + struct GtkLock *gtklock = g_malloc0(sizeof(struct GtkLock)); + if(!gtklock) report_error_and_exit("Failed allocation"); +- gtklock->app = gtk_application_new(NULL, G_APPLICATION_DEFAULT_FLAGS); ++ gtklock->app = gtk_application_new(NULL, GTKLOCK_FLAGS); + if(gtklock->use_layer_shell) g_application_hold(G_APPLICATION(gtklock->app)); + gtklock->windows = g_array_new(FALSE, TRUE, sizeof(struct Window *)); + gtklock->messages = g_array_new(FALSE, TRUE, sizeof(char *)); diff --git a/srcpkgs/gtklock/template b/srcpkgs/gtklock/template index 48a6f370e48c..abb435f32844 100644 --- a/srcpkgs/gtklock/template +++ b/srcpkgs/gtklock/template @@ -1,7 +1,7 @@ # Template file for 'gtklock' pkgname=gtklock version=1.3.7 -revision=1 +revision=2 build_style=gnu-makefile make_use_env=yes hostmakedepends="pkg-config wayland-devel scdoc" From 14f954a163657f397f4d1dcb3230e8ca7f1e8175 Mon Sep 17 00:00:00 2001 From: q66 Date: Sun, 25 Sep 2022 13:47:49 +0000 Subject: [PATCH 19/30] lua-language-server: restore ppc patch --- srcpkgs/lua-language-server/patches/ppc.patch | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 srcpkgs/lua-language-server/patches/ppc.patch diff --git a/srcpkgs/lua-language-server/patches/ppc.patch b/srcpkgs/lua-language-server/patches/ppc.patch new file mode 100644 index 000000000000..f8ce59ead268 --- /dev/null +++ b/srcpkgs/lua-language-server/patches/ppc.patch @@ -0,0 +1,32 @@ +commit a384b9814f0d1c0072d557c96df5b73831d25325 +Author: q66 +Date: Sun Sep 25 13:46:41 2022 +0000 + + fix build on ppc* + +diff --git a/3rd/luamake/3rd/bee.lua/bee/thread/spinlock.h b/3rd/luamake/3rd/bee.lua/bee/thread/spinlock.h +index ad0cf4e..ac77d14 100644 +--- a/3rd/luamake/3rd/bee.lua/bee/thread/spinlock.h ++++ b/3rd/luamake/3rd/bee.lua/bee/thread/spinlock.h +@@ -18,6 +18,8 @@ + asm volatile ("div %0, %0, zero" : "=r" (dummy)); + asm volatile ("" ::: "memory"); + }} ++#elif defined(__powerpc__) ++ namespace bee { inline void cpu_relax() { asm volatile("ori 0,0,0" ::: "memory"); }} + #else + #error unsupport platform + #endif +diff --git a/luamake/3rd/bee.lua/bee/thread/spinlock.h b/luamake/3rd/bee.lua/bee/thread/spinlock.h +index ad0cf4e..ac77d14 100644 +--- a/luamake/3rd/bee.lua/bee/thread/spinlock.h ++++ b/luamake/3rd/bee.lua/bee/thread/spinlock.h +@@ -18,6 +18,8 @@ + asm volatile ("div %0, %0, zero" : "=r" (dummy)); + asm volatile ("" ::: "memory"); + }} ++#elif defined(__powerpc__) ++ namespace bee { inline void cpu_relax() { asm volatile("ori 0,0,0" ::: "memory"); }} + #else + #error unsupport platform + #endif From b36c44452e6acae149f43f77090a54c09ba8526e Mon Sep 17 00:00:00 2001 From: q66 Date: Sun, 25 Sep 2022 14:02:44 +0000 Subject: [PATCH 20/30] liburcu: fix build on ppcle --- srcpkgs/liburcu/patches/ppcle.patch | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 srcpkgs/liburcu/patches/ppcle.patch diff --git a/srcpkgs/liburcu/patches/ppcle.patch b/srcpkgs/liburcu/patches/ppcle.patch new file mode 100644 index 000000000000..3baf82aac84a --- /dev/null +++ b/srcpkgs/liburcu/patches/ppcle.patch @@ -0,0 +1,28 @@ +commit b7e9de38d953218f3c7faaf39795bf7ac68a0e81 +Author: q66 +Date: Sun Sep 25 13:58:16 2022 +0000 + + fix build on ppcle + +diff --git a/configure b/configure +index 449fc8c..710cbfe 100755 +--- a/configure ++++ b/configure +@@ -15038,6 +15038,8 @@ case $host_cpu in #( + ARCHTYPE="x86" ;; #( + powerpc) : + ARCHTYPE="ppc" ;; #( ++ powerpcle) : ++ ARCHTYPE="ppc" ;; #( + ppc64) : + ARCHTYPE="ppc" ;; #( + powerpc64) : +@@ -15046,6 +15048,8 @@ case $host_cpu in #( + ARCHTYPE="ppc" ;; #( + ppc) : + ARCHTYPE="ppc" ;; #( ++ ppcle) : ++ ARCHTYPE="ppc" ;; #( + s390) : + ARCHTYPE="s390" ;; #( + s390x) : From 6cdfa78f6aea77f40dbf8133a7c3c4ed4262f515 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 25 Sep 2022 21:06:02 +0700 Subject: [PATCH 21/30] python3-protobuf: strips python/ from upstream patches --- srcpkgs/python3-protobuf/patches/python-3.11.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/python3-protobuf/patches/python-3.11.patch b/srcpkgs/python3-protobuf/patches/python-3.11.patch index 831e41ef9001..f6ed1b078357 100644 --- a/srcpkgs/python3-protobuf/patches/python-3.11.patch +++ b/srcpkgs/python3-protobuf/patches/python-3.11.patch @@ -5,13 +5,13 @@ Subject: [PATCH] Fix build with Python 3.11 The PyFrameObject structure members have been removed from the public C API. --- - python/google/protobuf/pyext/descriptor.cc | 75 ++++++++++++++++++---- + google/protobuf/pyext/descriptor.cc | 75 ++++++++++++++++++---- 1 file changed, 62 insertions(+), 13 deletions(-) -diff --git a/python/google/protobuf/pyext/descriptor.cc b/python/google/protobuf/pyext/descriptor.cc +diff --git a/google/protobuf/pyext/descriptor.cc b/google/protobuf/pyext/descriptor.cc index fc83acf01a..fc97b0fa6c 100644 ---- a/python/google/protobuf/pyext/descriptor.cc -+++ b/python/google/protobuf/pyext/descriptor.cc +--- a/google/protobuf/pyext/descriptor.cc ++++ b/google/protobuf/pyext/descriptor.cc @@ -58,6 +58,37 @@ : 0) \ : PyBytes_AsStringAndSize(ob, (charpp), (sizep))) From 6ef0e7e589271703f97907e57eb89f70f04d6612 Mon Sep 17 00:00:00 2001 From: q66 Date: Sun, 25 Sep 2022 15:21:48 +0000 Subject: [PATCH 22/30] maturin: broken on ppc32 --- srcpkgs/maturin/template | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template index d9c4164cf7e5..1f726666eb3c 100644 --- a/srcpkgs/maturin/template +++ b/srcpkgs/maturin/template @@ -23,6 +23,13 @@ if [ "$CROSS_BUILD" ]; then makedepends+=" rust-std" fi +case "$XBPS_TARGET_MACHINE" in + ppc64*) ;; + ppc*) + broken="https://github.com/console-rs/indicatif/blob/main/src/state.rs#L2" + ;; +esac + post_extract() { mv ../target-lexicon* target-lexicon echo "[patch.crates-io]" >> Cargo.toml From ceea3a0f78b25e9e06578dcdc0e3da2825ccdc74 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 25 Sep 2022 15:40:10 +0200 Subject: [PATCH 23/30] getmail: remove package uses Python 2: https://pyropus.ca./software/getmail/documentation.html#python3 --- srcpkgs/getmail/template | 13 ------------- srcpkgs/getmail/update | 1 - srcpkgs/removed-packages/template | 1 + 3 files changed, 1 insertion(+), 14 deletions(-) delete mode 100644 srcpkgs/getmail/template delete mode 100644 srcpkgs/getmail/update diff --git a/srcpkgs/getmail/template b/srcpkgs/getmail/template deleted file mode 100644 index bd28b1e907e9..000000000000 --- a/srcpkgs/getmail/template +++ /dev/null @@ -1,13 +0,0 @@ -# Template file for 'getmail' -pkgname=getmail -version=5.14 -revision=2 -build_style=python2-module -hostmakedepends="python-devel" -depends="python" -short_desc="POP3/IMAP mail retriever with reliable Maildir and command delivery" -maintainer="Orphaned " -license="GPL-2.0-only" -homepage="http://pyropus.ca/software/getmail" -distfiles="http://pyropus.ca/software/getmail/old-versions/${pkgname}-${version}.tar.gz" -checksum=f3a99fe74564237d12ca8d4582e113c067c9205b5ab640f72b4e8447606a99c1 diff --git a/srcpkgs/getmail/update b/srcpkgs/getmail/update deleted file mode 100644 index 2c857beffb29..000000000000 --- a/srcpkgs/getmail/update +++ /dev/null @@ -1 +0,0 @@ -ignore="*a*" diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 7bed6e0f99b2..0d0ea591b6f6 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -100,6 +100,7 @@ replaces=" gens-gs<=2.16.7_2 geoip-data<=20171002_2 gespeaker<=0.8.6_3 + getmail<=5.14_2 giti<=1.0.0_1 gksu<=2.0.2_4 glibmm-doc<=2.64.2_2 From 5b14fc1c3fefe54b31c78816839dee72820ab8c4 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 25 Sep 2022 15:52:17 +0200 Subject: [PATCH 24/30] miro-video-converter: remove package Python 2, GTK 2, last release in 2012 --- srcpkgs/miro-video-converter/template | 14 -------------- srcpkgs/removed-packages/template | 1 + 2 files changed, 1 insertion(+), 14 deletions(-) delete mode 100644 srcpkgs/miro-video-converter/template diff --git a/srcpkgs/miro-video-converter/template b/srcpkgs/miro-video-converter/template deleted file mode 100644 index ee6d418455d5..000000000000 --- a/srcpkgs/miro-video-converter/template +++ /dev/null @@ -1,14 +0,0 @@ -# Template file for 'miro-video-converter' -pkgname=miro-video-converter -version=3.0.2 -revision=3 -wrksrc=mirovideoconverter3-${version} -build_style=python2-module -hostmakedepends="python-setuptools" -depends="python pygtk ffmpeg" -short_desc="Simple video convert with presets for iOS and Android" -maintainer="Duncaen " -license="GPL-3.0-or-later" -homepage="http://www.mirovideoconverter.com/" -distfiles="https://github.com/pculture/mirovideoconverter3/archive/v${version}.tar.gz" -checksum=3c564cf88e6264f206b9c0cef136809805412f92e536b5407f5d64c1c4dd9970 diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 0d0ea591b6f6..781b69d583b0 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -281,6 +281,7 @@ replaces=" masterpassword-cli<=2.6_5 mattermost-desktop<=4.6.0_1 mdds0<=0.12.1_3 + miro-video-converter<=3.0.2_3 mirrorbits<=0.5.1_1 mongroup<=0.4.1_2 mozjs68<=68.11.0_1 From dc4931e2191f92d65e827bf77b93beedba622557 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Sun, 25 Sep 2022 22:00:03 +0200 Subject: [PATCH 25/30] 0ad: update to 0.0.26. --- srcpkgs/0ad/patches/fix-python3.10.patch | 78 ------------------------ srcpkgs/0ad/template | 8 +-- 2 files changed, 4 insertions(+), 82 deletions(-) delete mode 100644 srcpkgs/0ad/patches/fix-python3.10.patch diff --git a/srcpkgs/0ad/patches/fix-python3.10.patch b/srcpkgs/0ad/patches/fix-python3.10.patch deleted file mode 100644 index 2935c6c6b3e7..000000000000 --- a/srcpkgs/0ad/patches/fix-python3.10.patch +++ /dev/null @@ -1,78 +0,0 @@ -diff -ru --new-file 0ad-0.0.25b-alpha.orig/libraries/source/spidermonkey/patch.sh 0ad-0.0.25b-alpha/libraries/source/spidermonkey/patch.sh ---- 0ad-0.0.25b-alpha.orig/libraries/source/spidermonkey/patch.sh 2021-12-17 08:53:59.543315034 +0100 -+++ 0ad-0.0.25b-alpha/libraries/source/spidermonkey/patch.sh 2021-12-17 08:53:34.789777469 +0100 -@@ -43,6 +43,8 @@ - # Note that this isn't quite the upstream patch to match our version. - patch -p1 < ../FixRust150.diff - -+patch -p1 < ../python-3.10.diff -+ - # Patch those separately, as they might interfere with normal behaviour. - if [ "$(uname -s)" = "FreeBSD" ]; - then -diff -ru --new-file 0ad-0.0.25b-alpha.orig/libraries/source/spidermonkey/python-3.10.diff 0ad-0.0.25b-alpha/libraries/source/spidermonkey/python-3.10.diff ---- 0ad-0.0.25b-alpha.orig/libraries/source/spidermonkey/python-3.10.diff 1970-01-01 01:00:00.000000000 +0100 -+++ 0ad-0.0.25b-alpha/libraries/source/spidermonkey/python-3.10.diff 2021-12-17 09:05:09.713419684 +0100 -@@ -0,0 +1,62 @@ -+diff -ru mozjs-78.6.0.orig/python/mozbuild/mozbuild/backend/configenvironment.py mozjs-78.6.0/python/mozbuild/mozbuild/backend/configenvironment.py -+--- mozjs-78.6.0.orig/python/mozbuild/mozbuild/backend/configenvironment.py 2020-11-28 17:33:58.000000000 +0100 -++++ mozjs-78.6.0/python/mozbuild/mozbuild/backend/configenvironment.py 2021-12-17 08:52:07.342371513 +0100 -+@@ -9,7 +9,8 @@ -+ import sys -+ import json -+ -+-from collections import Iterable, OrderedDict -++from collections.abc import Iterable -++from collections import OrderedDict -+ from types import ModuleType -+ -+ import mozpack.path as mozpath -+diff -ru mozjs-78.6.0.orig/python/mozbuild/mozbuild/makeutil.py mozjs-78.6.0/python/mozbuild/mozbuild/makeutil.py -+--- mozjs-78.6.0.orig/python/mozbuild/mozbuild/makeutil.py 2020-11-28 17:33:58.000000000 +0100 -++++ mozjs-78.6.0/python/mozbuild/mozbuild/makeutil.py 2021-12-17 09:05:02.820298351 +0100 -+@@ -7,7 +7,7 @@ -+ import os -+ import re -+ import six -+-from collections import Iterable -++from collections.abc import Iterable -+ -+ -+ class Makefile(object): -+diff -ru mozjs-78.6.0.orig/python/mozbuild/mozbuild/util.py mozjs-78.6.0/python/mozbuild/mozbuild/util.py -+--- mozjs-78.6.0.orig/python/mozbuild/mozbuild/util.py 2020-11-28 17:33:58.000000000 +0100 -++++ mozjs-78.6.0/python/mozbuild/mozbuild/util.py 2021-12-17 08:52:31.045908142 +0100 -+@@ -782,7 +782,7 @@ -+ self._strings = StrictOrderingOnAppendList() -+ self._children = {} -+ -+- class StringListAdaptor(collections.Sequence): -++ class StringListAdaptor(collections.abc.Sequence): -+ def __init__(self, hsl): -+ self._hsl = hsl -+ -+diff -ru mozjs-78.6.0.orig/testing/mozbase/manifestparser/manifestparser/filters.py mozjs-78.6.0/testing/mozbase/manifestparser/manifestparser/filters.py -+--- mozjs-78.6.0.orig/testing/mozbase/manifestparser/manifestparser/filters.py 2020-11-28 17:34:00.000000000 +0100 -++++ mozjs-78.6.0/testing/mozbase/manifestparser/manifestparser/filters.py 2021-12-17 09:02:44.801711871 +0100 -+@@ -12,7 +12,8 @@ -+ -+ import itertools -+ import os -+-from collections import defaultdict, MutableSequence -++from collections import defaultdict -++from collections.abc import MutableSequence -+ -+ import six -+ from six import string_types -+diff -ru mozjs-78.6.0.orig/third_party/python/virtualenv/virtualenv.py mozjs-78.6.0/third_party/python/virtualenv/virtualenv.py -+--- mozjs-78.6.0.orig/third_party/python/virtualenv/virtualenv.py 2020-11-28 17:34:05.000000000 +0100 -++++ mozjs-78.6.0/third_party/python/virtualenv/virtualenv.py 2021-12-17 08:58:55.798970530 +0100 -+@@ -1804,7 +1804,7 @@ -+ pass -+ else: -+ # noinspection PyProtectedMember -+- if sysconfig._get_default_scheme() == "posix_local": -++ if sysconfig.get_default_scheme() == "posix_local": -+ local_path = os.path.join(home_dir, "local") -+ if not os.path.exists(local_path): -+ os.mkdir(local_path) diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template index b9f0751c4836..c768d057320c 100644 --- a/srcpkgs/0ad/template +++ b/srcpkgs/0ad/template @@ -1,20 +1,20 @@ # Template file for '0ad' pkgname=0ad -version=0.0.25b -revision=4 +version=0.0.26 +revision=1 archs="x86_64* i686* aarch64* armv7l* ppc64le*" wrksrc="${pkgname}-${version}-alpha" hostmakedepends="pkg-config perl cmake python3 rust cargo yasm tar clang" makedepends="SDL2-devel boost-devel gloox-devel libcurl-devel libenet-devel libopenal-devel libpng-devel libsodium-devel libxml2-devel miniupnpc-devel - nspr-devel wxWidgets-gtk3-devel fmt-devel mozjs78-devel" + nspr-devel wxWidgets-gtk3-devel fmt-devel mozjs78-devel freetype-devel" depends="${pkgname}-data" short_desc="Historically-based real-time strategy game" maintainer="Helmut Pozimski " license="GPL-2.0-or-later, CC-BY-SA-3.0, MPL-2.0, MIT" homepage="https://play0ad.com" distfiles="https://releases.wildfiregames.com/${pkgname}-${version}-alpha-unix-build.tar.xz" -checksum=d70dcd75f473a7d5c81432c3d9260926bf8d9dff5cd541796169497d1c522edd +checksum=2e1c6df7e3312e77c5f82788664cffc3a78d3bf60606c00039275e1d13c0ee4b nocross="uses bundled third-party libraries that do not cross-compile" lib32disabled=yes From 451f110fa83be56c3a2a62db579f66bb4a18344d Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Sun, 25 Sep 2022 22:00:24 +0200 Subject: [PATCH 26/30] 0ad-data: update to 0.0.26. --- srcpkgs/0ad-data/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/0ad-data/template b/srcpkgs/0ad-data/template index 0d95f166281a..86fc97d4e0b2 100644 --- a/srcpkgs/0ad-data/template +++ b/srcpkgs/0ad-data/template @@ -1,6 +1,6 @@ # Template file for '0ad-data' pkgname=0ad-data -version=0.0.25b +version=0.0.26 revision=1 wrksrc="${pkgname%-data}-${version}-alpha" short_desc="Historically-based real-time strategy game (data files)" @@ -8,7 +8,7 @@ maintainer="Helmut Pozimski " license="CC-BY-SA-3.0" homepage="https://play0ad.com" distfiles="https://releases.wildfiregames.com/0ad-${version}-alpha-unix-data.tar.xz" -checksum=9e535e5e37b770748920a39967f06a7927bef872a6d1aa23537b77595bcb3fb1 +checksum=b200e48558f882807910e3c686567b6a396248d9d418044ecfde090b05772d7d nocross=yes case "$XBPS_TARGET_MACHINE" in From 6ff7d0b25de6243e87f575fdb40358560e9d521c Mon Sep 17 00:00:00 2001 From: Hervy Qurrotul Ainur Rozi Date: Sun, 25 Sep 2022 17:59:31 +0700 Subject: [PATCH 27/30] obs: update to 28.0.2 --- srcpkgs/obs/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/obs/template b/srcpkgs/obs/template index 64c6e7634a91..2d0a02ea3735 100644 --- a/srcpkgs/obs/template +++ b/srcpkgs/obs/template @@ -1,6 +1,6 @@ # Template file for 'obs' pkgname=obs -version=28.0.1 +version=28.0.2 revision=1 archs="i686* x86_64* ppc64le* aarch64*" wrksrc="obs-studio-${version}" @@ -20,7 +20,7 @@ license="GPL-2.0-or-later" homepage="https://obsproject.com" changelog="https://github.com/obsproject/obs-studio/releases" distfiles="https://github.com/obsproject/obs-studio/archive/${version}.tar.gz" -checksum=e6074ba5be56b2b06a44329279f1eada662686b68e44616f453f1fa4c2c33165 +checksum=9c650bf9c891c1d791626474895cb7aeff7b6758a09d81ab32221f8e95c44ce3 pre_configure() { # it's not enough to use -DENABLE_BROWSER ... From 116bd5da1f5dfef5c44d02e1c56f9b9896ce1523 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sun, 25 Sep 2022 21:28:04 -0400 Subject: [PATCH 28/30] chezmoi: update to 2.24.0. --- srcpkgs/chezmoi/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template index 26189d2b508e..79189d3580f5 100644 --- a/srcpkgs/chezmoi/template +++ b/srcpkgs/chezmoi/template @@ -1,6 +1,6 @@ # Template file for 'chezmoi' pkgname=chezmoi -version=2.23.0 +version=2.24.0 revision=1 build_style=go go_import_path="github.com/twpayne/chezmoi/v2" @@ -11,7 +11,7 @@ maintainer="classabbyamp " license="MIT" homepage="https://chezmoi.io/" distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz" -checksum=bd613842f5952b9ceb7547106e5ea295fa716fe6301ec09d36cf14c186b338b8 +checksum=46f84d714524aa6f045e42310de887fb35e8b4f8d22a3857d1ff538f56ca235b pre_build() { local _date From 9b7bd5f42d4c072f221c214554e96170933b7d7e Mon Sep 17 00:00:00 2001 From: Anthony Thompson Date: Mon, 26 Sep 2022 17:03:02 +1000 Subject: [PATCH 29/30] cleaned up comments --- srcpkgs/yabridge/template | 2 -- 1 file changed, 2 deletions(-) diff --git a/srcpkgs/yabridge/template b/srcpkgs/yabridge/template index 536a3c8b2b3d..1d24b17ccdcf 100644 --- a/srcpkgs/yabridge/template +++ b/srcpkgs/yabridge/template @@ -19,8 +19,6 @@ checksum=86fcd65b6f3dd5cf60c2afa476f63959a2cc4ef4d4629810916739d7af645f01 do_configure() { cd ${wrksrc} - export LIBRARY_PATH=/usr/lib32/:$LIBRARY_PATH - echo " LIBRARY PATH = " $LIBRARY_PATH meson setup build --buildtype=release --cross-file=cross-wine.conf --unity=on --unity-size=1000 -Dbitbridge=true } From 460d7516ca296ba0e7a14b37bd943232c847077e Mon Sep 17 00:00:00 2001 From: Anthony Thompson Date: Mon, 26 Sep 2022 17:26:11 +1000 Subject: [PATCH 30/30] remove .gitignore --- .gitignore | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 .gitignore diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 05dde1831f6f..000000000000 --- a/.gitignore +++ /dev/null @@ -1,15 +0,0 @@ -*.swo -*.swp -*~ -\#*# -*.o -masterdir* -hostdir* -masterdir*/ -hostdir*/ -etc/conf -etc/conf.* -etc/virtual -**/etc -etc/xbps.d/custom -.xbps-checkvers*.plist