Mercurial Mercurial > upstream > oracle > spec-files / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patches/gimp-04-fixxref-modules.diff
author rohinis
Tue, 29 Nov 2011 17:32:55 +0000
branchs11express-2010-11
changeset 22234 c23e64da3e06
parent 20080 b004f64dad27
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:
20080
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
     1
 
--- gimp-2.6.7.orig/devel-docs/libgimpcolor/Makefile.am 2010-02-02 23:14:26.461012598 +0000
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
     2
 
+++ gimp-2.6.7/devel-docs/libgimpcolor/Makefile.am      2010-02-02 23:21:59.780445729 +0000
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
     3
 
@@ -19,7 +19,7 @@
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
     4
 
 MKDB_OPTIONS = --sgml-mode --output-format=xml
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
     5
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
     6
 
 # Extra options to supply to gtkdoc-fixref
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
     7
 
-FIXXREF_OPTIONS =
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
     8
 
+FIXXREF_OPTIONS = --module=$(DOC_MODULE)
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
     9
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    10
 
 # Used for dependencies
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    11
 
 HFILE_GLOB = $(DOC_SOURCE_DIR)/*.h
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    12
 
--- gimp-2.6.7.orig/devel-docs/libgimpconfig/Makefile.am        2010-02-02 23:14:26.466912830 +0000
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    13
 
+++ gimp-2.6.7/devel-docs/libgimpconfig/Makefile.am     2010-02-02 23:24:39.683453712 +0000
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    14
 
@@ -19,7 +19,7 @@
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    15
 
 MKDB_OPTIONS = --sgml-mode --output-format=xml
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    16
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    17
 
 # Extra options to supply to gtkdoc-fixref
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    18
 
-FIXXREF_OPTIONS = --extra-dir=../libgimpbase/html --extra-dir=../libgimpcolor/html --extra-dir=../libgimpmath/html
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    19
 
+FIXXREF_OPTIONS = --extra-dir=../libgimpbase/html --extra-dir=../libgimpcolor/html --extra-dir=../libgimpmath/html --module=$(DOC_MODULE)
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    20
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    21
 
 # Used for dependencies
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    22
 
 HFILE_GLOB = $(DOC_SOURCE_DIR)/*.h
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    23
 
--- gimp-2.6.7.orig/devel-docs/libgimpmath/Makefile.am  2010-02-02 23:14:26.477266439 +0000
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    24
 
+++ gimp-2.6.7/devel-docs/libgimpmath/Makefile.am       2010-02-02 23:26:08.651249656 +0000
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    25
 
@@ -19,7 +19,7 @@
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    26
 
 MKDB_OPTIONS = --sgml-mode --output-format=xml
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    27
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    28
 
 # Extra options to supply to gtkdoc-fixref
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    29
 
-FIXXREF_OPTIONS =
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    30
 
+FIXXREF_OPTIONS = --module=$(DOC_MODULE)
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    31
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    32
 
 # Used for dependencies
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    33
 
 HFILE_GLOB = $(DOC_SOURCE_DIR)/*.h
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    34
 
--- gimp-2.6.7.orig/devel-docs/libgimpmodule/Makefile.am        2010-02-02 23:14:26.583459855 +0000
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    35
 
+++ gimp-2.6.7/devel-docs/libgimpmodule/Makefile.am     2010-02-02 23:28:35.139822019 +0000
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    36
 
@@ -19,7 +19,7 @@
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    37
 
 MKDB_OPTIONS = --sgml-mode --output-format=xml
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    38
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    39
 
 # Extra options to supply to gtkdoc-fixref
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    40
 
-FIXXREF_OPTIONS =
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    41
 
+FIXXREF_OPTIONS = --module=$(DOC_MODULE)
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    42
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    43
 
 # Used for dependencies
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    44
 
 HFILE_GLOB = $(DOC_SOURCE_DIR)/*.h
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    45
 
--- gimp-2.6.7.orig/devel-docs/libgimpthumb/Makefile.am 2010-02-02 23:14:26.485150690 +0000
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    46
 
+++ gimp-2.6.7/devel-docs/libgimpthumb/Makefile.am      2010-02-02 23:30:11.674878664 +0000
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    47
 
@@ -19,7 +19,7 @@
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    48
 
 MKDB_OPTIONS = --sgml-mode --output-format=xml
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    49
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    50
 
 # Extra options to supply to gtkdoc-fixref
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    51
 
-FIXXREF_OPTIONS = --extra-dir=../libgimpmath/html
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    52
 
+FIXXREF_OPTIONS = --extra-dir=../libgimpmath/html --module=$(DOC_MODULE)
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    53
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    54
 
 # Used for dependencies
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    55
 
 HFILE_GLOB = $(DOC_SOURCE_DIR)/*.h
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    56
 
--- gimp-2.6.7.orig/devel-docs/libgimp/Makefile.am      2010-02-02 23:14:26.419121473 +0000
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    57
 
+++ gimp-2.6.7/devel-docs/libgimp/Makefile.am   2010-02-03 00:01:27.831794111 +0000
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    58
 
@@ -19,7 +19,7 @@
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    59
 
 MKDB_OPTIONS = --sgml-mode --output-format=xml
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    60
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    61
 
 # Extra options to supply to gtkdoc-fixref
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    62
 
-FIXXREF_OPTIONS = --extra-dir=../libgimpbase/html --extra-dir=../libgimpcolor/html --extra-dir=../libgimpconfig/html --extra-dir=../libgimpmath/html --extra-dir=../libgimpwidgets/html
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    63
 
+FIXXREF_OPTIONS = --extra-dir=../libgimpbase/html --extra-dir=../libgimpcolor/html --extra-dir=../libgimpconfig/html --extra-dir=../libgimpmath/html --extra-dir=../libgimpwidgets/html --module=$(DOC_MODULE)
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    64
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    65
 
 # Used for dependencies
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    66
 
 HFILE_GLOB = $(DOC_SOURCE_DIR)/*.h
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    67
 
--- gimp-2.6.7.orig/devel-docs/libgimpwidgets/Makefile.am       2010-02-02 23:14:26.507928484 +0000
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    68
 
+++ gimp-2.6.7/devel-docs/libgimpwidgets/Makefile.am    2010-02-02 23:58:24.512228368 +0000
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    69
 
@@ -19,7 +19,7 @@
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    70
 
 MKDB_OPTIONS = --sgml-mode --output-format=xml
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    71
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    72
 
 # Extra options to supply to gtkdoc-fixref
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    73
 
-FIXXREF_OPTIONS = --extra-dir=../libgimpbase/html --extra-dir=../libgimpcolor/html --extra-dir=../libgimpconfig/html --extra-dir=../libgimpmath/html --extra-dir=../libgimp/html
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    74
 
+FIXXREF_OPTIONS = --extra-dir=../libgimpbase/html --extra-dir=../libgimpcolor/html --extra-dir=../libgimpconfig/html --extra-dir=../libgimpmath/html --extra-dir=../libgimp/html --module=$(DOC_MODULE)
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    75
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    76
 
 # Used for dependencies
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    77
 
 HFILE_GLOB = $(DOC_SOURCE_DIR)/*.h
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    78
 
diff -ruN gimp-2.6.7.orig/devel-docs/libgimpbase/Makefile.am gimp-2.6.7/devel-docs/libgimpbase/Makefile.am
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    79
 
--- gimp-2.6.7.orig/devel-docs/libgimpbase/Makefile.am	2010-02-03 00:58:49.609993900 +0000
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    80
 
+++ gimp-2.6.7/devel-docs/libgimpbase/Makefile.am	2010-02-03 00:59:28.149825100 +0000
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    81
 
@@ -19,7 +19,7 @@
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    82
 
 MKDB_OPTIONS = --sgml-mode --output-format=xml
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    83
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    84
 
 # Extra options to supply to gtkdoc-fixref
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    85
 
-FIXXREF_OPTIONS =
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    86
 
+FIXXREF_OPTIONS = --module=$(DOC_MODULE)
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    87
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    88
 
 # Used for dependencies
b004f64dad27 2010-09-10 Leon Sha <[email protected]>
leon.sha
parents:
diff changeset 
    89
 
 HFILE_GLOB = $(DOC_SOURCE_DIR)/*.h
upstream/oracle/spec-files