[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/work/gpg4win/scripts/debian-xcompile
From:       Andre Heinecke <aheinecke () intevation ! de>
Date:       2013-04-17 12:55:38
Message-ID: 20130417125538.708C7AC87A () svn ! kde ! org
[Download RAW message or body]

SVN commit 1349876 by aheinecke:

Fix qt build options and adapt dependencies for wheezy.

Only wheezy is the supported distribution now as I don't
want to maintain more then one.


 M  +4 -1      10-build-qt.sh  
 M  +11 -49    config  


--- branches/work/gpg4win/scripts/debian-xcompile/10-build-qt.sh #1349875:1349876
@@ -28,6 +28,9 @@
     QT_FLAGS_ACTUAL="$QT_FLAGS_ACTUAL -system-$i"
 done
 
-yes yes | run "Configuring native Qt build" "$QT_SRC/configure" $QT_FLAGS_ACTUAL
+cd $QT_SRC
 
+echo yes | run "Configuring native Qt build" "./configure" $QT_FLAGS_ACTUAL
+
 run "Building minimal native Qt" $NICENESS make -j$MAKE_JOBS
+cd $(dirname "$0")
--- branches/work/gpg4win/scripts/debian-xcompile/config #1349875:1349876
@@ -31,66 +31,28 @@
 
 readonly debian_version="$(cat /etc/debian_version)" || die "Cannot read \
/etc/debian_version"  case "$debian_version" in
-    4.0*) # etch
-    msg Found Etch
-    readonly etch=true
-    readonly lenny=false
-    readonly squeeze=false
+    7.0*) # Wheezy
+    msg Found Wheezy
     ;;
-    5.0*) # lenny
-    msg Found Lenny
-    readonly etch=false
-    readonly lenny=true
-    readonly squeeze=false
-    ;;
-    6.0*) # squeeze
-    msg Found Squeeze
-    readonly etch=false
-    readonly lenny=false
-    readonly squeeze=true
-    ;;
     *)
-    die "Unknown Debian version $debian_version"
+    die "Found unsupported Debian version $debian_version"
     ;;
 esac
 
 # apt-get stuff
 readonly APT_SOURCES_LIST=/etc/apt/sources.list
 readonly APT_PREFERENCES=/etc/apt/preferences
-if $etch ; then
-    readonly APT_RELEASE=etch-backports
-fi
 
-# Currently squeeze versions of autoconf and automake are used
-if $squeeze ; then
-    unset XGETTEXT
-    unset AUTOCONF
-    unset AUTOMAKE
-fi
-
 # packages needed
-readonly INSTALLER_TOOLCHAIN="mingw32 nsis stow zip unzip bzip2 texinfo imagemagick \
libglib2.0-dev tetex-bin tetex-extra gs-common hyperlatex latex-xcolor subversion \
icecc wget libjpeg62-dev libpng12-dev zlib1g-dev libdbus-1-dev libdbus-glib-1-dev \
libssl-dev libx11-dev libxext-dev autoconf automake gettext shared-mime-info \
                libsm-dev libxml2-dev libxml2-utils libxslt1-dev libbz2-dev"
-# cmake is a separate install because of a bug in the cmake package
-# which makes it impossible to install without errors when
-# emacsen-common is also being installed with the same apt-get
-# invocation.  See the following debian bugreports for details:
-# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=471975
-# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=481391
-if $etch ; then
-    # backported packages to be installed from $APT_RELEASE
-    readonly BACKPORTED_TOOLCHAIN="cmake"
-else
-    readonly INSTALLER_TOOLCHAIN2="cmake"
-fi
+readonly INSTALLER_TOOLCHAIN="gcc-mingw32 nsis stow zip unzip bzip2 texinfo \
imagemagick \ +libglib2.0-dev latex-xcolor subversion icecc wget libjpeg8-dev \
+libpng12-dev zlib1g-dev libdbus-1-dev libdbus-glib-1-dev libssl-dev \
+libx11-dev libxext-dev autoconf automake gettext shared-mime-info libsm-dev \
+libxml2-dev libxml2-utils libxslt1-dev libbz2-dev"
 
-# icecream stuff
-if $etch ; then
-    readonly ICECREAM_WEB=ftp://ftp.kdab.net/pub/gpg4win/devtools/debian-etch-mingw32-icecream-env.tar.gz
                
-    readonly ICECREAM_LOCAL=/opt/debian-etch-mingw32-icecream-env.tar.gz
-else
+# TODO: Icecream is untested on wheezy
     readonly ICECREAM_WEB=ftp://ftp.kdab.net/pub/gpg4win/devtools/debian-lenny-mingw32-icecream-env.tar.gz
  readonly ICECREAM_LOCAL=/opt/debian-lenny-mingw32-icecream-env.tar.gz
-fi
 
 # gpg4win git
 readonly GPG4WIN_GIT=git://git.gnupg.org/gpg4win.git
@@ -111,8 +73,8 @@
 readonly QT_BASENAME=qt-everywhere-opensource-src-$QT_VERSION
 readonly QT_LOCAL=$QT_BASENAME.tar.gz
 readonly QT_WEB=http://releases.qt-project.org/qt4/source/$QT_LOCAL
-readonly QT_NATIVE_FLAGS="-fast -shared -release"
-readonly QT_NATIVE_EXCLUDE="exceptions accessibility stl sql-ibase sql-mysql \
sql-odbc sql-psql sql-sqlite sql-sqlite2 qt3support xmlpatterns phonon phonon-backend \
webkit gif libtiff libmng nis cups iconv separate-debug-info nas-sound opengl \
xinerama xcursor xfixes xrandr xrender fontconfig tablet xkb glib" +readonly \
QT_NATIVE_FLAGS="-fast -shared -release -opensource" +readonly \
QT_NATIVE_EXCLUDE="exceptions accessibility stl sql-ibase sql-mysql sql-odbc sql-psql \
sql-sqlite sql-sqlite2 qt3support xmlpatterns phonon phonon-backend webkit gif \
libtiff libmng nis cups iconv separate-debug-info nas-sound opengl xinerama xcursor \
xfixes xrandr xrender fontconfig xkb glib"  readonly QT_NATIVE_SYSTEM="libjpeg zlib \
libpng"  
 readonly QT_SRC="$SRCDIR/$QT_BASENAME"


[prev in list] [next in list] [prev in thread] [next in thread]