diff --git a/gtk-integration/PKGBUILD b/gtk-integration/PKGBUILD index d760403de..222d83cde 100644 --- a/gtk-integration/PKGBUILD +++ b/gtk-integration/PKGBUILD @@ -8,31 +8,34 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf pkgname=gtk-integration -pkgver=1.3 -pkgrel=2 +pkgver=1.4 +pkgrel=1 iconspkgver=2.5.0 -widgetpkgver=3.2 +widgetpkgver=0.7.7 chthemever=0.3.1 -_kdever=44 _colors=3.0 pkgdesc="A bundles and gtk apps integration package for Chakra GNU/Linux" arch=('i686' 'x86_64') -url="http://www.nanolx.org/home/item/75-oxygen-refit - http://kde-look.org/content/show.php/Oxygen-Molecule+KDE+%26+GTK%2B+unified+theme?content=103741 - -http://plasmasturm.org/programs/gtk-chtheme/ - http://code.google.com/p/princeamds-code/" +url=("http://www.nanolx.org/home/item/75-oxygen-refit" + "http://kde-look.org/content/show.php/gtk-oxygen-engine?content=129715" + "http://plasmasturm.org/programs/gtk-chtheme/" + "http://code.google.com/p/princeamds-code/") + license=('LGPL3' 'GPL') -depends=('qt' 'oxygen-icons' 'python2' 'gtk2' 'pygtk') -makedepends=('findutils' 'imagemagick' 'liblqr') -provides=('gtk-integration' 'oxygenrefit2-icon-theme' 'oxygen-molecule-theme' 'gtk-chtheme' 'gtk-icon-theme-changer') +depends=('kdelibs' 'qt' 'oxygen-icons' 'python2' 'gtk2' 'pygtk') +makedepends=('gcc' 'cmake' 'findutils' 'imagemagick' 'liblqr') +provides=('gtk-integration' 'oxygenrefit2-icon-theme' 'gtk-oxygen-engine' 'gtk-chtheme' 'gtk-icon-theme-changer') +conflicts=('oxygenrefit2-icon-theme' 'gtk-oxygen-engine' 'gtk-oxygen-engine-git' 'gtk-chtheme' 'gtk-icon-theme-changer') source=("http://download.tuxfamily.org/oxygenrefit2/oxygen-refit-2-$iconspkgver.tar.bz2" - "http://kde-look.org/CONTENT/content-files/103741-Oxygen-Molecule_${widgetpkgver}_theme.tar.gz" + "http://kde-look.org/CONTENT/content-files/129715-gtk-oxygen-engine-$widgetpkgver.tgz" "http://plasmasturm.org/programs/gtk-chtheme/gtk-chtheme-$chthemever.tar.bz2" "http://chakra-project.org/sources/gtk-integration/gtk-icon-theme-changer.tar.gz") md5sums=('60f32f98d8d33d82db79b6bb934f0580' - '90e852de1ab202fa0dafb038b829846d' + 'bc034cd906d67bc461e5fcb19971aff2' 'f688053bf26dd6c4f1cd0bf2ee33de2a' 'fb9519061e9cf26577d34b02171c256b') @@ -40,23 +43,12 @@ function create_install() { cat > "${startdir}/${pkgname}.install" < Appearance -> Colors' and selecting the OxygenMolecule. - # - # Also, to make sure your GTK apps use only the Oxygen Molecule color scheme, - # navigate to \`System Settings -> Appearance -> Colors -> Options (tab)' and - # uncheck the "Apply colors to non-KDE4 applications" option. - EOF } @@ -71,7 +63,6 @@ EOF } function build() { - # Icon theme cd ${srcdir} install -d ${pkgdir}/usr/share/icons/ @@ -80,12 +71,14 @@ function build() { find -type f -print0 | xargs -0 chmod 644 # Widget theme - mkdir -p "${pkgdir}/usr/bin" - mkdir -p "${pkgdir}/usr/share/themes" - mkdir -p "${pkgdir}/usr/share/apps/color-schemes" - tar -xzf kde${_kdever}-oxygen-molecule.tar.gz -C "${pkgdir}/usr/share/themes" - cp Oxygen-Molecule_${_colors}.colors "${pkgdir}/usr/share/apps/color-schemes" - install -m 755 flatmolecule "${pkgdir}/usr/bin/" + cd $srcdir/gtk-oxygen-engine-$widgetpkgver + rm -rf build + mkdir build && cd build + cmake -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr .. || return 1 + make || return 1 + make DESTDIR=${pkgdir} install # Gtk-ChTheme cd ${srcdir}/gtk-chtheme-$chthemever @@ -98,17 +91,17 @@ function build() { cd ${srcdir} cp -a gtk-icon-theme-changer/gtk-icon-themes.py ${pkgdir}/usr/bin/gtk-icon-theme-changer chmod -R 755 "$pkgdir" - +} + +function package() { # Additional desktop files cd ${startdir} install -Dm 644 gtk-chtheme.desktop ${pkgdir}/usr/share/applications/gtk-chtheme.desktop || return 1 install -Dm 644 gtk-icon-theme-changer.desktop ${pkgdir}/usr/share/applications/gtk-icon-theme-changer.desktop || return 1 -} - -function package() { - # Create the install file create_install export install="${pkgname}.install" } + + diff --git a/gtk-integration/gtk-integration.install b/gtk-integration/gtk-integration.install index f4ab12468..619e747aa 100644 --- a/gtk-integration/gtk-integration.install +++ b/gtk-integration/gtk-integration.install @@ -1,22 +1,11 @@ post_install() { cat <<-'EOF' - - ################################################################################## - # - # GTK - Integration v1.3-2 + # GTK - Integration v1.4-1 # # If you want GTK+ apps or bundles run with root privileges to be themed as well # copy your `~/.gtkrc-2.0-kde4' file to `/root/gtkrc-2.0' # # sudo cp ~/.gtkrc-2.0-kde4 /root/.gtkrc-2.0 - # - # You may apply the Oxygen-Molecule color scheme to your KDE apps by going to - # `System Settings -> Appearance -> Colors' and selecting the OxygenMolecule. - # - # Also, to make sure your GTK apps use only the Oxygen Molecule color scheme, - # navigate to `System Settings -> Appearance -> Colors -> Options (tab)' and - # uncheck the "Apply colors to non-KDE4 applications" option. - EOF }