Compare commits
No commits in common. "rawhide" and "f38" have entirely different histories.
3 changed files with 30 additions and 251 deletions
|
|
@ -1,5 +1,4 @@
|
|||
Avoid implicit declaration of exit and implicit ints.
|
||||
Also fix the return type of the va_copy probe function.
|
||||
|
||||
The libtool change is in libtool upstream already, via:
|
||||
|
||||
|
|
@ -15,7 +14,6 @@ Date: Mon Aug 11 22:36:42 2008 +0200
|
|||
|
||||
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
||||
|
||||
|
||||
diff --git a/admin/libtool.m4.in b/admin/libtool.m4.in
|
||||
index 7f5eed6d83a973fa..70703d6c1f1bf71e 100644
|
||||
--- a/admin/libtool.m4.in
|
||||
|
|
@ -29,21 +27,8 @@ index 7f5eed6d83a973fa..70703d6c1f1bf71e 100644
|
|||
}]
|
||||
EOF
|
||||
if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
|
||||
diff --git a/configure b/configure
|
||||
index 649739b168ae8dc3..00fc221e124a2703 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -42024,7 +42024,7 @@ cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
|
||||
#include <stdarg.h>
|
||||
- void f (int i, ...) {
|
||||
+ int f (int i, ...) {
|
||||
va_list args1, args2;
|
||||
va_start (args1, i);
|
||||
va_copy (args2, args1);
|
||||
diff --git a/flow/gsl/configure.in.in b/flow/gsl/configure.in.in
|
||||
index 3b147b9265085e28..b8274808a88ebfba 100644
|
||||
index 3b147b9265085e28..8cb1ec41cf723413 100644
|
||||
--- a/flow/gsl/configure.in.in
|
||||
+++ b/flow/gsl/configure.in.in
|
||||
@@ -23,12 +23,12 @@ AC_CACHE_CHECK([size of $2], glib_Sizeof,
|
||||
|
|
@ -62,13 +47,7 @@ index 3b147b9265085e28..b8274808a88ebfba 100644
|
|||
}],
|
||||
[glib_Sizeof=`cat conftestval` dnl''
|
||||
],
|
||||
@@ -160,12 +160,12 @@ dnl all results in config.log for bug reports.
|
||||
AC_CACHE_CHECK([for an implementation of va_copy()],glib_cv_va_copy,[
|
||||
AC_TRY_RUN([
|
||||
#include <stdarg.h>
|
||||
- void f (int i, ...) {
|
||||
+ int f (int i, ...) {
|
||||
va_list args1, args2;
|
||||
@@ -165,7 +165,7 @@ AC_CACHE_CHECK([for an implementation of va_copy()],glib_cv_va_copy,[
|
||||
va_start (args1, i);
|
||||
va_copy (args2, args1);
|
||||
if (va_arg (args2, int) != 42 || va_arg (args1, int) != 42)
|
||||
|
|
@ -77,13 +56,7 @@ index 3b147b9265085e28..b8274808a88ebfba 100644
|
|||
va_end (args1); va_end (args2);
|
||||
}
|
||||
int main() {
|
||||
@@ -179,12 +179,12 @@ AC_CACHE_CHECK([for an implementation of va_copy()],glib_cv_va_copy,[
|
||||
AC_CACHE_CHECK([for an implementation of __va_copy()],glib_cv___va_copy,[
|
||||
AC_TRY_RUN([
|
||||
#include <stdarg.h>
|
||||
- void f (int i, ...) {
|
||||
+ int f (int i, ...) {
|
||||
va_list args1, args2;
|
||||
@@ -184,7 +184,7 @@ AC_CACHE_CHECK([for an implementation of __va_copy()],glib_cv___va_copy,[
|
||||
va_start (args1, i);
|
||||
__va_copy (args2, args1);
|
||||
if (va_arg (args2, int) != 42 || va_arg (args1, int) != 42)
|
||||
|
|
|
|||
89
arts.spec
89
arts.spec
|
|
@ -8,9 +8,9 @@ Name: arts
|
|||
Summary: aRts (analog realtime synthesizer) - the KDE sound system
|
||||
Epoch: 8
|
||||
Version: 1.5.10
|
||||
Release: 69%{?dist}
|
||||
Release: 56%{?dist}
|
||||
|
||||
License: LGPL-2.0-or-later
|
||||
License: LGPLv2+
|
||||
Url: http://www.kde.org
|
||||
Source0: ftp://ftp.kde.org/pub/kde/stable/3.5.10/src/%{name}-%{version}.tar.bz2
|
||||
Source1: gslconfig-wrapper.h
|
||||
|
|
@ -32,7 +32,6 @@ Patch51: kde-3.5-libtool-shlibext.patch
|
|||
Patch52: arts-1.5.8-glibc-libio.patch
|
||||
Patch53: arts-autoconf-2.7x.patch
|
||||
Patch54: arts-c99.patch
|
||||
Patch55: kde3-autoconf-2.72.patch
|
||||
|
||||
# upstream patches
|
||||
|
||||
|
|
@ -100,37 +99,36 @@ Install %{name}-devel if you intend to write applications using aRts.
|
|||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch -P1 -p1 -b .debug
|
||||
%patch -P2 -p1 -b .glib
|
||||
%patch -P5 -p1 -b .alsa
|
||||
%patch -P6 -p1 -b .glibc
|
||||
%patch -P8 -p1 -b .multilib
|
||||
%patch -P9 -p1 -b .cpu-overload-quiet
|
||||
%patch -P10 -p1 -b .assertion-failure
|
||||
%patch -P11 -p1 -b .alsa11
|
||||
%patch1 -p1 -b .debug
|
||||
%patch2 -p1 -b .glib
|
||||
%patch5 -p1 -b .alsa
|
||||
%patch6 -p1 -b .glibc
|
||||
%patch8 -p1 -b .multilib
|
||||
%patch9 -p1 -b .cpu-overload-quiet
|
||||
%patch10 -p1 -b .assertion-failure
|
||||
%patch11 -p1 -b .alsa11
|
||||
|
||||
%patch -P50 -p1 -b .dlopenext
|
||||
%patch -P51 -p1 -b .libtool-shlibext
|
||||
%patch -P52 -p1 -b .glibc-libio
|
||||
%patch -P53 -p1 -b .autoconf2.7x
|
||||
%patch -P54 -p1 -b .c99
|
||||
%patch -P55 -p1 -b .autoconf-2.72
|
||||
%patch50 -p1 -b .dlopenext
|
||||
%patch51 -p1 -b .libtool-shlibext
|
||||
%patch52 -p1 -b .glibc-libio
|
||||
%patch53 -p1 -b .autoconf2.7x
|
||||
%patch54 -p1 -b .c99
|
||||
|
||||
%patch -P200 -p1 -b .CVE-2009-3736
|
||||
%patch -P201 -p1 -b .CVE-2015-7543
|
||||
%patch200 -p1 -b .CVE-2009-3736
|
||||
%patch201 -p1 -b .CVE-2015-7543
|
||||
|
||||
%patch -P300 -p1 -b .acinclude
|
||||
%patch -P301 -p1 -b .automake-version
|
||||
%patch -P302 -p1 -b .automake-add-missing
|
||||
%patch -P303 -p1 -b .libtool-aarch64
|
||||
%patch -P304 -p1 -b .configure
|
||||
%patch -P305 -p1 -b .file-literal
|
||||
%patch300 -p1 -b .acinclude
|
||||
%patch301 -p1 -b .automake-version
|
||||
%patch302 -p1 -b .automake-add-missing
|
||||
%patch303 -p1 -b .libtool-aarch64
|
||||
%patch304 -p1 -b .configure
|
||||
%patch305 -p1 -b .file-literal
|
||||
make -f admin/Makefile.common cvs
|
||||
|
||||
%build
|
||||
unset QTDIR && . /etc/profile.d/qt.sh
|
||||
|
||||
export CXXFLAGS="%{optflags} -Wno-error=narrowing --std=gnu++17"
|
||||
export CXXFLAGS="%{optflags} -Wno-error=narrowing"
|
||||
|
||||
%configure \
|
||||
--includedir=%{_includedir}/kde \
|
||||
|
|
@ -222,45 +220,6 @@ test -z "$(chrpath --list %{buildroot}%{_bindir}/artsd 2>/dev/null | grep RPATH=
|
|||
|
||||
|
||||
%changelog
|
||||
* Wed Jul 15 2026 Fedora Release Engineering <releng@fedoraproject.org> - 8:1.5.10-69
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
|
||||
|
||||
* Fri Feb 06 2026 Than Ngo <than@redhat.com> - 8:1.5.10-68
|
||||
- Fix rhbz#2433872 - FTBFS
|
||||
|
||||
* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 8:1.5.10-67
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
|
||||
|
||||
* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 8:1.5.10-66
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
|
||||
|
||||
* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 8:1.5.10-65
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||
|
||||
* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 8:1.5.10-64
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||
|
||||
* Mon Oct 21 2024 Than Ngo <than@redhat.com> - 8:1.5.10-63
|
||||
- Fix rhbz#2300566, FTBFS
|
||||
|
||||
* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 8:1.5.10-62
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||
|
||||
* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 8:1.5.10-61
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 8:1.5.10-60
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Wed Nov 22 2023 Florian Weimer <fweimer@redhat.com> - 8:1.5.10-59
|
||||
- Update C99 patch
|
||||
|
||||
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 8:1.5.10-58
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Mon Jun 12 2023 Than Ngo <than@redhat.com> - 1.5.10-57
|
||||
- migrated to SPDX license
|
||||
|
||||
* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 8:1.5.10-56
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
|
|
@ -1,153 +0,0 @@
|
|||
diff -up kdebase-3.5.10/admin/acinclude.m4.in.me kdebase-3.5.10/admin/acinclude.m4.in
|
||||
--- kdebase-3.5.10/admin/acinclude.m4.in.me 2024-04-22 16:33:28.286459023 +0200
|
||||
+++ kdebase-3.5.10/admin/acinclude.m4.in 2024-04-22 23:11:19.667504254 +0200
|
||||
@@ -2629,8 +2629,8 @@ AC_TRY_LINK(
|
||||
LIBS="$ac_save_LIBS"
|
||||
CXXFLAGS="$ac_save_CXXFLAGS"
|
||||
AC_LANG_RESTORE
|
||||
-fi
|
||||
])
|
||||
+fi
|
||||
|
||||
if eval "test ! \"`echo $kde_cv_qt_jpeg`\" = no"; then
|
||||
AC_MSG_RESULT(yes)
|
||||
@@ -2744,68 +2744,69 @@ KDE_TRY_TIFFLIB(tiff, [],
|
||||
AC_SUBST(LIBTIFF)
|
||||
])
|
||||
|
||||
-AC_DEFUN([KDE_FIND_LIBEXR],
|
||||
-[
|
||||
+AC_DEFUN([KDE_FIND_LIBEXR],
|
||||
+[
|
||||
AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
|
||||
-AC_REQUIRE([AC_FIND_ZLIB])
|
||||
-AC_CACHE_VAL(ac_cv_libexr,
|
||||
-[
|
||||
+AC_REQUIRE([AC_FIND_ZLIB])
|
||||
+AC_CACHE_VAL(ac_cv_libexr,
|
||||
+[
|
||||
if test -z "$PKG_CONFIG"; then
|
||||
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
|
||||
- fi
|
||||
-
|
||||
+ fi
|
||||
+
|
||||
AC_MSG_CHECKING([for OpenEXR libraries])
|
||||
-
|
||||
+
|
||||
if test "$PKG_CONFIG" = "no" ; then
|
||||
- AC_MSG_RESULT(no)
|
||||
+ AC_MSG_RESULT(no)
|
||||
echo "*** The pkg-config script could not be found. Make sure it is"
|
||||
echo "*** in your path, or set the PKG_CONFIG environment variable"
|
||||
echo "*** to the full path to pkg-config."
|
||||
echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
|
||||
- else
|
||||
+ else
|
||||
if ! $PKG_CONFIG --exists OpenEXR ; then
|
||||
- AC_MSG_RESULT(no)
|
||||
+ AC_MSG_RESULT(no)
|
||||
EXRSTATUS=no
|
||||
- else
|
||||
+ else
|
||||
if ! $PKG_CONFIG --atleast-version="1.1.1" OpenEXR ; then
|
||||
- AC_MSG_RESULT(no)
|
||||
+ AC_MSG_RESULT(no)
|
||||
EXRSTATUS=old
|
||||
else
|
||||
kde_save_LIBS="$LIBS"
|
||||
LIBS="$LIBS $all_libraries $USER_LDFLAGS `pkg-config --libs OpenEXR` $LIBZ"
|
||||
- AC_LANG_SAVE
|
||||
- AC_LANG_CPLUSPLUS
|
||||
+ AC_LANG_SAVE
|
||||
+ AC_LANG_CPLUSPLUS
|
||||
kde_save_CXXFLAGS="$CXXFLAGS"
|
||||
EXR_FLAGS=`$PKG_CONFIG --cflags OpenEXR`
|
||||
CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES $EXR_FLAGS"
|
||||
+ fi
|
||||
+ fi
|
||||
+ fi
|
||||
+ AC_TRY_LINK(
|
||||
+ [
|
||||
+ #include <ImfRgbaFile.h>
|
||||
+ ],
|
||||
+ [
|
||||
+ using namespace Imf;
|
||||
+ RgbaInputFile file ("dummy");
|
||||
+ return 0;
|
||||
+ ],
|
||||
+ eval "ac_cv_libexr='`pkg-config --libs OpenEXR`'",
|
||||
+ eval "ac_cv_libexr=no"
|
||||
+ )
|
||||
+ LIBS="$kde_save_LIBS"
|
||||
+ CXXFLAGS="$kde_save_CXXFLAGS"
|
||||
+ AC_LANG_RESTORE
|
||||
+ ])
|
||||
|
||||
- AC_TRY_LINK(dnl
|
||||
- [
|
||||
- #include <ImfRgbaFile.h>
|
||||
- ],
|
||||
- [
|
||||
- using namespace Imf;
|
||||
- RgbaInputFile file ("dummy");
|
||||
- return 0;
|
||||
- ],
|
||||
- eval "ac_cv_libexr='`pkg-config --libs OpenEXR`'",
|
||||
- eval "ac_cv_libexr=no"
|
||||
- )
|
||||
- LIBS="$kde_save_LIBS"
|
||||
- CXXFLAGS="$kde_save_CXXFLAGS"
|
||||
- AC_LANG_RESTORE
|
||||
- ])dnl
|
||||
- if eval "test ! \"`echo $ac_cv_libexr`\" = no"; then
|
||||
- AC_DEFINE_UNQUOTED(HAVE_EXR, 1, [Define if you have OpenEXR])
|
||||
- LIB_EXR="$ac_cv_libexr"
|
||||
- AC_MSG_RESULT($ac_cv_libexr)
|
||||
- else
|
||||
- AC_MSG_RESULT(no)
|
||||
- LIB_EXR=""
|
||||
- fi
|
||||
- fi
|
||||
- fi
|
||||
+ if eval "test ! \"`echo $ac_cv_libexr`\" = no"; then
|
||||
+ AC_DEFINE_UNQUOTED(HAVE_EXR, 1, [Define if you have OpenEXR])
|
||||
+ LIB_EXR="$ac_cv_libexr"
|
||||
+ AC_MSG_RESULT($ac_cv_libexr)
|
||||
+ else
|
||||
+ AC_MSG_RESULT(no)
|
||||
+ LIB_EXR=""
|
||||
fi
|
||||
+
|
||||
AC_SUBST(LIB_EXR)
|
||||
AC_SUBST(EXR_FLAGS)
|
||||
])
|
||||
@@ -2828,7 +2829,7 @@ fi
|
||||
kde_save_CFLAGS="$CFLAGS"
|
||||
CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
|
||||
|
||||
-AC_TRY_LINK(dnl
|
||||
+AC_TRY_LINK(
|
||||
[
|
||||
#include<png.h>
|
||||
],
|
||||
@@ -2842,7 +2843,7 @@ AC_TRY_LINK(dnl
|
||||
)
|
||||
LIBS="$kde_save_LIBS"
|
||||
CFLAGS="$kde_save_CFLAGS"
|
||||
-])dnl
|
||||
+])
|
||||
if eval "test ! \"`echo $ac_cv_lib_png`\" = no"; then
|
||||
AC_DEFINE_UNQUOTED(HAVE_LIBPNG, 1, [Define if you have libpng])
|
||||
LIBPNG="$ac_cv_lib_png"
|
||||
@@ -5926,10 +5927,6 @@ We need perl to generate some code.])
|
||||
AC_DEFUN([KDE_CHECK_LARGEFILE],
|
||||
[
|
||||
AC_SYS_LARGEFILE
|
||||
-if test "$ac_cv_sys_file_offset_bits" != no; then
|
||||
- CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits"
|
||||
-fi
|
||||
-
|
||||
if test "x$ac_cv_sys_large_files" != "xno"; then
|
||||
CPPFLAGS="$CPPFLAGS -D_LARGE_FILES=1"
|
||||
fi
|
||||
Loading…
Add table
Add a link
Reference in a new issue