diff options
Diffstat (limited to 'java/eclipse-devel/files/post-patch-plugins-org.eclipse.swt-Eclipse_SWT_PI-gtk-library-build.sh')
| -rw-r--r-- | java/eclipse-devel/files/post-patch-plugins-org.eclipse.swt-Eclipse_SWT_PI-gtk-library-build.sh | 83 |
1 files changed, 60 insertions, 23 deletions
diff --git a/java/eclipse-devel/files/post-patch-plugins-org.eclipse.swt-Eclipse_SWT_PI-gtk-library-build.sh b/java/eclipse-devel/files/post-patch-plugins-org.eclipse.swt-Eclipse_SWT_PI-gtk-library-build.sh index ee57619488c9..88b57e05c52a 100644 --- a/java/eclipse-devel/files/post-patch-plugins-org.eclipse.swt-Eclipse_SWT_PI-gtk-library-build.sh +++ b/java/eclipse-devel/files/post-patch-plugins-org.eclipse.swt-Eclipse_SWT_PI-gtk-library-build.sh @@ -1,5 +1,5 @@ ---- gtk/library/build.sh.orig 2008-08-02 20:48:26.157201172 -0400 -+++ gtk/library/build.sh 2008-08-02 22:49:45.246241822 -0400 +--- gtk/library/build.sh.orig 2008-09-11 21:18:02.725614374 -0400 ++++ gtk/library/build.sh 2008-09-11 21:18:07.455632295 -0400 @@ -50,6 +50,10 @@ fi fi @@ -20,7 +20,7 @@ SWT_PTR_CFLAGS=-DSWT_PTR_SIZE_64 export SWT_PTR_CFLAGS if [ -d /lib64 ]; then -@@ -74,23 +78,28 @@ +@@ -74,47 +78,44 @@ fi fi @@ -30,43 +30,80 @@ -else - echo "libgnome-2.0 and libgnomeui-2.0 not found:" - echo " *** SWT Program support for GNOME will not be compiled." +-fi +- +-if [ x`pkg-config --exists cairo && echo YES` = "xYES" ]; then +- echo "Cairo found, compiling SWT support for the cairo graphics library." +- MAKE_CAIRO=make_cairo +-else +- echo "Cairo not found:" +- echo " *** Advanced graphics support using cairo will not be compiled." +if [ x${MAKE_GNOME} = "xmake_gnome" ]; then + if [ x`pkg-config --exists gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0 && echo YES` = "xYES" ]; then + echo "libgnomeui-2.0 found, compiling SWT program support using GNOME" -+ MAKE_GNOME=make_gnome ++ _MAKE_GNOME=make_gnome + else + echo "libgnome-2.0 and libgnomeui-2.0 not found:" + echo " *** SWT Program support for GNOME will not be compiled." + fi fi --if [ x`pkg-config --exists cairo && echo YES` = "xYES" ]; then -- echo "Cairo found, compiling SWT support for the cairo graphics library." -- MAKE_CAIRO=make_cairo --else -- echo "Cairo not found:" -- echo " *** Advanced graphics support using cairo will not be compiled." +-if [ -z "${MOZILLA_INCLUDES}" -a -z "${MOZILLA_LIBS}" ]; then +- if [ x`pkg-config --exists mozilla-xpcom && echo YES` = "xYES" ]; then +- MOZILLA_INCLUDES=`pkg-config --cflags mozilla-xpcom` +- MOZILLA_LIBS=`pkg-config --libs mozilla-xpcom` +- export MOZILLA_INCLUDES +- export MOZILLA_LIBS +- MAKE_MOZILLA=make_mozilla +- elif [ x`pkg-config --exists firefox-xpcom && echo YES` = "xYES" ]; then +- MOZILLA_INCLUDES=`pkg-config --cflags firefox-xpcom` +- MOZILLA_LIBS=`pkg-config --libs firefox-xpcom` +- export MOZILLA_INCLUDES +- export MOZILLA_LIBS +- MAKE_MOZILLA=make_mozilla +- elif [ x`pkg-config --exists libxul && echo YES` = "xYES" ]; then +- MOZILLA_INCLUDES=`pkg-config --cflags libxul` +- MOZILLA_LIBS=`pkg-config --libs libxul` +- export MOZILLA_INCLUDES +- export MOZILLA_LIBS +- MAKE_MOZILLA=make_mozilla +if [ x${MAKE_CAIRO} = "xmake_cairo" ]; then + if [ x`pkg-config --exists cairo && echo YES` = "xYES" ]; then + echo "Cairo found, compiling SWT support for the cairo graphics library." -+ MAKE_CAIRO=make_cairo -+ else ++ _MAKE_CAIRO=make_cairo + else +- echo "None of the following libraries were found: Mozilla/XPCOM, Firefox/XPCOM, or XULRunner/XPCOM" +- echo " *** Mozilla embedding support will not be compiled." + echo "Cairo not found:" + echo " *** Advanced graphics support using cairo will not be compiled." -+ fi + fi fi --if [ -z "${MOZILLA_INCLUDES}" -a -z "${MOZILLA_LIBS}" ]; then +if [ x${MAKE_MOZILLA} = "xmake_mozilla" ]; then + if [ -z "${MOZILLA_INCLUDES}" -a -z "${MOZILLA_LIBS}" ]; then - if [ x`pkg-config --exists mozilla-xpcom && echo YES` = "xYES" ]; then - MOZILLA_INCLUDES=`pkg-config --cflags mozilla-xpcom` - MOZILLA_LIBS=`pkg-config --libs mozilla-xpcom` -@@ -113,6 +122,7 @@ - echo "None of the following libraries were found: Mozilla/XPCOM, Firefox/XPCOM, or XULRunner/XPCOM" - echo " *** Mozilla embedding support will not be compiled." - fi ++ case ${BROWSER} in ++ "firefox" | "mozilla" | "seamonkey" | "xulrunner") ++ MOZILLA_INCLUDES=`pkg-config --cflags ${BROWSER}-xpcom` ++ MOZILLA_LIBS=`pkg-config --libs ${BROWSER}-xpcom` ++ export MOZILLA_INCLUDES ++ export MOZILLA_LIBS ++ _MAKE_MOZILLA=make_mozilla ++ ;; ++ *) ++ echo "None of the following libraries were found: Mozilla/XPCOM, Firefox/XPCOM, or XULRunner/XPCOM" ++ echo " *** Mozilla embedding support will not be compiled." ++ ;; ++ esac + fi - fi - ++fi ++ # Find AWT if available + if [ -z "${AWT_LIB_PATH}" ]; then + if [ -d ${JAVA_HOME}/jre/lib/${AWT_ARCH} ]; then +@@ -142,5 +143,5 @@ + if [ "x${1}" = "xclean" ]; then + make -f $MAKEFILE clean + else +- make -f $MAKEFILE all $MAKE_GNOME $MAKE_CAIRO $MAKE_AWT $MAKE_MOZILLA ${1} ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9} ++ make -f $MAKEFILE all $_MAKE_GNOME $_MAKE_CAIRO $MAKE_AWT $_MAKE_MOZILLA ${1} ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9} + fi |