[Lunar-commits] <moonbase> rm the %GIF alias and cleanup since we no longer have libungif

Christian Krause wookietreiber at lunar-linux.org
Mon Aug 29 16:11:39 CEST 2011


commit 5d718ead55be62de308054fce9fa188c6b347321
Author: Christian Krause <wookietreiber at lunar-linux.org>
Date:   Mon Aug 29 16:11:39 2011 +0200

    rm the %GIF alias and cleanup since we no longer have libungif
---
 aliases                         |    1 -
 editors/emacs/DEPENDS           |   20 ++++++++++----------
 graphics/OpenSceneGraph/DEPENDS |    2 +-
 graphics/fbida/DEPENDS          |    2 +-
 graphics/giflib/CONFLICTS       |    1 -
 graphics/giflib/DETAILS         |    7 ++-----
 graphics/imlib2/DEPENDS         |    2 +-
 kde4/apps/koffice/DEPENDS       |    2 +-
 kde4/base/kdelibs/DEPENDS       |    2 +-
 kde4/base/kdenetwork/DEPENDS    |    2 +-
 libs/ming/DEPENDS               |    2 +-
 mono/libgdiplus/DEPENDS         |   12 ++++--------
 printer/pdf417_enc/DEPENDS      |    2 +-
 qt4-apps/qt4/DEPENDS            |    2 +-
 video/DirectFB/DEPENDS          |    2 +-
 web/bluefish/DEPENDS            |    2 +-
 zbeta/e17/evas-svn/DEPENDS      |    2 +-
 zbeta/e17/imlib2-svn/DEPENDS    |    2 +-
 zbeta/emacs-cvs/DEPENDS         |   28 ++++++++++++++--------------
 zbeta/fbv/DEPENDS               |    2 +-
 zbeta/mplayer2/DEPENDS          |    2 +-
 21 files changed, 45 insertions(+), 54 deletions(-)

diff --git a/aliases b/aliases
index c29e165..afc3eeb 100644
--- a/aliases
+++ b/aliases
@@ -13,6 +13,5 @@
 %XINELIB:xine-lib xine-lib-vdpau
 %CROND:cronie hc-cron vixie-cron
 %JPEG:libjpeg-turbo jpeg
-%GIF:giflib libungif
 %QEMU:qemu qemu-kvm
 %GNUPG:gnupg gnupg2
diff --git a/editors/emacs/DEPENDS b/editors/emacs/DEPENDS
index 3c9c240..e16ecad 100644
--- a/editors/emacs/DEPENDS
+++ b/editors/emacs/DEPENDS
@@ -1,10 +1,10 @@
-optional_depends  "%GIF" "--with-gif" "--without-gif" "for gif support if you use faces"
-optional_depends  "%JPEG" "--with-jpeg" "--without-jpeg" "for jpeg support if you use faces"
-optional_depends  "tiff" "--with-tiff" "--without-tiff" "for tiff support if you use faces"
-optional_depends  "libpng" "--with-png" "--without-png" "for png support if you use faces"
-optional_depends  "librsvg" "--with-rsvg" "--without-rsvg" "for SVG image support"
-optional_depends  "%X" "--with-x --with-xpm" "--without-xpm" "for xpm support if you use faces"
-optional_depends  "openMotif" "--with-x-toolkit=motif" "" "for OSF/Motif standard GUI"
-optional_depends  "gtk+-2" "--with-x-toolkit=gtk" "" "for gtk+ support GUI"
-optional_depends  "libXft" "--with-xft" "--without-xft" "for anti alias font support"
-optional_depends  "dbus" "--with-dbus" "--without-dbus" "for D-BUS support"
+optional_depends "giflib"    "--with-gif"             "--without-gif"  "for gif support if you use faces"
+optional_depends "%JPEG"     "--with-jpeg"            "--without-jpeg" "for jpeg support if you use faces"
+optional_depends "tiff"      "--with-tiff"            "--without-tiff" "for tiff support if you use faces"
+optional_depends "libpng"    "--with-png"             "--without-png"  "for png support if you use faces"
+optional_depends "librsvg"   "--with-rsvg"            "--without-rsvg" "for SVG image support"
+optional_depends "%X"        "--with-x --with-xpm"    "--without-xpm"  "for xpm support if you use faces"
+optional_depends "openMotif" "--with-x-toolkit=motif" ""               "for OSF/Motif standard GUI"
+optional_depends "gtk+-2"    "--with-x-toolkit=gtk"   ""               "for gtk+ support GUI"
+optional_depends "libXft"    "--with-xft"             "--without-xft"  "for anti alias font support"
+optional_depends "dbus"      "--with-dbus"            "--without-dbus" "for D-BUS support"
diff --git a/graphics/OpenSceneGraph/DEPENDS b/graphics/OpenSceneGraph/DEPENDS
index 84fd041..15dd540 100644
--- a/graphics/OpenSceneGraph/DEPENDS
+++ b/graphics/OpenSceneGraph/DEPENDS
@@ -1,6 +1,6 @@
 depends  cmake
 depends  jasper
-depends  %GIF
+depends  giflib
 depends  curl
 depends  pth
 depends  %XINELIB
diff --git a/graphics/fbida/DEPENDS b/graphics/fbida/DEPENDS
index 464f609..86d2ff3 100644
--- a/graphics/fbida/DEPENDS
+++ b/graphics/fbida/DEPENDS
@@ -1,7 +1,7 @@
 depends  %JPEG
 depends  libexif
 
-optional_depends %GIF       "" "" "for GIF viewing support"
+optional_depends giflib     "" "" "for GIF viewing support"
 optional_depends libpng     "" "" "for PNG viewing support"
 optional_depends tiff       "" "" "for TIFF viewing support"
 optional_depends xsane      "" "" "for scanning support"
diff --git a/graphics/giflib/CONFLICTS b/graphics/giflib/CONFLICTS
deleted file mode 100644
index 14f8666..0000000
--- a/graphics/giflib/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts libungif
diff --git a/graphics/giflib/DETAILS b/graphics/giflib/DETAILS
index fef20b5..a662fb3 100644
--- a/graphics/giflib/DETAILS
+++ b/graphics/giflib/DETAILS
@@ -9,9 +9,6 @@
            SHORT="A library for compressed GIF images"
 
 cat << EOF
-A library for reading and writing gif images. It is binary compatible
-with libungif. This library use LZW compression in the gif format (the
-Unisys patent on it expired in 2004). Unless you really need to write
-compressed gifs, I would suggest libungif (available from the same sites
-as this library) as a better alternative.
+A library for reading and writing gif images. This library use LZW
+compression in the gif format (the Unisys patent on it expired in 2004).
 EOF
diff --git a/graphics/imlib2/DEPENDS b/graphics/imlib2/DEPENDS
index e70da02..2c39bbb 100644
--- a/graphics/imlib2/DEPENDS
+++ b/graphics/imlib2/DEPENDS
@@ -3,7 +3,7 @@ depends freetype2
 optional_depends "%JPEG"     "" "--without-jpeg"  "for JPEG image loader"
 optional_depends "libpng"    "" "--without-png"   "for PNG image loader"
 optional_depends "tiff"      "" "--without-tiff"  "for TIFF image loader"
-optional_depends "%GIF"      "" "--without-gif"   "for GIF image loader"
+optional_depends "giflib"    "" "--without-gif"   "for GIF image loader"
 optional_depends "zlib"      "" "--without-zlib"  "for ZLIB loader"
 optional_depends "bzip2"     "" "--without-bzip2" "for BZIP2 loader"
 optional_depends "libid3tag" "" "--without-id3"   "for ID3 loader"
diff --git a/kde4/apps/koffice/DEPENDS b/kde4/apps/koffice/DEPENDS
index 4574526..8a0fe0c 100644
--- a/kde4/apps/koffice/DEPENDS
+++ b/kde4/apps/koffice/DEPENDS
@@ -25,7 +25,7 @@ optional_depends "boost"        "-DWITH_Boost=ON"      "-DWITH_Boost=OFF"      "
 optional_depends "exiv2"        "-DWITH_Exiv2=ON"      "-DWITH_Exiv2=OFF"      "for image metadata support"
 optional_depends "fftw3         "-DWITH_FFTW3=ON"      "-DWITH_FFTW3=OFF"      "for Fast Fourier Tranform support"
 optional_depends "freetds"      "-DWITH_FreeTDS=ON"    "-DWITH_FreeTDS=OFF"    "for Tabular DataStream support"
-optional_depends "%GIF"         "-DWITH_GIF2=ON"       "-DWITH_GIF2=OFF"       "for gif graphics support"
+optional_depends "giflib"       "-DWITH_GIF2=ON"       "-DWITH_GIF2=OFF"       "for gif graphics support"
 optional_depends "glib-2"       "-DWITH_GLIB2=ON"      "-DWITH_GLIB2=OFF"      "for glib support"
 optional_depends "gmm"          ""                     ""                      "for matrices support"
 optional_depends "libpqxx       ""                     ""                      "for postgresql database support"
diff --git a/kde4/base/kdelibs/DEPENDS b/kde4/base/kdelibs/DEPENDS
index fde2176..f437354 100644
--- a/kde4/base/kdelibs/DEPENDS
+++ b/kde4/base/kdelibs/DEPENDS
@@ -8,7 +8,7 @@ depends phonon
 depends shared-mime-info
 depends boost
 depends attica
-depends %GIF
+depends giflib
 depends docbook-xml
 
 optional_depends "udev"        "-DWITH_UDev=ON"    "-DWITH_UDev=OFF"    "for udev support"
diff --git a/kde4/base/kdenetwork/DEPENDS b/kde4/base/kdenetwork/DEPENDS
index 8bcebb9..d894f83 100644
--- a/kde4/base/kdenetwork/DEPENDS
+++ b/kde4/base/kdenetwork/DEPENDS
@@ -12,7 +12,7 @@ optional_depends expat         "-DWITH_Expat=ON" "-DWITH_Expat=OFF" "for expat s
 optional_depends libxml2       "-DWITH_LibXml2=ON" "-DWITH_LibXml2=OFF" "for XML support"
 optional_depends libxslt       "-DWITH_LibXslt=ON" "-DWITH_LibXslt=OFF" "for XSLT support"
 optional_depends gpgme         "-DWITH_QGpgme=ON" "-DWITH_QGpgme=OFF" "for gpgme support"
-optional_depends %GIF          "-DWITH_GIF=ON"   "-DWITH_GIF=OFF"   "for gif graphics support"
+optional_depends giflib        "-DWITH_GIF=ON"   "-DWITH_GIF=OFF"   "for gif graphics support"
 optional_depends glib-2        "-DWITH_GLIB2=ON" "-DWITH_GLIB2=OFF" "for glib2 support"
 optional_depends %JPEG         "-DWITH_JPEG=ON"  "-DWITH_JPEG=OFF"  "for jpeg graphics support"
 optional_depends libktorrent   "-DWITH_KTorrent=ON" "-DWITH_KTorrent=OFF" "for torrent support"
diff --git a/libs/ming/DEPENDS b/libs/ming/DEPENDS
index bf8af7d..c13bcf5 100644
--- a/libs/ming/DEPENDS
+++ b/libs/ming/DEPENDS
@@ -1,4 +1,4 @@
-depends %GIF
+depends giflib
 
 optional_depends Python "--enable-python" "--disable-python" "for Python script support"
 optional_depends perl   "--enable-perl"   "--disable-perl"   "for perl scripting support"
diff --git a/mono/libgdiplus/DEPENDS b/mono/libgdiplus/DEPENDS
index 7d84432..004ec1a 100644
--- a/mono/libgdiplus/DEPENDS
+++ b/mono/libgdiplus/DEPENDS
@@ -1,11 +1,7 @@
 depends  %X
 depends  glib-2
 
-optional_depends  "tiff"     ""  "--without-libtiff"  \
-                  "for TIFF image IO support"
-optional_depends  "%JPEG"     ""  "--without-libjpg"   \
-                  "for JPEG image support"
-optional_depends  "libexif"  ""  "--without-libexif"  \
-                  "for EXIF image tag support"
-optional_depends  "%GIF" ""  ""                   \
-                  "for GIF image support"
+optional_depends "tiff"    "" "--without-libtiff" "for TIFF image IO support"
+optional_depends "%JPEG"   "" "--without-libjpg"  "for JPEG image support"
+optional_depends "libexif" "" "--without-libexif" "for EXIF image tag support"
+optional_depends "giflib"  "" ""                  "for GIF image support"
diff --git a/printer/pdf417_enc/DEPENDS b/printer/pdf417_enc/DEPENDS
index 1627648..287b706 100644
--- a/printer/pdf417_enc/DEPENDS
+++ b/printer/pdf417_enc/DEPENDS
@@ -1 +1 @@
-depends %GIF
+depends giflib
diff --git a/qt4-apps/qt4/DEPENDS b/qt4-apps/qt4/DEPENDS
index f4a4bbb..cbca3cc 100644
--- a/qt4-apps/qt4/DEPENDS
+++ b/qt4-apps/qt4/DEPENDS
@@ -5,7 +5,7 @@ optional_depends  "openssl"    "-openssl"          "-no-openssl"    "for Secure
 optional_depends  "libmng"     "-system-libmng"    "-qt-libmng"     "Use system or Qt version of MNG"
 optional_depends  "libpng"     "-system-libpng"    "-qt-libpng"     "Use system or Qt verion of PNG"
 optional_depends  "zlib"       "-system-zlib"      "-qt-zlib"       "Choose system or Qt version of zlib"
-optional_depends  "%GIF"   "-qt-gif"           "-no-gif"        "for GIF reading support"
+optional_depends  "giflib"     "-qt-gif"           "-no-gif"        "for GIF reading support"
 optional_depends  "fontconfig" "-fontconfig"       "-no-fontconfig" "for anti alias font support"
 optional_depends  "cups"       "-cups"             "-no-cups"       "for printing support, needed by kdelibs"
 optional_depends  "nas"        "-system-nas-sound" "-no-nas-sound"  "for Network Audio System support"
diff --git a/video/DirectFB/DEPENDS b/video/DirectFB/DEPENDS
index 2718a35..e8f83ad 100644
--- a/video/DirectFB/DEPENDS
+++ b/video/DirectFB/DEPENDS
@@ -2,7 +2,7 @@ depends pkgconfig
 
 optional_depends "mesa-lib" "" "" "for OpenGL (selected with previous drivers)"
 
-optional_depends "%GIF"         "--enable-gif"      "--disable-gif"      "for GIF image provider (recommended)"
+optional_depends "giflib"       "--enable-gif"      "--disable-gif"      "for GIF image provider (recommended)"
 optional_depends "%JPEG"        "--enable-jpeg"     "--disable-jpeg"     "for JPEG image provider (recommended)"
 optional_depends "libpng"       "--enable-png"      "--disable-png"      "for PNG image provider (recommended)"
 optional_depends "freetype2"    "--enable-freetype" "--disable-freetype" "for freetype font provider (recommended)"
diff --git a/web/bluefish/DEPENDS b/web/bluefish/DEPENDS
index 46af6b4..ab1ef9e 100644
--- a/web/bluefish/DEPENDS
+++ b/web/bluefish/DEPENDS
@@ -1,7 +1,7 @@
 depends gtk+-2
 depends %JPEG
 depends tiff
-depends %GIF
+depends giflib
 depends libpng
 depends pcre
 
diff --git a/zbeta/e17/evas-svn/DEPENDS b/zbeta/e17/evas-svn/DEPENDS
index 72de1cb..e8fd237 100644
--- a/zbeta/e17/evas-svn/DEPENDS
+++ b/zbeta/e17/evas-svn/DEPENDS
@@ -5,7 +5,7 @@ optional_depends  "libpng"    "--enable-image-loader-png"   ""         \
                               "enable PNG image loader"
 optional_depends  "%JPEG"     "--enable-image-loader-jpeg"  ""         \
                               "enable JPEG image loader"
-optional_depends  "%GIF"  "--enable-image-loader-gif"   ""         \
+optional_depends  "giflib"    "--enable-image-loader-gif"   ""         \
                               "enable GIF image loader"
 optional_depends  "tiff"      "--enable-image-loader-tiff"  ""         \
                               "enable TIFF image loader"
diff --git a/zbeta/e17/imlib2-svn/DEPENDS b/zbeta/e17/imlib2-svn/DEPENDS
index 3ba1515..ebcd96a 100644
--- a/zbeta/e17/imlib2-svn/DEPENDS
+++ b/zbeta/e17/imlib2-svn/DEPENDS
@@ -1,5 +1,5 @@
 depends libpng
-depends %GIF
+depends giflib
 depends %JPEG
 depends freetype2
 
diff --git a/zbeta/emacs-cvs/DEPENDS b/zbeta/emacs-cvs/DEPENDS
index 39123f0..bf7d8b9 100644
--- a/zbeta/emacs-cvs/DEPENDS
+++ b/zbeta/emacs-cvs/DEPENDS
@@ -1,15 +1,15 @@
 depends texinfo
-optional_depends  %GIF "--with-gif" "" "for gif support if you use faces"
-optional_depends  tiff "--with-tiff" "" "for tiff support if you use faces"
-optional_depends  libpng "--with-png" "" "for png support if you use faces"
-optional_depends  librsvg "--with-rsvg" "" "for svg support"
-optional_depends  "%X" "--with-x --with-xpm" "" "for xpm support if you use faces"
-optional_depends  gtk+-2  "--with-x-toolkit=gtk" "" "for a GTK2 user interface"
-optional_depends  libXft "--enable-font-backend --with-xft" "" "for pretty font support"
-optional_depends  %JPEG    "--with-jpeg" "" "for jpeg support if you use faces"
-optional_depends  tiff     "--with-tiff" "" "for tiff support if you use faces"
-optional_depends  libpng   "--with-png" "" "for png support if you use faces"
-optional_depends  librsvg  "--with-rsvg" "" "for svg support"
-optional_depends  "%X"     "--with-x --with-xpm" "" "for xpm support if you use faces"
-optional_depends  gtk+-2   "--with-x-toolkit=gtk" "" "for a GTK2 user interface"
-optional_depends  libXft   "--enable-font-backend --with-xft" "" "for pretty font support"
+
+optional_depends "giflib"  "--with-gif"                       "" "for gif support if you use faces"
+optional_depends "tiff"    "--with-tiff"                      "" "for tiff support if you use faces"
+optional_depends "libpng"  "--with-png"                       "" "for png support if you use faces"
+optional_depends "librsvg" "--with-rsvg"                      "" "for svg support"
+optional_depends "%X"      "--with-x --with-xpm"              "" "for xpm support if you use faces"
+optional_depends "gtk+-2"  "--with-x-toolkit=gtk"             "" "for a GTK2 user interface"
+optional_depends "libXft"  "--enable-font-backend --with-xft" "" "for pretty font support"
+optional_depends "%JPEG"   "--with-jpeg"                      "" "for jpeg support if you use faces"
+optional_depends "tiff"    "--with-tiff"                      "" "for tiff support if you use faces"
+optional_depends "libpng"  "--with-png"                       "" "for png support if you use faces"
+optional_depends "librsvg" "--with-rsvg"                      "" "for svg support"
+optional_depends "gtk+-2"  "--with-x-toolkit=gtk"             "" "for a GTK2 user interface"
+optional_depends "libXft"  "--enable-font-backend --with-xft" "" "for pretty font support"
diff --git a/zbeta/fbv/DEPENDS b/zbeta/fbv/DEPENDS
index e47cde5..7c14ecf 100644
--- a/zbeta/fbv/DEPENDS
+++ b/zbeta/fbv/DEPENDS
@@ -1,3 +1,3 @@
 optional_depends "%JPEG"  "" "--without-libjpeg"  "for jpeg support"
 optional_depends "libpng" "" "--without-libpng"   "for png support"
-optional_depends "%GIF"   "" "--without-libungif" "for gif support"
+optional_depends "giflib" "" "--without-libungif" "for gif support"
diff --git a/zbeta/mplayer2/DEPENDS b/zbeta/mplayer2/DEPENDS
index 347bb32..95d555d 100644
--- a/zbeta/mplayer2/DEPENDS
+++ b/zbeta/mplayer2/DEPENDS
@@ -4,7 +4,7 @@ optional_depends "libXext"    "" "--disable-x11"        "for X11 video output"
 optional_depends "alsa-lib"   "" "--disable-alsa"       "for ALSA audio output"
 optional_depends "%JPEG"      "" "--disable-jpeg"       "for JPEG support"
 optional_depends "libpng"     "" "--disable-png"        "for PNG support"
-optional_depends "%GIF"       "" "--disable-gif"        "for GIF support"
+optional_depends "giflib"     "" "--disable-gif"        "for GIF support"
 optional_depends "ffmpeg"     "" "--disable-ffmpeg"     "for FFmpeg codec"
 optional_depends "faad"       "" "--disable-faad"       "for FAAD2 (AAC) codec"
 optional_depends "libmad"     "" "--disable-mad"        "for libmad (MPEG audio) support"


More information about the Lunar-commits mailing list