diff --git a/adapted-babl.patch b/adapted-babl.patch index 6a6c480ce5695c66197448e960592ea4ac0cfa61..1b631d18d274a664193cc5e53b3a2d6b7f682a45 100644 --- a/adapted-babl.patch +++ b/adapted-babl.patch @@ -12,7 +12,7 @@ diff --git a/configure.ac b/configure.ac index 9d6420c..41981ab 100644 --- a/configure.ac +++ b/configure.ac -@@ -716,8 +716,8 @@ AC_SUBST(ISO_CODES_LOCALEDIR) +@@ -720,8 +720,8 @@ AC_SUBST(ISO_CODES_LOCALEDIR) # Checks for required libraries ############################### diff --git a/autogen.sh b/autogen.sh deleted file mode 100644 index 13b819f46d00c729b7a59ca8efdaa8765175baad..0000000000000000000000000000000000000000 --- a/autogen.sh +++ /dev/null @@ -1,316 +0,0 @@ -#!/bin/sh - -# This script does all the magic calls to automake/autoconf and -# friends that are needed to configure a git clone. As described in -# the file HACKING you need a couple of extra tools to run this script -# successfully. -# -# If you are compiling from a released tarball you don't need these -# tools and you shouldn't use this script. Just call ./configure -# directly. - -AUTOMAKE_RECOMMENDED_VERSION=1.16 - -AUTOCONF_REQUIRED_VERSION=2.54 -AUTOMAKE_REQUIRED_VERSION=1.13.0 -INTLTOOL_REQUIRED_VERSION=0.40.1 -LIBTOOL_REQUIRED_VERSION=1.5 -LIBTOOL_WIN32_REQUIRED_VERSION=2.2 - -ACLOCAL=${ACLOCAL-aclocal-${AUTOMAKE_RECOMMENDED_VERSION}} -AUTOCONF=${AUTOCONF-autoconf} -AUTOHEADER=${AUTOHEADER-autoheader} -AUTOMAKE=${AUTOMAKE-automake-${AUTOMAKE_RECOMMENDED_VERSION}} -LIBTOOLIZE=${LIBTOOLIZE-libtoolize} - -PROJECT="GNU Image Manipulation Program" -TEST_TYPE=-d -FILE=plug-ins - - -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. -ORIGDIR=`pwd` -cd $srcdir - - -check_version () -{ - VERSION_A=$1 - VERSION_B=$2 - - save_ifs="$IFS" - IFS=. - set dummy $VERSION_A 0 0 0 - MAJOR_A=$2 - MINOR_A=$3 - MICRO_A=$4 - set dummy $VERSION_B 0 0 0 - MAJOR_B=$2 - MINOR_B=$3 - MICRO_B=$4 - IFS="$save_ifs" - - if expr "$MAJOR_A" = "$MAJOR_B" > /dev/null; then - if expr "$MINOR_A" \> "$MINOR_B" > /dev/null; then - echo "yes (version $VERSION_A)" - elif expr "$MINOR_A" = "$MINOR_B" > /dev/null; then - if expr "$MICRO_A" \>= "$MICRO_B" > /dev/null; then - echo "yes (version $VERSION_A)" - else - echo "Too old (version $VERSION_A)" - DIE=1 - fi - else - echo "Too old (version $VERSION_A)" - DIE=1 - fi - elif expr "$MAJOR_A" \> "$MAJOR_B" > /dev/null; then - echo "Major version might be too new ($VERSION_A)" - else - echo "Too old (version $VERSION_A)" - DIE=1 - fi -} - -echo -echo "I am testing that you have the tools required to build the" -echo "$PROJECT from git. This test is not foolproof," -echo "so if anything goes wrong, see the file HACKING for more information..." -echo - -DIE=0 - -OS=`uname -s` -case $OS in - *YGWIN* | *INGW*) - echo "Looks like Win32, you will need libtool $LIBTOOL_WIN32_REQUIRED_VERSION or newer." - echo - LIBTOOL_REQUIRED_VERSION=$LIBTOOL_WIN32_REQUIRED_VERSION - ;; -esac - -printf "checking for libtool >= $LIBTOOL_REQUIRED_VERSION ... " -if ($LIBTOOLIZE --version) < /dev/null > /dev/null 2>&1; then - LIBTOOLIZE=$LIBTOOLIZE -elif (glibtoolize --version) < /dev/null > /dev/null 2>&1; then - LIBTOOLIZE=glibtoolize -else - echo - echo " You must have libtool installed to compile $PROJECT." - echo " Install the appropriate package for your distribution," - echo " or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" - echo - DIE=1 -fi - -if test x$LIBTOOLIZE != x; then - VER=`$LIBTOOLIZE --version \ - | grep libtool | sed "s/.* \([0-9.]*\)[-a-z0-9]*$/\1/"` - check_version $VER $LIBTOOL_REQUIRED_VERSION -fi - -# check if gtk-doc is explicitly disabled -for ag_option in $AUTOGEN_CONFIGURE_ARGS $@ -do - case $ag_option in - -disable-gtk-doc | --disable-gtk-doc) - enable_gtk_doc=no - ;; - esac -done - -if test x$enable_gtk_doc = xno; then - echo "skipping test for gtkdocize" -else - printf "checking for gtkdocize ... " - if (gtkdocize --version) < /dev/null > /dev/null 2>&1; then - echo "yes" - else - echo - echo " You must have gtk-doc installed to compile $PROJECT." - echo " Install the appropriate package for your distribution," - echo " or get the source tarball at" - echo " https://ftp.gnome.org/pub/GNOME/sources/gtk-doc/" - echo " You can also use the option --disable-gtk-doc to skip" - echo " this test but then you will not be able to generate a" - echo " configure script that can build the API documentation." - DIE=1 - fi -fi - -printf "checking for autoconf >= $AUTOCONF_REQUIRED_VERSION ... " -if ($AUTOCONF --version) < /dev/null > /dev/null 2>&1; then - VER=`$AUTOCONF --version | head -n 1 \ - | grep -iw autoconf | sed "s/.* \([0-9.]*\)[-a-z0-9]*$/\1/"` - check_version $VER $AUTOCONF_REQUIRED_VERSION -else - echo - echo " You must have autoconf installed to compile $PROJECT." - echo " Download the appropriate package for your distribution," - echo " or get the source tarball at ftp://ftp.gnu.org/pub/gnu/autoconf/" - echo - DIE=1; -fi - - -printf "checking for automake >= $AUTOMAKE_REQUIRED_VERSION ... " -if ($AUTOMAKE --version) < /dev/null > /dev/null 2>&1; then - AUTOMAKE=$AUTOMAKE - ACLOCAL=$ACLOCAL -elif (automake-1.16 --version) < /dev/null > /dev/null 2>&1; then - AUTOMAKE=automake-1.16 - ACLOCAL=aclocal-1.16 -elif (automake-1.15 --version) < /dev/null > /dev/null 2>&1; then - AUTOMAKE=automake-1.15 - ACLOCAL=aclocal-1.15 -elif (automake-1.14 --version) < /dev/null > /dev/null 2>&1; then - AUTOMAKE=automake-1.14 - ACLOCAL=aclocal-1.14 -elif (automake-1.13 --version) < /dev/null > /dev/null 2>&1; then - AUTOMAKE=automake-1.13 - ACLOCAL=aclocal-1.13 -elif (automake --version) < /dev/null > /dev/null 2>&1; then - AUTOMAKE=automake - ACLOCAL=aclocal -else - echo - echo " You must have automake $AUTOMAKE_REQUIRED_VERSION or newer installed to compile $PROJECT." - echo " Download the appropriate package for your distribution," - echo " or get the source tarball at ftp://ftp.gnu.org/pub/gnu/automake/" - echo - DIE=1 -fi - -if test x$AUTOMAKE != x; then - VER=`$AUTOMAKE --version \ - | grep automake | sed "s/.* \([0-9.]*\)[-a-z0-9]*$/\1/"` - check_version $VER $AUTOMAKE_REQUIRED_VERSION -fi - - -printf "checking for intltool >= $INTLTOOL_REQUIRED_VERSION ... " -if (intltoolize --version) < /dev/null > /dev/null 2>&1; then - VER=`intltoolize --version \ - | grep intltoolize | sed "s/.* \([0-9.]*\)/\1/"` - check_version $VER $INTLTOOL_REQUIRED_VERSION -else - echo - echo " You must have intltool installed to compile $PROJECT." - echo " Get the latest version from" - echo " ftp://ftp.gnome.org/pub/GNOME/sources/intltool/" - echo - DIE=1 -fi - - -printf "checking for xsltproc ... " -if (xsltproc --version) < /dev/null > /dev/null 2>&1; then - echo "yes" -else - echo - echo " You must have xsltproc installed to compile $PROJECT." - echo " Get the latest version from" - echo " ftp://ftp.gnome.org/pub/GNOME/sources/libxslt/" - echo - DIE=1 -fi - -if test "$DIE" -eq 1; then - echo - echo "Please install/upgrade the missing tools and call me again." - echo - exit 1 -fi - - -test $TEST_TYPE $FILE || { - echo - echo "You must run this script in the top-level $PROJECT directory." - echo - exit 1 -} - - -if test -z "$NOCONFIGURE"; then - echo - echo "I am going to run ./configure with the following arguments:" - echo - echo " $AUTOGEN_CONFIGURE_ARGS $@" - echo - - if test -z "$*"; then - echo "If you wish to pass additional arguments, please specify them " - echo "on the $0 command line or set the AUTOGEN_CONFIGURE_ARGS " - echo "environment variable." - echo - fi -fi - - -if test -z "$ACLOCAL_FLAGS"; then - - acdir=`$ACLOCAL --print-ac-dir` - m4list="glib-2.0.m4 glib-gettext.m4 gtk-3.0.m4 intltool.m4 pkg.m4" - - for file in $m4list - do - if [ ! -f "$acdir/$file" ]; then - echo - echo "WARNING: aclocal's directory is $acdir, but..." - echo " no file $acdir/$file" - echo " You may see fatal macro warnings below." - echo " If these files are installed in /some/dir, set the " - echo " ACLOCAL_FLAGS environment variable to \"-I /some/dir\"" - echo " or install $acdir/$file." - echo - fi - done -fi - -rm -rf autom4te.cache - -$ACLOCAL $ACLOCAL_FLAGS -RC=$? -if test $RC -ne 0; then - echo "$ACLOCAL gave errors. Please fix the error conditions and try again." - exit $RC -fi - -$LIBTOOLIZE --force || exit $? - -if test x$enable_gtk_doc = xno; then - if test -f gtk-doc.make; then :; else - echo "EXTRA_DIST = missing-gtk-doc" > gtk-doc.make - fi - echo "WARNING: You have disabled gtk-doc." - echo " As a result, you will not be able to generate the API" - echo " documentation and 'make dist' will not work." - echo -else - gtkdocize || exit $? -fi - -# optionally feature autoheader -($AUTOHEADER --version) < /dev/null > /dev/null 2>&1 && $AUTOHEADER || exit 1 - -$AUTOMAKE --add-missing || exit $? -$AUTOCONF || exit $? - -intltoolize --automake || exit $? - - -cd $ORIGDIR - -if test -z "$NOCONFIGURE"; then - $srcdir/configure $AUTOGEN_CONFIGURE_ARGS "$@" - RC=$? - if test $RC -ne 0; then - echo - echo "Configure failed or did not finish!" - exit $RC - fi - - echo - echo "Now type 'make' to compile the $PROJECT." -fi diff --git a/gimp-2.99.6.tar.bz2 b/gimp-2.99.10.tar.bz2 similarity index 68% rename from gimp-2.99.6.tar.bz2 rename to gimp-2.99.10.tar.bz2 index 31b14d69b81b05654e0877bb3c7ec59658a9f72d..e8e12cb5139f04b74aaa6ccc2f32b8906a428637 100644 Binary files a/gimp-2.99.6.tar.bz2 and b/gimp-2.99.10.tar.bz2 differ diff --git a/gimp.spec b/gimp.spec index cab5293b49148d6b3729b23f36a58f8712077010..d6b854ac3257a77d286dd96e0f0cc857285fe4e5 100644 --- a/gimp.spec +++ b/gimp.spec @@ -1,7 +1,5 @@ %define requires_file() %( readlink -f '%*' | LC_ALL=C xargs -r rpm -q --qf 'Requires: %%{name} >= %%{epoch}:%%{version}\\n' -f | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not") -%bcond_without is_git_build -%bcond_without binreloc %define alsa_version 1.0.0 %define appstream_glib_version 0.7.7 @@ -43,8 +41,8 @@ %global apiver 3.0 Name: gimp -Version: 2.99.6 -Release: 3 +Version: 2.99.10 +Release: 1 Epoch: 2 Summary: The GNU Image Manipulation Program License: GPL-3.0-or-later @@ -52,8 +50,7 @@ Group: Productivity/Graphics/Bitmap Editors URL: https://www.gimp.org/ Source: https://download.gimp.org/mirror/pub/gimp/v2.99/%{name}-%{version}.tar.bz2 Source1: macros.gimp -Source2: autogen.sh -Source3: MAINTAINERS +Source2: MAINTAINERS Source98: gimp-rpmlintrc Source99: baselibs.conf Patch0: git_info_from_dirname.patch @@ -124,6 +121,8 @@ BuildRequires: pkgconfig(xfixes) BuildRequires: pkgconfig(xmu) BuildRequires: pkgconfig(xpm) BuildRequires: pkgconfig(zlib) +BuildRequires: autoconf libtool gettext-devel +BuildRequires: ncurses-devel ncurses-libs slang-devel gpm-devel gpm-libs %requires_eq gegl-0_4 Requires: gjs Requires: libgimp-3_0-0 = %{epoch}:%{version} @@ -246,13 +245,13 @@ that extend gimp. %prep %autosetup -p1 -chmod 744 %{SOURCE2} +rm -rf configure +libtoolize --force +autoreconf --force --install cp %{SOURCE2} . -cp %{SOURCE3} . %build %define _lto_cflags %{nil} -NOCONFIGURE=1 ./autogen.sh export LC_ALL=en_US.UTF-8 export LANG=en_US.UTF-8 @@ -321,7 +320,7 @@ install -m 644 -c macros.gimp \ %files -f plugins.list %license COPYING LICENSE -%doc AUTHORS NEWS* README MAINTAINERS HACKING +%doc AUTHORS NEWS* README MAINTAINERS devel-docs/HACKING.md %{_bindir}/gimp %{_bindir}/gimp-2.* %{_bindir}/gimp-console @@ -333,6 +332,7 @@ install -m 644 -c macros.gimp \ %{_datadir}/metainfo/org.gimp.GIMP.appdata.xml %{_datadir}/applications/gimp.desktop %{_datadir}/icons/hicolor/*/apps/*.png +%{_datadir}/icons/hicolor/*/apps/*.svg %{_datadir}/gimp/ %{_libdir}/gimp/2.99/environ/default.env %{_libdir}/gimp/2.99/interpreters/default.interp @@ -391,10 +391,10 @@ install -m 644 -c macros.gimp \ %{_libdir}/girepository-1.0/GimpUi-3.0.typelib %files vala -%{_datadir}/vala/vapi/gimp-3.deps -%{_datadir}/vala/vapi/gimp-3.vapi -%{_datadir}/vala/vapi/gimp-ui-3.deps -%{_datadir}/vala/vapi/gimp-ui-3.vapi +%{_datadir}/vala/vapi/gimp-3.0.deps +%{_datadir}/vala/vapi/gimp-3.0.vapi +%{_datadir}/vala/vapi/gimp-ui-3.0.deps +%{_datadir}/vala/vapi/gimp-ui-3.0.vapi %files devel %doc README.i18n @@ -405,8 +405,6 @@ install -m 644 -c macros.gimp \ %{_libdir}/pkgconfig/gimp-3.0.pc %{_libdir}/pkgconfig/gimpthumb-3.0.pc %{_libdir}/pkgconfig/gimpui-3.0.pc -%dir %{_datadir}/gtk-doc -%{_datadir}/gtk-doc/html/* %dir %{_datadir}/locale %{_datadir}/locale/*/LC_MESSAGES/* %config %{_sysconfdir}/rpm/macros.gimp @@ -417,6 +415,9 @@ install -m 644 -c macros.gimp \ %{_libdir}/gimp/2.99/extensions/org.gimp.extension.goat-exercises %changelog +* Thu Nov 30 2023 Ge Wang - 2:2.99.10-1 +- Update to version 2.99.10 + * Thu Oct 19 2023 xu_ping <707078654@qq.com> - 2:2.99.6-3 - adapted babl diff --git a/git_info_from_dirname.patch b/git_info_from_dirname.patch index 3a96d5a960afbc8c8265aece26eb27679800bf20..17c29eab1c297fe602ac44eefe32f52f5ebda496 100644 --- a/git_info_from_dirname.patch +++ b/git_info_from_dirname.patch @@ -2,7 +2,7 @@ diff --git a/Makefile.am b/Makefile.am index 5321a0c7d5..e6b16a66e6 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -142,16 +142,10 @@ CLEANFILES = $(generated_sources) +@@ -141,16 +141,10 @@ CLEANFILES = $(generated_sources) # already exists because then we are probably working with a tarball # in which case the git-version.h we ship is correct. git-version.h: update-git-version-header