Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (76acea13efddba0e2be2557bf7869a37119a72e9)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (76acea13efddba0e2be2557bf7869a37119a72e9)
  • Date: Wed, 12 Jun 2013 22:58:06 -0500

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

x11-libs/tango-icon-theme-extras/DEPENDS | 1
x11-libs/tango-icon-theme-extras/HISTORY | 5 ++
x11-libs/tango-icon-theme-extras/PRE_BUILD | 5 ++
x11-libs/tango-icon-theme-extras/rsvg-2.35.2.patch | 35
++++++++++++++++++++
x11-libs/tango-icon-theme/DEPENDS | 1
x11-libs/tango-icon-theme/HISTORY | 5 ++
x11-libs/tango-icon-theme/PRE_BUILD | 5 ++
x11-libs/tango-icon-theme/rsvg-2.35.2.patch | 36
+++++++++++++++++++++
8 files changed, 93 insertions(+)

New commits:
commit 76acea13efddba0e2be2557bf7869a37119a72e9
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

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

commit c0b35e685c26c371f6963913ccee04e90d766dab
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

tango-icon-theme: 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-rsvg-2_35_2.patch&package=tango-icon-theme&project=openSUSE%3AFactory

diff --git a/x11-libs/tango-icon-theme-extras/DEPENDS
b/x11-libs/tango-icon-theme-extras/DEPENDS
index 50d5644..d09a5bd 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 5f16d80..5579bae9 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 AT 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 AT 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 0000000..be9eed9
--- /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 0000000..5f93c42
--- /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
+
diff --git a/x11-libs/tango-icon-theme/DEPENDS
b/x11-libs/tango-icon-theme/DEPENDS
index ac9ca71..b931765 100755
--- a/x11-libs/tango-icon-theme/DEPENDS
+++ b/x11-libs/tango-icon-theme/DEPENDS
@@ -1,3 +1,4 @@
+depends autoconf &&
depends icon-naming-utils &&
depends imagemagick &&
depends intltool &&
diff --git a/x11-libs/tango-icon-theme/HISTORY
b/x11-libs/tango-icon-theme/HISTORY
index 7681ee7..16c0851 100644
--- a/x11-libs/tango-icon-theme/HISTORY
+++ b/x11-libs/tango-icon-theme/HISTORY
@@ -1,3 +1,8 @@
+2013-06-12 Eric Sandall <sandalle AT 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-rsvg-2_35_2.patch&package=tango-icon-theme&project=openSUSE%3AFactory
+
2009-02-27 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated to version 0.8.90

diff --git a/x11-libs/tango-icon-theme/PRE_BUILD
b/x11-libs/tango-icon-theme/PRE_BUILD
new file mode 100755
index 0000000..be9eed9
--- /dev/null
+++ b/x11-libs/tango-icon-theme/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/rsvg-2.35.2.patch
b/x11-libs/tango-icon-theme/rsvg-2.35.2.patch
new file mode 100644
index 0000000..c39ca1f
--- /dev/null
+++ b/x11-libs/tango-icon-theme/rsvg-2.35.2.patch
@@ -0,0 +1,36 @@
+# From
https://build.opensuse.org/package/view_file?expand=1&file=tango-icon-theme-rsvg-2_35_2.patch&package=tango-icon-theme&project=openSUSE%3AFactory
+Index: tango-icon-theme-0.8.90/configure.ac
+===================================================================
+--- tango-icon-theme-0.8.90.orig/configure.ac
++++ tango-icon-theme-0.8.90/configure.ac
+@@ -82,7 +82,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-0.8.90/svg2png.sh.in
+===================================================================
+--- tango-icon-theme-0.8.90.orig/svg2png.sh.in
++++ tango-icon-theme-0.8.90/svg2png.sh.in
+@@ -9,12 +9,14 @@ fi
+
+ ICONFILE=`basename ${3}`
+ ICONNAME=`echo ${ICONFILE} | 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
+
+ echo "${SVGCONVERT} ${OPTIONS} ${3} ${2}/${ICONNAME}.png"
+-${SVGCONVERT} ${OPTIONS} ${3} ${2}/${ICONNAME}.png
++${SVGCONVERT} ${OPTIONS} ${3} ${OUTPUT} ${2}/${ICONNAME}.png
+
+



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (76acea13efddba0e2be2557bf7869a37119a72e9), Eric Sandall, 06/12/2013

Archive powered by MHonArc 2.6.24.

Top of Page