patches/pygtksourceview-01-configure.diff
author rohinis
Tue, 29 Nov 2011 17:32:55 +0000
branchs11express-2010-11
changeset 22234 c23e64da3e06
parent 16624 7e793d4eb0ab
permissions -rw-r--r--
2011-11-29 Rohini S <[email protected]> * patches/Python26-22-audio.diff: Fixes CVE-2010-1634 * specs/SUNWPython26.spec: Fixes CR 7085446
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
16624
7e793d4eb0ab 2009-09-23 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     1
--- pygtksourceview-2.8.0/configure.ac-orig	2009-09-23 13:08:51.142485973 -0500
7e793d4eb0ab 2009-09-23 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     2
+++ pygtksourceview-2.8.0/configure.ac	2009-09-23 13:09:19.026688500 -0500
7e793d4eb0ab 2009-09-23 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     3
@@ -74,6 +74,9 @@ AC_SUBST(PYGOBJECT_INCLUDEDIR)
7e793d4eb0ab 2009-09-23 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     4
 PYGOBJECT_DATADIR=`$PKG_CONFIG --variable=datadir pygobject-2.0`
7e793d4eb0ab 2009-09-23 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     5
 AC_SUBST(PYGOBJECT_DATADIR)
7e793d4eb0ab 2009-09-23 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     6
 
7e793d4eb0ab 2009-09-23 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     7
+PYGOBJECT_XSLFILES=`$PKG_CONFIG --variable=xslfiles pygobject-2.0`
7e793d4eb0ab 2009-09-23 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     8
+AC_SUBST(PYGOBJECT_XSLFILES)
7e793d4eb0ab 2009-09-23 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     9
+
7e793d4eb0ab 2009-09-23 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    10
 PYGOBJECT_FIXXREF="$PYTHON `$PKG_CONFIG --variable=fixxref pygobject-2.0`"
7e793d4eb0ab 2009-09-23 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    11
 AC_SUBST(PYGOBJECT_FIXXREF)
7e793d4eb0ab 2009-09-23 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    12
 
7e793d4eb0ab 2009-09-23 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    13
@@ -113,10 +116,13 @@ PYGTK_DATADIR=`$PKG_CONFIG --variable=da
7e793d4eb0ab 2009-09-23 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    14
 
7e793d4eb0ab 2009-09-23 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    15
 AC_SUBST(PYGTK_DATADIR)
7e793d4eb0ab 2009-09-23 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    16
 
7e793d4eb0ab 2009-09-23 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    17
+PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0`
7e793d4eb0ab 2009-09-23 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    18
+AC_SUBST(PYGTK_DEFSDIR)
7e793d4eb0ab 2009-09-23 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    19
+
7e793d4eb0ab 2009-09-23 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    20
 
7e793d4eb0ab 2009-09-23 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    21
 dnl codegen
7e793d4eb0ab 2009-09-23 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    22
 AC_MSG_CHECKING(for pygtk codegen)
7e793d4eb0ab 2009-09-23 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    23
-CODEGENDIR=`$PKG_CONFIG --variable=codegendir pygtk-2.0`
7e793d4eb0ab 2009-09-23 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    24
+CODEGENDIR=`$PKG_CONFIG --variable=codegendir pygobject-2.0`
7e793d4eb0ab 2009-09-23 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    25
 echo $CODEGENDIR
7e793d4eb0ab 2009-09-23 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    26
 if test -f $CODEGENDIR/codegen.py; then
7e793d4eb0ab 2009-09-23 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    27
 	CODEGEN=$CODEGENDIR/codegen.py
7e793d4eb0ab 2009-09-23 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    28
--- pygtksourceview-2.7.0.orig/Makefile.am	2009-08-27 21:14:06.455302476 +0100
7e793d4eb0ab 2009-09-23 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    29
+++ pygtksourceview-2.7.0/Makefile.am	2009-08-27 21:15:58.280856152 +0100
7e793d4eb0ab 2009-09-23 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    30
@@ -44,9 +44,9 @@
7e793d4eb0ab 2009-09-23 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    31
 	(cd $(srcdir)\
7e793d4eb0ab 2009-09-23 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    32
 	&& $(PYTHON) $(CODEGEN)							\
7e793d4eb0ab 2009-09-23 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    33
 		--override $*.override						\
7e793d4eb0ab 2009-09-23 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    34
-		--register @PYGTK_DATADIR@/pygtk/2.0/defs/gdk-types.defs	\
7e793d4eb0ab 2009-09-23 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    35
-		--register @PYGTK_DATADIR@/pygtk/2.0/defs/pango-types.defs	\
7e793d4eb0ab 2009-09-23 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    36
-		--register @PYGTK_DATADIR@/pygtk/2.0/defs/gtk-types.defs	\
7e793d4eb0ab 2009-09-23 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    37
+		--register @PYGTK_DEFSDIR@/gdk-types.defs \
7e793d4eb0ab 2009-09-23 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    38
+		--register @PYGTK_DEFSDIR@/pango-types.defs \
7e793d4eb0ab 2009-09-23 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    39
+		--register @PYGTK_DEFSDIR@/gtk-types.defs \
7e793d4eb0ab 2009-09-23 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    40
 		--prefix py$* $*.defs) > gen-$*.c				\
7e793d4eb0ab 2009-09-23 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    41
 		&& cp gen-$*.c $*.c						\
7e793d4eb0ab 2009-09-23 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    42
 		&& rm -f gen-$*.c
7e793d4eb0ab 2009-09-23 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    43
diff -ruN pygtksourceview-2.7.0.orig/docs/Makefile.am pygtksourceview-2.7.0/docs/Makefile.am
7e793d4eb0ab 2009-09-23 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    44
--- pygtksourceview-2.7.0.orig/docs/Makefile.am	2009-08-27 21:14:06.453578602 +0100
7e793d4eb0ab 2009-09-23 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    45
+++ pygtksourceview-2.7.0/docs/Makefile.am	2009-08-27 21:16:31.949134185 +0100
7e793d4eb0ab 2009-09-23 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    46
@@ -3,8 +3,8 @@
7e793d4eb0ab 2009-09-23 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    47
 REF_VERSION = $(PYGTKSOURCEVIEW_MAJOR_VERSION).$(PYGTKSOURCEVIEW_MINOR_VERSION)
7e793d4eb0ab 2009-09-23 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    48
 FULL_VERSION = $(REF_VERSION).$(PYGTKSOURCEVIEW_MICRO_VERSION)
7e793d4eb0ab 2009-09-23 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    49
 
7e793d4eb0ab 2009-09-23 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    50
-HTML_STYLE = $(PYGOBJECT_DATADIR)/pygobject/xsl/ref-html-style.xsl
7e793d4eb0ab 2009-09-23 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    51
-PDF_STYLE = $(PYGOBJECT_DATADIR)/pygobject/xsl/pdf-style.xsl
7e793d4eb0ab 2009-09-23 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    52
+HTML_STYLE = $(PYGOBJECT_XSLFILES)/ref-html-style.xsl
7e793d4eb0ab 2009-09-23 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    53
+PDF_STYLE = $(PYGOBJECT_XSLFILES)/pdf-style.xsl
7e793d4eb0ab 2009-09-23 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    54
 
7e793d4eb0ab 2009-09-23 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    55
 XMLFILES = 							\
7e793d4eb0ab 2009-09-23 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    56
 	reference/gtksourceview2-ref.xml			\