Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-gnome-2.32 grimoire by Ladislav Hagara (3057eae56995ebe48fc251e9822c937f12139226)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ladislav Hagara <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-gnome-2.32 grimoire by Ladislav Hagara (3057eae56995ebe48fc251e9822c937f12139226)
  • Date: Thu, 21 Oct 2010 13:30:33 -0500

GIT changes to devel-gnome-2.32 grimoire by Ladislav Hagara <hgr AT vabo.cz>:

x11-toolkits/gtk+2/HISTORY | 3 ++
x11-toolkits/gtk+2/PRE_BUILD | 3 ++
x11-toolkits/gtk+2/doc.patch | 46
+++++++++++++++++++++++++++++++++++++++++++
3 files changed, 52 insertions(+)

New commits:
commit 3057eae56995ebe48fc251e9822c937f12139226
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

gtk+2: PRE_BUILD, doc.patch: added patch

doc is broken now, for example:
https://bugzilla.gnome.org/show_bug.cgi?id=631910

diff --git a/x11-toolkits/gtk+2/HISTORY b/x11-toolkits/gtk+2/HISTORY
index bfadd55..f3d4ee4 100644
--- a/x11-toolkits/gtk+2/HISTORY
+++ b/x11-toolkits/gtk+2/HISTORY
@@ -1,3 +1,6 @@
+2010-10-21 Ladislav Hagara <hgr AT vabo.cz>
+ * PRE_BUILD, doc.patch: added patch
+
2010-10-20 Ladislav Hagara <hgr AT vabo.cz>
* DEPENDS: both stable and devel depends on gdk-pixbuf2

diff --git a/x11-toolkits/gtk+2/PRE_BUILD b/x11-toolkits/gtk+2/PRE_BUILD
new file mode 100755
index 0000000..8db6d8d
--- /dev/null
+++ b/x11-toolkits/gtk+2/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SPELL_DIRECTORY/doc.patch
diff --git a/x11-toolkits/gtk+2/doc.patch b/x11-toolkits/gtk+2/doc.patch
new file mode 100644
index 0000000..18b42df
--- /dev/null
+++ b/x11-toolkits/gtk+2/doc.patch
@@ -0,0 +1,46 @@
+diff -Naur gtk+-2.22.0.ori/configure gtk+-2.22.0/configure
+--- gtk+-2.22.0.ori/configure 2010-09-23 16:27:27.000000000 +0200
++++ gtk+-2.22.0/configure 2010-10-21 19:42:13.000000000 +0200
+@@ -24376,7 +24376,7 @@
+ ac_config_commands="$ac_config_commands gdk/gdkconfig.h"
+
+
+-ac_config_files="$ac_config_files config.h.win32 gtk-zip.sh Makefile
gdk-2.0.pc gtk+-2.0.pc gtk+-unix-print-2.0.pc gail.pc gdk-2.0-uninstalled.pc
gtk+-2.0-uninstalled.pc gail-uninstalled.pc m4macros/Makefile po/Makefile.in
po-properties/Makefile.in demos/Makefile demos/gtk-demo/Makefile
demos/gtk-demo/geninclude.pl tests/Makefile docs/Makefile
docs/reference/Makefile docs/reference/gdk/Makefile
docs/reference/gdk/version.xml docs/reference/gtk/Makefile
docs/reference/gtk/version.xml docs/reference/libgail-util/Makefile
docs/faq/Makefile docs/tools/Makefile docs/tutorial/Makefile build/Makefile
build/win32/Makefile build/win32/vs9/Makefile gdk/Makefile gdk/x11/Makefile
gdk/win32/Makefile gdk/win32/rc/Makefile gdk/win32/rc/gdk.rc
gdk/quartz/Makefile gdk/directfb/Makefile gdk/tests/Makefile gtk/Makefile
gtk/makefile.msc gtk/gtkversion.h gtk/gtk-win32.rc gtk/theme-bits/Makefile
gtk/tests/Makefile modules/Makefile modules/other/Makefile
modules/other/gail/Makefile modules/other/gail/libgail-util/Makefile
modules/other/gail/tests/Makefile modules/engines/Makefile
modules/engines/pixbuf/Makefile modules/engines/ms-windows/Makefile
modules/engines/ms-windows/Theme/Makefile
modules/engines/ms-windows/Theme/gtk-2.0/Makefile modules/input/Makefile
modules/printbackends/Makefile modules/printbackends/cups/Makefile
modules/printbackends/lpr/Makefile modules/printbackends/file/Makefile
modules/printbackends/papi/Makefile modules/printbackends/test/Makefile
perf/Makefile"
++ac_config_files="$ac_config_files config.h.win32 gtk-zip.sh Makefile
gdk-2.0.pc gtk+-2.0.pc gtk+-unix-print-2.0.pc gail.pc gdk-2.0-uninstalled.pc
gtk+-2.0-uninstalled.pc gail-uninstalled.pc m4macros/Makefile po/Makefile.in
po-properties/Makefile.in demos/Makefile demos/gtk-demo/Makefile
demos/gtk-demo/geninclude.pl tests/Makefile docs/Makefile
docs/reference/Makefile docs/reference/gdk/Makefile
docs/reference/gdk/version.xml docs/reference/gtk/Makefile
docs/reference/gtk/version.xml docs/reference/libgail-util/Makefile
docs/tools/Makefile build/Makefile build/win32/Makefile
build/win32/vs9/Makefile gdk/Makefile gdk/x11/Makefile gdk/win32/Makefile
gdk/win32/rc/Makefile gdk/win32/rc/gdk.rc gdk/quartz/Makefile
gdk/directfb/Makefile gdk/tests/Makefile gtk/Makefile gtk/makefile.msc
gtk/gtkversion.h gtk/gtk-win32.rc gtk/theme-bits/Makefile gtk/tests/Makefile
modules/Makefile modules/other/Makefile modules/other/gail/Makefile
modules/other/gail/libgail-util/Makefile modules/other/gail/tests/Makefile
modules/engines/Makefile modules/engines/pixbuf/Makefile
modules/engines/ms-windows/Makefile modules/engines/ms-windows/Theme/Makefile
modules/engines/ms-windows/Theme/gtk-2.0/Makefile modules/input/Makefile
modules/printbackends/Makefile modules/printbackends/cups/Makefile
modules/printbackends/lpr/Makefile modules/printbackends/file/Makefile
modules/printbackends/papi/Makefile modules/printbackends/test/Makefile
perf/Makefile"
+
+
+ cat >confcache <<\_ACEOF
+@@ -25743,9 +25743,7 @@
+ "docs/reference/gtk/Makefile") CONFIG_FILES="$CONFIG_FILES
docs/reference/gtk/Makefile" ;;
+ "docs/reference/gtk/version.xml") CONFIG_FILES="$CONFIG_FILES
docs/reference/gtk/version.xml" ;;
+ "docs/reference/libgail-util/Makefile") CONFIG_FILES="$CONFIG_FILES
docs/reference/libgail-util/Makefile" ;;
+- "docs/faq/Makefile") CONFIG_FILES="$CONFIG_FILES docs/faq/Makefile" ;;
+ "docs/tools/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tools/Makefile"
;;
+- "docs/tutorial/Makefile") CONFIG_FILES="$CONFIG_FILES
docs/tutorial/Makefile" ;;
+ "build/Makefile") CONFIG_FILES="$CONFIG_FILES build/Makefile" ;;
+ "build/win32/Makefile") CONFIG_FILES="$CONFIG_FILES
build/win32/Makefile" ;;
+ "build/win32/vs9/Makefile") CONFIG_FILES="$CONFIG_FILES
build/win32/vs9/Makefile" ;;
+diff -Naur gtk+-2.22.0.ori/docs/Makefile.am gtk+-2.22.0/docs/Makefile.am
+--- gtk+-2.22.0.ori/docs/Makefile.am 2010-04-09 04:29:53.000000000 +0200
++++ gtk+-2.22.0/docs/Makefile.am 2010-10-21 19:42:27.000000000 +0200
+@@ -1,7 +1,7 @@
+ ## Process this file with automake to produce Makefile.in
+ include $(top_srcdir)/Makefile.decl
+
+-SUBDIRS = tutorial faq reference tools
++SUBDIRS = reference tools
+
+ EXTRA_DIST += \
+ defsformat.txt \
+diff -Naur gtk+-2.22.0.ori/docs/Makefile.in gtk+-2.22.0/docs/Makefile.in
+--- gtk+-2.22.0.ori/docs/Makefile.in 2010-09-23 16:27:21.000000000 +0200
++++ gtk+-2.22.0/docs/Makefile.in 2010-10-21 19:42:35.000000000 +0200
+@@ -360,7 +360,7 @@
+ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11
target tests."; exit 1; } \
+ && DISPLAY=:$$XID && export DISPLAY
+
+-SUBDIRS = tutorial faq reference tools
++SUBDIRS = reference tools
+ all: all-recursive
+
+ .SUFFIXES:



  • [SM-Commit] GIT changes to devel-gnome-2.32 grimoire by Ladislav Hagara (3057eae56995ebe48fc251e9822c937f12139226), Ladislav Hagara, 10/21/2010

Archive powered by MHonArc 2.6.24.

Top of Page