karasz
/
package-update
1
0
Fork 0
Code Issues Releases Activity
Browse Source

kdelibs: further cleanup preparing for kde4 switch

user/karasz/test/ecn
Aldas Nabazas 16 years ago committed by Alejandro Mery
parent
e025af81d9
commit
22a17bd6d3
5 changed files with 38 additions and 67 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      kde/kdelibs/config.in
  2. 52
      kde/kdelibs/kdelibs.cache
  3. 10
      kde/kdelibs/kdelibs.conf
  4. 2
      kde/kdelibs/kdelibs.desc
  5. 37
      kde/kdelibs/parse-config

4
kde/kdelibs/config.in
Unescape View File

@ -18,10 +18,6 @@ if pkgcheck kdelibs X ; then
menu_begin MENU_PKG_KDE 'KDE Package Options' menu_begin MENU_PKG_KDE 'KDE Package Options'
text 'Install prefix for KDE Packages' \ text 'Install prefix for KDE Packages' \
SDECFG_PKG_KDE_CORE_PREFIX "opt/kde" SDECFG_PKG_KDE_CORE_PREFIX "opt/kde"
bool 'Increase optimization possibilities (--enable-final)' \
SDECFG_PKG_KDE_ENABLE_FINAL 0
bool 'Generate KDE Library Documentation' \
SDECFG_PKG_KDE_APIDOX 0
menu_end menu_end
fi fi

52
kde/kdelibs/kdelibs.cache
Unescape View File

@ -1,77 +1,73 @@
[TIMESTAMP] 1133990501 Wed Dec 7 22:21:41 2005 [TIMESTAMP] 1239828186 Wed Apr 15 23:43:06 2009
[BUILDTIME] 255 (9) ERROR [BUILDTIME] 1180 (5)
[SIZE] 365.24 MB, 16113 files [SIZE] 307.77 MB, 4218 files
[DEP] acl
[DEP] alsa-lib
[DEP] arts
[DEP] aspell [DEP] aspell
[DEP] attr [DEP] attr
[DEP] autoconf [DEP] automoc4
[DEP] bash [DEP] bash
[DEP] binutils [DEP] binutils
[DEP] bzip2 [DEP] bzip2
[DEP] xorg-cf-files [DEP] cmake
[DEP] coreutils [DEP] coreutils
[DEP] cups
[DEP] diffutils [DEP] diffutils
[DEP] e2fsprogs
[DEP] expat [DEP] expat
[DEP] gamin [DEP] fhs
[DEP] findutils [DEP] findutils
[DEP] fixesproto
[DEP] flex
[DEP] fontconfig [DEP] fontconfig
[DEP] freetype [DEP] freetype
[DEP] gamin
[DEP] gawk [DEP] gawk
[DEP] gcc [DEP] gcc
[DEP] gettext [DEP] glib
[DEP] glibc [DEP] glibc
[DEP] grep [DEP] grep
[DEP] imake [DEP] ilmbase
[DEP] inputproto
[DEP] jasper [DEP] jasper
[DEP] libart_lgpl23
[DEP] libdnet
[DEP] libdrm
[DEP] libice [DEP] libice
[DEP] libidn
[DEP] libjpeg [DEP] libjpeg
[DEP] libpng [DEP] libpng
[DEP] libsm [DEP] libsm
[DEP] libtiff [DEP] libungif
[DEP] libx11 [DEP] libx11
[DEP] libxau [DEP] libxau
[DEP] libxcb
[DEP] libxcursor [DEP] libxcursor
[DEP] libxdmcp [DEP] libxdmcp
[DEP] libxext [DEP] libxext
[DEP] libxfixes [DEP] libxfixes
[DEP] libxft [DEP] libxft
[DEP] libxinerama
[DEP] libxml [DEP] libxml
[DEP] libxmu [DEP] libxpm
[DEP] libxrandr
[DEP] libxrender [DEP] libxrender
[DEP] libxslt [DEP] libxslt
[DEP] libxt [DEP] libxt
[DEP] libxxf86vm [DEP] libxtst
[DEP] linux-header [DEP] linux-header
[DEP] lua
[DEP] m4
[DEP] make [DEP] make
[DEP] mdnsresponder
[DEP] mesa [DEP] mesa
[DEP] mktemp [DEP] nas
[DEP] net-tools
[DEP] openexr [DEP] openexr
[DEP] openssl [DEP] openssl
[DEP] patch
[DEP] pcre [DEP] pcre
[DEP] perl [DEP] perl
[DEP] phonon
[DEP] pkgconfig [DEP] pkgconfig
[DEP] qt3 [DEP] qt4
[DEP] renderproto [DEP] renderproto
[DEP] sed [DEP] sed
[DEP] shared-mime-info
[DEP] soprano
[DEP] strigi
[DEP] sysfiles [DEP] sysfiles
[DEP] tar [DEP] tar
[DEP] util-linux [DEP] util-linux
[DEP] valgrind
[DEP] xextproto [DEP] xextproto
[DEP] xproto [DEP] xproto
[DEP] zlib [DEP] zlib

10
kde/kdelibs/kdelibs.conf
Unescape View File

@ -14,16 +14,6 @@
# GNU General Public License can be found in the file COPYING. # GNU General Public License can be found in the file COPYING.
# --- SDE-COPYRIGHT-NOTE-END --- # --- SDE-COPYRIGHT-NOTE-END ---
if [ "$SDECFG_PKG_KDE_APIDOX" ] ; then
echo_status "KDE library documentation will be generated."
var_insert makeinstopt " " "apidox"
fi
# If kerberos config is available use it.
if [ -n "$KRB5_CONFIG" ] ; then
var_append extraconfopt " " "--with-gssapi=yes"
fi
kde_pm() { kde_pm() {
cat > $root/etc/profile.d/kde <<-EOP cat > $root/etc/profile.d/kde <<-EOP

2
kde/kdelibs/kdelibs.desc
Unescape View File

@ -30,7 +30,7 @@
[M] Nagy Karoly Gabriel <[email protected]> [M] Nagy Karoly Gabriel <[email protected]>
[C] extra/development extra/desktop/kde [C] extra/development extra/desktop/kde
[F] FPIC-QUIRK KDE [F] KDE
[L] GPL [L] GPL
[S] Stable [S] Stable

37
kde/kdelibs/parse-config
Unescape View File

@ -15,11 +15,11 @@
if hasflag KDE; then if hasflag KDE; then
if [ "$prefix_auto" = 1 ] ; then if [ "$prefix_auto" = 1 ] ; then
if [ "$pkg" == "kdelibs" ]; then if [ "$pkg" == "automoc4" ]; then
prefix="${SDECFG_PKG_KDE_CORE_PREFIX:-opt/kde}" prefix="${SDECFG_PKG_KDE_CORE_PREFIX:-opt/kde}"
else else
pkgprefix -t kdelibs pkgprefix -t automoc4
prefix=`pkgprefix kdelibs` prefix=`pkgprefix automoc4`
fi fi
set_confopt set_confopt
fi fi
@ -29,26 +29,15 @@ if hasflag KDE; then
export PATH="$(pkgprefix bindir qt4):$PATH" export PATH="$(pkgprefix bindir qt4):$PATH"
export LD_LIBRARY_PATH="$QTDIR/${libdir##*/}:/$prefix/${libdir##*/}:$LD_LIBRARY_PATH" export LD_LIBRARY_PATH="$QTDIR/${libdir##*/}:/$prefix/${libdir##*/}:$LD_LIBRARY_PATH"
# some feature and optimization settings ... kde_cmake()
if pkginstalled openldap; then {
pkgprefix -t openldap mkdir build; cd build
var_append confopt " " "--with-ldap=$root/$( pkgprefix openldap )" var_remove_regex confopt ' ' '--.*'
fi var_remove_regex extraconfopt ' ' '--.*'
var_append extraconfopt " " "-DCMAKE_INSTALL_PREFIX=/$prefix -DCMAKE_LIBRARY_PATH=$libdir"
# FIXME: no conditionals? eval cmake $confopt $extraconfopt ..
var_append confopt " " "--with-xinerama --enable-dnotify" }
[ "$SDECFG_PKG_KDE_ENABLE_FINAL" != "1" ] ||
var_append confopt " " "--enable-final"
if [ $arch = x86 ]; then
var_append confopt " " "--enable-fast-malloc=full"
fi
if [[ $libdir != *lib ]]; then
var_append confopt " " "--enable-libsuffix=${libdir##*/lib}"
fi
# HACK around test for kdelibs hook_add preconf 3 "kde_cmake"
hook_add preconf 5 "mkdir build; cd build; .. $confopt $extraconfopt"
fi fi

Write Preview
Loading…
Cancel
Save