rpms/frysk/FC-4 .cvsignore, NONE, 1.1 40-blacklist-fonts.conf, NONE, 1.1 50-no-hint-fonts.conf, NONE, 1.1 antlr.patch, NONE, 1.1 cairo-java-pkg-dir.patch, NONE, 1.1 fontconfig-2.3.91-crosscheck.patch, NONE, 1.1 fontconfig-2.3.93-defaultconfig.patch, NONE, 1.1 frysk.spec, NONE, 1.1 glib-java-macro.patch, NONE, 1.1 glib-java-pkg-dir.patch, NONE, 1.1 glib2.csh, NONE, 1.1 glib2.sh, NONE, 1.1 gtk+-2.4.1-lib64.patch, NONE, 1.1 gtk+-2.8.10-abicheck.patch, NONE, 1.1 gtk+-2.8.10-set-invisible-char-to-bullet.patch, NONE, 1.1 gtk+-2.8.6-frysk-theme-fix.patch, NONE, 1.1 gtk+-2.8.6-inputmethod.patch, NONE, 1.1 gtk+-libgdk-lm.patch, NONE, 1.1 gtk+-skip-glib-check.patch, NONE, 1.1 gtk+-skip-pango-check.patch, NONE, 1.1 jdom-compiler.patch, NONE, 1.1 jdom-files.patch, NONE, 1.1 libglade-2.0.1-nowarning.patch, NONE, 1.1 libglade-java-pkg-dir.patch, NONE, 1.1 libgtk-java-pkg-dir.patch, NONE, 1.1 libvte-java-frysk-libgnomeui-canvas-version-fix.patch, NONE, 1.1 libvte-java-pkg-dir.patch, NONE, 1.1 pango-1.2.5-lib64.patch, NONE, 1.1 pango-sk! ip-cairo-check.patch, NONE, 1.1 pango-slighthint.patch, NONE, 1.1 sources, NONE, 1.1 update.sh, NONE, 1.1
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Jan 24 00:34:05 UTC 2006
Author: cagney
Update of /cvs/dist/rpms/frysk/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv4051
Added Files:
.cvsignore 40-blacklist-fonts.conf 50-no-hint-fonts.conf
antlr.patch cairo-java-pkg-dir.patch
fontconfig-2.3.91-crosscheck.patch
fontconfig-2.3.93-defaultconfig.patch frysk.spec
glib-java-macro.patch glib-java-pkg-dir.patch glib2.csh
glib2.sh gtk+-2.4.1-lib64.patch gtk+-2.8.10-abicheck.patch
gtk+-2.8.10-set-invisible-char-to-bullet.patch
gtk+-2.8.6-frysk-theme-fix.patch gtk+-2.8.6-inputmethod.patch
gtk+-libgdk-lm.patch gtk+-skip-glib-check.patch
gtk+-skip-pango-check.patch jdom-compiler.patch
jdom-files.patch libglade-2.0.1-nowarning.patch
libglade-java-pkg-dir.patch libgtk-java-pkg-dir.patch
libvte-java-frysk-libgnomeui-canvas-version-fix.patch
libvte-java-pkg-dir.patch pango-1.2.5-lib64.patch
pango-skip-cairo-check.patch pango-slighthint.patch sources
update.sh
Log Message:
Patch up RHEL-4 frysk mega-rpm to [almost] build on FC-4.
--- NEW FILE .cvsignore ---
glib-2.9.4.tar.bz2
glib-java-0.2.2.tar.gz
fontconfig-2.3.93.tar.gz
cairo-1.0.2.tar.gz
cairo-java-1.0.2.tar.gz
pango-1.11.2.tar.bz2
update-scripts.tar.gz
gtk+-2.8.10.tar.bz2
atk-1.11.2.tar.bz2
libgtk-java-2.8.2.tar.gz
libglade-2.5.1.tar.bz2
libglade-java-2.12.1.tar.gz
libvte-java-0.11.11.tar.gz
frysk-0.0.1.2006.01.13.tar.bz2
antlr-2.7.5.tar.gz
jdom-1.0.tar.gz
frysk-0.0.1.2006.01.22.tar.bz2
--- NEW FILE 40-blacklist-fonts.conf ---
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<!-- Blacklist certain fonts that freetype can't handle -->
<fontconfig>
<selectfont>
<rejectfont>
<pattern>
<patelt name="family"><string>Hershey-Gothic-English</string></patelt>
</pattern>
</rejectfont>
<rejectfont>
<pattern>
<patelt name="family"><string>Hershey-Plain-Duplex-Italic</string></patelt>
</pattern>
</rejectfont>
<rejectfont>
<pattern>
<patelt name="family"><string>Hershey-Plain-Duplex</string></patelt>
</pattern>
</rejectfont>
<rejectfont>
<pattern>
<patelt name="family"><string>Hershey-Script-Simplex</string></patelt>
</pattern>
</rejectfont>
<rejectfont>
<pattern>
<patelt name="family"><string>Hershey-Plain-Triplex</string></patelt>
</pattern>
</rejectfont>
<rejectfont>
<pattern>
<patelt name="family"><string>Hershey-Plain-Triplex-Italic</string></patelt>
</pattern>
</rejectfont>
<rejectfont>
<pattern>
<patelt name="family"><string>Hershey-Script-Complex</string></patelt>
</pattern>
</rejectfont>
<rejectfont>
<pattern>
<patelt name="family"><string>Hershey-Gothic-Italian</string></patelt>
</pattern>
</rejectfont>
<rejectfont>
<pattern>
<patelt name="family"><string>Hershey-Gothic-German</string></patelt>
</pattern>
</rejectfont>
</selectfont>
</fontconfig>
--- NEW FILE 50-no-hint-fonts.conf ---
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<!-- We can't hint CJK fonts well, so turn off hinting for CJK fonts. -->
<match target="font">
<test name="family" compare="eq">
<string>Kochi Mincho</string>
</test>
<edit name="hinting" mode="assign">
<bool>false</bool>
</edit>
<edit name="embeddedbitmap" mode="assign">
<bool>false</bool>
</edit>
</match>
<match target="font">
<test name="family" compare="eq">
<string>Kochi Gothic</string>
</test>
<edit name="hinting" mode="assign">
<bool>false</bool>
</edit>
<edit name="embeddedbitmap" mode="assign">
<bool>false</bool>
</edit>
</match>
<match target="font">
<test name="family" compare="eq">
<string>Sazanami Mincho</string>
</test>
<edit name="hinting" mode="assign">
<bool>false</bool>
</edit>
<edit name="embeddedbitmap" mode="assign">
<bool>false</bool>
</edit>
</match>
<match target="font">
<test name="family" compare="eq">
<string>Sazanami Gothic</string>
</test>
<edit name="hinting" mode="assign">
<bool>false</bool>
</edit>
<edit name="embeddedbitmap" mode="assign">
<bool>false</bool>
</edit>
</match>
<match target="font">
<test name="family" compare="eq">
<string>Baekmuk Batang</string>
</test>
<edit name="hinting" mode="assign">
<bool>false</bool>
</edit>
</match>
<match target="font">
<test name="family" compare="eq">
<string>Baekmuk Dotum</string>
</test>
<edit name="hinting" mode="assign">
<bool>false</bool>
</edit>
</match>
<match target="font">
<test name="family" compare="eq">
<string>Baekmuk Gulim</string>
</test>
<edit name="hinting" mode="assign">
<bool>false</bool>
</edit>
</match>
<match target="font">
<test name="family" compare="eq">
<string>Baekmuk Headline</string>
</test>
<edit name="hinting" mode="assign">
<bool>false</bool>
</edit>
</match>
<match target="font">
<test name="family" compare="eq">
<string>AR PL Mingti2L Big5</string>
</test>
<edit name="hinting" mode="assign">
<bool>false</bool>
</edit>
</match>
<match target="font">
<test name="family" compare="eq">
<string>AR PL ShanHeiSun Uni</string>
</test>
<edit name="hinting" mode="assign">
<bool>false</bool>
</edit>
<edit name="embeddedbitmap" mode="assign">
<bool>true</bool>
</edit>
</match>
<match target="font">
<test name="family" compare="eq">
<string>AR PL KaitiM Big5</string>
</test>
<edit name="hinting" mode="assign">
<bool>false</bool>
</edit>
</match>
<match target="font">
<test name="family" compare="eq">
<string>AR PL ZenKai Uni</string>
</test>
<edit name="hinting" mode="assign">
<bool>false</bool>
</edit>
</match>
<match target="font">
<test name="family" compare="eq">
<string>AR PL SungtiL GB</string>
</test>
<edit name="hinting" mode="assign">
<bool>false</bool>
</edit>
</match>
<match target="font">
<test name="family" compare="eq">
<string>AR PL KaitiM GB</string>
</test>
<edit name="hinting" mode="assign">
<bool>false</bool>
</edit>
</match>
<match target="font">
<test name="family" compare="eq">
<string>ZYSong18030</string>
</test>
<edit name="hinting" mode="assign">
<bool>false</bool>
</edit>
</match>
<!--
We also need to turn off hinting for Indic fonts with a joined baseline.
-->
<match target="font">
<test name="family" compare="eq">
<string>Mukti Narrow</string>
</test>
<edit name="hinting" mode="assign">
<bool>false</bool>
</edit>
</match>
<match target="font">
<test name="family" compare="eq">
<string>Lohit Hindi</string>
</test>
<edit name="hinting" mode="assign">
<bool>false</bool>
</edit>
</match>
<match target="font">
<test name="family" compare="eq">
<string>Lohit Bengali</string>
</test>
<edit name="hinting" mode="assign">
<bool>false</bool>
</edit>
</match>
<match target="font">
<test name="family" compare="eq">
<string>Lohit Punjabi</string>
</test>
<edit name="hinting" mode="assign">
<bool>false</bool>
</edit>
</match>
<!--
Gujarti fonts are distorted when hinting is enabled. Turn it off.
-->
<match target="font">
<test name="family" compare="eq">
<string>Lohit Gujarati</string>
</test>
<edit name="hinting" mode="assign">
<bool>false</bool>
</edit>
</match>
</fontconfig>
antlr.patch:
.cvsignore | 1 +
ChangeLog | 26 ++++++++++++++++++++++++++
Makefile.in | 22 +++++++++++-----------
antlr/Makefile.in | 7 +------
configure | 10 +++++-----
configure.in | 10 +++++-----
scripts/javac.sh.in | 2 +-
7 files changed, 50 insertions(+), 28 deletions(-)
--- NEW FILE antlr.patch ---
Index: frysk-imports/antlr/.cvsignore
diff -u /dev/null frysk-imports/antlr/.cvsignore:1.1
--- /dev/null Mon Jan 23 17:26:35 2006
+++ frysk-imports/antlr/.cvsignore Sat Nov 26 14:17:25 2005
@@ -0,0 +1 @@
+autom4te.cache
Index: frysk-imports/antlr/ChangeLog
diff -u /dev/null frysk-imports/antlr/ChangeLog:1.5
--- /dev/null Mon Jan 23 17:26:35 2006
+++ frysk-imports/antlr/ChangeLog Tue Nov 29 02:40:39 2005
@@ -0,0 +1,26 @@
+2005-11-28 Andrew Cagney <cagney at redhat.com>
+
+ * scripts/javac.sh.in: Accept gcj4.
+
+ * configure.in (user_make): Make gcc4 and gcj first choice.
+ * configure: Re-generate.
+
+2005-11-26 Andrew Cagney <cagney at redhat.com>
+
+ * antlr/Makefile.in (antlr_java_FILES): Delete "damned ugly hack".
+
+ * .cvsignore: New file, add autom4te.cache.
+ * configure.in (AX_JAVA_PROGS([JAR])): Check for fastjar.
+ (AX_JAVA_PROGS([JAVAC])): Check for ecj.
+ * configure: Re-generate.
+
+2005-11-25 Andrew Cagney <cagney at redhat.com>
+
+ * Makefile.in (install): Cripple target.
+
+Local Variables:
+mode: change-log
+left-margin: 8
+fill-column: 74
+version-control: never
+End:
Index: frysk-imports/antlr/Makefile.in
diff -u frysk-imports/antlr/Makefile.in:1.1.1.1 frysk-imports/antlr/Makefile.in:1.2
--- frysk-imports/antlr/Makefile.in:1.1.1.1 Fri Nov 25 22:29:25 2005
+++ frysk-imports/antlr/Makefile.in Fri Nov 25 23:44:41 2005
@@ -29,7 +29,7 @@
## get standard make rules from autoconf
@stdmake@
-test clean distclean install ::
+test clean distclean ::
@ if test -f examples/Makefile ; then \
$(MAKE) -C examples $@ ; \
fi
@@ -123,16 +123,16 @@
extradir = $(datadir)/$(versioneddir)
install ::
- $(MKDIR) -p "$(bindir)"
- $(MKDIR) -p "$(extradir)"
- $(MKDIR) -p "$(docdir)"
- $(INSTALL) -m 755 scripts/run-antlr "$(bindir)/antlr"
- $(INSTALL) -m 755 scripts/antlr-config "$(bindir)/antlr-config"
- $(INSTALL) -m 444 @abs_top_srcdir@/extras/antlr-mode.el "$(extradir)"
- $(INSTALL) -m 444 @abs_top_srcdir@/extras/antlr-jedit.xml "$(extradir)"
- $(INSTALL) -m 444 @abs_top_srcdir@/LICENSE.txt "$(docdir)"
- $(INSTALL) -m 444 @abs_top_srcdir@/README.txt "$(docdir)"
- $(INSTALL) -m 444 @abs_top_srcdir@/INSTALL.txt "$(docdir)"
+# $(MKDIR) -p "$(bindir)"
+# $(MKDIR) -p "$(extradir)"
+# $(MKDIR) -p "$(docdir)"
+# $(INSTALL) -m 755 scripts/run-antlr "$(bindir)/antlr"
+# $(INSTALL) -m 755 scripts/antlr-config "$(bindir)/antlr-config"
+# $(INSTALL) -m 444 @abs_top_srcdir@/extras/antlr-mode.el "$(extradir)"
+# $(INSTALL) -m 444 @abs_top_srcdir@/extras/antlr-jedit.xml "$(extradir)"
+# $(INSTALL) -m 444 @abs_top_srcdir@/LICENSE.txt "$(docdir)"
+# $(INSTALL) -m 444 @abs_top_srcdir@/README.txt "$(docdir)"
+# $(INSTALL) -m 444 @abs_top_srcdir@/INSTALL.txt "$(docdir)"
install ::
echo "installation done"
Index: frysk-imports/antlr/configure
diff -u frysk-imports/antlr/configure:1.1.1.1 frysk-imports/antlr/configure:1.3
--- frysk-imports/antlr/configure:1.1.1.1 Fri Nov 25 22:29:25 2005
+++ frysk-imports/antlr/configure Tue Nov 29 02:27:24 2005
@@ -2320,7 +2320,7 @@
case $LANG_JAVA in
1)
- ax_arg_list="java gij"
+ ax_arg_list="gij4 gij java"
if test "x${JAVA}" != "x" ; then
ax_arg_list="${JAVA}"
fi
@@ -2405,7 +2405,7 @@
case $LANG_JAVA in
1)
- ax_arg_list="jikes javac gcj"
+ ax_arg_list="gcj4 gcj jikes javac ecj"
if test "x${JAVAC}" != "x" ; then
ax_arg_list="${JAVAC}"
fi
@@ -2490,7 +2490,7 @@
case $LANG_JAVA in
1)
- ax_arg_list="jar"
+ ax_arg_list="fastjar4 fastjar jar"
if test "x${JAR}" != "x" ; then
ax_arg_list="${JAR}"
fi
@@ -2798,9 +2798,9 @@
## of course GNU. If there's a GNU compiler around we prefer
## GNU. This avoids also a problem with vendors having CC
## a symbolic link to "gcc" instead of "g++".
- cxx_compiler_list="g++ aCC CC xlC xlC_r cxx c++"
+ cxx_compiler_list="g++4 g++ aCC CC xlC xlC_r cxx c++"
# FIXME: for other unix flavours
- c_compiler_list="cc gcc xlc_r acc"
+ c_compiler_list="gcc4 gcc cc xlc_r acc"
;;
esac
Index: frysk-imports/antlr/configure.in
diff -u frysk-imports/antlr/configure.in:1.1.1.1 frysk-imports/antlr/configure.in:1.3
--- frysk-imports/antlr/configure.in:1.1.1.1 Fri Nov 25 22:29:25 2005
+++ frysk-imports/antlr/configure.in Tue Nov 29 02:27:24 2005
@@ -493,17 +493,17 @@
AX_JAVA_PROGS(
[JAVA],
- [java gij],
+ [gij4 gij java],
[AX_VAR_HEAD([JAVA])]
)
AX_JAVA_PROGS(
[JAVAC],
- [jikes javac gcj],
+ [gcj4 gcj jikes javac ecj],
[AX_VAR_HEAD([JAVAC])]
)
AX_JAVA_PROGS(
[JAR],
- [jar],
+ [fastjar4 fastjar jar],
[
AX_VAR_HEAD([JAR])
]
@@ -644,9 +644,9 @@
## of course GNU. If there's a GNU compiler around we prefer
## GNU. This avoids also a problem with vendors having CC
## a symbolic link to "gcc" instead of "g++".
- cxx_compiler_list="g++ aCC CC xlC xlC_r cxx c++"
+ cxx_compiler_list="g++4 g++ aCC CC xlC xlC_r cxx c++"
# FIXME: for other unix flavours
- c_compiler_list="cc gcc xlc_r acc"
+ c_compiler_list="gcc4 gcc cc xlc_r acc"
;;
esac
Index: frysk-imports/antlr/antlr/Makefile.in
diff -u frysk-imports/antlr/antlr/Makefile.in:1.1.1.1 frysk-imports/antlr/antlr/Makefile.in:1.2
--- frysk-imports/antlr/antlr/Makefile.in:1.1.1.1 Fri Nov 25 22:29:28 2005
+++ frysk-imports/antlr/antlr/Makefile.in Sat Nov 26 16:03:47 2005
@@ -270,12 +270,7 @@
$(eol)
-## damned ugly hack ..
-ifeq (gcj, at javac@)
- antlr_java_FILES = $(antlr_java1_FILES)
-else
- antlr_java_FILES = $(antlr_java1_FILES) $(antlr_swing_FILES)
-endif
+antlr_java_FILES = $(antlr_java1_FILES) $(antlr_swing_FILES)
## rule how to compile java files
@ANTLR_JAR@ :: $(antlr_java_FILES)
Index: frysk-imports/antlr/scripts/javac.sh.in
diff -u frysk-imports/antlr/scripts/javac.sh.in:1.1.1.1 frysk-imports/antlr/scripts/javac.sh.in:1.2
--- frysk-imports/antlr/scripts/javac.sh.in:1.1.1.1 Fri Nov 25 22:29:26 2005
+++ frysk-imports/antlr/scripts/javac.sh.in Tue Nov 29 02:40:39 2005
@@ -100,7 +100,7 @@
javacflags="${javacflags} -sourcepath ${srcdir}"
javacflags="${javacflags} -classpath ${classpath}"
;;
- gcj)
+ gcj*)
javacflags="-d ."
javacflags="${javacflags} -I${srcdir} -C"
javacflags="${javacflags} -classpath ${classpath}"
cairo-java-pkg-dir.patch:
cairo-java.pc.in | 1 +
configure.ac | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
--- NEW FILE cairo-java-pkg-dir.patch ---
--- cairo-java-1.0.2/configure.ac.dist 2005-12-10 00:48:14.000000000 -0500
+++ cairo-java-1.0.2/configure.ac 2005-12-10 01:00:59.000000000 -0500
@@ -27,8 +27,8 @@
apiversion="1.0"
-INSTALLED_CLASSPATH=\${prefix}/share/java/cairo${apiversion}-${VERSION}.jar
-INSTALLED_JNI_DIR=\${prefix}/lib/
+INSTALLED_CLASSPATH=\${datadir}/java/cairo${apiversion}-${VERSION}.jar
+INSTALLED_JNI_DIR=\${libdir}/
AC_SUBST(INSTALLED_CLASSPATH)
AC_SUBST(INSTALLED_JNI_DIR)
--- cairo-java-1.0.2/cairo-java.pc.in.pkg-dir 2005-12-10 10:03:57.000000000 -0500
+++ cairo-java-1.0.2/cairo-java.pc.in 2005-12-10 10:05:09.000000000 -0500
@@ -2,6 +2,7 @@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
+datadir=@datadir@
Name: Cairo-Java
fontconfig-2.3.91-crosscheck.patch:
fccache.c | 2 ++
fccharset.c | 14 ++++++++++++++
fcint.h | 3 +++
3 files changed, 19 insertions(+)
--- NEW FILE fontconfig-2.3.91-crosscheck.patch ---
--- fontconfig-2.3.91.cvs20051031/src/fccache.c.crosscheck 2005-10-31 12:25:03.000000000 -0500
+++ fontconfig-2.3.91.cvs20051031/src/fccache.c 2005-10-31 12:25:31.000000000 -0500
@@ -808,6 +808,8 @@
if (!FcFontSetSerialize (bank, set))
goto bail;
+ FcCharSetCrossCheck(bank);
+
return current_dir_block;
bail:
--- fontconfig-2.3.91.cvs20051031/src/fcint.h.crosscheck 2005-10-31 12:25:26.000000000 -0500
+++ fontconfig-2.3.91.cvs20051031/src/fcint.h 2005-10-31 12:25:31.000000000 -0500
@@ -549,6 +549,9 @@
FcChar16 *
FcCharSetGetNumbers(const FcCharSet *c);
+void
+FcCharSetCrossCheck (int bank);
+
/* fcdbg.c */
void
FcValueListPrint (const FcValueListPtr l);
--- fontconfig-2.3.91.cvs20051031/src/fccharset.c.crosscheck 2005-10-31 12:25:15.000000000 -0500
+++ fontconfig-2.3.91.cvs20051031/src/fccharset.c 2005-10-31 12:25:31.000000000 -0500
@@ -1425,6 +1425,20 @@
return block_ptr;
}
+void
+FcCharSetCrossCheck (int bank)
+{
+ int bi = FcCacheBankToIndex(bank);
+ int i;
+
+ for (i = 0; i < charset_ptr; i++)
+ if (charsets[bi][i].ref != FC_REF_CONSTANT)
+ {
+ printf ("ERROR! BAD CHARSET! PLEASE INFORM plam at mit.edu!\n");
+ abort();
+ }
+}
+
FcCharLeaf *
FcCharSetGetLeaf(const FcCharSet *c, int i)
{
fontconfig-2.3.93-defaultconfig.patch:
fonts.conf.in | 103 ++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 82 insertions(+), 21 deletions(-)
--- NEW FILE fontconfig-2.3.93-defaultconfig.patch ---
--- fontconfig-2.3.93/fonts.conf.in.defaultconfig 2005-11-02 23:48:59.000000000 -0500
+++ fontconfig-2.3.93/fonts.conf.in 2006-01-17 20:33:53.000000000 -0500
@@ -78,7 +78,9 @@
<family>Times</family>
<family>Nimbus Roman No9 L</family>
<family>Luxi Serif</family>
+ <family>Sazanami Mincho</family>
<family>Kochi Mincho</family>
+ <family>AR PL ZenKai Uni</family>
<family>AR PL SungtiL GB</family>
<family>AR PL Mingti2L Big5</family>
<family>ï¼ï¼³ 明æœ</family>
@@ -98,7 +100,9 @@
<family>Albany AMT</family>
<family>Nimbus Sans L</family>
<family>Luxi Sans</family>
+ <family>Sazanami Gothic</family>
<family>Kochi Gothic</family>
+ <family>AR PL ShanHeiSun Uni</family>
<family>AR PL KaitiM GB</family>
<family>AR PL KaitiM Big5</family>
<family>ï¼ï¼³ ゴシック</family>
@@ -146,15 +150,37 @@
-->
<alias>
<family>Times</family>
- <accept><family>Nimbus Roman No9 L</family></accept>
+ <accept>
+ <family>Nimbus Roman No9 L</family>
+ <family>Thorndale AMT</family>
+ <family>Times New Roman</family>
+ </accept>
</alias>
<alias>
<family>Helvetica</family>
- <accept><family>Nimbus Sans L</family></accept>
+ <accept>
+ <family>Nimbus Sans L</family>
+ <family>Albany AMT</family>
+ <family>Arial</family>
+ </accept>
</alias>
<alias>
<family>Courier</family>
- <accept><family>Nimbus Mono L</family></accept>
+ <accept>
+ <family>Cumberland AMT</family>
+ <family>Courier New</family>
+ <family>Nimbus Mono L</family>
+ </accept>
+ </alias>
+
+ <alias>
+ <family>ZapfDingbats</family>
+ <accept><family>Dingbats</family></accept>
+ </alias>
+
+ <alias>
+ <family>Symbol</family>
+ <accept><family>Open Symbols L</family></accept>
</alias>
<!--
@@ -163,11 +189,18 @@
-->
<alias>
<family>Times New Roman</family>
- <accept><family>Thorndale AMT</family></accept>
+ <accept>
+ <family>Thorndale AMT</family>
+ <family>Nimbus Roman No9 L</family>
+ </accept>
</alias>
<alias>
<family>Arial</family>
- <accept><family>Albany AMT</family></accept>
+ <accept>
+ <family>Albany AMT</family>
+ <family>Nimbus Sans L</family>
+ <family>Arial</family>
+ </accept>
</alias>
<alias>
<family>Courier New</family>
@@ -260,16 +293,25 @@
<alias>
<family>serif</family>
<prefer>
+ <family>Nimbus Roman No9 L</family>
+ <family>Thorndale AMT</family>
<family>Bitstream Vera Serif</family>
<family>Times New Roman</family>
- <family>Thorndale AMT</family>
<family>Luxi Serif</family>
- <family>Nimbus Roman No9 L</family>
<family>Times</family>
- <family>Frank Ruehl</family>
+ <family>KacstQura</family>
+ <family>Frank Ruehl CLM</family>
+ <family>Lohit Bengali</family>
+ <family>Lohit Gujarati</family>
+ <family>Lohit Hindi</family>
+ <family>Lohit Punjabi</family>
+ <family>Lohit Tamil</family>
+ <family>Sazanami Mincho</family>
+ <family>Kochi Mincho</family>
+ <family>ZYSong18030</family>
<family>MgOpen Canonica</family>
<family>FreeSerif</family>
- <family>Kochi Mincho</family>
+ <family>AR PL Zenkai Uni</family>
<family>AR PL SungtiL GB</family>
<family>AR PL Mingti2L Big5</family>
<family>ï¼ï¼³ 明æœ</family>
@@ -279,39 +321,58 @@
<alias>
<family>sans-serif</family>
<prefer>
+ <family>Luxi Sans</family>
+ <family>Albany AMT</family>
<family>Bitstream Vera Sans</family>
<family>Verdana</family>
<family>Arial</family>
- <family>Albany AMT</family>
- <family>Luxi Sans</family>
<family>Nimbus Sans L</family>
<family>Helvetica</family>
+ <family>KacstQura</family>
<family>Nachlieli</family>
- <family>MgOpen Modata</family>
- <family>FreeSans</family>
+ <family>Lohit Bengali</family>
+ <family>Lohit Gujarati</family>
+ <family>Lohit Hindi</family>
+ <family>Lohit Punjabi</family>
+ <family>Lohit Tamil</family>
+ <family>Sazanami Gothic</family>
<family>Kochi Gothic</family>
- <family>AR PL KaitiM GB</family>
- <family>AR PL KaitiM Big5</family>
<family>ï¼ï¼³ ゴシック</family>
- <family>Baekmuk Dotum</family>
+ <family>MgOpen Modata</family>
+ <family>FreeSans</family>
+ <family>ZYSong18030</family>
+ <family>AR PL ShanHeiSun Uni</family>
+ <family>AR PL SungtiL GB</family>
+ <family>AR PL Mingti2L Big5</family>
+ <family>Baekmuk Gulim</family>
<family>SimSun</family>
</prefer>
</alias>
<alias>
<family>monospace</family>
<prefer>
+ <family>Luxi Mono</family>
<family>Bitstream Vera Sans Mono</family>
<family>Andale Mono</family>
<family>Courier New</family>
<family>Cumberland AMT</family>
- <family>Luxi Mono</family>
+ <family>KacstQura</family>
+ <family>Miriam Mono CLM</family>
+ <family>Lohit Bengali</family>
+ <family>Lohit Gujarati</family>
+ <family>Lohit Hindi</family>
+ <family>Lohit Punjabi</family>
+ <family>Lohit Tamil</family>
<family>Nimbus Mono L</family>
<family>Courier</family>
- <family>Miriam Mono</family>
+ <family>Sazanami Gothic</family>
+ <family>Kochi Gothic</family>
+ <family>ZYSong18030</family>
+ <family>AR PL ShanHeiSun Uni</family>
+ <family>AR PL SungtiL GB</family>
+ <family>AR PL Mingti2L Big5</family>
+ <family>Baekmuk Gulim</family>
<family>FreeMono</family>
- <family>Kochi Gothic</family>
- <family>AR PL KaitiM GB</family>
- <family>Baekmuk Dotum</family>
</prefer>
</alias>
--- NEW FILE frysk.spec ---
# Path to the directory that contains the GCC tools used to build
# frysk; and any version suffix. If you're using a custom compiler
# modify this.
%define frysk_gcc_prefix /usr/bin/
%define frysk_gcc_suffix %{nil}
# Sometimes just the libraries are wanted; sometimes not everything
# builds. Provide fine grained control.
%define build_antlr 1
%define build_frysk 0
#---- cairo/fontconfig/pango defines
%define freetype_version 2.1.5
#---- pango defines
%define pkgconfig_version 0.12
%define xft_version 1.9.1.020626.1517-1
#---- gtk2 defines
%define _unpackaged_files_terminate_build 1
%define _missing_doc_files_terminate_build 1
%define libpng_version 2:1.2.2-16
Summary: Frysk execution analysis tool
Name: frysk
Version: 0.0.1.2006.01.22
Release: 0.FC4.1.1
License: GPL + EXPLICIT EXCEPTION
Group: Development/System
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
URL: http://sourceware.org/frysk
%define frysk %{name}-%{version}
Source0: %{name}-%{version}.tar.bz2
%define antlr_version 2.7.5
%define antlr antlr-%{antlr_version}
Source100: %{antlr}.tar.gz
Patch101: antlr.patch
%define atk_version 1.11.2
%define atk atk-%{atk_version}
Source200: %{atk}.tar.bz2
%define cairo_version 1.0.2
%define cairo cairo-%{cairo_version}
Source300: %{cairo}.tar.gz
%define cairo_java_version 1.0.2
%define cairo_java cairo-java-%{cairo_java_version}
Source400: %{cairo_java}.tar.gz
# frysk local: frysk-2022: allow overriding of datadir (containing .jars)
Patch499: cairo-java-pkg-dir.patch
%define fontconfig_version 2.3.93
%define fontconfig fontconfig-%{fontconfig_version}
Source500: %{fontconfig}.tar.gz
# see -install
Source501: 40-blacklist-fonts.conf
Source502: 50-no-hint-fonts.conf
Patch501: fontconfig-2.3.93-defaultconfig.patch
Patch502: fontconfig-2.3.91-crosscheck.patch
%define glib2_version 2.9.4
%define glib2 glib-%{glib2_version}
Source600: %{glib2}.tar.bz2
Source602: glib2.sh
Source603: glib2.csh
%define glib_java_version 0.2.2
%define glib_java glib-java-%{glib_java_version}
Source700: %{glib_java}.tar.gz
# frysk local: frysk-2144: replace hard-wired <<gcj>> with $GCJ
Patch790: glib-java-macro.patch
# frysk local: frysk-2022: allow overriding of datadir (containing .jars)
Patch799: glib-java-pkg-dir.patch
%define gtk2_version 2.8.10
%define gtk2 gtk+-%{gtk2_version}
Source800: %{gtk2}.tar.bz2
# Biarch changes
Patch800: gtk+-2.4.1-lib64.patch
# Backported from 2.10
Patch801: gtk+-2.8.6-inputmethod.patch
Patch802: gtk+-2.8.10-abicheck.patch
Patch803: gtk+-2.8.10-set-invisible-char-to-bullet.patch
# frysk local: just assume glib and pango
Patch890: gtk+-skip-glib-check.patch
Patch891: gtk+-skip-pango-check.patch
# frysk local: pass -lm
Patch892: gtk+-libgdk-lm.patch
# frysk local: frysk-2031: Try to make themes work
Patch894: gtk+-2.8.6-frysk-theme-fix.patch
%define libgtk_java_version 2.8.2
%define libgtk_java libgtk-java-%{libgtk_java_version}
Source900: %{libgtk_java}.tar.gz
# frysk local: frysk-2022: allow overriding of datadir (containing .jars)
Patch999: libgtk-java-pkg-dir.patch
%define libglade2_version 2.5.1
%define libglade2 libglade-%{libglade2_version}
Source1100: %{libglade2}.tar.bz2
# http://bugzilla.gnome.org/show_bug.cgi?id=121025
Patch1101: libglade-2.0.1-nowarning.patch
%define libglade_java_version 2.12.1
%define libglade_java libglade-java-%{libglade_java_version}
Source1200: %{libglade_java}.tar.gz
# frysk local: frysk-2022: allow overriding of datadir (containing .jars)
Patch1299: libglade-java-pkg-dir.patch
%define pango_version 1.11.2
%define pango pango-%{pango_version}
Source1300: %{pango}.tar.bz2
Patch1301: pango-slighthint.patch
# Look for pango.modules in an arch-specific directory
Patch1305: pango-1.2.5-lib64.patch
# frysk local: frysk-local: assume cairo
Patch1390: pango-skip-cairo-check.patch
%define libvte_java_version 0.11.11
%define libvte_java libvte-java-%{libvte_java_version}
Source1500: %{libvte_java}.tar.gz
# frysk local: Allow libgnomeui 2.8.0 instead of 2.9.1
Patch1590: libvte-java-frysk-libgnomeui-canvas-version-fix.patch
# frysk local: frysk-2022: allow overriding of datadir (containing .jars)
Patch1599: libvte-java-pkg-dir.patch
%define jdom_version 1.0
%define jdom jdom-%{jdom_version}
Source1600: %{jdom}.tar.gz
# frysk local: List of files to compile.
Patch1690: jdom-files.patch
# frysk local: Hacks to get around broken GCJ
Patch1691: jdom-compiler.patch
# frysk
BuildRequires: make
BuildRequires: transfig
BuildRequires: gcc4 gcc4-java gcc4-c++
BuildRequires: autoconf automake automake17
#---- glib2
BuildRequires: /sbin/ldconfig
#---- gtk2
BuildRequires: XFree86-devel
BuildRequires: gtk-doc
BuildRequires: libtiff-devel
BuildRequires: libjpeg-devel
#---- libglade
BuildRequires: libxml2 >= 2.4.10
#---- glib2
BuildRequires: gettext
#---- cairo
BuildRequires: pkgconfig
BuildRequires: xorg-x11-devel
BuildRequires: libpng-devel
BuildRequires: freetype-devel >= %{freetype_version}
#---- fontconfig
BuildRequires: expat-devel
BuildRequires: perl
BuildRequires: docbook-utils-pdf >= 0.6.14
BuildRequires: elinks >= 0.9.2
#---- pango
BuildRequires: libtool >= 1.4.2-10
BuildRequires: pkgconfig >= %{pkgconfig_version}
BuildRequires: freetype-devel >= %{freetype_version}
BuildRequires: xorg-x11-devel >= 4.2.99
BuildRequires: pkgconfig
#---- vte-java
BuildRequires: vte-devel libgnomeui-devel libgnomecanvas
Requires: vte
# Limit build to i386 ...
ExclusiveArch: %{ix86}
%description
Frysk is an execution-analysis technology implemented using native Java and C++.
It is aimed at providing developers and sysadmins with the ability to both
examine and analyze running multi-host, multi-process, multi-threaded systems.
Frysk allows the monitoring of running processes and threads, of locking
primitives and will also expose deadlocks, gather data and debug any given
process in the system.
%prep
# -nNAME: Set unpack-directory to NAME (default %{name}-%{version})
# -q: Quiet, a must have!
# -T: disable default unpacking of first TAR ball.
# -b#: Unpack Source# AND-THEN cd into unpack-directory
# -c: create (and cd to) unpack-directory before proceeding
# -a#: cd into unpack-directory and then unpack Source#
# -D: disable default of first deleting unpack-directory
%setup -n %{frysk} -q -T -b0
./autogen.sh
%setup -n %{glib2} -q -T -b600
# Unpack glib-java early; other java packages use this packages m4
# macros.
%setup -n %{glib_java} -q -T -b700
%patch790 -p1 -b .macro
%patch799 -p1 -b .pkg-dir
aclocal -I macros
autoconf
automake
%setup -n %{fontconfig} -q -T -b500
%patch501 -p1 -b .defaultconfig
%patch502 -p1 -b .crosscheck
%setup -n %{atk} -q -T -b200
%setup -n %{cairo} -q -T -b300
%setup -n %{cairo_java} -q -T -b400
%patch499 -p1 -b .pkg-dir
aclocal -I ../%{glib_java}/macros
autoconf
automake
%setup -n %{pango} -q -T -b1300
%patch1301 -p1 -b .slighthint
%patch1305 -p1 -b .lib64
%patch1390 -p2 -b .skip-cairo-check
autoconf
automake-1.7
%setup -n %{gtk2} -q -T -b800
%patch800 -p1 -b .lib64
%patch801 -p1 -b .inputmethod
%patch802 -p1 -b .abicheck
%patch803 -p1 -b .set-invisible-char-to-bullet
# %patch890 -p2 -b .skip-glib-check
%patch891 -p0 -b .skip-pango-check
%patch892 -p0 -b .libgdk-lm
%patch894 -p0 -b .frysk-theme-fix
libtoolize --force
# Patch5 modifies gdk-pixbuf/Makefile.am
aclocal-1.7
automake-1.7
autoconf
%setup -n %{libgtk_java} -q -T -b900
%patch999 -p1 -b .pkg-dir
aclocal -I ../%{glib_java}/macros
autoconf
automake
%setup -n %{libglade2} -q -T -b1100
%patch1101 -p1 -b .nowarning
# aclocal -I m4 -I macros
# autoconf
%setup -n %{libglade_java} -q -T -b1200
%patch1299 -p1 -b .pkg-dir
aclocal -I ../%{glib_java}/macros -I ../%{libgtk_java}/macros
autoconf
automake
%setup -n %{libvte_java} -q -T -b1500
%patch1590 -p0 -b .canvas-version-fix
%patch1599 -p1 -b .pkg-dir
aclocal -I ../%{glib_java}/macros -I ../%{libgtk_java}/macros
autoconf
automake
%setup -n %{antlr} -q -T -b100
%patch101 -p2
# frysk local: Antlr's config.* is really really old.
for i in $(find . -name config.guess -o -name config.sub) ; do
[ -f /usr/lib/rpm/redhat/$(basename $i) ] && %{__rm} -f $i && %{__cp} -fv /usr/lib/rpm/redhat/$(basename $i) $i
done
%setup -n %{jdom} -q -T -b1600
%patch1690 -p0
%patch1691 -p1 -b .compiler
# Finish up back in in the frysk sub directory, so that build starts
# there.
%setup -D -q -T -c
%build
# %define BUILDDIR $RPM_BUILD_DIR/build-%{name}-%{version}-%{release}-%{_target_platform}
%define BUILDDIR $RPM_BUILD_DIR/build-%{name}-%{version}
%define DESTDIR $RPM_BUILD_ROOT
%define destdir DESTDIR = %{DESTDIR}
# We have to prevent the standard dependency generation from identifying
# our private libraries in our provides and requires.
%define _use_internal_dependency_generator 0
%define __find_provides /bin/sh -c '/usr/lib/rpm/find-provides | tee frysk.provides | fgrep frysk'
%define __find_requires /bin/sh -c '/usr/lib/rpm/find-requires | fgrep -v -f frysk.provides'
# In case the previous build failed
echo Deleting the install tree ...
rm -rf $RPM_BUILD_ROOT
rm -rf %{BUILDDIR}
echo ... use make install-short
%install
echo $RPM_BUILD_ROOT
# Hey, were's this script being run?
pwd
# Set configure options that will install into frysk special locations
# under /usr. frysk-gtk is slightly different, it installs lib/ and
# include/ files into sub-directories so that they do not thwack the
# existing installed stuff.
%define _prefix /usr
%define _sysconfdir /etc/frysk
%define _sharedstatedir %{_prefix}/com/frysk
%define _localstatedir %{_prefix}/var/frysk
%define __frysk_datadir %{_prefix}/share/frysk
%define __frysk_libdir %{_prefix}/%{_lib}/frysk
%define __frysk_includedir %{_prefix}/include/frysk
%define __frysk_configure --build=%{_build} --host=%{_host} --target=%{_target_platform} --program-prefix=%{?_program_prefix} --prefix=%{_prefix} --exec-prefix=%{_exec_prefix} --bindir=%{_bindir} --sbindir=%{_sbindir} --sysconfdir=%{_sysconfdir} --datadir=%{_datadir} --includedir=%{_includedir} --libdir=%{_libdir} --libexecdir=%{_libexecdir} --localstatedir=%{_localstatedir} --sharedstatedir=%{_sharedstatedir} --mandir=%{_mandir} --infodir=%{_infodir}
%define __frysk_libs_configure %{__frysk_configure} --libdir=%{__frysk_libdir} --includedir=%{__frysk_includedir} --datadir=%{__frysk_datadir} --program-prefix=frysk-
# export LD_LIBRARY_PATH and PKG_CONFIG_PATH
export PKG_CONFIG_PATH=$RPM_BUILD_ROOT/%{__frysk_libdir}/pkgconfig:%{_libdir}/pkgconfig
export LD_LIBRARY_PATH=$RPM_BUILD_ROOT/%{__frysk_libdir}
#----------------------------------------------------------------------
# Some build magic; CONFIGURE, BUILD, and INSTALL each check to see if
# they have previously already run and if they have, skip. Makes
# install-short very efficient.
# Force the GCC-4 version of all tools (don't want this being confused
# by optional rpms such as eclipse-ecj). The absolute path is
# required as otherwize AC_PATH_PROG ignores the environment variable
# (AC_PATH_PROGS doesn't appear to suffer from this bug, sigh!
EXPORT ()
{
local p=%{frysk_gcc_prefix}
local s=%{frysk_gcc_suffix}
%ifarch ppc64
local c=" -mminimal-toc"
%else
local c=""
%endif
echo export RPM_BUILD_ROOT=$RPM_BUILD_ROOT
echo export RPM_BUILD_DIR=$RPM_BUILD_DIR
echo export \'JAVAC=${JAVAC:-${p}gcj${s} -C${c}}\'
echo export \'GCJ=${GCJ:-${p}gcj${s}${c}}\'
echo export \'GIJ=${GIJ:-${p}gij${s}}\'
echo export \'JAR=${JAR:-${p}fastjar${s}}\'
echo export \'GCJH=${GCJH:-${p}gcjh${s}}\'
echo export \'GCJ_DBTOOL=${GCJ_DBTOOL:-${p}gcj-dbtool${s}}\'
echo export \'GCC=${GCC:-${p}gcc${s}${c}}\'
echo export \'CC=${CC:-${p}gcc${s}${c}}\'
echo export \'CXX=${CXX:-${p}g++${s}${c}}\'
echo export \'JAVA=${JAVA:-${p}gij${s}}\'
echo export \'JV_SCAN=${JV_SCAN:-${p}jv-scan${s}}\'
echo export PKG_CONFIG_PATH=${PKG_CONFIG_PATH:-$RPM_BUILD_ROOT/%{__frysk_libdir}/pkgconfig:%{_libdir}/pkgconfig}
echo export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:-$RPM_BUILD_ROOT/%{__frysk_libdir}}
}
MKSCRIPT ()
{
local c=$1 ; shift
local d=$1 ; shift
local script=%{BUILDDIR}/$c.$d
mkdir -p `dirname ${script}`
rm -f ${script}
touch ${script}
chmod a+x ${script}
echo '#!/bin/sh -xe' >> ${script}
echo mkdir -p %{BUILDDIR}/$d >> ${script}
echo cd %{BUILDDIR}/$d >> ${script}
EXPORT >> ${script}
echo ${script}
}
ECHO_CMD ()
{
local arg
for arg in "$@" ; do
echo \'"${arg}"\' \\
done
echo '"$@"'
}
# REQUIRES <package> <dependencies>
REQUIRES ()
{
local d=$1 ; shift
CONFIG_P && return # if not configured skip
for i in "$@" x ; do
test $i = x && continue
for j in CONFIGURED BUILT INSTALLED ; do
if test ! -r %{BUILDDIR}/$i/$j -o %{BUILDDIR}/$i/$j -nt %{BUILDDIR}/$d/CONFIGURED ; then
rm -f %{BUILDDIR}/$d/CONFIGURED
return
fi
done
done
}
CONFIG_P ()
{
test ! -r %{BUILDDIR}/$1/CONFIGURED
}
CONFIGURED ()
{
touch %{BUILDDIR}/$1/CONFIGURED
}
CONFIG ()
{
local d=$1 ; shift
if CONFIG_P $d ; then
rm -f %{BUILDDIR}/$d/BUILT
rm -f %{BUILDDIR}/$d/INSTALLED
local script=`MKSCRIPT CONFIG $d`
ECHO_CMD ${RPM_BUILD_DIR}/$d/configure "$@" >> ${script}
${script}
CONFIGURED $d
fi
}
BUILD_P ()
{
test ! -r %{BUILDDIR}/$1/BUILT
}
BUILT ()
{
touch %{BUILDDIR}/$1/BUILT
}
BUILD ()
{
local d=$1 ; shift
if BUILD_P $d ; then
rm -f %{BUILDDIR}/$d/INSTALLED
local script=`MKSCRIPT BUILD $d`
ECHO_CMD make "$@" >> ${script}
${script}
BUILT $d
fi
}
INSTALL_P ()
{
test ! -r %{BUILDDIR}/$1/INSTALLED
}
INSTALLED ()
{
touch %{BUILDDIR}/$1/INSTALLED
}
INSTALL ()
{
local d=$1 ; shift
local script=%{BUILDDIR}/INSTALL/$d
if INSTALL_P $d ; then
local script=`MKSCRIPT INSTALL $d`
ECHO_CMD make install "DESTDIR = %{DESTDIR}" "$@" >> ${script}
${script}
INSTALLED $d
fi
}
# Generate a script that runs program ($1) writing the output into the
# file ($2). Also install a dummy version of the file so that it is
# included in the rpm manifest and hence is automatically removed when
# the rpm is removed; doing that avoids the need for a -postun step
# that removes the file.
MKUPDATE ()
{
local name=$1 ; shift
local query=%{_bindir}/$1 ; shift
local file=%{_sysconfdir}/$1 ; shift
local script=$RPM_BUILD_ROOT%{_bindir}/${name}
# Create the script
mkdir -p `dirname ${script}`
rm -f ${script}
touch ${script}
chmod u=rwx,go=rx ${script}
echo '#!/bin/sh' >> ${script}
echo "mkdir -p `dirname ${file}`" >> ${script}
echo "${query} > ${file}" >> ${script}
# Create the scratch file
mkdir -p `dirname $RPM_BUILD_ROOT${file}`
rm -f $RPM_BUILD_ROOT${file}
touch $RPM_BUILD_ROOT${file}
chmod u=rw,go=r $RPM_BUILD_ROOT${file}
echo '# Generated file; to regenerate:' >> $RPM_BUILD_ROOT${file}
sed -e 's/^/#/' ${script} >> $RPM_BUILD_ROOT${file}
}
#-------------glib2----------------------------------------
%define glib2_builddir %{BUILDDIR}/%{glib2}
CONFIG %{glib2} \
--disable-gtk-doc \
--enable-static \
%{__frysk_libs_configure}
BUILD %{glib2} \
%{?_smp_mflags}
INSTALL %{glib2}
%define GLIB_CFLAGS -pthread -I$RPM_BUILD_ROOT/%{__frysk_includedir}/glib-2.0 -I$RPM_BUILD_ROOT/%{__frysk_libdir}/glib-2.0/include
%define glib_cflags GLIB_CFLAGS = %{GLIB_CFLAGS}
%define lib_gobject %{glib2_builddir}/gobject/libgobject-2.0.la
%define lib_gmodule %{glib2_builddir}/gmodule/libgmodule-2.0.la
%define lib_gthread %{glib2_builddir}/gthread/libgthread-2.0.la
%define lib_glib %{glib2_builddir}/glib/libglib-2.0.la
#------------glib-java-------------------------------------
%define glib_java_builddir %{BUILDDIR}/%{glib_java}
%define glib_java_makeflags "%{glib_cflags}" "GLIB_LIBS = %{lib_gobject} %{lib_gmodule} %{lib_gthread} %{lib_glib}"
if CONFIG_P %{glib_java} ; then
CONFIG %{glib_java} \
--without-javadocs \
%{__frysk_libs_configure}
# FIXME: find a better solution for this
pushd %{BUILDDIR}/%{glib_java}
sed -i 's/^pic_flag=\"\"/pic_flag=\"\ \-fPIC\"/' libtool
sed -i 's/^compiler_c_o=\"no\"/compiler_c_o=\"yes\"/' libtool
popd
fi
BUILD %{glib_java} %{?_smp_mflags} %{glib_java_makeflags}
INSTALL %{glib_java}
%define JGJAVA_CFLAGS -I$RPM_BUILD_ROOT/%{__frysk_includedir}/glib-java
%define jgjava_cflags JGJAVA_CFLAGS = %{JGJAVA_CFLAGS}
%define GLIB_JAVA_CFLAGS %{JGJAVA_CFLAGS}
%define JGJAR $RPM_BUILD_ROOT/%{__frysk_datadir}/java/glib0.2-0.2.2.jar
%define jgjar JGJAR = %{JGJAR}
%define GLIB_JAVA_JAR $RPM_BUILD_ROOT/%{__frysk_datadir}/java/glib0.2-0.2.2.jar
%define lib_glibjava %{glib_java_builddir}/libglibjava.la
%define lib_glibjni %{glib_java_builddir}/libglibjni.la
#-------------fontconfig-----------------------------------
%define fontconfig_builddir %{BUILDDIR}/%{fontconfig}
# Work around weird elinks bug where elinks refuses to open the
# temporary html file generated by jade because it thinks it's a
# special file. Only happens in beehive.
export ELINKS_CONFDIR=$PWD/elinks-conf
mkdir -p $ELINKS_CONFDIR
echo "set protocol.file.allow_special_files = 1" > $ELINKS_CONFDIR/elinks.conf
CONFIG %{fontconfig} \
--with-add-fonts=/usr/X11R6/lib/X11/fonts/Type1,/usr/X11R6/lib/X11/fonts/OTF \
%{__frysk_libs_configure}
BUILD %{fontconfig} %{?_smp_mflags}
if INSTALL_P %{fontconfig} ; then
INSTALL %{fontconfig}
install -m 0644 %{SOURCE501} $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d
install -m 0644 %{SOURCE502} $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d
rm $RPM_BUILD_ROOT%{__frysk_libdir}/*.la
rm $RPM_BUILD_ROOT%{_localstatedir}/cache/fontconfig/stamp
fi
%define lib_fontconfig %{fontconfig_builddir}/src/libfontconfig.la
#------------atk-------------------------------------------
%define atk_makeflags "DEP_CFLAGS = %{GLIB_CFLAGS}" "DEP_LIBS = %{lib_gobject} %{lib_gmodule} %{lib_glib}"
%define atk_builddir %{BUILDDIR}/%{atk}
CONFIG %{atk} \
--disable-glibtest \
--disable-gtk-doc \
%{__frysk_libs_configure}
BUILD %{atk} %{?_smp_mflags} %{atk_makeflags}
INSTALL %{atk}
%define ATK_CFLAGS -I$RPM_BUILD_ROOT/%{__frysk_includedir}/atk-1.0
%define lib_atk %{atk_builddir}/atk/libatk-1.0.la
#------------cairo-----------------------------------------
%define cairo_builddir %{BUILDDIR}/%{cairo}
CONFIG %{cairo} \
--enable-warnings \
--disable-glitz \
--disable-quartz \
--disable-atsui \
--disable-xcb \
--disable-win32 \
--disable-gtk-doc \
%{__frysk_libs_configure}
BUILD %{cairo} %{?_smp_mflags}
INSTALL %{cairo}
%define CAIRO_CFLAGS -I$RPM_BUILD_ROOT/%{__frysk_includedir}/cairo -I$RPM_BUILD_ROOT/%{__frysk_includedir}
%define cairo_cflags CAIRO_CFLAGS = %{CAIRO_CFLAGS}
%define lib_cairo %{cairo_builddir}/src/libcairo.la
#------------cairo-java------------------------------------
%define cairo_java_builddir %{BUILDDIR}/%{cairo_java}
%define cairo_java_makeflags "%{glib_cflags}" "GLIB_LIBS = %{lib_gobject} %{lib_gmodule} %{lib_gthread} %{lib_glib}" "%{cairo_cflags}" "CAIRO_LIBS = %{lib_cairo}" "%{jgjava_cflags}" "JGJAVA_LIBS = %{lib_glibjava}" "JGJNI_LIBS = %{lib_glibjni}" "%{jgjar}"
CONFIG %{cairo_java} \
--without-javadocs \
%{__frysk_libs_configure}
BUILD %{cairo_java} %{?_smp_mflags} %{cairo_java_makeflags}
INSTALL %{cairo_java}
%define CAIROJAR $RPM_BUILD_ROOT/%{__frysk_datadir}/java/cairo1.0-1.0.2.jar
%define cairojar CAIROJAR = %{CAIROJAR}
%define CAIRO_JAVA_CFLAGS -I$RPM_BUILD_ROOT/%{__frysk_includedir}/cairo -I$RPM_BUILD_ROOT/%{__frysk_includedir}/glib-java
%define cairo_java_cflags CAIRO_JAVA_CFLAGS = %{CAIRO_JAVA_CFLAGS}
%define lib_cairojava %{cairo_java_builddir}/libcairojava.la
#------------pango-----------------------------------------
%define pango_makeflags "%{glib_cflags}" "%{cairo_cflags}" "FONTCONFIG_LIBS = %{lib_fontconfig}" "GLIB_LIBS = %{lib_gobject} %{lib_gmodule} %{lib_gthread} %{lib_glib}" "CAIRO_LIBS = %{lib_cairo}" "XFT_CFLAGS = -I$RPM_BUILD_ROOT/%{__frysk_includedir} -I/usr/X11R6/include -I/usr/include/freetype2 -I/usr/include/freetype2/config" "XFT_LIBS = -L/usr/X11R6/%{_lib} -lXft -lX11 -lfreetype -lXrender %{lib_fontconfig}"
%define pango_builddir %{BUILDDIR}/%{pango}
CONFIG %{pango} \
%{__frysk_libs_configure}
BUILD %{pango} %{?_smp_mflags} %{pango_makeflags}
if INSTALL_P ; then
MKUPDATE frysk-update-pango-modules frysk-pango-querymodules pango/%{_target_platform}/pango.modules
INSTALL %{pango} %{pango_makeflags}
fi
%define PANGO_CFLAGS -I$RPM_BUILD_ROOT/%{__frysk_includedir}/pango-1.0 -I$RPM_BUILD_ROOT/%{__frysk_includedir}
%define pango_cflags PANGO_CFLAGS = %{PANGO_CFLAGS}
%define lib_pango %{pango_builddir}/pango/libpango-1.0.la
%define lib_pangocairo %{pango_builddir}/pango/libpangocairo-1.0.la
%define lib_pangoft2 %{pango_builddir}/pango/libpangoft2-1.0.la
%define lib_pangox %{pango_builddir}/pango/libpangox-1.0.la
%define lib_pangoxft %{pango_builddir}/pango/libpangoxft-1.0.la
#------------gtk2------------------------------------------
%define gtk2_makeflags "GDK_PIXBUF_DEP_CFLAGS = %{GLIB_CFLAGS} -I/usr/include/libpng12" "GDK_PIXBUF_DEP_LIBS = %{lib_gobject} %{lib_gmodule} %{lib_gthread} %{lib_glib}" "GDK_DEP_CFLAGS = -DXTHREADS -D_REENTRANT -DXUSE_MTSAFE_API %{GLIB_CFLAGS} %{CAIRO_CFLAGS} %{PANGO_CFLAGS}" "GDK_DEP_LIBS = -L/usr/X11R6/%{_lib} -lXrandr -lXrender -lXi -lXinerama -lXext -lX11 %{lib_gobject} %{lib_gmodule} %{lib_gthread} %{lib_glib} %{lib_fontconfig} -ldl -lXcursor -lXrender -lXext -lXfixes -lX11 -lm" "GTK_DEP_CFLAGS = %{GLIB_CFLAGS} %{PANGO_CFLAGS} %{CAIRO_CFLAGS} %{ATK_CFLAGS}" "GTK_DEP_LIBS = -L/usr/X11R6/%{_lib} -lX11 %{lib_pangocairo} %{lib_pango} %{lib_atk} %{lib_gobject} %{lib_gmodule} %{lib_gthread} %{lib_glib} %{lib_cairo} -ldl -lm" "%{glib_cflags}" "GLIB_LIBS = %{lib_gobject} %{lib_gmodule} %{lib_gthread} %{lib_glib}" "%{cairo_cflags}" "GDK_PIXBUF_XLIB_DEP_CFLAGS = %{GLIB_CFLAGS} -I/usr/X11R6/include"
%define gtk2_builddir %{BUILDDIR}/%{gtk2}
CONFIG %{gtk2} \
--disable-glibtest \
--with-xinput=xfree \
--disable-gtk-doc \
%{__frysk_libs_configure}
## smp_mflags doesn't work for now due to gdk-pixbuf.loaders, may be fixed
## past gtk 2.1.2
# make # %{?_smp_mflags}
BUILD %{gtk2} %{gtk2_makeflags}
if INSTALL_P ; then
MKUPDATE frysk-update-gdk-pixbuf-loaders frysk-gdk-pixbuf-query-loaders gtk-2.0/gdk-pixbuf.loaders
# NOTE: XXX: Because a patch hardwires GTK_LIB to /usr/lib
# instead of /usr/lib/frysk, this generates paths that point
# to the existing / installed immodules. XXX: Per rant with
# pango's MKUPDATE call, _host should be _target_platform.
MKUPDATE frysk-update-gtk-immodules frysk-gtk-query-immodules-2.0 gtk-2.0/%{_host}/gtk.immodules
INSTALL %{gtk2} %{gtk2_makeflags}
fi
%define GTK_CFLAGS -I$RPM_BUILD_ROOT/%{__frysk_includedir}/gtk-2.0 -I$RPM_BUILD_ROOT/%{__frysk_libdir}/gtk-2.0/include
%define lib_gdk_x11 %{gtk2_builddir}/gdk/libgdk-x11-2.0.la
%define lib_gdk_pixbuf %{gtk2_builddir}/gdk-pixbuf/libgdk_pixbuf-2.0.la
%define lib_gtk_x11 %{gtk2_builddir}/gtk/libgtk-x11-2.0.la
#------------libgtk-java-----------------------------------
%define libgtk_java_builddir %{BUILDDIR}/%{libgtk_java}
%define libgtk_java_makeflags "%{glib_cflags}" "GLIB_LIBS = %{lib_gobject} %{lib_gmodule} %{lib_gthread} %{lib_glib}" "%{cairo_cflags}" "CAIRO_LIBS = %{lib_cairo}" "%{jgjava_cflags}" "JGJAVA_LIBS = %{lib_glibjava}" "JGJNI_LIBS = %{lib_glibjni}" "%{jgjar}" "%{cairo_java_cflags}" "CAIRO_JAVA_LIBS = %{lib_cairojava}" "%{cairojar}" "GTK_CFLAGS = %{GTK_CFLAGS} %{GLIB_CFLAGS} %{ATK_CFLAGS} %{PANGO_CFLAGS}" "GTK_LIBS = -ldl %{lib_gdk_x11} %{lib_gdk_pixbuf} %{lib_gobject} %{lib_gmodule} %{lib_glib} %{lib_atk} %{libgpango} %{lib_pangocairo}" "ATK_CFLAGS = %{ATK_CFLAGS}" "ATK_LIBS = %{lib_atk}" "GTHREAD_CFLAGS = %{GLIB_CFLAGS}" "GTHREAD_LIBS = %{lib_gthread} %{lib_glib}"
CONFIG %{libgtk_java} \
--without-javadocs \
%{__frysk_libs_configure}
BUILD %{libgtk_java} %{?_smp_mflags} %{libgtk_java_makeflags}
INSTALL %{libgtk_java}
%define GTKJAR $RPM_BUILD_ROOT/%{__frysk_datadir}/java/gtk2.8-2.8.2.jar
%define gtkjar GTKJAR = %{GTKJAR}
%define GTK2_JAR $RPM_BUILD_ROOT/%{__frysk_datadir}/java/gtk2.8-2.8.2.jar
%define GTKJAVA_CFLAGS -I$RPM_BUILD_ROOT/%{__frysk_includedir}/libgtk-java -I$RPM_BUILD_ROOT/%{__frysk_includedir}/glib-java -I$RPM_BUILD_ROOT/%{__frysk_includedir}/gtk-2.0 -I$RPM_BUILD_ROOT/%{__frysk_includedir}/cairo -I$RPM_BUILD_ROOT/%{__frysk_libdir}/gtk-2.0/include -I$RPM_BUILD_ROOT/%{__frysk_includedir}/atk-1.0 -I$RPM_BUILD_ROOT/%{__frysk_includedir}/pango-1.0 -I$RPM_BUILD_ROOT/%{__frysk_includedir}/glib-2.0 -I$RPM_BUILD_ROOT/%{__frysk_libdir}/glib-2.0/include
%define gtkjava_cflags GTKJAVA_CFLAGS = %{GTKJAVA_CFLAGS}
%define lib_gtk_java %{libgtk_java_builddir}/libgtkjava.la
%define lib_gtkjni %{libgtk_java_builddir}/libgtkjni.la
#------------libglade2--------------------------------------
%define libglade2_makeflags "LIBGLADE_CFLAGS = %{GLIB_CFLAGS} %{GTK_CFLAGS} %{CAIRO_CFLAGS} %{PANGO_CFLAGS} -I/usr/include/libxml2 %{ATK_CFLAGS}" "LIBGLADE_LIBS = -Wl,--export-dynamic -lxml2 -lpthread -lz %{lib_gtk_x11} %{lib_gdk_x11} %{lib_gdk_pixbuf} %{lib_atk} -lm %{lib_pangocairo} %{lib_pangoft2} %{lib_pango} %{lib_cairo} %{lib_gobject} %{lib_gmodule} %{lib_gthread} %{lib_glib} -ldl"
%define libglade2_builddir %{BUILDDIR}/%{libglade2}
CONFIG %{libglade2} \
--without-javadocs \
--disable-gtktest \
--without-gnome \
%{__frysk_libs_configure}
BUILD %{libglade2} %{?_smp_mflags} %{libglade2_makeflags}
INSTALL %{libglade2}
%define LIBGLADE_CFLAGS -I$RPM_BUILD_ROOT/%{__frysk_includedir}/libglade-2.0 -I$RPM_BUILD_ROOT/%{__frysk_includedir}/gtk-2.0 -I$RPM_BUILD_ROOT/%{__frysk_includedir}/gtk-2.0/include -I$RPM_BUILD_ROOT/%{__frysk_includedir}/atk-1.0 -I$RPM_BUILD_ROOT/%{__frysk_includedir}/cairo -I$RPM_BUILD_ROOT/%{__frysk_includedir}/pango-1.0 -I$RPM_BUILD_ROOT/%{__frysk_includedir}/glib-2.0 -I$RPM_BUILD_ROOT/%{__frysk_includedir}/glib-2.0/include -I/usr/include/libxml
%define libglade_cflags LIBGLADE_CFLAGS = %{LIBGLADE_CFLAGS}
%define lib_glade %{libglade2_builddir}/glade/libglade-2.0.la
#------------libglade-java---------------------------------
# REQUIRES: libgtk-java
%define libglade_java_builddir %{BUILDDIR}/%{libglade_java}
%define libglade_java_makeflags %{libgtk_java_makeflags} "%{libglade_cflags}" "LIBGLADE_LIBS = %{lib_glade} %{libgtk} %{lib_atk} %{lib_cairo} %{lib_gdk_x11} %{lib_gdk_x11_pixbuf} %{lib_pangocairo} %{lib_pango} %{lib_gobject} %{lib_gmodule} %{lib_glib}" "%{gtkjar}" "%{gtkjava_cflags}" "GTKJAVA_LIBS = %{lib_gtk_java} %{lib_cairojava} %{lib_glibjava} %{lib_gdk_x11} %{lib_atk} %{lib_gdk_x11_pixbuf} %{lib_pangocairo} %{lib_pango} %{lib_cairo} %{lib_gobject} %{lib_gmodule} -ldl %{lib_glib} %{lib_gtk_x11}" "GTKJNI_LIBS = %{lib_gtkjni}"
CONFIG %{libglade_java} \
--without-gnome \
--without-javadocs \
%{__frysk_libs_configure}
BUILD %{libglade_java} %{?_smp_mflags} %{libglade_java_makeflags}
INSTALL %{libglade_java}
%define GLADE_JAR $RPM_BUILD_ROOT/%{__frysk_datadir}/java/glade2.12.jar
#------------libvte-java-----------------------------------
%define libvte_java_builddir %{BUILDDIR}/%{libvte_java}
%define libvte_java_makeflags %{libglade_java_makeflags} "GNOME_CFLAGS = -pthread -DORBIT2=1 -I$RPM_BUILD_ROOT/%{__frysk_includedir}/gtk-2.0 -I$RPM_BUILD_ROOT/%{__frysk_includedir}/glib-2.0 -I$RPM_BUILD_ROOT/%{__frysk_libdir}/glib-2.0/include -I$RPM_BUILD_ROOT/%{__frysk_includedir}/pango-1.0 -I/usr/include/ -I/usr/include/freetype2 -I$RPM_BUILD_ROOT/%{__frysk_libdir}/gtk-2.0/include -I$RPM_BUILD_ROOT/%{__frysk_includedir}/atk-1.0 -I$RPM_BUILD_ROOT/%{__frysk_includedir}/cairo -I/usr/include/libgnomeui-2.0 -I/usr/include/libgnome-2.0 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/libart-2.0 -I/usr/include/gconf/2 -I/usr/include/libbonoboui-2.0 -I/usr/include/orbit-2.0 -I/usr/include/libbonobo-2.0 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/bonobo-activation-2.0 -I/usr/include/libxml2" "GNOME_LIBS = -Wl,--export-dynamic -pthread -L/usr/X11R6/%{_lib} -lgnomeui-2 -lSM -lICE -lbonoboui-2 -lxml2 -lpthread -lz -lgnome-2 -lpopt -lbonobo-2 -lgconf-2 !
-lgnomevfs-2 -lbonobo-activation -lORBit-2 %{lib_gthread} -lgnomecanvas-2 -lart_lgpl_2 %{lib_pangoft2} %{lib_gtk_x11} %{lib_gdk_x11} %{lib_atk} -lgdk_pixbuf-2.0 -lm %{lib_pangocairo} %{lib_pango} %{lib_cairo} %{lib_gobject} %{lib_gmodule} -ldl %{lib_glib}" "VTE_CFLAGS = -I$RPM_BUILD_ROOT/%{__frysk_includedir}/glib-2.0 -I$RPM_BUILD_ROOT/%{__frysk_libdir}/glib-2.0/include -I$RPM_BUILD_ROOT/%{__frysk_includedir}/gtk-2.0 -I/usr/include -I$RPM_BUILD_ROOT/%{__frysk_includedir}/pango-1.0 -I/usr/X11R6/include -I/usr/include/freetype2 -I/usr/include/freetype2/config -I$RPM_BUILD_ROOT/%{__frysk_libdir}/gtk-2.0/include -I$RPM_BUILD_DIR/%{__frysk_includedir}/atk-1.0 -I$RPM_BUILD_ROOT/%{__frysk_includedir}/cairo" "VTE_LIBS = -L/usr/X11R6/%{_lib} -lvte -lz -lncurses -lSM -lICE -lXft -lX11 -lfreetype -lXrender %{lib_gtk_x11} %{lib_pangoxft} %{lib_pangox} %{lib_fontconfig} %{lib_gdk_x11} %{lib_atk} %{lib_gdk_pixbuf} -lm %{lib_pangocairo} %{lib_cairo} %{lib_pangoft2} %{lib_pango} %{lib_gobje!
ct} %{lib_gmodule} -ldl %{lib_glib}" "JGJAVA_CFLAGS = %{JGJAV!
A_CFLAGS
} -I $RPM_BUILD_ROOT/%{__frysk_includedir}"
CONFIG %{libvte_java} \
--without-javadocs \
%{__frysk_libs_configure}
BUILD %{libvte_java} %{libvte_java_makeflags}
INSTALL %{libvte_java}
%define VTE_JAVA_JAR $RPM_BUILD_ROOT/%{__frysk_datadir}/java/vte0.11.jar
#-----------antlr------------------------------------------
%if %{build_antlr}
%define antlr_builddir %{BUILDDIR}/%{antlr}
export ANTLR_JAR=$RPM_BUILD_ROOT/%{__frysk_datadir}/java/antlr.jar
CONFIG %{antlr} \
--disable-python \
--disable-csharp \
--disable-cxx \
--disable-examples \
%{__frysk_libs_configure}
BUILD %{antlr} %{?_smp_mflags}
if INSTALL_P %{antlr} ; then
install -d `dirname $ANTLR_JAR`
install %{antlr_builddir}/antlr/antlr.jar $ANTLR_JAR
INSTALLED %{antlr}
fi
%endif
#-----------jdom------------------------------------------
%define jdom_builddir %{BUILDDIR}/%{jdom}
export JDOM_JAR=$RPM_BUILD_ROOT/%{__frysk_datadir}/java/jdom.jar
mkdir -p %{jdom_builddir}
CONFIGURED %{jdom}
if BUILD_P %{jdom} ; then
pushd %{jdom_builddir}
rm -f BUILD.tmp
echo '#!/bin/sh -xe' >> BUILD.tmp
echo classdir=$PWD >> BUILD.tmp
EXPORT >> BUILD.tmp
echo '( cd ../../%{jdom} && ${JAVAC} -Ipackage -Isrc/java -O -g -d $classdir @jdom.files )' >> BUILD.tmp
echo 'find * -name "*.class" -print | ${JAR} -@ -cf jdom.jar' >> BUILD.tmp
chmod a+x BUILD.tmp
mv BUILD.tmp BUILD.sh
%{jdom_builddir}/BUILD.sh
popd
BUILT %{jdom}
fi
if INSTALL_P %{jdom} ; then
install -d `dirname $JDOM_JAR`
install %{jdom_builddir}/jdom.jar $JDOM_JAR
INSTALLED %{jdom}
fi
#-----------frysk------------------------------------------
%if %{build_frysk}
%define frysk_builddir %{BUILDDIR}/%{frysk}
%define frysk_rpaths -Djava.library.path=%{__frysk_libdir}: -Wl,-rpath,%{__frysk_libdir}:
%define frysk_makeflags "FRYSK_GTK_CFLAGS = %{GTK_CFLAGS} %{ATK_CFLAGS} %{CAIRO_CFLAGS} %{PANGO_CFLAGS} %{GLIB_CFLAGS} %{GTK_CFLAGS} %{GLIB_JAVA_CFLAGS} %{GTKJAVA_CFLAGS}" "FRYSK_GTK_CLASSPATH = %{GTK2_JAR}:%{GLIB_JAVA_JAR}" "FRYSK_GTK_JARS = %{GTK2_JAR} %{GLIB_JAVA_JAR}" "FRYSK_GTK_LIBS = -L$RPM_BUILD_ROOT/%{__frysk_libdir} -lgtkjava -lcairojava -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpangoft2-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 -lglibjava" "FRYSK_GUI_JARS = %{GTK2_JAR} %{GLADE_JAR} %{GLIB_JAVA_JAR} %{VTE_JAVA_JAR}" "FRYSK_GUI_CFLAGS = %{GTK_CFLAGS} %{ATK_CFLAGS} %{CAIRO_CFLAGS} %{PANGO_CFLAGS} %{GLIB_CFLAGS} %{GTK_CFLAGS} %{GLIB_JAVA_CFLAGS} %{GTKJAVA_CFLAGS}" "FRYSK_GUI_LIBS = -L$RPM_BUILD_ROOT/%{__frysk_libdir} -lgtkjava -lcairojava -lglade-2.0 -lgladejava -lvtejava -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpangoft2-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0!
-ldl -lglib-2.0 -lglibjava" "frysk_bindir_frysk_LDFLAGS = --main=frysk.bindir.frysk %{frysk_rpaths}" "frysk_bindir_fstack_LDFLAGS = --main=frysk.bindir.fstack %{frysk_rpaths}" "frysk_bindir_ftrace_LDFLAGS = --main=frysk.bindir.ftrace %{frysk_rpaths}"
export FRYSK_GTK_JARS="XXX: ignored"
export FRYSK_GUI_JARS="XXX: ignored"
CONFIG %{frysk} \
%{__frysk_configure}
BUILD %{frysk} %{?_smp_mflags} %{frysk_makeflags}
INSTALL %{frysk} %{frysk_makeflags}
%endif
#-----------done------------------------------------------
%post
%{_bindir}/frysk-update-pango-modules
%{_bindir}/frysk-update-gdk-pixbuf-loaders
%{_bindir}/frysk-update-gtk-immodules
/sbin/ldconfig
%postun
/sbin/ldconfig
%clean
rm -rf %{buildroot}
%files
%defattr(-,root,root)
/usr/bin/*
%if %{build_frysk}
/usr/%{_lib}/libEggTrayIcon.so
/usr/%{_lib}/libfrysk-*.so
/usr/%{_lib}/libftk*.so
/usr/share/java/frysk-*.jar
/usr/share/java/ftk.jar
/usr/share/applications/frysk.desktop
/usr/share/pixmaps/fryskTrayIcon48.png
%endif
/usr/share/man/*/frysk-*
/usr/include/frysk/*
/usr/%{_lib}/frysk/*
/usr/share/frysk/*
/etc/frysk/*
%changelog
* Mon Jan 23 2006 Andrew Cagney <cagney at redhat.com> 0.0.1.2006.01.22-0.EL4.1
- Write pango.modules to %{_target_platform}, instead of %{_host}
sub-directory.
* Sat Jan 21 2006 Andrew Cagney <cagney at redhat.com> 0.0.1.2006.01.22-0.EL4.0
- Import glib 2.9.4.tar.bz2, atk 1.11.2.tar.bz2, and frysk
0.0.1.2006.01.22.
- Add/update gtk+-2.8.10-set-invisible-char-to-bullet.patch,
fontconfig-2.3.93-defaultconfig.patch, and 50-no-hint-fonts.conf.
- Add frysk.desktop, and fryskTrayIcon48.png to -files.
* Sat Jan 21 2006 Andrew Cagney <cagney at redhat.com> 0.0.1.2006.01.13-0.EL4.9
- Replace macros gccp, and gccs with frysk_gcc_prefix and
frysk_gcc_suffix. Update EXPORT function to use.
- In EXPORT, for ppc64, append -mminimal-toc to all all compiler
environment variables.
- Add macros build_frysk, and build_antlr. Use instead of
architecture test.
* Sat Jan 21 2006 Andrew Cagney <cagney at redhat.com> 0.0.1.2006.01.13-0.EL4.8
- For antlr, update config.guess and config.sub; problem reported by
Wu Zhou <woodzltc at cn.ibm.com>
* Sat Jan 21 2006 Andrew Cagney <cagney at redhat.com> 0.0.1.2006.01.13-0.EL4.7
- Drop update-scripts.tar.gz and update-scripts-frysk.patch.
- Replace -post and -postun steps generating pango.modules and
gdk-pixbuf.loaders with the scripts frysk-update-gdk-pixbuf-loaders,
frysk-update-gtk-immodules, and frysk-update-pango-modules run from
-post, and generated by MKUPDATE.
* Sat Jan 21 2006 Andrew Cagney <cagney at redhat.com> 0.0.1.2006.01.13-0.EL4.6
- Rename lib_pangoft to lib_pangoft2.
- Add lib_pangoft2 to libglade2_makeflags.
* Fri Jan 20 2006 Andrew Cagney <cagney at redhat.com> 0.0.1.2006.01.13-0.EL4.5
- Fix typo, point lib_gdk_xll at libgdk-xll and not libgtk-xll.
- Add lib_gtk_x11 to libglade2_makeflags.
* Fri Jan 20 2006 Andrew Cagney <cagney at redhat.com> 0.0.1.2006.01.13-0.EL4.4
- Add shell functions MKSCRIPT and ECHO_CMD for creating a shell
script. In CONFIG, BUILD, and INSTALL use these to create a shell
script containing all the config, build or install information.
Run.
* Thu Jan 19 2006 Diego Novillo <dnovillo at redhat.com> 0.0.1.2006.01.13-0.EL4.3
- Use %{_target_platform} instead of i686-redhat-linux-gnu.
* Tue Jan 17 2006 Andrew Cagney <cagney at redhat.com> 0.0.1.2006.01.13-0.EL4.2
- Add gtk+-2.8.6-frysk-theme-fix.patch; partial fix to lack of themes.
* Tue Jan 17 2006 Andrew Cagney <cagney at redhat.com> 0.0.1.2006.01.13-0.EL4.1
- Import new packages and patches from FC-5: atk-1.11.0, cairo-1.11.0,
fontconfig-2.3.93, glib-29.3, gtk+-2.8.10, libglade-java-2.12.1,
pango-1.11.2. For pango, add XFT_LIBS, XFT_CFLAGS to
pango_makeflags. For libglade, add --without-gnome to configure
line. For fontconfig, also install config files.
- Use /%{_lib}, instead of /lib, in XFT_LIBS library paths.
- Don't build on x86-64 for now (sorry).
* Fri Jan 13 2006 Andrew Cagney <cagney at redhat.com> 0.0.1.2006.01.13-0.EL4.0
- Import frysk-0.0.1.2006.01.13.tar.bz2
- Revamp -prep and -bupid sections: unpack glib-java early so its m4
macros are available; eliminate jg-common; -setup all tar balls
under $RPM_BUILD_DIR; change BUILDDIR to $RPM_BUILD_DIR/build-...;
in -setup remove entire BUILDDIR.
- Update __frysk_configure and __frysk_libs_configure to explicitly
specify all paths (especially --mandir which was wrong). Where
applicable use _sysconfigdir, _bindir, et.al. instead of
_frysk_sysconfigdir, et.al. In -files, replace /usr/man/*/frysk-*
with /usr/share/man/*/frysk-*.
- Rename libglade to libglade2 to better match rpm name.
- Define gccp[refix] and gccs[uffix], use in hardwired GCC paths.
Pass FRYSK_GTK_... instead of FRYSK_IMPORTS_ make file variables to
frysk's make.
* Tue Jan 10 2006 Diego Novillo <dnovillo at redhat.com> 0.0.1.2005.12.14.15.12-0.EL4.6
- Add gtk+-libgdk-lm.patch.
- Add support for building support libraries on x86_64.
- Disable main frysk build on x86_64.
* Thu Jan 5 2006 Andrew Cagney <cagney at redhat.com> 0.0.1.2005.12.14.15.12-0.EL4.5
- In build section, delete all the INSTALLED markers.
* Thu Dec 22 2005 Adam Jocksch <ajocksch at redhat.com> 0.0.1.2005.12.14.15.12-0.EL4.4
- updated libgtk-java tarball, bumped release.
* Mon Dec 19 2005 Peter Jones <pjones at redhat.com> 0.0.1.2005.12.14.15.12-0.EL4.3
- bumped release to build in rhel4u3 tree
* Mon Dec 19 2005 Roland McGrath <roland at redhat.com> - 0.0.1.2005.12.14.15.12-0.EL4.2
- Avoid improper provides/requires in rpm.
* Wed Dec 14 2005 Andrew Cagney <cagney at redhat.com> 0.0.1.2005.12.14.15.12-0.EL4.1
- Import frysk-0.0.1.2005.12.14.15.12.tar.bz2.
- Add /usr/lib/libftk*.so, and /usr/share/ftk.jar to files.
* Tue Dec 13 2005 Andrew Cagney <cagney at redhat.com> 0.0.0.20051211.1-0.EL4.6
- Add dependencies on autoconf, automake, and automake17.
* Tue Dec 13 2005 Rick Moseley <rmoseley at redhat.com> 0.0.0.20051211.1-0.EL4.5
- Add patch to the jdom source to fix 4.0.2-12 compiler error
* Mon Dec 12 2005 Rick Moseley <rmoseley at redhat.com> 0.0.0.20051211.1-0.EL4.4
- Add patches to correct jg-common/glib-java macro file errors
- Add patch to correct frysk-imports/test/Makefile.am error
- Add GIJ variable to exports
* Sun Dec 11 2005 Andrew Cagney <cagney at redhat.com> 0.0.0.20051211.1-0.EL4.3
- Add commands to generate / remove the files
pango/i686-redhat-linux-gnu/pango.modules, and
gtk-2.0/gdk-pixbuf.loaders during post and postun phases.
* Sun Dec 11 2005 Andrew Cagney <cagney at redhat.com> 0.0.0.20051211.1-0.EL4.2
- Bum version number.
* Sun Dec 11 2005 Andrew Cagney <cagney at redhat.com> 0.0.0.20051211.1-0.EL4.1
- Update pango-skip-cairo-check.patch, leave in definition of
HAVE_CAIRO_FREETYPE.
* Sun Dec 11 2005 Andrew Cagney <cagney at redhat.com> 0.0.0.20051211.1-0.EL4.0
- Set JV_SCAN.
- Import 0.0.0.20051211.1.
- Replace CONFIGURE with CONFIG; generates a CONFIG.sh script and runs
that.
- For JDOM, generate a BUILD.sh script and run that.
* Sun Dec 10 2005 Rick Moseley <rmoseley at redhat.com> 0.0.0.20051209.1-0.EL4.4
- added "BuildRequires: gtk-doc" under the gtk2 section(BZ 2028)
* Sat Dec 10 2005 Andrew Cagney <cagney at redhat.com> 0.0.0.20051209-0.EL4.3
- Add -lpangoft2 to frysk_makeflags.
- Add frysk_bindir_frysk_LDFLAGS, frysk_bindir_ftrace_LDFLAGS, and
frysk_bindir_fstack_LDFLAGS to frysk_makeflags. XXX: Needs a better
way.
* Sat Dec 10 2005 Andrew Cagney <cagney at redhat.com> 0.0.0.20051209-0.EL4.2
- Add *-pkg-dir.patchs, add datadir to, and fix classpath and
macro_dir in the PACKAGE.pc, add file.
- For java packages, where needed run aclocal with -I
../jg-common/macros, and -I ../libgtk-java/macros.
* Fri Dec 9 2005 Andrew Cagney <cagney at redhat.com> 0.0.0.20051209-0.EL4.1
- Import 0.0.0.20051209 tar ball.
- Add frysk-head.patch. Run frysk's autogen.sh.
* Fri Dec 9 2005 Rick Moseley <rmoseley at redhat.com> 0.0.0.20051202.1-0.EL4.5
- added "export CC=/usr/bin/gcc4" so gcc4 compiler will be used.
* Thu Dec 8 2005 Andrew Cagney <cagney at redhat.com> 0.0.0.20051202.1-0.EL4.5
- Move --datadir to __frysk_libs_config.
* Thu Dec 8 2005 Andrew Cagney <cagney at redhat.com> 0.0.0.20051202.1-0.EL4.4
- Delete buildroot hack.
- Bump version number.
* Thu Dec 8 2005 Adam Jocksch <ajocksch at redhat.com> 0.0.0.20051202.1-0.EL4.3
- Renamed TextMarkFactoryFix to libgtk-java-TextMarkFactoryFix.
* Thu Dec 8 2005 Andrew Cagney <cagney at redhat.com> 0.0.0.20051202.1-0.EL4.3
- Delete build_failed check.
* Wed Dec 7 2005 Andrew Cagney <cagney at redhat.com> 0.0.0.20051202.1-0.EL4.3
- Rename GTK2_CFLAGS to GTK_CFLAGS, avoid confusion.
- Delete remaining build_*, and install_* flags.
- Enable antlr, jdom, and frysk.
- Delete /usr/share/java/frysk-*.jar from files section.
* Wed Dec 7 2005 Adam Jocksch <ajocksch at redhat.com> 0.0.0.20051202.1-0.EL4.3
- Fixed typo in declaration of libpangoft.
- Added patch to fix libgtk-java TextMark problem (java-gnome bug #323508).
* Wed Dec 7 2005 Adam Jocksch <ajocksch at redhat.com> 0.0.0.20051202.1-0.EL4.3
- Changed references to .la files away from the .libs directories in glib-java
and libgtk-java
* Wed Dec 7 2005 Andrew Cagney <cagney at redhat.com> 0.0.0.20051202.1-0.EL4.3
- Add CONFIGURE, BUILD, and INSTALL shell functions to install - only
do the actioin if it hasn't been performed before. Delete
corresponding build_* and install_* macros.
- Rename __frysk_gtk_configure to __frysk_libs_configure.
* Wed Dec 7 2005 Adam Jocksch <ajocksch at redhat.com> 0.0.0.20051202.1-0.EL4.3
- Added defs for libpango{ft|x|xft} to pango build section, updated all
relevant paths.
* Wed Dec 7 2005 Andrew Cagney <cagney at redhat.com> 0.0.0.20051202.1-0.EL4.3
- Rename libglade (the second definition) to lib_glade, ditto for all
other macro's defining a .la path; stop's macro recursion.
* Wed Dec 7 2005 Adam Jocksch <ajocksch at redhat.com> 0.0.0.20051202.1-0.EL4.3
- Updated versions of libgtk-java, glib-java, and cairo-java to latest official
releases, removed old versions.
* Wed Dec 7 2005 Adam Jocksch <ajocksch at redhat.com> 0.0.0.20051202.1-0.EL4.3
- Enabled build of libvte-java.
* Tue Dec 6 2005 Adam Jocksch <ajocksch at redhat.com> 0.0.0.20051202.1-0.EL4.3
- Added libgtkjni, libgtk_java definition to libgtk-java section.
- Added libgtk_x11 definition to gtk2 section.
- Enabled libglade-java build.
* Tue Dec 6 2005 Adam Jocksch <ajocksch at redhat.com> 0.0.0.20051202.1-0.EL4.3
- Added lib* definitions for cairo-java.
- Added cflags definition for cairo-java.
- libgtk-java build enabled, libgtk_java_makeflags set.
* Tue Dec 6 2005 Andrew Cagney <cagney at redhat.com> 0.0.0.20051202.1-0.EL4.3
- Add DEP_LIBS to atk_makeflags.
- Add lib* definitions for all .la files.
- Enable gtk2 and libglade.
- Explicitly specify the MAKE *_LIB variable in the *_makeflags line.
* Mon Dec 5 2005 Andrew Cagney <cagney at redhat.com> 0.0.0.20051202.1-0.EL4.3
- Move atk's build code to before gtk, enable.
- Pass location of atk to libglade and gtk's make.
- Disable gtk, sigh.
* Mon Dec 5 2005 Andrew Cagney <cagney at redhat.com> 0.0.0.20051202.1-0.EL4.3
- Add libglade-atk-ver-1-8.patch, don't enable.
- Define GTK2_CFLAGS, and GTK2_LIBS.
- Define libglade_makeflags, pass to libglade's make.
* Mon Dec 5 2005 Andrew Cagney <cagney at redhat.com> 0.0.0.20051202.1-0.EL4.3
- Print RPM_BUILD_ROOT
- Enable gtk2; added libgthread-2.0.la to GLIB_LIBS, and
GDK_PIXBUF_XLIB_DEP_CFLAGS to gtk2_makeflags.
* Mon Dec 5 2005 Adam Jocksch <ajocksch at redhat.com> 0.0.0.20051202.1-0.EL4.3
- cairo-java is now being built.
* Mon Dec 5 2005 Adam Jocksch <ajocksch at redhat.com> 0.0.0.20051202.1-0.EL4.3
- Got glib-java section building.
* Mon Dec 5 2005 Andrew Cagney <cagney at redhat.com> 0.0.0.20051202.1-0.EL4.3
- Re-order build list, build for gtk, cairo, glib, build java bindings
immediatly after c library.
* Mon Dec 5 2005 Andrew Cagney <cagney at redhat.com> 0.0.0.20051202.1-0.EL4.3
- Disable atk.
- Pass pango_makeflags to pango's make install.
* Mon Dec 5 2005 Andrew Cagney <cagney at redhat.com> 0.0.0.20051202.1-0.EL4.3
- Define SRCDIR, DESTDIR, and BUILDDIR. Use throughout.
- Re-indent all if/fi code.
* Mon Dec 5 2005 Andrew Cagney <cagney at redhat.com> 0.0.0.20051202.1-0.EL4.3
- Fix gtk+-skip-glib-check.patch to patch m4macros/gtk-2.0.m4 instead
of a generated file. Use --disable-glibtest.
- Add gtk+-skip-pango-check.patch, to disable pango runtime test.
- For pango, run autoconf, and automake as part of setup.
- Cleanup all makefile parameters (GLIB_CFLAGS, et.al.) so that they
are defined consistently.
- Define pango_makeflags, pass to pango's make forcing it to look in
the build tree for headers and libraries. Ditto for gtk2_makeflags.
* Sun Dec 4 2005 Andrew Cagney <cagney at redhat.com> 0.0.0.20051202.1-0.EL4.3
- Add gtk+-skip-glib-check.patch; skips over the glib validation step.
- Add pango-skip-cairo-check.patch; skips over cairo validation step.
- For pango, override glib, cairo, and fontconfig flags.
* Sat Dec 3 2005 Andrew Cagney <cagney at redhat.com> 0.0.0.20051202.1-0.EL4.3
- Add install_* flags to control install.
- Run autoconf et.al. as part of setup.
- Do everything in install (outch!).
- Pass %{?_smp_mflags} to make commands.
- Point PKG_CONFIG_PATH, and LD_LIBRARY_PATH at RPM_BUILD_ROOT.
- Update list of files.
- Delete the install-root as part of build.
- Pass DESTDIR to all make install commands.
- Always define ANTLR_JAR and JDOM_JAR variables.
- Enable build of frysk.
- Define glib_cflags, glib_libs, cairo_cflags, and pass where needed.
* Fri Dec 2 2005 Andrew Cagney <cagney at redhat.com> 0.0.0.20051202.1-0.EL4.3
- Disable frysk part of build, causes internal compiler error.
* Fri Dec 2 2005 Andrew Cagney <cagney at redhat.com> 0.0.0.20051202.1-0.EL4.2
- Add requirements for gcc4-java and gcc4-c++
* Fri Dec 2 2005 Andrew Cagney <cagney at redhat.com> 0.0.0.20051202.1-0.EL4.1
- Add more installed files.
* Fri Dec 2 2005 Andrew Cagney <cagney at redhat.com> 0.0.0.20051202.1-0.EL4.1
- Wrap every step in if%{build...}.
- Bump version to 0.0.0.20051202.1.
* Thu Dec 1 2005 Andrew Cagney <cagney at redhat.com> 0.0.0.20051201.1-0.EL4.1
- Use Adam's --prefix=... trick to get all of the gnome stuff to build.
* Thu Dec 1 2005 Andrew Cagney <cagney at redhat.com> 0.0.0.20051201.1-0.EL4.1
- Fix package config path (/usr/lib) to match. Add conditional build variables.
* Thu Dec 1 2005 Adam Jocksch <ajocksch at redhat.com> 0.0.0.20051201.1-0.EL4.1
- Various typo-fixes.
* Thu Dec 1 2005 Andrew Cagney <cagney at redhat.com> 0.0.0.20051201.1-0.EL4.1
- Update frysk tar ball, has JDOM configury enabled.
* Thu Dec 1 2005 Andrew Cagney <cagney at redhat.com> 0.0.0.20051128.2-0.EL4.2
- Build jdom, define JDOM_JAR.
* Thu Dec 1 2005 Andrew Cagney <cagney at redhat.com> 0.0.0.20051128.2-0.EL4.2
- Import jdom sources.
* Thu Dec 1 2005 Adam Jocksch <ajocksch at redhat.com> 0.0.0.20051128.2-0.EL4.2
- Added correct prefix for configure, testing install prefix.
* Thu Dec 1 2005 Adam Jocksch <ajocksch at redhat.com> 0.0.0.20051128.2-0.EL4.2
- Added build sections for frysk prerequisites.
* Thu Dec 1 2005 Adam Jocksch <ajocksch at redhat.com> 0.0.0.20051128.2-0.EL4.2
- Added paths for temporary install directory.
- Added BuildRequires and Requires for libvte-java.
* Thu Dec 1 2005 Andrew Cagney <cagney at redhat.com> 0.0.0.20051128.2-0.EL4.2
- Add libvte-java to sources and unpack.
* Wed Nov 30 2005 Andrew Cagney <cagney at redhat.com> 0.0.0.20051128.2-0.EL4.2
- Unpack and patch all tar balls; frysk being put in a sub-directory.
* Wed Nov 30 2005 Andrew Cagney <cagney at redhat.com> 0.0.0.20051128.2-0.EL4.2
- Add in initial full list of build dependencies, source files and
patches.
* Wed Nov 30 2005 Andrew Cagney <cagney at redhat.com> 0.0.0.20051128.2-0.EL4.1
- Update to 0.0.0.20051128.2, pick up fix for JAVAC=<absolute-path-bug>.
- Delete stray ^L.
* Wed Nov 30 2005 Andrew Cagney <cagney at redhat.com> 0.0.0.20051128.2-0.EL4.1
- Make environment variable paths absolute, hack around AC_PATH_PROG
bug.
* Tue Nov 29 2005 Andrew Cagney <cagney at redhat.com> 0.0.0.20051128.2-0.EL4
- Change frysk to a .bz2 file.
- Add BuildRequires gcc4 et.al.
- Add install.and files rules.
- Update antlr.patch to handle/prefer gcc4.
* Mon Nov 28 2005 Andrew Cagney <cagney at redhat.com> 0.0.0.20051128.2-0.EL4
- Bump frysk version to 0.0.0.20051128.2
- Fill out code for building antlr.jar, set ANTLR_JAR environment variable.
- Add initial logic for building frysk.
* Mon Nov 28 2005 Andrew Cagney <cagney at redhat.com> 0.0.0.20051116-0.EL4
- Add prep and build rules to build antlr, add antlr.patch.
* Mon Nov 28 2005 Andrew Cagney <cagney at redhat.com> 0.0.0.20051116-0.EL4
- Add antlr-2.7.5.tar.gz.
* Mon Nov 28 2005 Andrew Cagney <cagney at redhat.com> 0.0.0.20051116-0.EL4
- Rebirth, created from shell of devel frysk.spec.
* Wed Oct 26 2005 Igor Foox <ifoox at redhat.com> 0.0-1
- Birth.
glib-java-macro.patch:
am_path_gcj.m4 | 3 ++-
1 files changed, 2 insertions(+), 1 deletion(-)
--- NEW FILE glib-java-macro.patch ---
diff -ur glib-java-0.2.2.orig/macros/am_path_gcj.m4 glib-java-0.2.2/macros/am_path_gcj.m4
--- glib-java-0.2.2.orig/macros/am_path_gcj.m4 2005-05-24 07:47:43.000000000 -0500
+++ glib-java-0.2.2/macros/am_path_gcj.m4 2005-12-12 10:09:28.000000000 -0600
@@ -41,6 +41,7 @@
PATH="$GCJ_HOME/bin:$PATH"
fi
AC_PATH_PROG(GCJ, gcj, no)
+ AC_PATH_PROG(GIJ, gij, no)
min_gcj_version=ifelse([$0], ,3.0.0,$1)
AC_MSG_CHECKING(for GCJ - version >= $min_gcj_version)
@@ -104,7 +105,7 @@
}
}
EOF
- GCJ_JAR=`gcj -C Test.java && gij Test`
+ GCJ_JAR=`$GCJ -C Test.java && $GIJ Test`
rm Test.java Test.class
if test x$GCJ_JAR == x ; then
GCJ_JAR=`(test -d /usr/share/local/java && find /usr/local/share/java -name libgcj-?.?.?.jar) || (test -d /usr/share/java && find /usr/share/java -name libgcj-?.?.?.jar)`
glib-java-pkg-dir.patch:
configure.ac | 6 +++---
glib-java.pc.in | 1 +
2 files changed, 4 insertions(+), 3 deletions(-)
--- NEW FILE glib-java-pkg-dir.patch ---
--- glib-java-0.2.2/configure.ac.dist 2005-12-10 00:48:14.000000000 -0500
+++ glib-java-0.2.2/configure.ac 2005-12-10 01:01:11.000000000 -0500
@@ -30,9 +30,9 @@
AC_SUBST(apiversion)
WINDOWS_LIB_VERSION="0-2"
-INSTALLED_CLASSPATH=\${prefix}/share/java/glib${apiversion}-${VERSION}.jar
-INSTALLED_JNI_DIR=\${prefix}/lib/
-INSTALLED_MACRO_DIR=\${prefix}/share/glib-java/macros/
+INSTALLED_CLASSPATH=\${datadir}/java/glib${apiversion}-${VERSION}.jar
+INSTALLED_JNI_DIR=\${libdir}/
+INSTALLED_MACRO_DIR=\${datadir}/glib-java/macros/
AC_SUBST(INSTALLED_CLASSPATH)
AC_SUBST(INSTALLED_JNI_DIR)
AC_SUBST(INSTALLED_MACRO_DIR)
--- glib-java-0.2.2/glib-java.pc.in.pkg-dir 2005-12-10 10:03:57.000000000 -0500
+++ glib-java-0.2.2/glib-java.pc.in 2005-12-10 10:05:21.000000000 -0500
@@ -2,6 +2,7 @@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
+datadir=@datadir@
Name: glib-java
--- NEW FILE glib2.csh ---
## This caused GLib2 applications to convert filenames from
## locale encoding to UTF-8. If the locale encoding is already
## UTF-8 then it makes no difference.
setenv G_BROKEN_FILENAMES 1
--- NEW FILE glib2.sh ---
## This caused GLib2 applications to convert filenames from
## locale encoding to UTF-8. If the locale encoding is already
## UTF-8 then it makes no difference.
export G_BROKEN_FILENAMES=1
gtk+-2.4.1-lib64.patch:
gdk-pixbuf/Makefile.am | 1 +
gdk-pixbuf/gdk-pixbuf-io.c | 12 +++++++++++-
gtk/gtkrc.c | 12 +++++++++++-
3 files changed, 23 insertions(+), 2 deletions(-)
--- NEW FILE gtk+-2.4.1-lib64.patch ---
--- gtk+-2.6.0/gdk-pixbuf/gdk-pixbuf-io.c.lib64 2004-12-21 14:33:41.296252000 -0500
+++ gtk+-2.6.0/gdk-pixbuf/gdk-pixbuf-io.c 2004-12-21 14:35:57.858554000 -0500
@@ -258,7 +258,17 @@
gchar *result = g_strdup (g_getenv ("GDK_PIXBUF_MODULE_FILE"));
if (!result)
- result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gdk-pixbuf.loaders", NULL);
+ {
+ result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0",
+ HOST, "gdk-pixbuf.loaders", NULL);
+ if (!g_file_test (result, G_FILE_TEST_EXISTS))
+ {
+ g_free (result);
+
+ result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0",
+ "gdk-pixbuf.loaders", NULL);
+ }
+ }
return result;
}
--- gtk+-2.6.0/gdk-pixbuf/Makefile.am.lib64 2004-12-21 14:33:49.952587000 -0500
+++ gtk+-2.6.0/gdk-pixbuf/Makefile.am 2004-12-21 14:34:45.644839000 -0500
@@ -274,6 +274,7 @@
-I$(top_srcdir)/gdk-pixbuf \
-I$(top_builddir)/gdk-pixbuf \
-DGTK_SYSCONFDIR=\"$(sysconfdir)\" \
+ -DHOST=\"$(host_triplet)\" \
-DGTK_VERSION=\"$(GTK_VERSION)\" \
-DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\" \
-DG_DISABLE_DEPRECATED \
--- gtk+-2.6.0/gtk/gtkrc.c.lib64 2004-12-21 14:34:02.909617000 -0500
+++ gtk+-2.6.0/gtk/gtkrc.c 2004-12-21 14:36:39.265106000 -0500
@@ -377,7 +377,17 @@
if (im_module_file)
result = g_strdup (im_module_file);
else
- result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL);
+ {
+ result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", GTK_HOST,
+ "gtk.immodules", NULL);
+ if (!g_file_test (result, G_FILE_TEST_EXISTS))
+ {
+ g_free (result);
+
+ result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0",
+ "gtk.immodules", NULL);
+ }
+ }
}
#ifdef G_OS_WIN32
gtk+-2.8.10-abicheck.patch:
gdk-pixbuf/abicheck.sh | 2 +-
gdk/abicheck.sh | 2 +-
gtk/abicheck.sh | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
--- NEW FILE gtk+-2.8.10-abicheck.patch ---
--- gtk+-2.8.10/gdk-pixbuf/abicheck.sh.abicheck 2006-01-13 23:15:12.000000000 -0500
+++ gtk+-2.8.10/gdk-pixbuf/abicheck.sh 2006-01-13 23:15:26.000000000 -0500
@@ -1,5 +1,5 @@
#! /bin/sh
cpp -DINCLUDE_VARIABLES -P -DALL_FILES ${srcdir:-.}/gdk-pixbuf.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' -e 's/ PRIVATE$//' | sort > expected-abi
-nm -D .libs/libgdk_pixbuf-2.0.so | grep " [BDTR] " | cut -d ' ' -f 3 | sort > actual-abi
+nm -D -g --defined-only .libs/libgdk_pixbuf-2.0.so | cut -d ' ' -f 3 | sort > actual-abi
diff -u expected-abi actual-abi && rm expected-abi actual-abi
--- gtk+-2.8.10/gtk/abicheck.sh.abicheck 2006-01-13 23:14:33.000000000 -0500
+++ gtk+-2.8.10/gtk/abicheck.sh 2006-01-13 23:15:00.000000000 -0500
@@ -1,5 +1,5 @@
#! /bin/sh
cpp -DINCLUDE_VARIABLES -P -DG_OS_UNIX -DGTK_WINDOWING_X11 -DALL_FILES ${srcdir:-.}/gtk.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' -e 's/ PRIVATE//' | sort > expected-abi
-nm -D .libs/libgtk-x11-2.0.so | grep " [BDTR] " | cut -d ' ' -f 3 | sort > actual-abi
+nm -D -g --defined-only .libs/libgtk-x11-2.0.so | cut -d ' ' -f 3 | sort > actual-abi
diff -u expected-abi actual-abi && rm expected-abi actual-abi
--- gtk+-2.8.10/gdk/abicheck.sh.abicheck 2006-01-13 23:15:36.000000000 -0500
+++ gtk+-2.8.10/gdk/abicheck.sh 2006-01-13 23:15:50.000000000 -0500
@@ -1,5 +1,5 @@
#! /bin/sh
cpp -DINCLUDE_VARIABLES -P -DALL_FILES -DGDK_ENABLE_BROKEN -DGDK_WINDOWING_X11 ${srcdir:-.}/gdk.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' | sort | uniq > expected-abi
-nm -D .libs/libgdk-x11-2.0.so | grep " [BDTR] " | cut -d ' ' -f 3 | sort > actual-abi
+nm -D -g --defined-only .libs/libgdk-x11-2.0.so | cut -d ' ' -f 3 | sort > actual-abi
diff -u expected-abi actual-abi && rm expected-abi actual-abi
gtk+-2.8.10-set-invisible-char-to-bullet.patch:
gtkentry.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
--- NEW FILE gtk+-2.8.10-set-invisible-char-to-bullet.patch ---
--- gtk+-2.8.10/gtk/gtkentry.c.set-invisible-char-to-bullet 2006-01-19 15:12:18.000000000 -0500
+++ gtk+-2.8.10/gtk/gtkentry.c 2006-01-19 15:36:51.000000000 -0500
@@ -542,7 +542,7 @@
g_param_spec_unichar ("invisible-char",
P_("Invisible character"),
P_("The character to use when masking entry contents (in \"password mode\")"),
- '*',
+ (gunichar) 0x2022,
GTK_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
@@ -1000,7 +1000,7 @@
entry->editable = TRUE;
entry->visible = TRUE;
- entry->invisible_char = '*';
+ entry->invisible_char = (gunichar) 0x2022;
entry->dnd_position = -1;
entry->width_chars = -1;
entry->is_cell_renderer = FALSE;
@@ -4019,9 +4019,9 @@
* gtk_entry_set_visibility() has been called to set text visibility
* to %FALSE. i.e. this is the character used in "password mode" to
* show the user how many characters have been typed. The default
- * invisible char is an asterisk ('*'). If you set the invisible char
- * to 0, then the user will get no feedback at all; there will be
- * no text on the screen as they type.
+ * invisible char is a small bullet (Unicode character 2022). If you
+ * set the invisible char to 0, then the user will get no feedback at
+ * all; there will be no text on the screen as they type.
*
**/
void
gtk+-2.8.6-frysk-theme-fix.patch:
Makefile.am | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE gtk+-2.8.6-frysk-theme-fix.patch ---
--- gtk/Makefile.am 2005-10-26 11:12:46.000000000 -0400
+++ gtk/Makefile.am 2005-10-24 17:42:21.000000000 -0400
@@ -10,9 +10,9 @@
INCLUDES = \
-DG_LOG_DOMAIN=\"Gtk\" \
- -DGTK_LIBDIR=\"$(libdir)\" \
+ -DGTK_LIBDIR=\"/usr/lib\" \
-DGTK_DATADIR=\"$(datadir)\" \
- -DGTK_DATA_PREFIX=\"$(prefix)\" \
+ -DGTK_DATA_PREFIX=\"/usr\" \
-DGTK_SYSCONFDIR=\"$(sysconfdir)\" \
-DGTK_VERSION=\"$(GTK_VERSION)\" \
-DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\" \
gtk+-2.8.6-inputmethod.patch:
gdk/x11/gdkevents-x11.c | 2 +
gtk/gtkentry.c | 54 ++++++++++++++++++++++++++-------------
gtk/gtksettings.c | 23 ++++++++++++++++
gtk/gtktextview.c | 66 ++++++++++++++++++++++++++++++------------------
4 files changed, 102 insertions(+), 43 deletions(-)
--- NEW FILE gtk+-2.8.6-inputmethod.patch ---
--- gtk+-2.8.8/gtk/gtksettings.c.inputmethod 2005-08-29 00:47:20.000000000 -0400
+++ gtk+-2.8.8/gtk/gtksettings.c 2005-11-28 14:33:31.000000000 -0500
@@ -77,7 +77,9 @@
PROP_CURSOR_THEME_NAME,
PROP_CURSOR_THEME_SIZE,
#endif
- PROP_ALTERNATIVE_BUTTON_ORDER
+ PROP_ALTERNATIVE_BUTTON_ORDER,
+ PROP_SHOW_INPUT_METHOD_MENU,
+ PROP_SHOW_UNICODE_MENU
};
@@ -385,6 +387,25 @@
GTK_PARAM_READWRITE),
NULL);
g_assert (result == PROP_ALTERNATIVE_BUTTON_ORDER);
+
+ result = settings_install_property_parser (class,
+ g_param_spec_boolean ("gtk-show-input-method-menu",
+ P_("Show the 'Input Methods' menu"),
+ P_("Whether the context menus of entries and text views should offer to change the input method"),
+ TRUE,
+ GTK_PARAM_READWRITE),
+ NULL);
+ g_assert (result == PROP_SHOW_INPUT_METHOD_MENU);
+
+ result = settings_install_property_parser (class,
+ g_param_spec_boolean ("gtk-show-unicode-menu",
+ P_("Show the 'Insert Unicode Control Character' menu"),
+ P_("Whether the context menus of entries and text views should offer to insert control characters"),
+ TRUE,
+ GTK_PARAM_READWRITE),
+ NULL);
+ g_assert (result == PROP_SHOW_UNICODE_MENU);
+
}
static void
--- gtk+-2.8.8/gtk/gtktextview.c.inputmethod 2005-11-02 01:30:22.000000000 -0500
+++ gtk+-2.8.8/gtk/gtktextview.c 2005-11-28 14:33:31.000000000 -0500
@@ -7066,14 +7066,18 @@
/* We implicitely rely here on the fact that if we are pasting ourself, we'll
* have text targets as well as the private GTK_TEXT_BUFFER_CONTENTS target.
*/
- gboolean clipboard_contains_text = gtk_selection_data_targets_include_text (data);
+ gboolean clipboard_contains_text;
GtkWidget *menuitem;
GtkWidget *submenu;
gboolean have_selection;
gboolean can_insert;
GtkTextIter iter;
GtkTextIter sel_start, sel_end;
+ gboolean show_input_method_menu;
+ gboolean show_unicode_menu;
+ clipboard_contains_text = gtk_selection_data_targets_include_text (data);
+
if (text_view->popup_menu)
gtk_widget_destroy (text_view->popup_menu);
@@ -7121,33 +7125,47 @@
gtk_widget_show (menuitem);
gtk_menu_shell_append (GTK_MENU_SHELL (text_view->popup_menu), menuitem);
- menuitem = gtk_separator_menu_item_new ();
- gtk_widget_show (menuitem);
- gtk_menu_shell_append (GTK_MENU_SHELL (text_view->popup_menu), menuitem);
+ g_object_get (gtk_widget_get_settings (GTK_WIDGET (text_view)),
+ "gtk-show-input-method-menu", &show_input_method_menu,
+ "gtk-show-unicode-menu", &show_unicode_menu,
+ NULL);
- menuitem = gtk_menu_item_new_with_mnemonic (_("Input _Methods"));
- gtk_widget_show (menuitem);
- gtk_widget_set_sensitive (menuitem, can_insert);
+ if (show_input_method_menu || show_unicode_menu)
+ {
+ menuitem = gtk_separator_menu_item_new ();
+ gtk_widget_show (menuitem);
+ gtk_menu_shell_append (GTK_MENU_SHELL (text_view->popup_menu), menuitem);
+ }
- submenu = gtk_menu_new ();
- gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), submenu);
- gtk_menu_shell_append (GTK_MENU_SHELL (text_view->popup_menu), menuitem);
-
- gtk_im_multicontext_append_menuitems (GTK_IM_MULTICONTEXT (text_view->im_context),
- GTK_MENU_SHELL (submenu));
+ if (show_input_method_menu)
+ {
+ menuitem = gtk_menu_item_new_with_mnemonic (_("Input _Methods"));
+ gtk_widget_show (menuitem);
+ gtk_widget_set_sensitive (menuitem, can_insert);
+
+ submenu = gtk_menu_new ();
+ gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), submenu);
+ gtk_menu_shell_append (GTK_MENU_SHELL (text_view->popup_menu), menuitem);
+
+ gtk_im_multicontext_append_menuitems (GTK_IM_MULTICONTEXT (text_view->im_context),
+ GTK_MENU_SHELL (submenu));
+ }
- menuitem = gtk_menu_item_new_with_mnemonic (_("_Insert Unicode Control Character"));
- gtk_widget_show (menuitem);
- gtk_widget_set_sensitive (menuitem, can_insert);
-
- submenu = gtk_menu_new ();
- gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), submenu);
- gtk_menu_shell_append (GTK_MENU_SHELL (text_view->popup_menu), menuitem);
-
- _gtk_text_util_append_special_char_menuitems (GTK_MENU_SHELL (submenu),
- unichar_chosen_func,
- text_view);
+ if (show_unicode_menu)
+ {
+ menuitem = gtk_menu_item_new_with_mnemonic (_("_Insert Unicode Control Character"));
+ gtk_widget_show (menuitem);
+ gtk_widget_set_sensitive (menuitem, can_insert);
+ submenu = gtk_menu_new ();
+ gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), submenu);
+ gtk_menu_shell_append (GTK_MENU_SHELL (text_view->popup_menu), menuitem);
+
+ _gtk_text_util_append_special_char_menuitems (GTK_MENU_SHELL (submenu),
+ unichar_chosen_func,
+ text_view);
+ }
+
g_signal_emit (text_view,
signals[POPULATE_POPUP],
0,
--- gtk+-2.8.8/gtk/gtkentry.c.inputmethod 2005-11-23 09:29:33.000000000 -0500
+++ gtk+-2.8.8/gtk/gtkentry.c 2005-11-28 14:33:31.000000000 -0500
@@ -4567,10 +4567,13 @@
if (GTK_WIDGET_REALIZED (entry))
{
- gboolean clipboard_contains_text = gtk_selection_data_targets_include_text (data);
+ gboolean clipboard_contains_text;
GtkWidget *menuitem;
GtkWidget *submenu;
+ gboolean show_input_method_menu;
+ gboolean show_unicode_menu;
+ clipboard_contains_text = gtk_selection_data_targets_include_text (data);
if (entry->popup_menu)
gtk_widget_destroy (entry->popup_menu);
@@ -4604,11 +4607,23 @@
gtk_widget_show (menuitem);
gtk_menu_shell_append (GTK_MENU_SHELL (entry->popup_menu), menuitem);
- menuitem = gtk_separator_menu_item_new ();
- gtk_widget_show (menuitem);
- gtk_menu_shell_append (GTK_MENU_SHELL (entry->popup_menu), menuitem);
+ g_object_get (gtk_widget_get_settings (GTK_WIDGET (entry)),
+ "gtk-show-input-method-menu", &show_input_method_menu,
+ "gtk-show-unicode-menu", &show_unicode_menu,
+ NULL);
+
+ if (!entry->visible)
+ show_input_method_menu = FALSE;
- if (entry->visible)
+ if (show_input_method_menu || show_unicode_menu)
+ {
+
+ menuitem = gtk_separator_menu_item_new ();
+ gtk_widget_show (menuitem);
+ gtk_menu_shell_append (GTK_MENU_SHELL (entry->popup_menu), menuitem);
+ }
+
+ if (show_input_method_menu)
{
menuitem = gtk_menu_item_new_with_mnemonic (_("Input _Methods"));
gtk_widget_set_sensitive (menuitem, entry->editable);
@@ -4622,19 +4637,22 @@
GTK_MENU_SHELL (submenu));
}
- menuitem = gtk_menu_item_new_with_mnemonic (_("_Insert Unicode Control Character"));
- gtk_widget_show (menuitem);
-
- submenu = gtk_menu_new ();
- gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), submenu);
- gtk_menu_shell_append (GTK_MENU_SHELL (entry->popup_menu), menuitem);
-
- _gtk_text_util_append_special_char_menuitems (GTK_MENU_SHELL (submenu),
- unichar_chosen_func,
- entry);
- if (!entry->editable)
- gtk_widget_set_sensitive (menuitem, FALSE);
-
+ if (show_unicode_menu)
+ {
+ menuitem = gtk_menu_item_new_with_mnemonic (_("_Insert Unicode Control Character"));
+ gtk_widget_show (menuitem);
+
+ submenu = gtk_menu_new ();
+ gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), submenu);
+ gtk_menu_shell_append (GTK_MENU_SHELL (entry->popup_menu), menuitem);
+
+ _gtk_text_util_append_special_char_menuitems (GTK_MENU_SHELL (submenu),
+ unichar_chosen_func,
+ entry);
+ if (!entry->editable)
+ gtk_widget_set_sensitive (menuitem, FALSE);
+ }
+
g_signal_emit (entry,
signals[POPULATE_POPUP],
0,
--- gtk+-2.8.8/gdk/x11/gdkevents-x11.c.inputmethod 2005-08-19 01:46:06.000000000 -0400
+++ gtk+-2.8.8/gdk/x11/gdkevents-x11.c 2005-11-28 14:33:31.000000000 -0500
@@ -2802,6 +2802,8 @@
{ "Gtk/MenuBarAccel", "gtk-menu-bar-accel" },
{ "Gtk/CursorThemeName", "gtk-cursor-theme-name" },
{ "Gtk/CursorThemeSize", "gtk-cursor-theme-size" },
+ { "Gtk/ShowInputMethodMenu", "gtk-show-input-method-menu" },
+ { "Gtk/ShowUnicodeMenu", "gtk-show-unicode-menu" },
{ "Xft/Antialias", "gtk-xft-antialias" },
{ "Xft/Hinting", "gtk-xft-hinting" },
{ "Xft/HintStyle", "gtk-xft-hintstyle" },
gtk+-libgdk-lm.patch:
gdk-pixbuf/Makefile.am | 3 +++
gtk/theme-bits/Makefile.am | 1 +
2 files changed, 4 insertions(+)
--- NEW FILE gtk+-libgdk-lm.patch ---
--- gdk-pixbuf/Makefile.am.orig 2006-01-04 18:48:35.000000000 -0500
+++ gdk-pixbuf/Makefile.am 2006-01-04 21:03:43.000000000 -0500
@@ -287,13 +287,16 @@ LDADDS = libgdk_pixbuf-$(GTK_API_VERSION
noinst_PROGRAMS = test-gdk-pixbuf
test_gdk_pixbuf_LDADD = $(LDADDS)
+test_gdk_pixbuf_LDFLAGS = -lm
bin_PROGRAMS = gdk-pixbuf-csource gdk-pixbuf-query-loaders
gdk_pixbuf_csource_SOURCES = gdk-pixbuf-csource.c
gdk_pixbuf_csource_LDADD = $(LDADDS)
+gdk_pixbuf_csource_LDFLAGS = -lm
gdk_pixbuf_query_loaders_DEPENDENCIES = $(DEPS)
gdk_pixbuf_query_loaders_LDADD = $(LDADDS)
+gdk_pixbuf_query_loaders_LDFLAGS = -lm
gdk_pixbuf_query_loaders_SOURCES = queryloaders.c
--- gtk/theme-bits/Makefile.am.orig 2003-05-06 17:55:40.000000000 -0400
+++ gtk/theme-bits/Makefile.am 2006-01-05 11:58:56.000000000 -0500
@@ -7,5 +7,6 @@ noinst_PROGRAMS = decompose-bits
decompose_bits_SOURCES = decompose-bits.c
decompose_bits_LDADD = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la
+decompose_bits_LDFLAGS = -lm
EXTRA_DIST = check-13.png check-13-inconsistent.png radio-13.png radio-13-inconsistent.png
gtk+-skip-glib-check.patch:
gtk-2.0.m4 | 77 -------------------------------------------------------------
1 files changed, 77 deletions(-)
--- NEW FILE gtk+-skip-glib-check.patch ---
--- ./gtk+-2.8.6/m4macros/gtk-2.0.m4.dist 2005-12-04 22:56:51.000000000 -0500
+++ ./gtk+-2.8.6/m4macros/gtk-2.0.m4 2005-12-04 22:57:34.000000000 -0500
@@ -69,83 +69,6 @@
ac_save_LIBS="$LIBS"
CFLAGS="$CFLAGS $GTK_CFLAGS"
LIBS="$GTK_LIBS $LIBS"
-dnl
-dnl Now check if the installed GTK+ is sufficiently new. (Also sanity
-dnl checks the results of pkg-config to some extent)
-dnl
- rm -f conf.gtktest
- AC_TRY_RUN([
-#include <gtk/gtk.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-int
-main ()
-{
- int major, minor, micro;
- char *tmp_version;
-
- system ("touch conf.gtktest");
-
- /* HP/UX 9 (%@#!) writes to sscanf strings */
- tmp_version = g_strdup("$min_gtk_version");
- if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
- printf("%s, bad version string\n", "$min_gtk_version");
- exit(1);
- }
-
- if ((gtk_major_version != $gtk_config_major_version) ||
- (gtk_minor_version != $gtk_config_minor_version) ||
- (gtk_micro_version != $gtk_config_micro_version))
- {
- printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
- $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
- gtk_major_version, gtk_minor_version, gtk_micro_version);
- printf ("*** was found! If pkg-config was correct, then it is best\n");
- printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
- printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
- printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
- printf("*** required on your system.\n");
- printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
- printf("*** to point to the correct configuration files\n");
- }
- else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
- (gtk_minor_version != GTK_MINOR_VERSION) ||
- (gtk_micro_version != GTK_MICRO_VERSION))
- {
- printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
- GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
- printf("*** library (version %d.%d.%d)\n",
- gtk_major_version, gtk_minor_version, gtk_micro_version);
- }
- else
- {
- if ((gtk_major_version > major) ||
- ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
- ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
- {
- return 0;
- }
- else
- {
- printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
- gtk_major_version, gtk_minor_version, gtk_micro_version);
- printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
- major, minor, micro);
- printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
- printf("***\n");
- printf("*** If you have already installed a sufficiently new version, this error\n");
- printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
- printf("*** being found. The easiest way to fix this is to remove the old version\n");
- printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n");
- printf("*** correct copy of pkg-config. (In this case, you will have to\n");
- printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
- printf("*** so that the correct libraries are found at run-time))\n");
- }
- }
- return 1;
-}
-],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
fi
gtk+-skip-pango-check.patch:
configure.in | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
--- NEW FILE gtk+-skip-pango-check.patch ---
--- configure.in.dist 2005-12-04 23:20:37.000000000 -0500
+++ configure.in 2005-12-04 23:28:06.000000000 -0500
@@ -1379,9 +1379,9 @@
else
gtk_save_LIBS="$LIBS"
LIBS="$PANGO_LIBS $LIBS"
- AC_TRY_LINK_FUNC(pango_context_new, :, AC_MSG_ERROR([
-*** Can't link to Pango. Pango is required to build
-*** GTK+. For more information see http://www.pango.org]))
+# AC_TRY_LINK_FUNC(pango_context_new, :, AC_MSG_ERROR([
+#*** Can't link to Pango. Pango is required to build
+#*** GTK+. For more information see http://www.pango.org]))
LIBS="$gtk_save_LIBS"
fi
jdom-compiler.patch:
ContentList.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
--- NEW FILE jdom-compiler.patch ---
diff -ur jdom-1.0.orig/src/java/org/jdom/ContentList.java jdom-1.0/src/java/org/jdom/ContentList.java
--- jdom-1.0.orig/src/java/org/jdom/ContentList.java 2004-02-27 21:30:27.000000000 -0600
+++ jdom-1.0/src/java/org/jdom/ContentList.java 2005-12-13 08:42:27.000000000 -0600
@@ -79,31 +79,31 @@
*/
final class ContentList extends AbstractList implements java.io.Serializable {
- private static final String CVS_ID =
+ /* private */ static final String CVS_ID =
"@(#) $RCSfile: ContentList.java,v $ $Revision: 1.39 $ $Date: 2004/02/28 03:30:27 $ $Name: jdom_1_0 $";
- private static final int INITIAL_ARRAY_SIZE = 5;
+ /* private */ static final int INITIAL_ARRAY_SIZE = 5;
/**
* Used inner class FilterListIterator to help hasNext and
* hasPrevious the next index of our cursor (must be here
* for JDK1.1).
*/
- private static final int CREATE = 0;
- private static final int HASPREV = 1;
- private static final int HASNEXT = 2;
- private static final int PREV = 3;
- private static final int NEXT = 4;
- private static final int ADD = 5;
- private static final int REMOVE = 6;
+ /* private */ static final int CREATE = 0;
+ /* private */ static final int HASPREV = 1;
+ /* private */ static final int HASNEXT = 2;
+ /* private */ static final int PREV = 3;
+ /* private */ static final int NEXT = 4;
+ /* private */ static final int ADD = 5;
+ /* private */ static final int REMOVE = 6;
/** Our backing list */
// protected ArrayList list;
- private Content elementData[];
- private int size;
+ /* private */ Content elementData[];
+ /* private */ int size;
/** Document or Element this list belongs to */
- private Parent parent;
+ /* private */ Parent parent;
/** Force either a Document or Element parent */
ContentList(Parent parent) {
jdom-files.patch:
jdom.files | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 61 insertions(+)
--- NEW FILE jdom-files.patch ---
--- /dev/null 2005-11-30 11:22:36.074665440 -0500
+++ jdom.files 2005-12-01 14:46:44.000000000 -0500
@@ -0,0 +1,61 @@
+./package/JDOMAbout.java
+./src/java/org/jdom/adapters/AbstractDOMAdapter.java
+./src/java/org/jdom/adapters/CrimsonDOMAdapter.java
+./src/java/org/jdom/adapters/DOMAdapter.java
+./src/java/org/jdom/adapters/JAXPDOMAdapter.java
+./src/java/org/jdom/adapters/OracleV1DOMAdapter.java
+./src/java/org/jdom/adapters/OracleV2DOMAdapter.java
+./src/java/org/jdom/adapters/XercesDOMAdapter.java
+./src/java/org/jdom/adapters/XML4JDOMAdapter.java
+./src/java/org/jdom/Attribute.java
+./src/java/org/jdom/AttributeList.java
+./src/java/org/jdom/CDATA.java
+./src/java/org/jdom/Comment.java
+./src/java/org/jdom/Content.java
+./src/java/org/jdom/ContentList.java
+./src/java/org/jdom/DataConversionException.java
+./src/java/org/jdom/DefaultJDOMFactory.java
+./src/java/org/jdom/DescendantIterator.java
+./src/java/org/jdom/DocType.java
+./src/java/org/jdom/Document.java
+./src/java/org/jdom/Element.java
+./src/java/org/jdom/EntityRef.java
+./src/java/org/jdom/filter/AbstractFilter.java
+./src/java/org/jdom/filter/AndFilter.java
+./src/java/org/jdom/filter/ContentFilter.java
+./src/java/org/jdom/filter/ElementFilter.java
+./src/java/org/jdom/filter/Filter.java
+./src/java/org/jdom/filter/NegateFilter.java
+./src/java/org/jdom/filter/OrFilter.java
+./src/java/org/jdom/FilterIterator.java
+./src/java/org/jdom/IllegalAddException.java
+./src/java/org/jdom/IllegalDataException.java
+./src/java/org/jdom/IllegalNameException.java
+./src/java/org/jdom/IllegalTargetException.java
+./src/java/org/jdom/input/BuilderErrorHandler.java
+./src/java/org/jdom/input/DOMBuilder.java
+./src/java/org/jdom/input/JAXPParserFactory.java
+./src/java/org/jdom/input/JDOMParseException.java
+./src/java/org/jdom/input/SAXBuilder.java
+./src/java/org/jdom/input/SAXHandler.java
+./src/java/org/jdom/input/TextBuffer.java
+./src/java/org/jdom/JDOMException.java
+./src/java/org/jdom/JDOMFactory.java
+./src/java/org/jdom/Namespace.java
+./src/java/org/jdom/output/DOMOutputter.java
+./src/java/org/jdom/output/EscapeStrategy.java
+./src/java/org/jdom/output/Format.java
+./src/java/org/jdom/output/JDOMLocator.java
+./src/java/org/jdom/output/NamespaceStack.java
+./src/java/org/jdom/output/SAXOutputter.java
+./src/java/org/jdom/output/XMLOutputter.java
+./src/java/org/jdom/Parent.java
+./src/java/org/jdom/ProcessingInstruction.java
+./src/java/org/jdom/Text.java
+./src/java/org/jdom/transform/JDOMResult.java
+./src/java/org/jdom/transform/JDOMSource.java
+./src/java/org/jdom/transform/XSLTransformer.java
+./src/java/org/jdom/transform/XSLTransformException.java
+./src/java/org/jdom/UncheckedJDOMFactory.java
+./src/java/org/jdom/Verifier.java
+./src/java/org/jdom/xpath/XPath.java
libglade-2.0.1-nowarning.patch:
glade-gtk.c | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
--- NEW FILE libglade-2.0.1-nowarning.patch ---
--- libglade-2.0.1/glade/glade-gtk.c.nowarning 2003-08-29 14:50:10.000000000 -0400
+++ libglade-2.0.1/glade/glade-gtk.c 2003-08-29 14:58:41.000000000 -0400
@@ -639,9 +639,8 @@
if (!strcmp (childinfo->properties[j].name, "label")) {
label = childinfo->properties[j].value;
break;
- } else {
- g_warning ("Unknown CList child property: %s", childinfo->properties[j].name);
}
+ /* Ignore all other properties */
}
if (label) {
@@ -683,6 +682,7 @@
char *icon = NULL;
gboolean use_stock = FALSE, active = FALSE, new_group = FALSE;
gboolean use_underline = FALSE;
+ gboolean sensitive = TRUE;
GtkWidget *iconw = NULL;
int j;
@@ -708,6 +708,8 @@
group_name = value;
} else if (!strcmp (name, "new_group")) {
new_group = BOOL (value);
+ } else if (!strcmp (name, "sensitive")) {
+ sensitive = BOOL (value);
} else if (!strcmp (name, "visible")) {
/* ignore for now */
} else if (!strcmp (name, "tooltip")) {
@@ -785,6 +787,8 @@
gtk_label_set_use_underline (GTK_LABEL (toolbar_child->label),
TRUE);
}
+
+ gtk_widget_set_sensitive (child, sensitive);
glade_xml_set_common_params (xml, child, childinfo->child);
} else {
libglade-java-pkg-dir.patch:
configure.ac | 4 ++--
glade-java.pc.in | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
--- NEW FILE libglade-java-pkg-dir.patch ---
--- libglade-java-2.12.0/configure.ac.dist 2005-12-10 00:48:14.000000000 -0500
+++ libglade-java-2.12.0/configure.ac 2005-12-10 01:01:28.000000000 -0500
@@ -29,8 +29,8 @@
apiversion="2.12"
WINDOWS_LIB_VERSION="2-12"
-INSTALLED_CLASSPATH=\${prefix}/share/java/glade${apiversion}-${VERSION}.jar
-INSTALLED_JNI_DIR=\${prefix}/lib/
+INSTALLED_CLASSPATH=\${datadir}/java/glade${apiversion}-${VERSION}.jar
+INSTALLED_JNI_DIR=\${libdir}/
AC_SUBST(INSTALLED_CLASSPATH)
AC_SUBST(INSTALLED_JNI_DIR)
--- libglade-java-2.12.0/glade-java.pc.in.pkg-dir 2005-12-10 10:03:57.000000000 -0500
+++ libglade-java-2.12.0/glade-java.pc.in 2005-12-10 10:06:00.000000000 -0500
@@ -2,6 +2,7 @@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
+datadir=@datadir@
Name: Glade-Java
libgtk-java-pkg-dir.patch:
configure.ac | 6 +++---
gtk2-java.pc.in | 1 +
2 files changed, 4 insertions(+), 3 deletions(-)
--- NEW FILE libgtk-java-pkg-dir.patch ---
--- libgtk-java-2.8.2/configure.ac.dist 2005-12-10 00:48:14.000000000 -0500
+++ libgtk-java-2.8.2/configure.ac 2005-12-10 01:01:38.000000000 -0500
@@ -30,9 +30,9 @@
AC_SUBST(gtkapiversion)
WINDOWS_LIB_VERSION="2-8"
-INSTALLED_CLASSPATH=\${prefix}/share/java/gtk${gtkapiversion}-${VERSION}.jar
-INSTALLED_JNI_DIR=\${prefix}/lib/
-INSTALLED_MACRO_DIR=\${prefix}/share/libgtk-java/macros/
+INSTALLED_CLASSPATH=\${datadir}/java/gtk${gtkapiversion}-${VERSION}.jar
+INSTALLED_JNI_DIR=\${libdir}/
+INSTALLED_MACRO_DIR=\${datadir}/libgtk-java/macros/
AC_SUBST(INSTALLED_CLASSPATH)
AC_SUBST(INSTALLED_JNI_DIR)
AC_SUBST(INSTALLED_MACRO_DIR)
--- libgtk-java-2.8.2/gtk2-java.pc.in.pkg-dir 2005-12-10 10:03:57.000000000 -0500
+++ libgtk-java-2.8.2/gtk2-java.pc.in 2005-12-10 10:06:06.000000000 -0500
@@ -2,6 +2,7 @@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
+datadir=@datadir@
Name: GTK-Java
libvte-java-frysk-libgnomeui-canvas-version-fix.patch:
configure.ac | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE libvte-java-frysk-libgnomeui-canvas-version-fix.patch ---
? libgnomeui-canvas-version-fix.patch
Index: configure.ac
===================================================================
RCS file: /cvs/gnome/libvte-java/configure.ac,v
retrieving revision 1.4
diff -u -r1.4 configure.ac
--- configure.ac 2 Oct 2005 22:45:10 -0000 1.4
+++ configure.ac 30 Nov 2005 23:37:26 -0000
@@ -51,7 +51,7 @@
JG_COMMON
JG_GTK_JAVA(2.8)
-PKG_CHECK_MODULES(GNOME, libgnomeui-2.0 >= 2.9.1 libgnomecanvas-2.0 >= 2.9.1)
+PKG_CHECK_MODULES(GNOME, libgnomeui-2.0 >= 2.8.0 libgnomecanvas-2.0 >= 2.8.0)
AC_SUBST(GNOME_CFLAGS)
AC_SUBST(GNOME_LIBS)
libvte-java-pkg-dir.patch:
configure.ac | 6 +++---
vte-java.pc.in | 1 +
2 files changed, 4 insertions(+), 3 deletions(-)
--- NEW FILE libvte-java-pkg-dir.patch ---
--- libvte-java-0.11.11/configure.ac.dist 2005-12-10 00:48:14.000000000 -0500
+++ libvte-java-0.11.11/configure.ac 2005-12-10 01:01:47.000000000 -0500
@@ -28,9 +28,9 @@
apiversion="0.11"
VERSION="0.11.11"
-INSTALLED_CLASSPATH=\${prefix}/share/java/vte${apiversion}-${VERSION}.jar
-INSTALLED_JNI_DIR=\${prefix}/lib/
-INSTALLED_MACRO_DIR=\${prefix}/share/libvte-java/macros/
+INSTALLED_CLASSPATH=\${datadir}/java/vte${apiversion}-${VERSION}.jar
+INSTALLED_JNI_DIR=\${libdir}/
+INSTALLED_MACRO_DIR=\${datadir}/libvte-java/macros/
AC_SUBST(INSTALLED_CLASSPATH)
AC_SUBST(INSTALLED_JNI_DIR)
AC_SUBST(INSTALLED_MACRO_DIR)
--- libvte-java-0.11.11/vte-java.pc.in.pkg-dir 2005-12-10 10:03:57.000000000 -0500
+++ libvte-java-0.11.11/vte-java.pc.in 2005-12-10 10:06:15.000000000 -0500
@@ -2,6 +2,7 @@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
+datadir=@datadir@
Name: vte-Java
pango-1.2.5-lib64.patch:
Makefile.am | 1 +
Makefile.in | 1 +
modules.c | 1 +
3 files changed, 3 insertions(+)
--- NEW FILE pango-1.2.5-lib64.patch ---
--- pango-1.2.5/pango/Makefile.am.lib64 2003-08-25 10:12:45.000000000 -0400
+++ pango-1.2.5/pango/Makefile.am 2003-12-08 18:43:51.000000000 -0500
@@ -16,6 +16,7 @@
-DPANGO_ENABLE_BACKEND \
-DPANGO_ENABLE_ENGINE \
-DSYSCONFDIR=\"$(sysconfdir)\" \
+ -DHOST=\"$(host_triplet)\" \
-DLIBDIR=\"$(libdir)\" \
-DMODULE_VERSION=\"$(PANGO_MODULE_VERSION)\" \
-DG_DISABLE_DEPRECATED \
--- pango-1.2.5/pango/modules.c.lib64 2002-12-06 19:54:27.000000000 -0500
+++ pango-1.2.5/pango/modules.c 2003-12-08 18:43:51.000000000 -0500
@@ -353,6 +353,7 @@
if (!file_str)
file_str = g_build_filename (pango_get_sysconf_subdirectory (),
+ HOST,
"pango.modules",
NULL);
--- pango-1.2.5/pango/Makefile.in.lib64 2003-12-09 10:48:24.000000000 -0500
+++ pango-1.2.5/pango/Makefile.in 2003-12-09 10:48:32.000000000 -0500
@@ -135,6 +135,7 @@
-DPANGO_ENABLE_BACKEND \
-DPANGO_ENABLE_ENGINE \
-DSYSCONFDIR=\"$(sysconfdir)\" \
+ -DHOST=\"$(host_triplet)\" \
-DLIBDIR=\"$(libdir)\" \
-DMODULE_VERSION=\"$(PANGO_MODULE_VERSION)\" \
-DG_DISABLE_DEPRECATED \
pango-skip-cairo-check.patch:
configure.in | 3 ++-
1 files changed, 2 insertions(+), 1 deletion(-)
--- NEW FILE pango-skip-cairo-check.patch ---
--- frysk-0.0.0.20051211.1/pango-1.10.0/configure.in.skip-cairo-check 2005-12-11 14:15:50.000000000 -0500
+++ frysk-0.0.0.20051211.1/pango-1.10.0/configure.in 2005-12-11 14:15:55.000000000 -0500
@@ -286,7 +286,8 @@
if $have_cairo_win32 && $have_win32; then
AC_DEFINE(HAVE_CAIRO_WIN32, 1, [Whether Cairo uses the Win32 GDI for fonts])
else
- AC_CHECK_LIB(cairo, cairo_ft_scaled_font_lock_face, have_cairo_freetype=true, :)
+ # AC_CHECK_LIB(cairo, cairo_ft_scaled_font_lock_face, have_cairo_freetype=true, :)
+ have_cairo_freetype=true
if $have_cairo_freetype && $have_freetype ; then
AC_DEFINE(HAVE_CAIRO_FREETYPE, 1, [Whether Cairo uses FreeType for fonts])
else
pango-slighthint.patch:
pangoft2.c | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
--- NEW FILE pango-slighthint.patch ---
--- pango-1.2.2/pango/pangoft2.c.slighthint 2003-05-29 18:34:36.000000000 -0400
+++ pango-1.2.2/pango/pangoft2.c 2003-05-29 19:39:08.000000000 -0400
@@ -210,6 +210,7 @@
FcPattern *pattern;
FcChar8 *filename;
FcBool antialias, hinting, autohint;
+ int hintstyle;
int id;
pattern = ft2font->font_pattern;
@@ -233,8 +234,21 @@
FC_HINTING, 0, &hinting) != FcResultMatch)
hinting = FcTrue;
- if (!hinting)
- ft2font->load_flags |= FT_LOAD_NO_HINTING;
+ if (FcPatternGetInteger (pattern, FC_HINT_STYLE, 0, &hintstyle) != FcResultMatch)
+ hintstyle = FC_HINT_FULL;
+
+ if (!hinting || hintstyle == FC_HINT_NONE)
+ ft2font->load_flags |= FT_LOAD_NO_HINTING;
+
+ switch (hintstyle) {
+ case FC_HINT_SLIGHT:
+ case FC_HINT_MEDIUM:
+ ft2font->load_flags |= FT_LOAD_TARGET_LIGHT;
+ break;
+ default:
+ ft2font->load_flags |= FT_LOAD_TARGET_NORMAL;
+ break;
+ }
/* force autohinting if requested */
if (FcPatternGetBool (pattern,
--- NEW FILE sources ---
467d473c2fd43e124bcab02b6548c135 glib-2.9.4.tar.bz2
46052b2c2aed6698275c54b7bd51cb38 glib-java-0.2.2.tar.gz
0d80f23213a9ca0ea60dc4879efffec3 fontconfig-2.3.93.tar.gz
d0b7111a14f90ec3afa777ec40c44984 cairo-1.0.2.tar.gz
cc2c90fec19cdcafd177463e85595120 cairo-java-1.0.2.tar.gz
3e1a72b0324a03f8710b9cd13f98c81f pango-1.11.2.tar.bz2
d8c012f67a8f23fa9aa495fca5331784 update-scripts.tar.gz
c2c0318d4dcd64315486850907b8e78d gtk+-2.8.10.tar.bz2
fd1f2349ece8a63257c7ffedfa6316af atk-1.11.2.tar.bz2
76e5048d11a71060a7cc08df8ef7018e libgtk-java-2.8.2.tar.gz
e4734a59f1f2308d7714dc0ebf8163f1 libglade-2.5.1.tar.bz2
44a223d1c6d66f15288360bbd2ed0c22 libglade-java-2.12.1.tar.gz
a81b9d7ca9a5dfbcbbb7524ca900cf69 libvte-java-0.11.11.tar.gz
1ef201f29283179c8e5ab618529cac78 antlr-2.7.5.tar.gz
ce29ecc05d63fdb419737fd00c04c281 jdom-1.0.tar.gz
958178e1427c8fdde93a891e7fc1e526 frysk-0.0.1.2006.01.22.tar.bz2
--- NEW FILE update.sh ---
#!/bin/sh
# Update <<upstream>>
( cd ../RHEL-4 && cvs update )
# Make a list of files that need to be pulled over
( cd ../RHEL-4
echo .cvsignore
echo sources
awk '{print $2}' sources
awk '/^Source[0-9]*:/ && !/%/ && !/http:/ {print $2}' frysk.spec
awk '/^Patch[0-9]*:/ {print $2}' frysk.spec
) | sort -u | while read source ; do
if ! cmp -s ../RHEL-4/${source} ${source} ; then
echo ${source}
cp ../RHEL-4/${source} .
fi
done
# Drag over the mashed frysk.spec file.
sed < ../RHEL-4/frysk.spec > frysk.spec \
-e 's,^\(%define build_frysk\).*$,\1 0,' \
-e 's,^\(Release:.*\).EL4.\(.*\)$,\1.FC4.\2,' \
-e 's,^\(%define frysk_gcc_suffix\).*,\1 %{nil},'
More information about the fedora-cvs-commits
mailing list