[packages/digikam] - versioned Obsoletes
commit b6e59b35878950ede4554778d53df35c75aa4053 Author: Jakub Bogusz Date: Sun Jul 4 08:02:23 2021 +0200 - versioned Obsoletes digikam.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- diff --git a/digikam.spec b/digikam.spec index d6726cc..3008553 100644 --- a/digikam.spec +++ b/digikam.spec @@ -57,8 +57,8 @@ BuildRequires:shared-desktop-ontologies-devel >= 0.2 BuildRequires: soprano-devel Requires: Qt5Sql-sqldriver-mysql Requires: Qt5Sql-sqldriver-sqlite3 -Obsoletes: digikamimageplugins -Obsoletes: kipi-plugins +Obsoletes: digikamimageplugins < 0.9.2 +Obsoletes: kipi-plugins < 1.10 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description gitweb: http://git.pld-linux.org/gitweb.cgi/packages/digikam.git/commitdiff/b6e59b35878950ede4554778d53df35c75aa4053 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/avidemux] - fixed x32 patch
commit cb1eb26f04b7cbeb6eb29c36e5daa05834bf81a0 Author: Jakub Bogusz Date: Sun Jul 4 07:58:55 2021 +0200 - fixed x32 patch avidemux-x32.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- diff --git a/avidemux-x32.patch b/avidemux-x32.patch index 8bca04c..df158e7 100644 --- a/avidemux-x32.patch +++ b/avidemux-x32.patch @@ -36,9 +36,9 @@ IF( ADM_CPU_X86_64 ) -SET(ASM_ARGS_FORMAT ${ASM_ARGS_FORMAT} -m amd64 -DARCH_X86_64=1 -DARCH_X86_32=0) +IF( ADM_CPU_64BIT ) -+SET(ASM_ARGS_FORMAT "${ASM_ARGS_FORMAT} -m amd64 -DARCH_X86_64=1 -DARCH_X86_32=0") ++SET(ASM_ARGS_FORMAT ${ASM_ARGS_FORMAT} -m amd64 -DARCH_X86_64=1 -DARCH_X86_32=0) +ELSE( ADM_CPU_64BIT ) -+SET(ASM_ARGS_FORMAT "${ASM_ARGS_FORMAT} -m x32 -DARCH_X86_64=1 -DARCH_X86_32=0") ++SET(ASM_ARGS_FORMAT ${ASM_ARGS_FORMAT} -m x32 -DARCH_X86_64=1 -DARCH_X86_32=0) +ENDIF( ADM_CPU_64BIT ) ELSE( ADM_CPU_X86_64 ) SET(ASM_ARGS_FORMAT ${ASM_ARGS_FORMAT} -DARCH_X86_64=0 -DARCH_X86_32=1) gitweb: http://git.pld-linux.org/gitweb.cgi/packages/avidemux.git/commitdiff/cb1eb26f04b7cbeb6eb29c36e5daa05834bf81a0 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/python-ctypesgen] - added x32 patch (adjust library search path on x32)
commit d3adbc4e915d85631a0e98a0c7ca1d180f88c38c Author: Jakub Bogusz Date: Sun Jul 4 07:56:10 2021 +0200 - added x32 patch (adjust library search path on x32) python-ctypesgen-x32.patch | 11 +++ python-ctypesgen.spec | 2 ++ 2 files changed, 13 insertions(+) --- diff --git a/python-ctypesgen.spec b/python-ctypesgen.spec index f2b4bdb..62bf48a 100644 --- a/python-ctypesgen.spec +++ b/python-ctypesgen.spec @@ -16,6 +16,7 @@ Group:Libraries/Python #Source0Download: https://github.com/davidjamesca/ctypesgen/releases Source0: https://github.com/davidjamesca/ctypesgen/archive/ctypesgen-%{version}/%{module}-%{version}.tar.gz # Source0-md5: 0928ef10a1f0323a82d55d6a0dfac8ff +Patch0:%{name}-x32.patch URL: https://github.com/davidjamesca/ctypesgen %if %{with python2} BuildRequires: python >= 1:2.3 @@ -61,6 +62,7 @@ nagłówkowych w C. %prep %setup -q -n %{module}-%{module}-%{version} +%patch0 -p1 %build %if %{with python2} diff --git a/python-ctypesgen-x32.patch b/python-ctypesgen-x32.patch new file mode 100644 index 000..6d6c8ec --- /dev/null +++ b/python-ctypesgen-x32.patch @@ -0,0 +1,11 @@ +--- ctypesgen-ctypesgen-1.0.2/ctypesgen/libraryloader.py.orig 2019-12-08 00:24:44.0 +0100 ctypesgen-ctypesgen-1.0.2/ctypesgen/libraryloader.py 2021-07-04 07:46:45.360836111 +0200 +@@ -262,6 +262,8 @@ + if bitage.startswith("64"): + # prefer 64 bit if that is our arch + unix_lib_dirs_list += ["/lib64", "/usr/lib64"] ++elif bitage.startswith("32") and platform.machine() == "x86_64": ++unix_lib_dirs_list += ["/libx32", "/usr/libx32"] + + # must include standard libs, since those paths are also used by 64 bit + # installs gitweb: http://git.pld-linux.org/gitweb.cgi/packages/python-ctypesgen.git/commitdiff/d3adbc4e915d85631a0e98a0c7ca1d180f88c38c ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/avidemux] - rediffed
commit 162737ed946f9fe07d357bcaf1a2415a64654f32 Author: Jakub Bogusz Date: Sun Jul 4 07:33:12 2021 +0200 - rediffed avidemux-ffmpeg-make.patch | 8 avidemux-x32.patch | 16 build.patch| 10 +- 3 files changed, 21 insertions(+), 13 deletions(-) --- diff --git a/avidemux-ffmpeg-make.patch b/avidemux-ffmpeg-make.patch index a955eac..b18f873 100644 --- a/avidemux-ffmpeg-make.patch +++ b/avidemux-ffmpeg-make.patch @@ -1,7 +1,7 @@ avidemux_2.7.0/cmake/admFFmpegBuild_helpers.cmake.orig 2017-12-25 10:11:38.555601657 +0100 -+++ avidemux_2.7.0/cmake/admFFmpegBuild_helpers.cmake 2017-12-25 14:01:39.232110743 +0100 -@@ -304,7 +304,7 @@ -SET(PARRALLEL "-j4") +--- avidemux_2.7.8/cmake/admFFmpegBuild_helpers.cmake.orig 2021-07-04 06:51:39.736302112 +0200 avidemux_2.7.8/cmake/admFFmpegBuild_helpers.cmake 2021-07-04 06:52:57.587005044 +0200 +@@ -324,7 +324,7 @@ MACRO(ADM_FF_ADD_DUMMY_TARGET) +endif(NOT NPROC EQUAL 0) endif(NOT MSVC) add_custom_target( libavutil_dummy ALL - COMMAND ${CMAKE_BUILD_TOOL} ${PARRALLEL} # We assume make or gnumake when host is unix diff --git a/avidemux-x32.patch b/avidemux-x32.patch index abf2a48..8bca04c 100644 --- a/avidemux-x32.patch +++ b/avidemux-x32.patch @@ -1,14 +1,22 @@ avidemux_2.6.10/cmake/admFFmpegBuild_helpers.cmake.orig2015-10-19 20:07:00.92350 +0200 -+++ avidemux_2.6.10/cmake/admFFmpegBuild_helpers.cmake 2015-10-19 20:34:06.114456242 +0200 -@@ -259,7 +259,7 @@ +--- avidemux_2.7.8/cmake/admFFmpegBuild_helpers.cmake.orig 2021-07-04 06:48:04.541811758 +0200 avidemux_2.7.8/cmake/admFFmpegBuild_helpers.cmake 2021-07-04 06:50:47.746939993 +0200 +@@ -286,14 +286,14 @@ MACRO(ADM_FF_BUILD_UNIX_STYLE) MESSAGE(STATUS "Configuring done, processing") -if (ADM_CPU_X86) +if (ADM_CPU_X86_X32 OR (ADM_CPU_X86_64 AND ADM_CPU_64BIT)) file(READ ${FFMPEG_BINARY_DIR}/config.h FF_CONFIG_H) - string(REGEX MATCH "#define[ ]+HAVE_YASM[ ]+1" FF_YASM "${FF_CONFIG_H}") + string(REGEX MATCH "#define[ ]+HAVE_X86ASM[ ]+1" FF_YASM "${FF_CONFIG_H}") + if (NOT FF_YASM) + message(FATAL_ERROR "Yasm was not found.") + endif (NOT FF_YASM) +-endif (ADM_CPU_X86) ++endif () + + execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory "libavutil" + WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/config") --- avidemux_2.6.10/cmake/admInstallDir.cmake.orig 2015-10-19 20:34:26.862201138 +0200 +++ avidemux_2.6.10/cmake/admInstallDir.cmake 2015-10-19 21:15:45.397657233 +0200 @@ -20,6 +20,8 @@ diff --git a/build.patch b/build.patch index c5802fc..d2b5309 100644 --- a/build.patch +++ b/build.patch @@ -1,11 +1,11 @@ avidemux_2.6.4/bootStrap.bash~ 2013-05-09 13:10:35.0 +0200 -+++ avidemux_2.6.4/bootStrap.bash 2013-08-29 11:56:46.570506339 +0200 -@@ -34,7 +34,7 @@ - mkdir $BUILDDIR || fail mkdir +--- avidemux_2.7.8/bootStrap.bash.orig 2021-07-04 06:43:32.054350981 +0200 avidemux_2.7.8/bootStrap.bash 2021-07-04 06:47:47.764275240 +0200 +@@ -66,7 +66,7 @@ Process() + fi cd $BUILDDIR cmake $COMPILER $PKG $FAKEROOT $QT_FLAVOR -DCMAKE_EDIT_COMMAND=vim $INSTALL_PREFIX $EXTRA $BUILD_QUIRKS $ASAN $DEBUG -G "$BUILDER" $SOURCEDIR || fail cmakeZ -make $PARAL >& /tmp/log$BUILDDIR || fail "make, result in /tmp/log$BUILDDIR" -+make $PARAL || fail "make, result in /tmp/log$BUILDDIR" ++make $PARAL || fail "make" if [ "x$PKG" != "x" ] ; then $FAKEROOT_COMMAND make package DESTDIR=$FAKEROOT_DIR/tmp || fail package fi gitweb: http://git.pld-linux.org/gitweb.cgi/packages/avidemux.git/commitdiff/162737ed946f9fe07d357bcaf1a2415a64654f32 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/crossmingw32-pango] - updated to 1.48.7
commit b4085687cbaefa4a4b835ba6d12727258ea293f3 Author: Jakub Bogusz Date: Sun Jul 4 07:31:01 2021 +0200 - updated to 1.48.7 crossmingw32-pango.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- diff --git a/crossmingw32-pango.spec b/crossmingw32-pango.spec index 7e73099..9370152 100644 --- a/crossmingw32-pango.spec +++ b/crossmingw32-pango.spec @@ -2,12 +2,12 @@ Summary: System for layout and rendering of internationalized text - cross MinGW Summary(pl.UTF-8): System renderowania międzynarodowego tekstu - wersja skrośna dla MinGW32 %definerealname pango Name: crossmingw32-%{realname} -Version: 1.48.6 +Version: 1.48.7 Release: 1 License: LGPL v2+ Group: Development/Libraries Source0: https://download.gnome.org/sources/pango/1.48/%{realname}-%{version}.tar.xz -# Source0-md5: 13eccb57eb04fd9a5293c74b792b3a65 +# Source0-md5: 01b2902c42313032784e1d1f99b0d9be URL: https://pango.gnome.org/ # cairo-ft cairo-pdf cairo-png cairo-ps cairo-win32 BuildRequires: crossmingw32-cairo >= 1.12.10 gitweb: http://git.pld-linux.org/gitweb.cgi/packages/crossmingw32-pango.git/commitdiff/b4085687cbaefa4a4b835ba6d12727258ea293f3 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: ruby-asciidoctor: asciidoctor-2.0.15.tar.gz
Request by: atler Files fetched: 1 STORED: https://github.com/asciidoctor/asciidoctor/archive/v2.0.15/asciidoctor-2.0.15.tar.gz e3ebbf64cf4014bae0e467befce92db2 asciidoctor-2.0.15.tar.gz Size: 1633310 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/ruby-asciidoctor] up to 2.0.15
commit 97e48c9ddafda2fd879ea80183e1fac89ec798b0 Author: Jan Palus Date: Sun Jul 4 01:05:40 2021 +0200 up to 2.0.15 ruby-asciidoctor.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- diff --git a/ruby-asciidoctor.spec b/ruby-asciidoctor.spec index 8dceda8..2b677c5 100644 --- a/ruby-asciidoctor.spec +++ b/ruby-asciidoctor.spec @@ -6,12 +6,12 @@ Summary: Implementation of the AsciiDoc text processor and publishing toolchain Summary(pl.UTF-8): Implementacja procesora tekstu i systemu publikacji AsciiDoc Name: ruby-asciidoctor -Version: 2.0.10 +Version: 2.0.15 Release: 1 License: MIT #Source0Download: https://github.com/asciidoctor/asciidoctor/releases Source0: https://github.com/asciidoctor/asciidoctor/archive/v%{version}/asciidoctor-%{version}.tar.gz -# Source0-md5: e5743019f56dfbfe83fca49a6898af58 +# Source0-md5: e3ebbf64cf4014bae0e467befce92db2 Group: Development/Languages URL: https://asciidoctor.org/ BuildRequires: ruby >= 1:2.3 gitweb: http://git.pld-linux.org/gitweb.cgi/packages/ruby-asciidoctor.git/commitdiff/97e48c9ddafda2fd879ea80183e1fac89ec798b0 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: pango: pango-1.48.7.tar.xz
Request by: atler Files fetched: 1 STORED: https://download.gnome.org/sources/pango/1.48/pango-1.48.7.tar.xz 01b2902c42313032784e1d1f99b0d9be pango-1.48.7.tar.xz Size: 2050880 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/pango] up to 1.48.7
commit 669b992c1978bdc744f90936298a72f69179ee6e Author: Jan Palus Date: Sun Jul 4 00:55:52 2021 +0200 up to 1.48.7 pango.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- diff --git a/pango.spec b/pango.spec index 9f12ee1..2870037 100644 --- a/pango.spec +++ b/pango.spec @@ -8,13 +8,13 @@ Summary: System for layout and rendering of internationalized text Summary(pl.UTF-8): System renderowania międzynarodowego tekstu Summary(pt_BR.UTF-8): Sistema para layout e renderização de texto internacionalizado Name: pango -Version: 1.48.6 +Version: 1.48.7 Release: 1 Epoch: 1 License: LGPL v2+ Group: X11/Libraries Source0: https://download.gnome.org/sources/pango/1.48/%{name}-%{version}.tar.xz -# Source0-md5: 13eccb57eb04fd9a5293c74b792b3a65 +# Source0-md5: 01b2902c42313032784e1d1f99b0d9be URL: https://pango.gnome.org/ # cairo-ft cairo-pdf cairo-png cairo-ps cairo-xlib BuildRequires: cairo-devel >= 1.12.10 gitweb: http://git.pld-linux.org/gitweb.cgi/packages/pango.git/commitdiff/669b992c1978bdc744f90936298a72f69179ee6e ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: libdrm: libdrm-2.4.107.tar.xz
Request by: atler Files fetched: 1 STORED: https://dri.freedesktop.org/libdrm/libdrm-2.4.107.tar.xz 252175d363e3dbc4ffe32faaa8e93494 libdrm-2.4.107.tar.xz Size: 425612 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/libdrm] up to 2.4.107
commit 19194326c8f65e5d6464c707ad56d2cf58979879 Author: Jan Palus Date: Sun Jul 4 00:52:36 2021 +0200 up to 2.4.107 libdrm.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- diff --git a/libdrm.spec b/libdrm.spec index c60e8f0..5c6c534 100644 --- a/libdrm.spec +++ b/libdrm.spec @@ -6,12 +6,12 @@ Summary: Userspace interface to kernel DRM services Summary(pl.UTF-8): Interfejs przestrzeni użytkownika do usług DRM jądra Name: libdrm -Version: 2.4.106 +Version: 2.4.107 Release: 1 License: MIT Group: Libraries Source0: https://dri.freedesktop.org/libdrm/%{name}-%{version}.tar.xz -# Source0-md5: 4e316ae1966a1a63c31a3885313a8fb8 +# Source0-md5: 252175d363e3dbc4ffe32faaa8e93494 URL: https://dri.freedesktop.org/ BuildRequires: docbook-dtd42-xml BuildRequires: docbook-style-xsl-nons gitweb: http://git.pld-linux.org/gitweb.cgi/packages/libdrm.git/commitdiff/19194326c8f65e5d6464c707ad56d2cf58979879 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: kernel: ERRORS: linux-5.13.tar.xz patch-5.13.0.xz
Request by: atler wget -nv --no-iri --user-agent=PLD/distfiles -O ./tmp/d2129a86-fbdb-46ba-b495-24fa479c4090/8d8999e11617a63ab90c5c9fe515eb36/patch-5.13.0.xz https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.13.0.xz: https://mirrors.edge.kernel.org/pub/linux/kernel/v5.x/patch-5.13.0.xz: 2021-07-04 00:46:23 ERROR 404: Not Found. wget -nv --no-iri --user-agent=PLD/distfiles -O ./tmp/d2129a86-fbdb-46ba-b495-24fa479c4090/8d8999e11617a63ab90c5c9fe515eb36/patch-5.13.0.xz https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.13.0.xz: exited with code 8 (0x00) FATAL: https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.13.0.xz (8d8999e11617a63ab90c5c9fe515eb36) was not fetched correctly (wget -nv --no-iri --user-agent=PLD/distfiles -O ./tmp/d2129a86-fbdb-46ba-b495-24fa479c4090/8d8999e11617a63ab90c5c9fe515eb36/patch-5.13.0.xz https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.13.0.xz: https://mirrors.edge.kernel.org/pub/linux/kernel/v5.x/patch-5.13.0.xz: 2021-07-04 00:46:23 ERROR 404: Not Found. ): file fetched but has 0 length Files fetched: 0 ALREADY GOT: https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.13.tar.xz 76c60fb304510a7bbd9c838790bc5fe4 linux-5.13.tar.xz -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/kernel] updated arm64 confiig and patch for 5.13
commit 72638cec30af2464d19749e3f6496e52dc2ca6d0 Author: Jan Palus Date: Sun Jul 4 00:44:27 2021 +0200 updated arm64 confiig and patch for 5.13 kernel-arm64.config | 25 + kernel-pinebook-pro.patch | 47 +++ 2 files changed, 28 insertions(+), 44 deletions(-) --- diff --git a/kernel-arm64.config b/kernel-arm64.config index a1053ec9..06742545 100644 --- a/kernel-arm64.config +++ b/kernel-arm64.config @@ -64,7 +64,6 @@ SETEND_EMULATION arm64=y ARM64_HW_AFDBM arm64=y ARM64_PAN arm64=y ARM64_USE_LSE_ATOMICS arm64=y -ARM64_VHE arm64=y ARM64_PMEM arm64=n ARM64_RAS_EXTN arm64=y ARM64_CNP arm64=y @@ -76,6 +75,7 @@ ARM64_BTI_KERNEL arm64=y ARM64_E0PD arm64=y ARCH_RANDOM arm64=y ARM64_MTE arm64=y +ARM64_EPAN arm64=y ARM64_SVE arm64=y ARM64_MODULE_PLTS arm64=y ARM64_PSEUDO_NMI arm64=n @@ -97,10 +97,9 @@ DMI arm64=y #- *** FILE: arch/arm64/Kconfig.platforms *** #- ARCH_ACTIONS arm64=n -ARCH_AGILEX arm64=n -ARCH_N5X arm64=n ARCH_SUNXI arm64=n ARCH_ALPINE arm64=n +ARCH_APPLE arm64=n ARCH_BCM2835 arm64=n ARCH_BCM4908 arm64=n ARCH_BCM_IPROC arm64=n @@ -124,7 +123,7 @@ ARCH_RENESAS arm64=n ARCH_ROCKCHIP arm64=y ARCH_S32 arm64=n ARCH_SEATTLE arm64=n -ARCH_STRATIX10 arm64=n +ARCH_INTEL_SOCFPGA arm64=n ARCH_SYNQUACER arm64=n ARCH_TEGRA arm64=n ARCH_SPRD arm64=n @@ -226,6 +225,7 @@ ARM_SMCCC_SOC_ID arm64=y #- #- *** PROBABLY REMOVED OPTIONS *** #- +ADI_AXI_ADC arm64=m AHCI_CEVA arm64=m AHCI_QORIQ arm64=m AHCI_XGENE arm64=m @@ -233,12 +233,16 @@ AK8974 arm64=m ALTERA_PR_IP_CORE_PLAT arm64=m AL_FIC arm64=n AMBA_PL08X arm64=n +ARCH_AGILEX arm64=n +ARCH_N5X arm64=n +ARCH_STRATIX10 arm64=n ARCH_ZX arm64=n ARCX_ANYBUS_CONTROLLER arm64=m ARM64_ERRATUM_858921 arm64=y ARM64_RANDOMIZE_TEXT_OFFSET arm64=n ARM64_RELOC_TEST arm64=m ARM64_UAO arm64=y +ARM64_VHE arm64=y ARM_ARCH_TIMER_EVTSTREAM arm64=y ARM_CCI400_PMU arm64=y ARM_CCI5xx_PMU arm64=y @@ -286,6 +290,7 @@ CLK_RK3308 arm64=y CLK_RK3328 arm64=y CLK_RK3368 arm64=y CLK_RK3399 arm64=y +CLK_RK3568 arm64=m CLK_RV110X arm64=y CLK_SP810 arm64=y CLK_VEXPRESS_OSC arm64=y @@ -336,6 +341,7 @@ DRM_ANALOGIX_ANX7625 arm64=m DRM_ARCPGU arm64=m DRM_CDNS_DSI arm64=m DRM_CDNS_MHDP8546 arm64=m +DRM_CHIPONE_ICN6211 arm64=m DRM_CHRONTEL_CH7033 arm64=m DRM_DISPLAY_CONNECTOR arm64=m DRM_DUMB_VGA_DAC arm64=m @@ -350,6 +356,7 @@ DRM_I2C_ADV7511_CEC arm64=y DRM_I2C_ADV7533 arm64=y DRM_KOMEDA arm64=m DRM_LIMA arm64=m +DRM_LONTIUM_LT8912B arm64=m DRM_LONTIUM_LT9611 arm64=m DRM_LONTIUM_LT9611UXC arm64=m DRM_LVDS_CODEC arm64=m @@ -517,6 +524,7 @@ I2C_DEMUX_PINCTRL arm64=m I2C_FSI arm64=m I2C_HID_OF arm64=m I2C_HID_OF_GOODIX arm64=m +I2C_HISI arm64=m I2C_MLXBF arm64=m I2C_MUX_GPMUX arm64=m I2C_NOMADIK arm64=m @@ -564,6 +572,7 @@ LEDS_LM3697 arm64=m LEDS_LP55XX_COMMON arm64=m LEDS_MAX77650 arm64=m LEDS_MAX77693 arm64=m +LEDS_RT4505 arm64=m LEDS_SPI_BYTE arm64=m LEDS_SYSCON arm64=y LIBNVDIMM arm64=m @@ -589,6 +598,7 @@ MFD_HI6421_SPMI arm64=m MFD_KHADAS_MCU arm64=m MFD_MAX77650 arm64=m MFD_MAX77686 arm64=m +MFD_NTXEC arm64=m MFD_RK808 arm64=m MFD_STMFX arm64=m MFD_TI_LP87565 arm64=m @@ -691,6 +701,7 @@ PINCTRL_EQUILIBRIUM arm64=m PINCTRL_MICROCHIP_SGPIO arm64=n PINCTRL_OCELOT arm64=n PINCTRL_RK805 arm64=m +PINCTRL_ROCKCHIP arm64=m PINCTRL_SINGLE arm64=m PINCTRL_STMFX arm64=m PL320_MBOX arm64=n @@ -708,6 +719,7 @@ POWER_RESET_XGENE arm64=y PWM_ATMEL_HLCDC_PWM arm64=m PWM_ATMEL_TCB arm64=m PWM_FSL_FTM arm64=m +PWM_NTXEC arm64=m PWM_ROCKCHIP arm64=m PWM_STMPE arm64=n PWRSEQ_EMMC arm64=m @@ -768,6 +780,7 @@ RTC_DRV_GOLDFISH arm64=m RTC_DRV_HYM8563 arm64=m RTC_DRV_ISL12026 arm64=m RTC_DRV_MAX77686 arm64=m +RTC_DRV_NTXEC arm64=m RTC_DRV_PL030 arm64=m RTC_DRV_PL031 arm64=m RTC_DRV_R7301 arm64=m @@ -815,12 +828,16 @@ SND_SOC_ROCKCHIP_MAX98090 arm64=m SND_SOC_ROCKCHIP_PDM arm64=m SND_SOC_ROCKCHIP_RT5645 arm64=m SND_SOC_ROCKCHIP_SPDIF arm64=m +SND_SOC_RT1316_SDW arm64=m +SND_SOC_RT711_SDCA_SDW arm64=m +SND_SOC_RT715_SDCA_SDW arm64=m SND_SOC_SOF_IMX_TOPLEVEL arm64=n SND_SOC_SOF_OF arm64=m SOC_BRCMSTB arm64=n SPI_CADENCE_QUADSPI arm64=m SPI_FSI arm64=m SPI_FSL_SPI arm64=m +SPI_HISI_KUNPENG arm64=m SPI_HISI_SFC_V3XX arm64=m SPI_MEM arm64=y SPI_PL022 arm64=m diff --git a/kernel-pinebook-pro.patch b/kernel-pinebook-pro.patch index deda44e4..d4f6dbb0 100644 --- a/kernel-pinebook-pro.patch +++ b/kernel-pinebook-pro.patch @@ -491,9 +491,9 @@ index a6fae1f86505..2908771f4d4e 100644 #include #include @@ -369,6 +370,11 @@ struct tcpm_port { - enum tcpm_ams next_ams; - bool in_ams; - +* SNK_READY for non-pd link. +*/ + bool slow_charger_loop; +#ifdef CONFIG_EXTCON + struct extcon_dev *extcon; + unsigned int *extcon_cables; @@ -661,8 +661,8 @@ index a6fae1f86505..2908771f4d4e 100644 struct fwnode_handle *fwnode) { @@ -4742,6 +4845,23 @@ static int
DISTFILES: lttng-modules: lttng-modules-2.13.0-rc2.tar.bz2
Request by: baggins Files fetched: 1 STORED: https://lttng.org/files/lttng-modules/lttng-modules-2.13.0-rc2.tar.bz2 2f5998af541a1fce28986ae7b07c2430 lttng-modules-2.13.0-rc2.tar.bz2 Size: 342271 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/lttng-modules] - up to 2.13.0 rc2, rel 2
commit 4b0bc276ea5549af6053d6e1be5dffc535c30bbf Author: Jan Rękorajski Date: Sun Jul 4 00:21:26 2021 +0200 - up to 2.13.0 rc2, rel 2 lttng-modules.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- diff --git a/lttng-modules.spec b/lttng-modules.spec index 5bd3675..18c7fcd 100644 --- a/lttng-modules.spec +++ b/lttng-modules.spec @@ -6,8 +6,8 @@ # nothing to be placed to debuginfo package %define_enable_debug_packages 0 -%definepre rc1 -%definerel 1 +%definepre rc2 +%definerel 2 %definepname lttng-modules Summary: LTTng 2.x kernel modules Summary(pl.UTF-8): Moduły jądra LTTng 2.x @@ -17,7 +17,7 @@ Release: %{rel}@%{_kernel_ver_str} License: GPL v2 Group: Base/Kernel Source0: https://lttng.org/files/lttng-modules/%{pname}-%{version}-%{pre}.tar.bz2 -# Source0-md5: 487c988fdb10146ca772baf908683980 +# Source0-md5: 2f5998af541a1fce28986ae7b07c2430 Patch0:build.patch URL: https://lttng.org/ %{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:3.0} gitweb: http://git.pld-linux.org/gitweb.cgi/packages/lttng-modules.git/commitdiff/4b0bc276ea5549af6053d6e1be5dffc535c30bbf ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/VirtualBox] - add fix for building with gccc 11 on ix86
commit 5c8fa7ad13c85efebd3ddc07c01ef6e3faf2026c Author: Jan Rękorajski Date: Sun Jul 4 00:14:15 2021 +0200 - add fix for building with gccc 11 on ix86 VirtualBox.spec | 4 +++- add__divmoddi4.patch | 36 2 files changed, 39 insertions(+), 1 deletion(-) --- diff --git a/VirtualBox.spec b/VirtualBox.spec index e3b60d7..1a70f1f 100644 --- a/VirtualBox.spec +++ b/VirtualBox.spec @@ -47,7 +47,7 @@ exit 1 %defineqtver 5.6.0 -%definerel 1 +%definerel 2 %definepname VirtualBox Summary: VirtualBox - x86 hardware virtualizer Summary(pl.UTF-8): VirtualBox - wirtualizator sprzętu x86 @@ -88,6 +88,7 @@ Patch15: %{pname}-lightdm-1.19.2.patch Patch16: %{pname}-no-vboxvideo.patch Patch17: qt5-gl.patch Patch19: kernel-4.9.256.patch +Patch20: add__divmoddi4.patch URL: http://www.virtualbox.org/ %if %{with userspace} %ifarch %{x8664} @@ -548,6 +549,7 @@ echo override vboxsf %{_kernel_ver} misc >> kernel/installed/etc/depmod.d/%{_ker %patch15 -p0 %patch16 -p0 %patch17 -p1 +%patch20 -p1 %{__sed} -i -e 's,@VBOX_DOC_PATH@,%{_docdir}/%{name}-%{version},' \ -e 's/Categories=.*/Categories=Utility;Emulator;/' src/VBox/Installer/common/virtualbox.desktop.in diff --git a/add__divmoddi4.patch b/add__divmoddi4.patch new file mode 100644 index 000..8dd30a2 --- /dev/null +++ b/add__divmoddi4.patch @@ -0,0 +1,36 @@ +add __divmoddi4 builtin + +GCC 11 will generate it in code + +void foo(unsigned char *u8Second, unsigned int *u32Nanosecond, long long timeSpec) +{ +long long i64Div; +int i32Div; +int i32Rem; +i64Div = timeSpec; +i32Rem = (int)(i64Div % 10); +i64Div /= 10; +*u32Nanosecond = i32Rem; +i32Rem = (int)(i64Div % 60); +*u8Second = i32Rem; +} + + +Upstream-Status: Pending +Signed-off-by: Khem Raj + +--- a/src/VBox/Runtime/common/math/gcc/divdi3.c b/src/VBox/Runtime/common/math/gcc/divdi3.c +@@ -68,3 +68,12 @@ __divdi3(a, b) + uq = - uq; + return uq; + } ++ ++quad_t ++__divmoddi4(quad_t a, quad_t b, quad_t* rem) ++{ ++ quad_t d = __divdi3(a,b); ++ *rem = a - (d*b); ++ return d; ++} ++ gitweb: http://git.pld-linux.org/gitweb.cgi/packages/VirtualBox.git/commitdiff/5c8fa7ad13c85efebd3ddc07c01ef6e3faf2026c ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: avidemux: avidemux_2.7.8.tar.gz
Request by: qboosh Files fetched: 1 STORED: https://downloads.sourceforge.net/avidemux/avidemux_2.7.8.tar.gz 15e2389c9c526b03bd3779a6a6da9db4 avidemux_2.7.8.tar.gz Size: 24692898 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/avidemux] - updated to 2.7.8 - updated x32 patch
commit 1692a186dbd0fa19cf6e213378b0e4f7417787e5 Author: Jakub Bogusz Date: Sat Jul 3 22:31:08 2021 +0200 - updated to 2.7.8 - updated x32 patch avidemux-x32.patch | 10 - avidemux.spec | 66 +- 2 files changed, 56 insertions(+), 20 deletions(-) --- diff --git a/avidemux.spec b/avidemux.spec index 1dc3aa9..5b6e065 100644 --- a/avidemux.spec +++ b/avidemux.spec @@ -23,12 +23,12 @@ Summary: A small audio/video editing software for Linux Summary(pl.UTF-8): Mały edytor audio/wideo dla Linuksa Name: avidemux -Version: 2.7.4 -Release: 2 +Version: 2.7.8 +Release: 1 License: GPL v2+ Group: X11/Applications/Multimedia -Source0: http://downloads.sourceforge.net/avidemux/%{name}_%{version}.tar.gz -# Source0-md5: 87b4dd1ef3a1f695b3d0f9971da8abde +Source0: https://downloads.sourceforge.net/avidemux/%{name}_%{version}.tar.gz +# Source0-md5: 15e2389c9c526b03bd3779a6a6da9db4 Source1: %{name}.desktop Source2: %{name}-qt4.desktop Source3: %{name}-qt5.desktop @@ -49,6 +49,7 @@ URL: http://fixounet.free.fr/avidemux/ %{?with_qt4:BuildRequires: QtScript-devel >= %{qt4_version}} BuildRequires: SDL2-devel >= 2 %{?with_system_liba52:BuildRequires: a52dec-libs-devel} +BuildRequires: aom-devel BuildRequires: aften-devel >= 0.0.8 BuildRequires: alsa-lib-devel >= 1.0 %{?with_arts:BuildRequires:artsc-devel} @@ -91,6 +92,7 @@ BuildRequires:libxml2-devel BuildRequires: nasm >= 0.98.32 BuildRequires: yasm %endif +BuildRequires: nv-codec-headers %{?with_amr:BuildRequires: opencore-amr-devel} BuildRequires: opus-devel BuildRequires: pkgconfig @@ -108,6 +110,7 @@ BuildRequires: rpmbuild(macros) >= 1.600 BuildRequires: sed >= 4.0 BuildRequires: sqlite3-devel >= 3 BuildRequires: twolame-devel +BuildRequires: xorg-lib-libXext-devel BuildRequires: xorg-lib-libXv-devel BuildRequires: xorg-proto-xextproto-devel BuildRequires: xvid-devel >= 1:1.0 @@ -426,7 +429,9 @@ rm -rf $RPM_BUILD_ROOT # R: libvorbis %attr(755,root,root) %{_libdir}/ADM_plugins6/audioEncoders/libADM_ae_vorbis.so -#%dir %{_libdir}/ADM_plugins6/videoDecoders +%dir %{_libdir}/ADM_plugins6/videoDecoders +# R: aom +%attr(755,root,root) %{_libdir}/ADM_plugins6/videoDecoders/libADM_vd_aom.so # R: libvpx [2.7.0: disabled in CMakeLists.txt] #%attr(755,root,root) %{_libdir}/ADM_plugins6/videoDecoders/libADM_vd_vpx.so @@ -439,6 +444,9 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_jpeg.so %attr(755,root,root) %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_libva.so %attr(755,root,root) %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_null.so +%attr(755,root,root) %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_utvideo.so +# R: libvpx +%attr(755,root,root) %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_vp9.so # R: libx264 %attr(755,root,root) %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_x264_other.so # R: libx265 @@ -447,27 +455,28 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_xvid4.so %attr(755,root,root) %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_yv12.so %ifnarch x32 -%attr(755,root,root) %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_ffNvenc.so +%attr(755,root,root) %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_ffNvencH264.so %attr(755,root,root) %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_ffNvencHEVC.so %endif %attr(755,root,root) %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_ffVaEncH264.so %attr(755,root,root) %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_ffVaEncHEVC.so %dir %{_libdir}/ADM_plugins6/videoFilters +%attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_DgBob.so +%attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_FluxSmooth.so %attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_addBorders.so %attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_admIvtc.so %attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_ascii.so %attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_avsfilter.so %attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_black.so +%attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_blend.so %attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_changeFps.so %attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_colorYuv.so %attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_denoise3dhq.so %attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_denoise3d.so -%attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_DgBob.so %attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_dummy.so %attr(755,root,root) %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_fadeToBlack.so
[packages/ffmpeg] - release 5
commit d4facc7cff1acfbe5520600e92075160932592fe Author: Jakub Bogusz Date: Sat Jul 3 22:26:31 2021 +0200 - release 5 ffmpeg.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/ffmpeg.spec b/ffmpeg.spec index 38f3317..1467e04 100644 --- a/ffmpeg.spec +++ b/ffmpeg.spec @@ -117,7 +117,7 @@ Summary:FFmpeg - a very fast video and audio converter Summary(pl.UTF-8): FFmpeg - szybki konwerter audio/wideo Name: ffmpeg Version: 4.4 -Release: 4 +Release: 5 # LGPL or GPL, chosen at configure time (GPL version is more featured) # GPL: frei0r libcdio libdavs2 rubberband vidstab x264 x265 xavs xavs2 xvid # v3 (allows *GPLv3 or Apache-licensed libs): gmp lensfun opencore-amr vmaf vo-*enc rkmpp gitweb: http://git.pld-linux.org/gitweb.cgi/packages/ffmpeg.git/commitdiff/d4facc7cff1acfbe5520600e92075160932592fe ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/subversion] - -tools depend on python, but not subversion bindings
commit 9ff41267746a68f70a544f83bc1d1ffe0ef70e7e Author: Jakub Bogusz Date: Sat Jul 3 22:10:58 2021 +0200 - -tools depend on python, but not subversion bindings subversion.spec | 1 - 1 file changed, 1 deletion(-) --- diff --git a/subversion.spec b/subversion.spec index fd0e28f..086d0fb 100644 --- a/subversion.spec +++ b/subversion.spec @@ -266,7 +266,6 @@ Summary(pt_BR.UTF-8): Módulos python para acessar os recursos do Subversion Group: Applications Requires: %{name} = %{version}-%{release} Requires: python -%{?with_python:Requires: python-subversion = %{version}} %description tools Subversion tools and scripts. gitweb: http://git.pld-linux.org/gitweb.cgi/packages/subversion.git/commitdiff/9ff41267746a68f70a544f83bc1d1ffe0ef70e7e ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/subversion] - added sh patch (adjust swig version checks for non-bash shells) - moved to ctypesgen 1.0.x
commit 1aac8b6c99f6b91b324f27c9fe961550012ec59e Author: Jakub Bogusz Date: Sat Jul 3 21:55:52 2021 +0200 - added sh patch (adjust swig version checks for non-bash shells) - moved to ctypesgen 1.0.x subversion-sh.patch | 16 subversion.spec | 73 - 2 files changed, 55 insertions(+), 34 deletions(-) --- diff --git a/subversion.spec b/subversion.spec index ddabf95..fd0e28f 100644 --- a/subversion.spec +++ b/subversion.spec @@ -1,3 +1,4 @@ +# TODO: python3 module (using swig >= 4.0.0) instead of python2 # # Conditional build: %bcond_withnet_client_only # build only net client @@ -68,6 +69,7 @@ Patch1: %{name}-DESTDIR.patch Patch2:%{name}-ruby-datadir-path.patch Patch3:%{name}-tests.patch Patch4:x32-libdir.patch +Patch5:%{name}-sh.patch URL: http://subversion.apache.org/ %{?with_apache:BuildRequires: apache-devel >= 2.4.14} BuildRequires: apr-devel >= 1:1.4 @@ -94,7 +96,9 @@ BuildRequires:libtool >= 2:2 BuildRequires: libutf8proc-devel >= 1.3.1-4 BuildRequires: lz4-devel BuildRequires: pkgconfig -%{?with_csvn:BuildRequires:python-ctypesgen} +BuildRequires: python >= 1:2.7 +%{?with_csvn:BuildRequires:python-ctypesgen >= 1.0.2} +BuildRequires: rpm-build >= 4.6 BuildRequires: rpm-pythonprov BuildRequires: rpmbuild(macros) >= 1.752 BuildRequires: sed >= 4.0 @@ -123,7 +127,7 @@ BuildRequires: rpm-rubyprov BuildRequires: ruby-devel >= 1:1.8.2 BuildRequires: ruby-irb BuildRequires: ruby-rubygems -BuildRequires: swig-ruby >= 1.3.24 +BuildRequires: swig-ruby >= 3.0.9 %endif Requires: %{name}-libs = %{version}-%{release} %requires_ge sqlite3 @@ -451,45 +455,58 @@ uwierzytelniać się przy użyciu Portfela KDE. %patch2 -p0 %patch3 -p1 %patch4 -p1 +%patch5 -p1 sed -i -e 's#serf_prefix/lib#serf_prefix/%{_lib}#g' build/ac-macros/serf.m4 sed -E -i -e '1s,#!\s*/usr/bin/env\s+python2(\s|$),#!%{__python}\1,' -e '1s,#!\s*/usr/bin/env\s+python(\s|$),#!%{__python}\1,' -e '1s,#!\s*/usr/bin/python(\s|$),#!%{__python}\1,' \ - tools/backup/hot-backup.py.in \ - tools/examples/blame.py \ - tools/examples/check-modified.py \ - tools/examples/dumpprops.py \ - tools/examples/get-location-segments.py \ - tools/examples/getfile.py \ - tools/examples/geturl.py \ - tools/examples/putfile.py \ - tools/examples/revplist.py \ - tools/examples/svnlook.py \ - tools/examples/svnshell.py \ - tools/examples/walk-config-auth.py + tools/backup/hot-backup.py.in \ + tools/examples/blame.py \ + tools/examples/check-modified.py \ + tools/examples/dumpprops.py \ + tools/examples/get-location-segments.py \ + tools/examples/getfile.py \ + tools/examples/geturl.py \ + tools/examples/putfile.py \ + tools/examples/revplist.py \ + tools/examples/svnlook.py \ + tools/examples/svnshell.py \ + tools/examples/walk-config-auth.py %build # disabled regeneration - subversion 1.6.13 is not ready for swig 2.0.x #%{__rm} subversion/bindings/swig/proxy/*.swg #cd subversion/bindings/swig && python "%{SOURCE5}" && cd ../../.. chmod +x ./autogen.sh && ./autogen.sh -%{__libtoolize} +#{__libtoolize} %configure \ + --disable-mod-activation \ + --disable-runtime-module-search \ + --with-apr=%{_bindir}/apr-1-config \ + --with-apr-util=%{_bindir}/apu-1-config \ --with-editor=vi \ + --with-serf=%{_prefix} \ --with-zlib=%{_libdir} \ - --disable-runtime-module-search \ - --disable-mod-activation \ +%if %{with apache} + --with-apache-libexecdir="$(%{_sbindir}/apxs -q LIBEXECDIR)" \ + --with-apxs=%{_sbindir}/apxs \ +%else + --without-apxs \ +%endif %if %{with db} --with-berkeley-db="db.h:%{_includedir}:%{_libdir}:db" \ %{?with_db6:--enable-bdb6} \ %else --without-berkeley-db \ %endif -%if %{with apache} - --with-apache-libexecdir="$(%{_sbindir}/apxs -q LIBEXECDIR)" \ - --with-apxs=%{_sbindir}/apxs \ -%else - --without-apxs \ +%if %{with csvn} + --with-ctypesgen=%{_bindir}/ctypesgen-2 \ +%endif +%if %{with gnome} + --with-gnome-keyring \ +%endif +%if %{with kwallet} + --with-kwallet \ %endif %if %{without swig} --without-swig \ @@ -504,9 +521,6 @@ chmod +x ./autogen.sh && ./autogen.sh %else ac_cv_path_RUBY=none \ %endif -%if %{with csvn} - --with-ctypesgen=%{_bindir}/ctypesgen.py \ -%endif %if %{with java} --enable-javahl \ --with-jdk="%{java_home}" \ @@ -514,15 +528,6 @@ chmod +x ./autogen.sh && ./autogen.sh %else --disable-javahl \ %endif - --with-serf=%{_prefix} \ - --with-apr=%{_bindir}/apr-1-config \ - --with-apr-util=%{_bindir}/apu-1-config \ -%if %{with kwallet} - --with-kwallet \ -%endif -%if
DISTFILES: python-ctypesgen: ctypesgen-1.0.2.tar.gz
Request by: qboosh Files fetched: 1 STORED: https://github.com/davidjamesca/ctypesgen/archive/ctypesgen-1.0.2/ctypesgen-1.0.2.tar.gz 0928ef10a1f0323a82d55d6a0dfac8ff ctypesgen-1.0.2.tar.gz Size: 119413 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/python-ctypesgen] - updated to 1.0.2 release - removed obsolete gcc7-fix patch - added python3- package - executables
commit 3a01e527b63e3f3ec57cb061b61ad43372d7591f Author: Jakub Bogusz Date: Sat Jul 3 21:53:52 2021 +0200 - updated to 1.0.2 release - removed obsolete gcc7-fix patch - added python3- package - executables are now named ctypesgen-2 (for py2) and ctypesgen{,-3} (for py3) gcc7-fix.patch| 36 -- python-ctypesgen.spec | 128 -- 2 files changed, 94 insertions(+), 70 deletions(-) --- diff --git a/python-ctypesgen.spec b/python-ctypesgen.spec index a776c11..f2b4bdb 100644 --- a/python-ctypesgen.spec +++ b/python-ctypesgen.spec @@ -1,25 +1,40 @@ -# TODO: programs shouldn't have ".py" extension +# +# Conditional build: +%bcond_without tests # unit tests +%bcond_without python2 # CPython 2.x module +%bcond_without python3 # CPython 3.x module + %definemodule ctypesgen -%definesnap20150512 -%definegitref 3d2d9803339503d2988382aa861b47a6a4872c32 -%definerel 2 Summary: A pure-python wrapper generator for ctypes Summary(pl.UTF-8): Generator wrapperów dla ctypes napisany w czystym Pythonie Name: python-%{module} -Version: 0.0 -Release: 1.%{snap}.%{rel} +Version: 1.0.2 +Release: 1 License: BSD Group: Libraries/Python -Source0: https://github.com/davidjamesca/ctypesgen/archive/%{gitref}/%{module}-%{snap}.tar.gz -# Source0-md5: abbc70e2fb7c5391ade6b56bd503c6ed -Patch0:gcc7-fix.patch +# only wheels on https://pypi.org/simple/ctypesgen so get from github +#Source0Download: https://github.com/davidjamesca/ctypesgen/releases +Source0: https://github.com/davidjamesca/ctypesgen/archive/ctypesgen-%{version}/%{module}-%{version}.tar.gz +# Source0-md5: 0928ef10a1f0323a82d55d6a0dfac8ff URL: https://github.com/davidjamesca/ctypesgen +%if %{with python2} BuildRequires: python >= 1:2.3 -BuildRequires: python-devel >= 1:2.3 BuildRequires: python-modules >= 1:2.3 +BuildRequires: python-setuptools +%if %{with tests} +BuildRequires: python-pytest +%endif +%endif +%if %{with python3} +BuildRequires: python3 >= 1:3.2 +BuildRequires: python3-modules >= 1:3.2 +BuildRequires: python3-setuptools +%if %{with tests} +BuildRequires: python3-pytest +%endif +%endif BuildRequires: rpm-pythonprov -BuildRequires: rpmbuild(macros) >= 1.710 -%pyrequires_eq python-modules +BuildRequires: rpmbuild(macros) >= 1.714 BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -31,44 +46,89 @@ written in C. Ten program automatycznie generuje wrappery ctypes dla plików nagłówkowych w C. +%package -n python3-%{module} +Summary: A pure-python wrapper generator for ctypes +Summary(pl.UTF-8): Generator wrapperów dla ctypes napisany w czystym Pythonie +Group: Libraries/Python + +%description -n python3-%{module} +This project automatically generates ctypes wrappers for header files +written in C. + +%description -n python3-%{module} -l pl.UTF-8 +Ten program automatycznie generuje wrappery ctypes dla plików +nagłówkowych w C. + %prep -%setup -q -n %{module}-%{gitref} -%patch0 -p1 +%setup -q -n %{module}-%{module}-%{version} %build +%if %{with python2} %py_build +%if %{with tests} +PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 \ +%{__python} -m pytest -v -x --showlocals ctypesgen/test/testsuite.py +%endif + +find ctypesgen -name '*.py[co]' | xargs %{__rm} +%endif + +%if %{with python3} +%py3_build + +%if %{with tests} +PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 \ +%{__python3} -m pytest -v -x --showlocals ctypesgen/test/testsuite.py +%endif + +find ctypesgen -name '__pycache__' | xargs %{__rm} -r +%endif + %install rm -rf $RPM_BUILD_ROOT +%if %{with python2} %py_install # defaultheader.py and preamble.py are templates not modules, so .py files # are required instead of compiled versions # libraryloader.py is used both as module and template, so both forms are required -%py_postclean -x defaultheader.py,preamble.py,libraryloader.py -%{__rm} $RPM_BUILD_ROOT%{py_sitescriptdir}/ctypesgencore/printer_python/{defaultheader,preamble}.py[co] +%py_postclean -x defaultheader.py,preamble/2_5.py,preamble/2_7.py,preable/3_2.py,libraryloader.py +%{__rm} $RPM_BUILD_ROOT%{py_sitescriptdir}/ctypesgen/printer_python/defaultheader.py[co] +%{__rm} $RPM_BUILD_ROOT%{py_sitescriptdir}/ctypesgen/printer_python/preamble/[23]_*.py[co] +%{__rm} -r $RPM_BUILD_ROOT%{py_sitescriptdir}/ctypesgen/test + +%{__mv} $RPM_BUILD_ROOT%{_bindir}/ctypesgen{,-2} + +find ctypesgen -name '*.py[co]' | xargs %{__rm} +%endif + +%if %{with python3} +%py3_install + +%{__rm} -r $RPM_BUILD_ROOT%{py3_sitescriptdir}/ctypesgen/test + +%{__mv} $RPM_BUILD_ROOT%{_bindir}/ctypesgen{,-3} +ln -s ctypesgen-3 $RPM_BUILD_ROOT%{_bindir}/ctypesgen +%endif %clean rm -rf $RPM_BUILD_ROOT +%if %{with python2} %files %defattr(644,root,root,755) -%doc LICENSE todo.txt -%attr(755,root,root) %{_bindir}/ctypesgen.py
[packages/ffmpeg] - added aom bcond (keeping it enabled by default)
commit c2a0ec661bb368fc8982c78f3c1f332bf9bc28f9 Author: Jakub Bogusz Date: Sat Jul 3 20:08:29 2021 +0200 - added aom bcond (keeping it enabled by default) ffmpeg.spec | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) --- diff --git a/ffmpeg.spec b/ffmpeg.spec index eca5256..bbaeefb 100644 --- a/ffmpeg.spec +++ b/ffmpeg.spec @@ -14,6 +14,7 @@ %bcond_withbootstrap # disable features to able to build without installed ffmpeg %bcond_withnonfree # unblock non free options of package (currently: cuda_nvcc, decklib, fdk_aac, npp, openssl, libressl/libtls) %bcond_without amr # AMR-NB/WB de/encoding via libopencore-amrnb/wb +%bcond_without aom # AV1 viden de/encoding via libaom %bcond_without aribb24 # ARIB text and caption decoding via libaribb24 %bcond_without avs # AVS encoding via xavs %bcond_without avs2# AVS2 de/encoding via libdavs2/libxavs2 @@ -141,7 +142,7 @@ BuildRequires: SDL2-devel >= 2.0.1 BuildRequires: SDL2-devel < 2.1.0 %{?with_vulkan:BuildRequires: Vulkan-Loader-devel >= 1.1.97} BuildRequires: alsa-lib-devel -BuildRequires: aom-devel >= 1.0.0 +%{?with_aom:BuildRequires: aom-devel >= 1.0.0} %{?with_aribb24:BuildRequires: aribb24-devel} BuildRequires: bzip2-devel BuildRequires: celt-devel >= 0.11.0 @@ -309,7 +310,7 @@ Summary(pl.UTF-8): Biblioteki ffmpeg Group: Libraries Requires: SDL2 >= 2.0.1 %{?with_vulkan:Requires: Vulkan-Loader >= 1.1.97} -Requires: aom >= 1.0.0 +%{?with_aom:Requires: aom >= 1.0.0} Requires: celt >= 0.11.0 %{?with_dav1d:Requires:dav1d >= 0.5.0} %{?with_avs2:Requires: davs2 >= 1.6} @@ -385,7 +386,7 @@ Requires: %{name}-libs = %{version}-%{release} %{?with_vulkan:Requires: Vulkan-Loader-devel >= 1.1.97} Requires: SDL2-devel >= 2.0.1 Requires: alsa-lib-devel -Requires: aom-devel >= 1.0.0 +%{?with_aom:Requires: aom-devel >= 1.0.0} %{?with_aribb24:Requires: aribb24-devel} %{?with_avs2:Requires: davs2-devel >= 1.6} Requires: bzip2-devel @@ -634,7 +635,7 @@ EOF --enable-version3 \ %{?with_frei0r:--enable-frei0r} \ %{?with_ladspa:--enable-ladspa} \ - --enable-libaom \ + %{?with_aom:--enable-libaom} \ %{?with_aribb24:--enable-libaribb24} \ --enable-libass \ --enable-libbluray \ gitweb: http://git.pld-linux.org/gitweb.cgi/packages/ffmpeg.git/commitdiff/61ffc605096d72cef2551833edaa85e7c17a4cd9 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/ffmpeg] - disabled dav1d by default (AV1 decoding already supported via AOM)
commit 61ffc605096d72cef2551833edaa85e7c17a4cd9 Author: Jakub Bogusz Date: Sat Jul 3 20:09:08 2021 +0200 - disabled dav1d by default (AV1 decoding already supported via AOM) ffmpeg.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/ffmpeg.spec b/ffmpeg.spec index bbaeefb..38f3317 100644 --- a/ffmpeg.spec +++ b/ffmpeg.spec @@ -23,7 +23,7 @@ %bcond_without codec2 # codec2 support using libcodec2 %bcond_without chromaprint # audio fingerprinting with chromaprint %bcond_withcudasdk # NVIDIA CUDA code using nvcc from CUDA SDK [BR: cuda.h, non-free] -%bcond_without dav1d # AV1 decoding via libdav1d +%bcond_withdav1d # AV1 decoding via libdav1d %bcond_without dc1394 # IIDC-1394 grabbing using libdc1394 %bcond_withdecklink# Blackmagic DeckLink I/O support (requires nonfree) %bcond_withfdk_aac # AAC de/encoding via libfdk_aac (requires nonfree) gitweb: http://git.pld-linux.org/gitweb.cgi/packages/ffmpeg.git/commitdiff/61ffc605096d72cef2551833edaa85e7c17a4cd9 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/ffmpeg] - added librist support (enabled by default) - added svtav1 bcond (disabled by default, AV1 encoding
commit faf180660d8dbe0f5ad6c850ccb4dc657a517d58 Author: Jakub Bogusz Date: Sat Jul 3 20:05:19 2021 +0200 - added librist support (enabled by default) - added svtav1 bcond (disabled by default, AV1 encoding already supported via AOM) - added uavs3d bcond (disabled by default, waiting for newer release of uavs3d liubrary) ffmpeg.spec | 27 +-- 1 file changed, 21 insertions(+), 6 deletions(-) --- diff --git a/ffmpeg.spec b/ffmpeg.spec index c39ae92..eca5256 100644 --- a/ffmpeg.spec +++ b/ffmpeg.spec @@ -1,5 +1,5 @@ # TODO: -# - libopenvino, librist >= 0.2, libsvtav1 (SvtAv1Enc) >= 0.8.4, libuavs3d >= 1.1.41 +# - libopenvino # - libtensorflow [-ltensorflow tensorflow/c/c_api.h] # - AMF >= 1.4.9.0 (available at https://github.com/GPUOpen-LibrariesAndSDKs/AMF, where is original source?) # @@ -41,6 +41,7 @@ %bcond_withlibdrm # Linux Direct Rendering Manager code %bcond_withlibklvanc # Kernel Labs VANC processing (in decklink driver) %bcond_without libmysofa # sofalizer filter +%bcond_without librist # RIST support via librist %bcond_withlibrsvg # SVG rasterization via librsvg %bcond_withlibxml2 # XML parsing using libxml2 %bcond_without lv2 # LV2 audio filtering @@ -61,24 +62,26 @@ %bcond_withrkmpp # Rockchip Media Process Platform code [implies libdrm] %bcond_without rubberband # rubberband filter %bcond_without shine # shine fixed-point MP3 encoder +%bcond_withsmb # SMB support via libsmbclient %bcond_without snappy # Snappy compression support (needed for hap encoding) +%bcond_without soxr# SoX Resampler support %bcond_without srt # Haivision SRT protocol support %bcond_without ssh # SFTP protocol support via libssh -%bcond_withsmb # SMB support via libsmbclient -%bcond_without soxr# SoX Resampler support +%bcond_withsvtav1 # AV1 encoding via SVT-AV1 %bcond_withtesseract # OCR filter based on Tesseract %bcond_without theora # Theora encoding via libtheora -%bcond_without vmaf# VMAF filter support -%bcond_without x264# H.264 x264 encoder -%bcond_without x265# H.265/HEVC x265 encoder +%bcond_withuavs3d # AVS3 decoding via libuavs3d (TODO: enable when 1.1.41 released) %bcond_withv4l2_request# V4L2 request API for stateless hw decoding %bcond_without va # VAAPI (Video Acceleration API) %bcond_without vapoursynth # VapourSynth demuxer %bcond_without vidstab # vid.stab video stabilization support +%bcond_without vmaf# VMAF filter support %bcond_without voamrwbenc # MR-WB encoding via libvo-amrwbenc %bcond_without vpx # VP8, a high-quality video codec %bcond_without vulkan # Vulkan code %bcond_without webp# WebP encoding support +%bcond_without x264# H.264 x264 encoder +%bcond_without x265# H.265/HEVC x265 encoder %bcond_without xvid# vid encoding via xvidcore %bcond_without zimg# zscale filter based on z.lib %bcond_without zmq # 0MQ message passing @@ -186,6 +189,7 @@ BuildRequires: libcdio-paranoia-devel >= 0.90-2 %if %{with dc1394} || %{with iec61883} BuildRequires: libraw1394-devel >= 2 %endif +%{?with_librist:BuildRequires: librist-devel >= 0.2} %{?with_librsvg:BuildRequires: librsvg-devel >= 2} BuildRequires: librtmp-devel %{?with_ssh:BuildRequires: libssh-devel} @@ -241,12 +245,14 @@ BuildRequires:rpmbuild(macros) >= 2.007 BuildRequires: speex-devel >= 1:1.2-rc1 %{?with_glslang:BuildRequires: spirv-tools-devel} %{?with_srt:BuildRequires: srt-devel >= 1.3} +%{?with_svtav1:BuildRequires: svt-av1-devel >= 0.8.4} BuildRequires: tar >= 1:1.22 %{?with_tesseract:BuildRequires: tesseract-devel} %{?with_doc:BuildRequires: tetex} %{?with_doc:BuildRequires: texi2html} %{?with_doc:BuildRequires: texinfo} BuildRequires: twolame-devel >= 0.3.10 +%{?with_uavs3d:BuildRequires: uavs3d-devel >= 1.1.41} %{?with_v4l2_request:BuildRequires:udev-devel} %{?with_vapoursynth:BuildRequires: vapoursynth-devel >= 42} %{?with_vidstab:BuildRequires: vid.stab-devel >= 0.98} @@ -315,6 +321,7 @@ Requires: gnutls-libs >= 3.0.20 %{?with_kvazaar:Requires: kvazaar-libs >= 0.8.1} %{?with_libmysofa:Requires:libmysofa >= 0.7} %{?with_openmpt:Requires: libopenmpt >= 0.4.5} +%{?with_librist:Requires: librist >= 0.2} %{?with_theora:Requires: libtheora >= 1.0-0.beta3} %if %{with va} Requires: libva >= 1.0.3 @@ -338,7 +345,9 @@ Requires: openjpeg2 >= 2.1 %{?with_shine:Requires:shine >= 3.0.0} Requires: speex >= 1:1.2-rc1 %{?with_srt:Requires: srt >= 1.3} +%{?with_svtav1:Requires: svt-av1 >= 0.8.4} Requires: twolame-libs >= 0.3.10
DISTFILES: python-slip: python-slip-0.6.5.tar.bz2
Request by: qboosh Files fetched: 1 STORED: https://github.com/nphilipp/python-slip/releases/download/python-slip-0.6.5/python-slip-0.6.5.tar.bz2 28ae5f93853466c44ec96706ba2a1eb4 python-slip-0.6.5.tar.bz2 Size: 25996 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/python-slip] - new URLs, updated to 0.6.5 - added collections_abc patch (fix for collections.Callable deprecated
commit a734686ff7e1e35d50a5b2e2eb606342a0fc9ebe Author: Jakub Bogusz Date: Sat Jul 3 20:01:54 2021 +0200 - new URLs, updated to 0.6.5 - added collections_abc patch (fix for collections.Callable deprecated since 3.2, removed in python 3.9) python-slip-collections_abc.patch | 57 +++ python-slip.spec | 21 --- 2 files changed, 69 insertions(+), 9 deletions(-) --- diff --git a/python-slip.spec b/python-slip.spec index 4b1cb7a..9c9111e 100644 --- a/python-slip.spec +++ b/python-slip.spec @@ -6,13 +6,15 @@ Summary: Miscellaneous convenience, extension and workaround code for Python 2 Summary(pl.UTF-8): Kod różnych udogodnień, rozszerzeń i obejść dla Pythona 2 Name: python-slip -Version: 0.6.0 -Release: 10 +Version: 0.6.5 +Release: 1 License: GPL v2+ Group: Development/Languages/Python -Source0: https://fedorahosted.org/released/python-slip/%{name}-%{version}.tar.bz2 -# Source0-md5: fb3299d75af1a67ca6679d96ce839da6 -URL: https://fedorahosted.org/python-slip/ +#Source0Download: https://github.com/nphilipp/python-slip/releases +Source0: https://github.com/nphilipp/python-slip/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2 +# Source0-md5: 28ae5f93853466c44ec96706ba2a1eb4 +Patch0:%{name}-collections_abc.patch +URL: https://github.com/nphilipp/python-slip %if %{with python2} BuildRequires: python >= 2 BuildRequires: python-devel >= 2 @@ -21,9 +23,9 @@ BuildRequires:python-devel >= 2 BuildRequires: python3 >= 1:3.2 BuildRequires: python3-modules >= 1:3.2 %endif -BuildRequires: rpmbuild(macros) >= 1.710 +BuildRequires: rpmbuild(macros) >= 1.714 Requires: python-selinux -Requires: python-six +Requires: python-six >= 1.13.0 BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -49,7 +51,7 @@ Requires: python-dbus >= 0.80 Requires: python-decorator # pygobject2 or pygobject3 actually (using slip._wrapper._gobject) Requires: python-pygobject >= 2 -Requires: python-six +Requires: python-six >= 1.13.0 Suggests: polkit >= 0.94 Conflicts: PolicyKit < 0.8-3 Conflicts: polkit < 0.94 @@ -122,7 +124,7 @@ Group: Libraries Requires: python3-dbus >= 0.80 Requires: python3-decorator Requires: python3-pygobject3 >= 3 -Requires: python3-six +Requires: python3-six >= 1.13.0 Requires: python3-slip = %{version}-%{release} Suggests: polkit >= 0.94 Conflicts: PolicyKit < 0.8-3 @@ -150,6 +152,7 @@ PolicyKit. %prep %setup -q +%patch0 -p1 %build %{__make} $(pwd)/setup.py diff --git a/python-slip-collections_abc.patch b/python-slip-collections_abc.patch new file mode 100644 index 000..a295efd --- /dev/null +++ b/python-slip-collections_abc.patch @@ -0,0 +1,57 @@ +--- python-slip-0.6.5/slip/dbus/polkit.py.orig 2017-05-16 12:14:36.0 +0200 python-slip-0.6.5/slip/dbus/polkit.py 2021-07-03 19:34:39.676622157 +0200 +@@ -26,7 +26,7 @@ + + from __future__ import absolute_import + +-import collections ++from six.moves import collections_abc + import dbus + from decorator import decorator + from functools import reduce +@@ -103,14 +103,14 @@ + def some_method(self, ...): + ...""" + +-assert(func is None or isinstance(func, collections.Callable)) ++assert(func is None or isinstance(func, collections_abc.Callable)) + + assert( + authfail_result in (None, AUTHFAIL_DONTCATCH) or + authfail_exception is None) + assert( + authfail_callback is None or +-isinstance(authfail_callback, collections.Callable)) ++isinstance(authfail_callback, collections_abc.Callable)) + assert( + authfail_exception is None or + issubclass(authfail_exception, Exception)) +--- python-slip-0.6.5/slip/util/hookable.py.orig 2017-05-16 12:14:36.0 +0200 python-slip-0.6.5/slip/util/hookable.py2021-07-03 19:35:20.166402805 +0200 +@@ -23,7 +23,7 @@ + """This module contains variants of certain base types which call registered + hooks on changes.""" + +-import collections ++from six.moves import collections_abc + from six import with_metaclass + + __all__ = ["Hookable", "HookableSet"] +@@ -67,7 +67,7 @@ + + def __init__(self, hook, args, kwargs, hookable=None): + +-assert(isinstance(hook, collections.Callable)) ++assert(isinstance(hook, collections_abc.Callable)) + assert(isinstance(hookable, Hookable)) + + for n, x in enumerate(args): +@@ -174,7 +174,7 @@ + self.__add_hook(hook, self, *args, **kwargs) + + def __add_hook(self, hook, _hookable, *args, **kwargs): +-assert isinstance(hook, collections.Callable) ++assert isinstance(hook, collections_abc.Callable) + assert
[packages/php4] - x32 fixes
commit dbef15de93b81a49036e709ffed23b8a4bb653e0 Author: Adam Gołębiowski Date: Sat Jul 3 12:02:12 2021 + - x32 fixes php4-libx32.patch | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) --- diff --git a/php4-libx32.patch b/php4-libx32.patch index 5004a30..34354fe 100644 --- a/php4-libx32.patch +++ b/php4-libx32.patch @@ -423,7 +423,7 @@ diff -urbB php-4.4.0.org/ext/ming/config.m4 php-4.4.0/ext/ming/config.m4 + PHP_ADD_LIBRARY_WITH_PATH(ming, $MING_DIR/libx32, MING_SHARED_LIBADD) AC_MSG_CHECKING([for destroySWFBlock]) - AC_TRY_RUN([ + old_CPPFLAGS=$CPPFLAGS diff -urbB php-4.4.0.org/ext/mssql/config.m4 php-4.4.0/ext/mssql/config.m4 --- php-4.4.0.org/ext/mssql/config.m4 2004-12-08 19:59:11.0 +0100 +++ php-4.4.0/ext/mssql/config.m4 2005-07-11 21:44:33.635262496 +0200 @@ -456,8 +456,8 @@ diff -urbB php-4.4.0.org/ext/mysql/config.m4 php-4.4.0/ext/mysql/config.m4 /usr/local/mysql/var/mysql.sock \ /Private/tmp/mysql.sock \ @@ -115,7 +115,7 @@ - - MYSQL_MODULE_TYPE=external + ;; + esac - for i in lib lib/mysql; do + for i in libx32 libx32/mysql; do @@ -465,7 +465,7 @@ diff -urbB php-4.4.0.org/ext/mysql/config.m4 php-4.4.0/ext/mysql/config.m4 done @@ -130,9 +130,9 @@ - PHP_CHECK_LIBRARY(mysqlclient, mysql_error, [], [ + PHP_CHECK_LIBRARY($MY_LIBNAME, mysql_error, [], [ AC_MSG_ERROR([mysql configure failed. Please check config.log for more information.]) ], [ --L$PHP_ZLIB_DIR/lib -L$MYSQL_LIB_DIR @@ -475,7 +475,7 @@ diff -urbB php-4.4.0.org/ext/mysql/config.m4 php-4.4.0/ext/mysql/config.m4 + MYSQL_LIBS="-L$PHP_ZLIB_DIR/libx32 -lz" else PHP_ADD_LIBRARY(z,, MYSQL_SHARED_LIBADD) - PHP_CHECK_LIBRARY(mysqlclient, mysql_errno, [], [ + PHP_CHECK_LIBRARY($MY_LIBNAME, mysql_errno, [], [ diff -urbB php-4.4.0.org/ext/xml/config.m4 php-4.4.0/ext/xml/config.m4 --- php-4.4.0.org/ext/xml/config.m42005-07-11 21:44:02.59898 +0200 +++ php-4.4.0/ext/xml/config.m42005-07-11 21:44:33.637262192 +0200 gitweb: http://git.pld-linux.org/gitweb.cgi/packages/php4.git/commitdiff/dbef15de93b81a49036e709ffed23b8a4bb653e0 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/php4] - release 69
commit e05065994b18a3fe0545f368e769a3b093745054 Author: Adam Gołębiowski Date: Sat Jul 3 11:54:44 2021 + - release 69 php4.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/php4.spec b/php4.spec index 0013a54..b6659af 100644 --- a/php4.spec +++ b/php4.spec @@ -72,7 +72,7 @@ %undefine with_msession %endif -%definerel 68 +%definerel 69 Summary: PHP: Hypertext Preprocessor Summary(fr.UTF-8): Le langage de script embarque-HTML PHP Summary(pl.UTF-8): Język skryptowy PHP gitweb: http://git.pld-linux.org/gitweb.cgi/packages/php4.git/commitdiff/e05065994b18a3fe0545f368e769a3b093745054 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/php4] - no Requires(triggerun)
commit 2b656e9fa942a4f3961bf2c9910b2e9e7262270a Author: Adam Gołębiowski Date: Sat Jul 3 11:54:36 2021 + - no Requires(triggerun) php4.spec | 1 - 1 file changed, 1 deletion(-) --- diff --git a/php4.spec b/php4.spec index 24f4130..0013a54 100644 --- a/php4.spec +++ b/php4.spec @@ -428,7 +428,6 @@ Summary(ru.UTF-8): Разделяемые библиотеки для php Summary(uk.UTF-8): Бібліотеки спільного використання для php Group: Libraries # because of dlclose() bugs in glibc <= 2.3.4 causing SEGVs on exit -Requires(triggerun): sed >= 4.0 Requires: glibc >= 6:2.3.5 Requires: php-dirs Provides: php(modules_api) = %{php_api_version} gitweb: http://git.pld-linux.org/gitweb.cgi/packages/php4.git/commitdiff/e05065994b18a3fe0545f368e769a3b093745054 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/php4] - drop obsolete, commented out source0 url
commit 3b311a1e76e2a762d2b41f6c16a88bccbc6de669 Author: Adam Gołębiowski Date: Sat Jul 3 11:54:20 2021 + - drop obsolete, commented out source0 url php4.spec | 1 - 1 file changed, 1 deletion(-) --- diff --git a/php4.spec b/php4.spec index 713bf35..24f4130 100644 --- a/php4.spec +++ b/php4.spec @@ -87,7 +87,6 @@ License: PHP Group: Libraries Source0: http://www.php.net/distributions/php-%{version}.tar.bz2 # Source0-md5: 2e3b2a0e27f10cb84fd00e5ecd7a1880 -#Source0: http://cvs.php.net/viewvc.cgi/phpweb/distributions/php-%{version}.tar.bz2?revision=1.1 Source3: %{name}-mod_php.conf Source4: %{name}-cgi-fcgi.ini Source5: %{name}-cgi.ini gitweb: http://git.pld-linux.org/gitweb.cgi/packages/php4.git/commitdiff/e05065994b18a3fe0545f368e769a3b093745054 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/php4] - rediffed
commit 32192ed5dfc850b04f4c26e044d3fd9f93568ce4 Author: Adam Gołębiowski Date: Sat Jul 3 11:53:19 2021 + - rediffed php4-acam.patch| 6 +++--- php4-allow-db31.patch | 2 +- php4-apache24.patch| 4 ++-- php4-both-apxs.patch | 2 +- php4-hyperwave-fix.patch | 2 +- php4-ini-search-path.patch | 2 +- php4-java-norpath.patch| 2 +- php4-lib64.patch | 10 +- php4-m4-divert.patch | 4 ++-- php4-mail.patch| 2 +- php4-mcal-shared-lib.patch | 4 ++-- php4-pldlogo.patch | 8 php4-sapi-ini-file.patch | 2 +- php4-shared.patch | 6 +++--- php4-threads-acfix.patch | 2 +- php4-uint32_t.patch| 4 ++-- php4-xmlrpc-fix.patch | 2 +- 17 files changed, 32 insertions(+), 32 deletions(-) --- diff --git a/php4-acam.patch b/php4-acam.patch index 5369ac7..c7c717c 100644 --- a/php4-acam.patch +++ b/php4-acam.patch @@ -1,10 +1,10 @@ --- php-4.2.2/ext/mysql/config.m4.orig Fri Aug 9 23:49:00 2002 +++ php-4.2.2/ext/mysql/config.m4 Sat Aug 10 00:05:40 2002 @@ -49,6 +49,7 @@ - [ --with-mysql[=DIR] Include MySQL support. DIR is the MySQL base directory. - If unspecified, the bundled MySQL library will be used.], yes) + [ --with-zlib-dir[=DIR] MySQL: Set the path to libz install prefix.], no, no) + fi +PHP_REQUIRE_CXX + if test "$PHP_MYSQL" != "no"; then AC_DEFINE(HAVE_MYSQL, 1, [Whether you have MySQL]) - if test "$PHP_SAFE_MODE" = "yes"; then diff --git a/php4-allow-db31.patch b/php4-allow-db31.patch index f715330..c0658a6 100644 --- a/php4-allow-db31.patch +++ b/php4-allow-db31.patch @@ -1,7 +1,7 @@ --- php-4.3.2/ext/dba/config.m4.orig Wed May 21 02:35:29 2003 +++ php-4.3.2/ext/dba/config.m4Mon Jun 23 11:53:32 2003 @@ -176,13 +176,13 @@ - AC_MSG_CHECKING(if db can be used as shared extension) + AC_MSG_CHECKING(if dba can be used as shared extension) AC_EGREP_CPP(yes,[ #include "$THIS_INCLUDE" -#if DB_VERSION_MAJOR > 3 || (DB_VERSION_MAJOR == 3 && DB_VERSION_MINOR > 2) diff --git a/php4-apache24.patch b/php4-apache24.patch index f61536a..4fd21db 100644 --- a/php4-apache24.patch +++ b/php4-apache24.patch @@ -78,7 +78,7 @@ diff -ur -x configure -x aclocal.m4 -x config.guess -x config.sub -x '*.orig' -x APU_BINDIR=`$APXS -q APU_BINDIR` APR_BINDIR=`$APXS -q APR_BINDIR` -@@ -114,8 +113,16 @@ +@@ -114,8 +114,16 @@ ;; esac @@ -96,7 +96,7 @@ diff -ur -x configure -x aclocal.m4 -x config.guess -x config.sub -x '*.orig' -x +fi fi AC_MSG_RESULT(yes) - + --- php-4.4.9/sapi.org/apache2handler/php_functions.c 2007-12-31 08:22:55.0 +0100 +++ php-4.4.9/sapi/apache2handler/php_functions.c 2014-08-11 13:09:01.932246720 +0200 @@ -324,7 +324,11 @@ diff --git a/php4-both-apxs.patch b/php4-both-apxs.patch index 9b467df..a90fb88 100644 --- a/php4-both-apxs.patch +++ b/php4-both-apxs.patch @@ -2,7 +2,7 @@ +++ ./Makefile.global 2005-06-16 23:10:40.0 +0300 @@ -20,6 +20,11 @@ libphp4.la: libphp_common.la $(PHP_SAPI_OBJS) - $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(phptempdir)/libphp_common.la $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ + $(LIBTOOL) --mode=link $(CC) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(phptempdir)/libphp_common.la $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ +$(LIBTOOL_SAPI): libphp_common.la $(PHP_SAPI_OBJS) + $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(phptempdir)/libphp_common.la $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ diff --git a/php4-hyperwave-fix.patch b/php4-hyperwave-fix.patch index 1b622a9..ccde575 100644 --- a/php4-hyperwave-fix.patch +++ b/php4-hyperwave-fix.patch @@ -1,7 +1,7 @@ --- php-4.3.0/ext/hyperwave/config.m4.orig Thu Jan 2 23:17:53 2003 +++ php-4.3.0/ext/hyperwave/config.m4 Thu Jan 2 23:19:42 2003 @@ -2,19 +2,12 @@ - dnl $Id$ + dnl $Id: config.m4,v 1.4 2002/03/12 16:47:14 sas Exp $ dnl -AC_MSG_CHECKING(for Hyperwave support) diff --git a/php4-ini-search-path.patch b/php4-ini-search-path.patch index 2c8499e..50fda9b 100644 --- a/php4-ini-search-path.patch +++ b/php4-ini-search-path.patch @@ -2,7 +2,7 @@ see also http://bugs.php.net/bug.php?id=34793 --- php-4.4.2/main/php_ini.c~ 2006-01-17 19:02:09.0 +0200 +++ php-4.4.2/main/php_ini.c 2006-01-17 19:26:46.0 +0200 @@ -19,7 +19,7 @@ - /* $Id$ */ + /* $Id: php_ini.c,v 1.106.2.15.2.5 2007/12/31 07:22:54 sebastian Exp $ */ /* Check CWD for php.ini */ -#define INI_CHECK_CWD diff --git a/php4-java-norpath.patch b/php4-java-norpath.patch index b6553c6..472495a 100644 --- a/php4-java-norpath.patch +++ b/php4-java-norpath.patch @@ -2,7 +2,7 @@ diff -burN php-4.3.2/ext/java/config.m4
DISTFILES: php: php-7.4.21.tar.xz
Request by: adamg Files fetched: 1 STORED: https://php.net/distributions/php-7.4.21.tar.xz 740bf0906e167c65b9ea8be71492b024 php-7.4.21.tar.xz Size: 10346628 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: php: php-8.0.8.tar.xz
Request by: adamg Files fetched: 1 STORED: https://php.net/distributions/php-8.0.8.tar.xz ff8897b914cb8de9d218bbae877decc7 php-8.0.8.tar.xz Size: 10674548 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/php] - updated to 8.0.8, solves CVE-2021-21704, CVE-2021-21705 - bumped zipver to 1.19.3
commit 4b9ded1dca3b808698a82c86fce2f0c98faa9966 Author: Adam Gołębiowski Date: Sat Jul 3 08:43:34 2021 + - updated to 8.0.8, solves CVE-2021-21704, CVE-2021-21705 - bumped zipver to 1.19.3 php.spec | 8 1 file changed, 4 insertions(+), 4 deletions(-) --- diff --git a/php.spec b/php.spec index 3aaa648..a2c97d4 100644 --- a/php.spec +++ b/php.spec @@ -147,8 +147,8 @@ Summary(pt_BR.UTF-8): A linguagem de script PHP Summary(ru.UTF-8): PHP - язык препроцессирования HTML-файлов, выполняемый на сервере Summary(uk.UTF-8): PHP - мова препроцесування HTML-файлів, виконувана на сервері Name: %{orgname}%{php_suffix} -Version: 8.0.7 -Release: 2 +Version: 8.0.8 +Release: 1 Epoch: 4 # All files licensed under PHP version 3.01, except # Zend is licensed under Zend @@ -156,7 +156,7 @@ Epoch: 4 License: PHP 3.01 and Zend and BSD Group: Libraries Source0: https://php.net/distributions/%{orgname}-%{version}.tar.xz -# Source0-md5: ee5d675f8e9d58fcdc4c887d3d9e8412 +# Source0-md5: ff8897b914cb8de9d218bbae877decc7 Source1: opcache.ini Source2: %{orgname}-mod_php.conf Source3: %{orgname}-cgi-fcgi.ini @@ -294,7 +294,7 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %definejsonver %{version} %definepharver %{version} %definesqlite3ver %{version} -%definezipver 1.19.2 +%definezipver 1.19.3 %definephpdbgver %{version} %definesodiumver %{version} gitweb: http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/4b9ded1dca3b808698a82c86fce2f0c98faa9966 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: php: php-7.3.29.tar.xz
Request by: adamg Files fetched: 1 STORED: https://php.net/distributions/php-7.3.29.tar.xz c896daba42dc92d5ad0d76f94e59787c php-7.3.29.tar.xz Size: 12139492 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/php/PHP_7_4] - updated to 7.4.21, solves CVE-2021-21704, CVE-2021-21705
commit cd8c0ebd0c8772a79e4b4dcdff3cfe018ca5950b Author: Adam Gołębiowski Date: Sat Jul 3 07:15:29 2021 + - updated to 7.4.21, solves CVE-2021-21704, CVE-2021-21705 php.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- diff --git a/php.spec b/php.spec index 0f4f430..b994f1e 100644 --- a/php.spec +++ b/php.spec @@ -149,7 +149,7 @@ Summary(pt_BR.UTF-8): A linguagem de script PHP Summary(ru.UTF-8): PHP Версии 7 - язык препроцессирования HTML-файлов, выполняемый на сервере Summary(uk.UTF-8): PHP Версії 7 - мова препроцесування HTML-файлів, виконувана на сервері Name: %{orgname}%{php_suffix} -Version: 7.4.20 +Version: 7.4.21 Release: 1 Epoch: 4 # All files licensed under PHP version 3.01, except @@ -158,7 +158,7 @@ Epoch: 4 License: PHP 3.01 and Zend and BSD Group: Libraries Source0: https://php.net/distributions/%{orgname}-%{version}.tar.xz -# Source0-md5: 6e0b6f6ac5c726e1194bff67f421cb5f +# Source0-md5: 740bf0906e167c65b9ea8be71492b024 Source1: opcache.ini Source2: %{orgname}-mod_php.conf Source3: %{orgname}-cgi-fcgi.ini gitweb: http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/cd8c0ebd0c8772a79e4b4dcdff3cfe018ca5950b ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/php/PHP_7_4] - updated to 7.4.20
commit e6f2ef17ae1d38288801c15c2816bb2630f45e73 Author: Adam Gołębiowski Date: Sat Jul 3 07:02:39 2021 + - updated to 7.4.20 php.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- diff --git a/php.spec b/php.spec index f045666..0f4f430 100644 --- a/php.spec +++ b/php.spec @@ -149,8 +149,8 @@ Summary(pt_BR.UTF-8): A linguagem de script PHP Summary(ru.UTF-8): PHP Версии 7 - язык препроцессирования HTML-файлов, выполняемый на сервере Summary(uk.UTF-8): PHP Версії 7 - мова препроцесування HTML-файлів, виконувана на сервері Name: %{orgname}%{php_suffix} -Version: 7.4.19 -Release: 2 +Version: 7.4.20 +Release: 1 Epoch: 4 # All files licensed under PHP version 3.01, except # Zend is licensed under Zend @@ -158,7 +158,7 @@ Epoch: 4 License: PHP 3.01 and Zend and BSD Group: Libraries Source0: https://php.net/distributions/%{orgname}-%{version}.tar.xz -# Source0-md5: 287ee24d4401489881be7338eff87f77 +# Source0-md5: 6e0b6f6ac5c726e1194bff67f421cb5f Source1: opcache.ini Source2: %{orgname}-mod_php.conf Source3: %{orgname}-cgi-fcgi.ini gitweb: http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/cd8c0ebd0c8772a79e4b4dcdff3cfe018ca5950b ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/php/PHP_7_3] - updated to 7.3.29, solves CVE-2021-21705, CVE-2021-21704
commit 4aff87df505cd62725b10904697612571506dfc6 Author: Adam Gołębiowski Date: Sat Jul 3 06:49:14 2021 + - updated to 7.3.29, solves CVE-2021-21705, CVE-2021-21704 php.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- diff --git a/php.spec b/php.spec index 688e793..3c39c54 100644 --- a/php.spec +++ b/php.spec @@ -156,8 +156,8 @@ Summary(pt_BR.UTF-8): A linguagem de script PHP Summary(ru.UTF-8): PHP Версии 7 - язык препроцессирования HTML-файлов, выполняемый на сервере Summary(uk.UTF-8): PHP Версії 7 - мова препроцесування HTML-файлів, виконувана на сервері Name: %{orgname}%{php_suffix} -Version: 7.3.28 -Release: 2 +Version: 7.3.29 +Release: 1 Epoch: 4 # All files licensed under PHP version 3.01, except # Zend is licensed under Zend @@ -166,7 +166,7 @@ License:PHP 3.01 and Zend and BSD Group: Libraries #Source0: https://downloads.php.net/~cmb/php-%{version}%{subver}.tar.xz Source0: https://php.net/distributions/%{orgname}-%{version}.tar.xz -# Source0-md5: 1be06424d70625db235c79209f939a87 +# Source0-md5: c896daba42dc92d5ad0d76f94e59787c Source1: opcache.ini Source2: %{orgname}-mod_php.conf Source3: %{orgname}-cgi-fcgi.ini gitweb: http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/4aff87df505cd62725b10904697612571506dfc6 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/swig] - versioned Obsoletes
commit e06517bd9df61b89f5b2d67be09e376346bccd46 Author: Jakub Bogusz Date: Sat Jul 3 08:47:19 2021 +0200 - versioned Obsoletes swig.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/swig.spec b/swig.spec index b33884d..334e93a 100644 --- a/swig.spec +++ b/swig.spec @@ -44,7 +44,7 @@ BuildRequires:rpmbuild(macros) >= 1.277 BuildRequires: ruby-devel >= 1:1.6.3 %endif %{?with_tcl:BuildRequires: tcl-devel >= 8.3.3} -Obsoletes: swig-ocaml +Obsoletes: swig-ocaml < 3.0.7 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description gitweb: http://git.pld-linux.org/gitweb.cgi/packages/swig.git/commitdiff/e06517bd9df61b89f5b2d67be09e376346bccd46 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/php] - Obsoletes: phpXX-program (for each version we provide) - release 2
commit a9729399d2fbcba1cd6b8daad3788384e49c Author: Adam Gołębiowski Date: Thu Jun 10 13:45:13 2021 + - Obsoletes: phpXX-program (for each version we provide) - release 2 php.spec | 13 - 1 file changed, 12 insertions(+), 1 deletion(-) --- diff --git a/php.spec b/php.spec index 967dd40..3aaa648 100644 --- a/php.spec +++ b/php.spec @@ -148,7 +148,7 @@ Summary(ru.UTF-8): PHP - язык препроцессирования HTML-фа Summary(uk.UTF-8): PHP - мова препроцесування HTML-файлів, виконувана на сервері Name: %{orgname}%{php_suffix} Version: 8.0.7 -Release: 1 +Release: 2 Epoch: 4 # All files licensed under PHP version 3.01, except # Zend is licensed under Zend @@ -460,6 +460,17 @@ Summary(pl.UTF-8): Dowiązanie symboliczne /usr/bin/php Group: Development/Languages/PHP Requires: %{name}-cli = %{epoch}:%{version}-%{release} Obsoletes: php-program < 4:5.3.28-7 +Obsoletes: php4-program +Obsoletes: php52-program +Obsoletes: php53-program +Obsoletes: php54-program +Obsoletes: php55-program +Obsoletes: php56-program +Obsoletes: php70-program +Obsoletes: php71-program +Obsoletes: php72-program +Obsoletes: php73-program +Obsoletes: php74-program %description program Package providing /usr/bin/php symlink to PHP CLI. gitweb: http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/a9729399d2fbcba1cd6b8daad3788384e49c ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/php/PHP_7_4] - Obsoletes: phpXX-program (for each version we provide) - release 2
commit 9ae4a40d415897ac97b3f07589cfaff01be4b2f9 Author: Adam Gołębiowski Date: Thu Jun 10 13:41:27 2021 + - Obsoletes: phpXX-program (for each version we provide) - release 2 php.spec | 13 - 1 file changed, 12 insertions(+), 1 deletion(-) --- diff --git a/php.spec b/php.spec index 90a9b40..f045666 100644 --- a/php.spec +++ b/php.spec @@ -150,7 +150,7 @@ Summary(ru.UTF-8): PHP Версии 7 - язык препроцессирова Summary(uk.UTF-8): PHP Версії 7 - мова препроцесування HTML-файлів, виконувана на сервері Name: %{orgname}%{php_suffix} Version: 7.4.19 -Release: 1 +Release: 2 Epoch: 4 # All files licensed under PHP version 3.01, except # Zend is licensed under Zend @@ -463,6 +463,17 @@ Summary(pl.UTF-8): Dowiązanie symboliczne /usr/bin/php Group: Development/Languages/PHP Requires: %{name}-cli = %{epoch}:%{version}-%{release} Obsoletes: php-program < 4:5.3.28-7 +Obsoletes: php4-program +Obsoletes: php52-program +Obsoletes: php53-program +Obsoletes: php54-program +Obsoletes: php55-program +Obsoletes: php56-program +Obsoletes: php70-program +Obsoletes: php71-program +Obsoletes: php72-program +Obsoletes: php73-program +Obsoletes: php80-program %description program Package providing /usr/bin/php symlink to PHP CLI. gitweb: http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/9ae4a40d415897ac97b3f07589cfaff01be4b2f9 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/php/PHP_7_3] - Obsoletes: phpXX-program (for each version we provide) - release 2
commit 517932c6560486fbd47fe5adcc5bfb5a86eacf76 Author: Adam Gołębiowski Date: Thu Jun 10 13:45:25 2021 + - Obsoletes: phpXX-program (for each version we provide) - release 2 php.spec | 13 - 1 file changed, 12 insertions(+), 1 deletion(-) --- diff --git a/php.spec b/php.spec index f69917b..688e793 100644 --- a/php.spec +++ b/php.spec @@ -157,7 +157,7 @@ Summary(ru.UTF-8): PHP Версии 7 - язык препроцессирова Summary(uk.UTF-8): PHP Версії 7 - мова препроцесування HTML-файлів, виконувана на сервері Name: %{orgname}%{php_suffix} Version: 7.3.28 -Release: 1 +Release: 2 Epoch: 4 # All files licensed under PHP version 3.01, except # Zend is licensed under Zend @@ -487,6 +487,17 @@ Summary(pl.UTF-8): Dowiązanie symboliczne /usr/bin/php Group: Development/Languages/PHP Requires: %{name}-cli = %{epoch}:%{version}-%{release} Obsoletes: php-program < 4:5.3.28-7 +Obsoletes: php4-program +Obsoletes: php52-program +Obsoletes: php53-program +Obsoletes: php54-program +Obsoletes: php55-program +Obsoletes: php56-program +Obsoletes: php70-program +Obsoletes: php71-program +Obsoletes: php72-program +Obsoletes: php74-program +Obsoletes: php80-program %description program Package providing /usr/bin/php symlink to PHP CLI. gitweb: http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/517932c6560486fbd47fe5adcc5bfb5a86eacf76 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/php/PHP_7_2] - Obsoletes: phpXX-program (for each version we provide) - release 2
commit b35043476b1899ef8f0c23fa2fec1c24a774d32c Author: Adam Gołębiowski Date: Thu Jun 10 13:46:35 2021 + - Obsoletes: phpXX-program (for each version we provide) - release 2 php.spec | 13 - 1 file changed, 12 insertions(+), 1 deletion(-) --- diff --git a/php.spec b/php.spec index 315620c..2fe71ec 100644 --- a/php.spec +++ b/php.spec @@ -155,7 +155,7 @@ Summary(ru.UTF-8): PHP Версии 7 - язык препроцессирова Summary(uk.UTF-8): PHP Версії 7 - мова препроцесування HTML-файлів, виконувана на сервері Name: %{orgname}%{php_suffix} Version: 7.2.34 -Release: 1 +Release: 2 Epoch: 4 # All files licensed under PHP version 3.01, except # Zend is licensed under Zend @@ -486,6 +486,17 @@ Group: Development/Languages/PHP Requires: %{name}-cli = %{epoch}:%{version}-%{release} Obsoletes: /usr/bin/php Obsoletes: php-program < 4:5.3.28-7 +Obsoletes: php4-program +Obsoletes: php52-program +Obsoletes: php53-program +Obsoletes: php54-program +Obsoletes: php55-program +Obsoletes: php56-program +Obsoletes: php70-program +Obsoletes: php71-program +Obsoletes: php73-program +Obsoletes: php74-program +Obsoletes: php80-program %description program Package providing /usr/bin/php symlink to PHP CLI. gitweb: http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/b35043476b1899ef8f0c23fa2fec1c24a774d32c ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/php/PHP_7_1] - Obsoletes: phpXX-program (for each version we provide) - release 4
commit fdc21f20a1d8d27e7dbb24cd96d5e78c6ef76376 Author: Adam Gołębiowski Date: Thu Jun 10 13:47:03 2021 + - Obsoletes: phpXX-program (for each version we provide) - release 4 php.spec | 13 - 1 file changed, 12 insertions(+), 1 deletion(-) --- diff --git a/php.spec b/php.spec index 528ef0a..a71da8e 100644 --- a/php.spec +++ b/php.spec @@ -151,7 +151,7 @@ Summary(ru.UTF-8): PHP Версии 7 - язык препроцессирова Summary(uk.UTF-8): PHP Версії 7 - мова препроцесування HTML-файлів, виконувана на сервері Name: %{orgname}%{php_suffix} Version: 7.1.33 -Release: 3 +Release: 4 Epoch: 4 # All files licensed under PHP version 3.01, except # Zend is licensed under Zend @@ -480,6 +480,17 @@ Group: Development/Languages/PHP Requires: %{name}-cli = %{epoch}:%{version}-%{release} Obsoletes: /usr/bin/php Obsoletes: php-program < 4:5.3.28-7 +Obsoletes: php4-program +Obsoletes: php52-program +Obsoletes: php53-program +Obsoletes: php54-program +Obsoletes: php55-program +Obsoletes: php56-program +Obsoletes: php70-program +Obsoletes: php72-program +Obsoletes: php73-program +Obsoletes: php74-program +Obsoletes: php80-program %description program Package providing /usr/bin/php symlink to PHP CLI. gitweb: http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/fdc21f20a1d8d27e7dbb24cd96d5e78c6ef76376 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/php/PHP_7_0] - Obsoletes: phpXX-program (for each version we provide) - release 9
commit d4f1a744eafa22af19068e4effbad4678f830a4f Author: Adam Gołębiowski Date: Thu Jun 10 13:47:31 2021 + - Obsoletes: phpXX-program (for each version we provide) - release 9 php.spec | 13 - 1 file changed, 12 insertions(+), 1 deletion(-) --- diff --git a/php.spec b/php.spec index a943c91..f704209 100644 --- a/php.spec +++ b/php.spec @@ -150,7 +150,7 @@ Summary(ru.UTF-8): PHP Версии 7 - язык препроцессирова Summary(uk.UTF-8): PHP Версії 7 - мова препроцесування HTML-файлів, виконувана на сервері Name: %{orgname}%{php_suffix} Version: 7.0.33 -Release: 8 +Release: 9 Epoch: 4 # All files licensed under PHP version 3.01, except # Zend is licensed under Zend @@ -468,6 +468,17 @@ Group: Development/Languages/PHP Requires: %{name}-cli = %{epoch}:%{version}-%{release} Obsoletes: /usr/bin/php Obsoletes: php-program < 4:5.3.28-7 +Obsoletes: php4-program +Obsoletes: php52-program +Obsoletes: php53-program +Obsoletes: php54-program +Obsoletes: php55-program +Obsoletes: php56-program +Obsoletes: php71-program +Obsoletes: php72-program +Obsoletes: php73-program +Obsoletes: php74-program +Obsoletes: php80-program %description program Package providing /usr/bin/php symlink to PHP CLI. gitweb: http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/d4f1a744eafa22af19068e4effbad4678f830a4f ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/php/PHP_5_6] - Obsoletes: phpXX-program (for each version we provide) - release 10
commit f145c25d9e364a24ca29826eb0b7710456a558f9 Author: Adam Gołębiowski Date: Thu Jun 10 13:48:12 2021 + - Obsoletes: phpXX-program (for each version we provide) - release 10 php.spec | 13 - 1 file changed, 12 insertions(+), 1 deletion(-) --- diff --git a/php.spec b/php.spec index 0b30e1e..4834c73 100644 --- a/php.spec +++ b/php.spec @@ -155,7 +155,7 @@ ERROR: You need to select at least one Apache SAPI to build shared modules. %undefine with_filter %endif -%definerel 9 +%definerel 10 %defineorgname php %definever_suffix 56 %definephp_suffix %{!?with_default_php:%{ver_suffix}} @@ -526,6 +526,17 @@ Group: Development/Languages/PHP Requires: %{name}-cli = %{epoch}:%{version}-%{release} Obsoletes: /usr/bin/php Obsoletes: php-program < 4:5.3.28-7 +Obsoletes: php4-program +Obsoletes: php52-program +Obsoletes: php53-program +Obsoletes: php54-program +Obsoletes: php55-program +Obsoletes: php70-program +Obsoletes: php71-program +Obsoletes: php72-program +Obsoletes: php73-program +Obsoletes: php74-program +Obsoletes: php80-program %description program Package providing /usr/bin/php symlink to PHP CLI. gitweb: http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/f145c25d9e364a24ca29826eb0b7710456a558f9 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/php/PHP_5_5] - Obsoletes: phpXX-program (for each version we provide) - release 23
commit 756f33140c1f3e7b203c6643fbcd6092e3048308 Author: Adam Gołębiowski Date: Thu Jun 10 13:51:23 2021 + - Obsoletes: phpXX-program (for each version we provide) - release 23 php.spec | 13 - 1 file changed, 12 insertions(+), 1 deletion(-) --- diff --git a/php.spec b/php.spec index 2e7aea4..73f7b10 100644 --- a/php.spec +++ b/php.spec @@ -140,7 +140,7 @@ ERROR: You need to select at least one Apache SAPI to build shared modules. %undefine with_filter %endif -%definerel 22 +%definerel 23 %defineorgname php %definever_suffix 55 %definephp_suffix %{!?with_default_php:%{ver_suffix}} @@ -509,6 +509,17 @@ Group: Development/Languages/PHP Requires: %{name}-cli = %{epoch}:%{version}-%{release} Obsoletes: /usr/bin/php Obsoletes: php-program < 4:5.3.28-7 +Obsoletes: php4-program +Obsoletes: php52-program +Obsoletes: php53-program +Obsoletes: php54-program +Obsoletes: php56-program +Obsoletes: php70-program +Obsoletes: php71-program +Obsoletes: php72-program +Obsoletes: php73-program +Obsoletes: php74-program +Obsoletes: php80-program %description program Package providing /usr/bin/php symlink to PHP CLI. gitweb: http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/756f33140c1f3e7b203c6643fbcd6092e3048308 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/php/PHP_5_4] - Obsoletes: phpXX-program (for each version we provide) - relase 31
commit cdcba5287d86e70a7791dc21abad0e8cc366cd50 Author: Adam Gołębiowski Date: Thu Jun 10 13:53:44 2021 + - Obsoletes: phpXX-program (for each version we provide) - relase 31 php.spec | 15 +-- 1 file changed, 13 insertions(+), 2 deletions(-) --- diff --git a/php.spec b/php.spec index 4fb46d7..eb5b318 100644 --- a/php.spec +++ b/php.spec @@ -138,7 +138,7 @@ ERROR: You need to select at least one Apache SAPI to build shared modules. %undefine with_filter %endif -%definerel 30 +%definerel 31 %defineorgname php %definever_suffix 54 %definephp_suffix %{!?with_default_php:%{ver_suffix}} @@ -504,7 +504,18 @@ Summary: /usr/bin/php symlink Summary(pl.UTF-8): Dowiązanie symboliczne /usr/bin/php Group: Development/Languages/PHP Requires: %{name}-cli = %{epoch}:%{version}-%{release} -Obsoletes: /usr/bin/php +Obsoletes: php-program < 4:5.3.28-7 +Obsoletes: php4-program +Obsoletes: php52-program +Obsoletes: php53-program +Obsoletes: php55-program +Obsoletes: php56-program +Obsoletes: php70-program +Obsoletes: php71-program +Obsoletes: php72-program +Obsoletes: php73-program +Obsoletes: php74-program +Obsoletes: php80-program %description program Package providing /usr/bin/php symlink to PHP CLI. gitweb: http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/cdcba5287d86e70a7791dc21abad0e8cc366cd50 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/php/PHP_5_3] - Obsoletes: phpXX-program (for each version we provide) - release 53
commit 595e5b766f7473d83dd02be0fc2db323b612b52e Author: Adam Gołębiowski Date: Thu Jun 10 13:55:02 2021 + - Obsoletes: phpXX-program (for each version we provide) - release 53 php.spec | 14 -- 1 file changed, 12 insertions(+), 2 deletions(-) --- diff --git a/php.spec b/php.spec index 1c462b8..7a7a6b2 100644 --- a/php.spec +++ b/php.spec @@ -143,7 +143,7 @@ ERROR: You need to select at least one Apache SAPI to build shared modules. %undefine with_alternatives %endif -%definerel 52 +%definerel 53 %defineorgname php %definever_suffix 53 %definephp_suffix %{!?with_default_php:%{ver_suffix}} @@ -554,8 +554,18 @@ Summary: /usr/bin/php symlink Summary(pl.UTF-8): Dowiązanie symboliczne /usr/bin/php Group: Development/Languages/PHP Requires: %{name}-cli = %{epoch}:%{version}-%{release} -Obsoletes: /usr/bin/php Obsoletes: php-program < 4:5.3.28-7 +Obsoletes: php4-program +Obsoletes: php52-program +Obsoletes: php54-program +Obsoletes: php55-program +Obsoletes: php56-program +Obsoletes: php70-program +Obsoletes: php71-program +Obsoletes: php72-program +Obsoletes: php73-program +Obsoletes: php74-program +Obsoletes: php80-program %description program Package providing /usr/bin/php symlink to PHP CLI. gitweb: http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/595e5b766f7473d83dd02be0fc2db323b612b52e ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/php/PHP_5_2] - Obsoletes: phpXX-program (for each version we provide) - release 36
commit 20022acefcdb468234bf41420f5b53672e1c6593 Author: Adam Gołębiowski Date: Thu Jun 10 13:57:15 2021 + - Obsoletes: phpXX-program (for each version we provide) - release 36 php.spec | 15 +-- 1 file changed, 13 insertions(+), 2 deletions(-) --- diff --git a/php.spec b/php.spec index d8e7a7e..26c9fc2 100644 --- a/php.spec +++ b/php.spec @@ -112,7 +112,7 @@ ERROR: You need to select at least one Apache SAPI to build shared modules. %definemagic_mime /usr/share/misc/magic.mime %endif -%definerel 35 +%definerel 36 %defineorgname php %definever_suffix 52 %definephp_suffix %{!?with_default_php:%{ver_suffix}} @@ -486,7 +486,18 @@ Summary: /usr/bin/php symlink Summary(pl.UTF-8): Dowiązanie symboliczne /usr/bin/php Group: Development/Languages/PHP Requires: %{name}-cli = %{epoch}:%{version}-%{release} -Obsoletes: /usr/bin/php +Obsoletes: php-program < 4:5.3.28-7 +Obsoletes: php4-program +Obsoletes: php52-program +Obsoletes: php54-program +Obsoletes: php55-program +Obsoletes: php56-program +Obsoletes: php70-program +Obsoletes: php71-program +Obsoletes: php72-program +Obsoletes: php73-program +Obsoletes: php74-program +Obsoletes: php80-program %description program Package providing /usr/bin/php symlink to PHP CLI. gitweb: http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/20022acefcdb468234bf41420f5b53672e1c6593 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/php4] - Obsoletes: phpXX-program (for each version we provide) - release 68
commit 7ed400b4ab1c495cc7cec17b80b2328bb5d6d53e Author: Adam Gołębiowski Date: Thu Jun 10 14:02:29 2021 + - Obsoletes: phpXX-program (for each version we provide) - release 68 php4.spec | 14 -- 1 file changed, 12 insertions(+), 2 deletions(-) --- diff --git a/php4.spec b/php4.spec index 13b7588..713bf35 100644 --- a/php4.spec +++ b/php4.spec @@ -72,7 +72,7 @@ %undefine with_msession %endif -%definerel 67 +%definerel 68 Summary: PHP: Hypertext Preprocessor Summary(fr.UTF-8): Le langage de script embarque-HTML PHP Summary(pl.UTF-8): Język skryptowy PHP @@ -404,7 +404,17 @@ Summary: /usr/bin/php symlink Summary(pl.UTF-8): Dowiązanie symboliczne /usr/bin/php Group: Development/Languages/PHP Requires: %{name}-cli = %{epoch}:%{version}-%{release} -Obsoletes: /usr/bin/php +Obsoletes: php52-program +Obsoletes: php53-program +Obsoletes: php54-program +Obsoletes: php55-program +Obsoletes: php56-program +Obsoletes: php70-program +Obsoletes: php71-program +Obsoletes: php72-program +Obsoletes: php73-program +Obsoletes: php74-program +Obsoletes: php80-program %description program Package providing /usr/bin/php symlink to PHP CLI. gitweb: http://git.pld-linux.org/gitweb.cgi/packages/php4.git/commitdiff/7ed400b4ab1c495cc7cec17b80b2328bb5d6d53e ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: py3c: py3c-1.3.1.tar.gz
Request by: qboosh Files fetched: 1 STORED: https://github.com/encukou/py3c/archive/v1.3.1/py3c-1.3.1.tar.gz 57f6518f3a7bcd501425bb23f2de15a7 py3c-1.3.1.tar.gz Size: 46679 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit