diff options
| author | Eric Sandall | 2013-06-12 20:57:09 -0700 |
|---|---|---|
| committer | Eric Sandall | 2013-06-12 20:57:09 -0700 |
| commit | 76acea13efddba0e2be2557bf7869a37119a72e9 (patch) | |
| tree | 72de003e0b2324355cd83c8fc46b0324988b0b9f /x11-libs/tango-icon-theme-extras | |
| parent | c0b35e685c26c371f6963913ccee04e90d766dab (diff) | |
tango-icon-theme-extras: Fix compilation against librsvg2 2.35+
Depends on autoconf for autoreconf
rsvg-2.35.2.patch added from
https://build.opensuse.org/package/view_file?expand=1&file=tango-icon-theme-extras-rsvg-2_35_2.patch&package=tango-icon-theme&project=openSUSE%3AFactory
Diffstat (limited to 'x11-libs/tango-icon-theme-extras')
| -rwxr-xr-x | x11-libs/tango-icon-theme-extras/DEPENDS | 1 | ||||
| -rw-r--r-- | x11-libs/tango-icon-theme-extras/HISTORY | 5 | ||||
| -rwxr-xr-x | x11-libs/tango-icon-theme-extras/PRE_BUILD | 5 | ||||
| -rw-r--r-- | x11-libs/tango-icon-theme-extras/rsvg-2.35.2.patch | 35 |
4 files changed, 46 insertions, 0 deletions
diff --git a/x11-libs/tango-icon-theme-extras/DEPENDS b/x11-libs/tango-icon-theme-extras/DEPENDS index 50d5644e9e..d09a5bd7a8 100755 --- a/x11-libs/tango-icon-theme-extras/DEPENDS +++ b/x11-libs/tango-icon-theme-extras/DEPENDS @@ -1,3 +1,4 @@ +depends autoconf && depends icon-naming-utils && depends imagemagick && depends pkgconfig && diff --git a/x11-libs/tango-icon-theme-extras/HISTORY b/x11-libs/tango-icon-theme-extras/HISTORY index 5f16d80f51..5579bae912 100644 --- a/x11-libs/tango-icon-theme-extras/HISTORY +++ b/x11-libs/tango-icon-theme-extras/HISTORY @@ -1,3 +1,8 @@ +2013-06-12 Eric Sandall <sandalle@sourcemage.org> + * DEPENDS: Depends on autoconf for autoreconf + * PRE_BUILD: Apply rsvg-2.35.2.patch to compile against librsvg2 2.35+ + * rsvg-2.35.2.patch: From https://build.opensuse.org/package/view_file?expand=1&file=tango-icon-theme-extras-rsvg-2_35_2.patch&package=tango-icon-theme&project=openSUSE%3AFactory + 2007-02-17 Eric Sandall <sandalle@sourcemage.org> * DETAILS,DEPENDS: Created diff --git a/x11-libs/tango-icon-theme-extras/PRE_BUILD b/x11-libs/tango-icon-theme-extras/PRE_BUILD new file mode 100755 index 0000000000..be9eed9b52 --- /dev/null +++ b/x11-libs/tango-icon-theme-extras/PRE_BUILD @@ -0,0 +1,5 @@ +default_pre_build && +cd "${SOURCE_DIRECTORY}" && +message "${MESSAGE_COLOR}Fix compilation against librsvg2 2.35+...${DEFAULT_COLOR}" && +patch -p1 < "${SPELL_DIRECTORY}"/rsvg-2.35.2.patch && +autoreconf -i diff --git a/x11-libs/tango-icon-theme-extras/rsvg-2.35.2.patch b/x11-libs/tango-icon-theme-extras/rsvg-2.35.2.patch new file mode 100644 index 0000000000..5f93c42f63 --- /dev/null +++ b/x11-libs/tango-icon-theme-extras/rsvg-2.35.2.patch @@ -0,0 +1,35 @@ +# From https://build.opensuse.org/package/view_file?expand=1&file=tango-icon-theme-extras-rsvg-2_35_2.patch&package=tango-icon-theme&project=openSUSE%3AFactory +Index: tango-icon-theme-extras-0.1.1/configure.ac +=================================================================== +--- tango-icon-theme-extras-0.1.1.orig/configure.ac ++++ tango-icon-theme-extras-0.1.1/configure.ac +@@ -68,7 +68,7 @@ if test "x$enable_large_bitmaps" = "xyes + PKG_CHECK_EXISTS([librsvg-2.0 >= 2.12.3], + [enable_large_bitmaps=yes], [enable_large_bitmaps=no]) + if test "x$enable_large_bitmaps" = "xyes"; then +- svgconvert_prog="rsvg" ++ svgconvert_prog="rsvg-convert" + else + svgconvert_prog="ksvgtopng" + fi +Index: tango-icon-theme-extras-0.1.1/svg2png.sh.in +=================================================================== +--- tango-icon-theme-extras-0.1.1.orig/svg2png.sh.in ++++ tango-icon-theme-extras-0.1.1/svg2png.sh.in +@@ -8,11 +8,13 @@ if [ ! -z "${ICONTEST}" ]; then + fi + + ICONNAME=`echo ${3} | sed -e "s/.svg//"` +-if test `basename $SVGCONVERT` = "rsvg"; then ++if test `basename $SVGCONVERT` = "rsvg-convert"; then + OPTIONS="-w ${1} -h ${1}" ++ OUTPUT="-o" + else + OPTIONS="${1} ${1}" ++ OUTPUT="" + fi + + +-${SVGCONVERT} ${OPTIONS} ${3} ${2}/${ICONNAME}.png ++${SVGCONVERT} ${OPTIONS} ${3} ${OUTPUT} ${2}/${ICONNAME}.png + |