From 062291fe009801da61e88a99b842d4d031b6896e Mon Sep 17 00:00:00 2001 From: kueller Date: Thu, 27 Aug 2009 08:43:45 +0000 Subject: [PATCH] Diverse korrekturen und neue progs fertiggestellt git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@4866 504e572c-2e33-0410-9681-be2bf7408885 --- SysBuild/BuildCluster/BaseLibs.dmk | 3 +- SysBuild/BuildCluster/BaseSysTools.dmk | 4 +- SysBuild/BuildCluster/Tools.dmk | 11 --- SysBuild/BuildCluster/XBaseLibs.dmk | 1 + SysBuild/BuildCluster/XTools.dmk | 45 ++++++++++++ SysBuild/{guibased => network}/firefox | 20 ++++-- SysBuild/{xsys => network}/thunderbird | 98 +++++++++++++++----------- SysBuild/tools/glib-2 | 2 + SysBuild/xserv/compiz | 2 + 9 files changed, 123 insertions(+), 63 deletions(-) rename SysBuild/{guibased => network}/firefox (94%) rename SysBuild/{xsys => network}/thunderbird (73%) diff --git a/SysBuild/BuildCluster/BaseLibs.dmk b/SysBuild/BuildCluster/BaseLibs.dmk index 0f9909f..205c1ff 100644 --- a/SysBuild/BuildCluster/BaseLibs.dmk +++ b/SysBuild/BuildCluster/BaseLibs.dmk @@ -37,6 +37,7 @@ 0 tools/lcms 0 tools/libmng 0 tools/glib-2 +0 tools/glib-1 0 tools/libIDL 0 multimedia/libmpeg3 0 multimedia/libfame @@ -52,11 +53,11 @@ 0 multimedia/libmikmod 0 tools/libotr 0 security/integrit +0 multimedia/flac #Keine Abhängigkeiten finden können #Kompiliert auch nicht mehr #kann möglicherweise weggelassen werden! #0 tools/libPropList -#0 tools/glib-1 #Braucht gcc-3 #0 xsys/libmcal #wird vorraussichtlich durch Libquicktime ersetzt diff --git a/SysBuild/BuildCluster/BaseSysTools.dmk b/SysBuild/BuildCluster/BaseSysTools.dmk index c9828cb..2abeff9 100755 --- a/SysBuild/BuildCluster/BaseSysTools.dmk +++ b/SysBuild/BuildCluster/BaseSysTools.dmk @@ -165,8 +165,6 @@ 0 network/pine 0 multimedia/speex 0 multimedia/ptlib -#Compiliert nicht mehr - wird glaub ich auch gar nimmer supported..:-( -#0 tools/openh323 0 network/wpa_supplicant 0 network/libbind 0 network/bind @@ -184,6 +182,8 @@ 0 tools/txt2regex 0 network/tor 0 tools/docbookx +0 tools/docbook-xsl +0 multimedia/normalize #Vorlaeufig deaktiviert - Code kompiliert nicht mehr. Fehler scheinen zu massiv für #einfachen fix.. #0 tools/amanda diff --git a/SysBuild/BuildCluster/Tools.dmk b/SysBuild/BuildCluster/Tools.dmk index 43ef355..d3af749 100644 --- a/SysBuild/BuildCluster/Tools.dmk +++ b/SysBuild/BuildCluster/Tools.dmk @@ -81,21 +81,10 @@ #pidgin plugin - wird wohl pidgin benötigen... #0 tools/pidgin-otr -#Benötigt PostgreSQL -#0 tools/dspam #0 tools/nagios-plugins -#0 tools/jabberd -#0 tools/courier-authlib -#0 tools/courier -#braucht courier -#0 tools/clamcour #Braucht nss Librarys #0 tools/rpm #Diverse C Fehler (xx not defined in this context) #0 multimedia/sidplay-libs #0 multimedia/sidplay #0 tools/pspell -#Abhängigkeiten zu SDL.h -#0 tools/ruby-utils -#braucht die docbook tools -#0 tools/scrollkeeper diff --git a/SysBuild/BuildCluster/XBaseLibs.dmk b/SysBuild/BuildCluster/XBaseLibs.dmk index 263836e..73e032e 100644 --- a/SysBuild/BuildCluster/XBaseLibs.dmk +++ b/SysBuild/BuildCluster/XBaseLibs.dmk @@ -21,6 +21,7 @@ 0 guibased/pango 0 guibased/jasper 0 guibased/gtk+-2 +0 guibased/gtk+-1 0 guibased/lesstif 0 guibased/efltk 1 dbase/unixODBC diff --git a/SysBuild/BuildCluster/XTools.dmk b/SysBuild/BuildCluster/XTools.dmk index 3023301..dd0176a 100644 --- a/SysBuild/BuildCluster/XTools.dmk +++ b/SysBuild/BuildCluster/XTools.dmk @@ -11,3 +11,48 @@ 0 multimedia/nas 0 development/ddd 0 guibased/nedit +0 development/gtk-doc +0 security/nmap +0 guibased/gnokii +0 guibased/sane-frontends +0 guibased/SDL_image +0 guibased/SDL_ttf +0 multimedia/smpeg +0 guibased/SDL_mixer +0 multimedia/pygame +0 development/ruby-utils +0 tools/scrollkeeper +0 network/rdesktop +0 network/ethereal +0 development/ffcall +0 guibased/gd +0 dbase/postgresql +0 network/jabberd +0 network/dspam +0 network/httpd +0 multimedia/alsa-tools +0 multimedia/xmix +0 network/imap +0 network/courier-authlib +0 network/courier +0 network/courier-analog +#does not funktion +#0 security/clamcour +8 network/courier-authlib +8 network/courier-analog +8 network/courier +128 network/courier-authlib +0 network/courier-imap +0 network/sqwebmail +0 development/php +0 network/procmail +0 multimedia/xmms +0 multimedia/xmms-sid +0 security/nspr +0 security/nss +0 tools/rpm +0 tools/alien +0 multimedia/sox +0 guibased/gtkglarea +0 guibased/xscreensaver +0 network/firefox diff --git a/SysBuild/guibased/firefox b/SysBuild/network/firefox similarity index 94% rename from SysBuild/guibased/firefox rename to SysBuild/network/firefox index 81c7b87..7a73610 100644 --- a/SysBuild/guibased/firefox +++ b/SysBuild/network/firefox @@ -69,7 +69,7 @@ # # -SRCPATH=GuiBased/Apps +SRCPATH=Network/Clients SRCDIR=mozilla premk() { @@ -104,9 +104,14 @@ mk32() { --enable-system-sqlite \ --enable-safe-browsing \ --enable-url-classifier \ + --enable-svg \ --disable-installer \ + --disable-debug \ + --disable-tests \ --disable-updater \ - --disable-crashreporter + --disable-crashreporter \ + --enable-system-cairo \ + --enable-default-toolkit=cairo-gtk2 make -j $NUMCPU make -j $NUMCPU DESTDIR=$TMPROOT install cd ../mozilla* @@ -144,13 +149,14 @@ mk() { --enable-system-sqlite \ --enable-safe-browsing \ --enable-url-classifier \ + --enable-svg \ --disable-installer \ + --disable-debug \ + --disable-tests \ --disable-updater \ - --disable-crashreporter - if [ "$MK64BIT" == "true" ]; then - sed -i -e "s/\(gint previous_active\)/\/\/\1/" ../mozilla*/widget/src/gtk2/nsPrintDialogGTK.cpp - sed -i -e "s/\(gtk_combo_box_set_active(changed_box\)/\/\/\1/" ../mozilla*/widget/src/gtk2/nsPrintDialogGTK.cpp - fi + --disable-crashreporter \ + --enable-system-cairo \ + --enable-default-toolkit=cairo-gtk2 make -j $NUMCPU make -j $NUMCPU DESTDIR=$TMPROOT install } diff --git a/SysBuild/xsys/thunderbird b/SysBuild/network/thunderbird similarity index 73% rename from SysBuild/xsys/thunderbird rename to SysBuild/network/thunderbird index 1b57170..3c9701c 100644 --- a/SysBuild/xsys/thunderbird +++ b/SysBuild/network/thunderbird @@ -69,7 +69,7 @@ # # -SRCPATH=X11/Net +SRCPATH=Network/Clients SRCDIR=mozilla premk() { @@ -78,34 +78,44 @@ premk() { } mk32() { - CC="gcc $BUILDOPTIONS32" \ - CXX="g++ $BUILDOPTIONS32" \ - LDFLAGS="-L/lib -L/usr/lib -L/usr/X11R7/lib -L/opt/gnome/lib" \ - ../mozilla*/configure --target=$TARGET32 \ - --build=$TARGET32 \ - --host=$TARGET32 \ - --prefix=/opt/firefox \ - --libexecdir=/opt/firefox/bin \ - --sysconfdir=/etc/sysconfig/firefox \ - --x-includes=/usr/X11R7/include \ - --x-libraries=/usr/X11R7/$LIBDIR \ - --with-x \ - --with-pthreads \ - --with-system-jpeg \ - --with-system-zlib \ - --with-system-png \ - --with-java-include-path=/usr/$LIBDIR/j2sdk/include \ - --with-java-bin-path=/usr/$LIBDIR/j2sdk/bin \ - --with-qt-dir=/usr/$LIBDIR/qt \ - --enable-application=mail \ - --enable-xinerama \ - --enable-image-decoders=all \ - --disable-installer \ - --disable-updater - sed -e "s/= ld$/= ld -melf_i386/" config/autoconf.mk | - sed -e "s/x86_64/i686/" >/tmp/autoconf.mk - mv /tmp/autoconf.mk config/autoconf.mk - make -j $NUMCPU + NSPR_CONFIG=/usr/X11R7/bin/nspr-config-32 \ + NSS_CONFIG=/usr/X11R7/bin/nss-config-32 \ + FT2_CONFIG=/usr/X11R7/bin/freetype-config-32 \ + CC="gcc $BUILDOPTIONS32 \ + -I/usr/X11R7/include/nss \ + -I/usr/X11R7/include/nspr \ + -I/usr/X11R7/include/cairo" \ + CXX="g++ $BUILDOPTIONS32 \ + -I/usr/X11R7/include/nspr \ + -I/usr/X11R7/include/nss \ + -I/usr/X11R7/include/cairo" \ + LDFLAGS="-L/lib -L/usr/lib -L/usr/X11R7/lib" \ + USE_ARCH=$UARCH \ + ../mozilla*/configure --host=$TARGET32 \ + --build=$TARGET32 \ + --prefix=/opt/thunderbird \ + --with-nspr-prefix=/usr/X11R7 \ + --with-nss-prefix=/usr/X11R7 \ + --with-system-nspr \ + --with-system-nss \ + --with-system-bz2 \ + --with-system-jpeg \ + --with-system-png \ + --with-system-zlib \ + --disable-debug \ + --disable-installer \ + --disable-xprint \ + --disable-tests \ + --enable-canvas \ + --enable-default-toolkit=gtk2 \ + --enable-safe-browsing \ + --enable-svg \ + --enable-system-cairo \ + --enable-system-sqlite \ + --host=$TARGET32 \ + --build=$TARGET32 \ + --enable-application=mail + make -j $NUMCPU OS_TEST=x86 make -j $NUMCPU DESTDIR=$TMPROOT install cd ../mozilla* rm -r ../build-thunderbird @@ -119,28 +129,32 @@ mk() { fi CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ - LDFLAGS="-L$LIBDIR -L/usr/$LIBDIR -L/usr/X11R7/$LIBDIR -L/opt/gnome/$LIBDIR" \ - ac_cv_visibility_pragma=no \ - ../mozilla*/configure --target=$TARGET \ + LDFLAGS="-L/$LIBDIR -L/usr/$LIBDIR -L/usr/X11R7/$LIBDIR" \ + USE_ARCH=$UARCH \ + ../mozilla*/configure --build=$TARGET \ --prefix=/opt/firefox \ - $ADDOPTIONS \ --libexecdir=/opt/firefox/bin \ --sysconfdir=/etc/sysconfig/firefox \ + $ADDOPTIONS \ --x-includes=/usr/X11R7/include \ --x-libraries=/usr/X11R7/$LIBDIR \ --with-x \ - --with-pthreads \ --with-system-jpeg \ --with-system-zlib \ - --with-system-png \ - --with-java-include-path=/usr/$LIBDIR/j2sdk/include \ - --with-java-bin-path=/usr/$LIBDIR/j2sdk/bin \ - --with-qt-dir=/usr/$LIBDIR/qt \ + --with-system-bz2 \ + --with-java-include-path=/usr/$LIBDIR/jdk/include \ + --with-java-bin-path=/usr/$LIBDIR/jdk/bin \ --enable-application=mail \ - --enable-xinerama \ + --enable-startup-notification \ + --with-qt-dir=/opt/qt-4 \ + --enable-nativ-uconf \ --enable-image-decoders=all \ + --enable-system-sqlite \ + --enable-safe-browsing \ + --enable-url-classifier \ --disable-installer \ - --disable-updater + --disable-updater \ + --disable-crashreporter make -j $NUMCPU make -j $NUMCPU DESTDIR=$TMPROOT install } @@ -153,14 +167,14 @@ postmk() { echo "pref(\"network.protocol-handler.app.https\", \"firefox\");" >>$TMPROOT/opt/firefox/lib/thunderbird*/defaults/pref/all-thunderbird.js if [ "$MK64BIT" == "true" ]; then cd $TMPROOT/opt/firefox/lib64 - ln -s thunderbird* thunderbird + ln -s thunderbird-[0-9]* thunderbird cd - cd $TMPROOT/opt/firefox/include ln -s thunderbird* thunderbird cd - fi cd $TMPROOT/opt/firefox/lib - ln -s thunderbird* thunderbird + ln -s thunderbird-[0-9]* thunderbird cd - cd $TMPROOT/opt/firefox/include ln -s thunderbird* thunderbird diff --git a/SysBuild/tools/glib-2 b/SysBuild/tools/glib-2 index 4bf10ba..b23c5c4 100644 --- a/SysBuild/tools/glib-2 +++ b/SysBuild/tools/glib-2 @@ -90,6 +90,7 @@ mk32() { make -j $NUMCPU && make -j $NUMCPU DESTDIR=$TMPROOT install make distclean + sed -i -e "s%\(-I\${includedir}/glib-2.0\).*\(-I\${libdir}/glib-2.0/include\)%\2 \1%" $TMPROOT/usr/lib/pkgconfig/glib-2.0.pc } #Hier wird der Make Prozess der Sourcen definiert @@ -107,6 +108,7 @@ mk() { --with-gnu-ld && make -j $NUMCPU && make -j $NUMCPU DESTDIR=$TMPROOT install + sed -i -e "s%\(-I\${includedir}/glib-2.0\).*\(-I\${libdir}/glib-2.0/include\)%\2 \1%" $TMPROOT/usr/$LIBDIR/pkgconfig/glib-2.0.pc } #Funktion wird nach Ablauf des Make Prozesses ausgeführt, und kann diff --git a/SysBuild/xserv/compiz b/SysBuild/xserv/compiz index da1da46..1b26a83 100644 --- a/SysBuild/xserv/compiz +++ b/SysBuild/xserv/compiz @@ -78,6 +78,7 @@ premk() { mk32() { CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ + USE_ARCH=$UARCH \ ./configure --host=$TARGET32 \ --localstatedir=/var \ --infodir=/usr/share/info \ @@ -92,6 +93,7 @@ mk32() { mk() { CC="gcc $BUILDOPTIONS" \ CXX="g++ $BUILDOPTIONS" \ + USE_ARCH=$UARCH \ ./configure --host=$TARGET \ --localstatedir=/var \ --infodir=/usr/share/info \