Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=kdetesting.git;a=commitdiff;h=2c3a3371be79ea4d7e874f1d67348caac784bd8d
commit 2c3a3371be79ea4d7e874f1d67348caac784bd8d
Merge: 9e6746e 8973eaf
Author: Melko <me...@frugalware.org>
Date: Fri Sep 9 17:34:37 2011 +0200
Merge remote-tracking branch 'frugalware-current/master'
Conflicts:
source/xapps-extra/k3d/FrugalBuild
source/xapps-extra/lyx/FrugalBuild
diff --cc source/xapps-extra/k3d/FrugalBuild
index 5719756,3e44b20..55ed7ec
--- a/source/xapps-extra/k3d/FrugalBuild
+++ b/source/xapps-extra/k3d/FrugalBuild
@@@ -16,15 -16,17 +16,16 @@@ _F_sourceforge_ext=".tar.gz
## trick to fix up2date
_F_sourceforge_name="$pkgname-source"
Finclude sourceforge cmake
- source=(${source[@]} \
- $pkgname-0.7.11.0-libpng14.patch \
- k3d-gtkmm-224.patch)
+ source=($source \
-$pkgname-0.7.11.0-libpng14.patch \
-$pkgname-gcc-4.6.patch \
-$pkgname-gtkmm2.24.patch)
++ $pkgname-0.7.11.0-libpng14.patch \
++ $pkgname-gcc-4.6.patch \
++ $pkgname-gtkmm2.24.patch)
url="http://www.k-3d.org/";
sha1sums=('5d677aef76053b01281476ae25f0bd4e998d319c' \
'068bb0671d608cdc59f556011491685725a56360' \
- 'ccb3198534afa59d5551bfdbef7f0697ad5c391a')
- CXXFLAGS="$CXXFLAGS -fpermissive"
+ '3f20ebb16cf8849ecc5caded583b11b2f25e6e16' \
+ 'd6857963451ff201320ffa5b9dd3212f057f7374')
-
build() {
Fcd $_F_sourceforge_name-$pkgver
rm -f CMakeCache.txt || Fdie
diff --cc source/xapps-extra/lyx/FrugalBuild
index 38038f8,e24ef96..4d5572b
--- a/source/xapps-extra/lyx/FrugalBuild
+++ b/source/xapps-extra/lyx/FrugalBuild
@@@ -3,11 -3,11 +3,11 @@@
# Contributor: Bence Nagy <nagybe...@tipogral.hu>
pkgname=lyx
- pkgver=2.0.0
- pkgrel=2
+ pkgver=2.0.1
+ pkgrel=1
pkgdesc="An advanced open-source document processor based on TeX"
url='http://www.lyx.org'
-depends=('texlive' 'python' 'perl' 'imagemagick>=6.6.1_5-1' 'aspell'
'libboost>=1.46.1' 'libqtgui>=4.6.2-3' 'util-linux-ng>=2.16')
+depends=('texlive' 'python' 'perl' 'imagemagick>=6.6.8_5-3' 'aspell'
'libboost>=1.46.1' 'libqtgui>=4.6.2-3' 'util-linux-ng>=2.16')
makedepends=('boost>=1.46.1')
groups=('xapps-extra')
archs=('i686' 'x86_64')
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
