diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-05-17 18:53:45 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-05-17 18:53:45 +0200 |
commit | b84f8dfdf58409163a410c241009870ecbd35952 (patch) | |
tree | 0ae6ab56ed3cbbc209f7ed0691a7fca52dc5d093 /community/lazarus | |
parent | 6feb300093e37e58027d52ca5734624565e09598 (diff) | |
parent | f675762300c4ee2717e029975bb3f94312245276 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/ccrtp/PKGBUILD
community/freerdp/PKGBUILD
community/python2-pymongo/PKGBUILD
community/yaz/PKGBUILD
extra/apr/PKGBUILD
extra/gnome-panel/PKGBUILD
extra/perl-ev/PKGBUILD
extra/poppler/PKGBUILD
extra/sqlite/PKGBUILD
extra/vim/PKGBUILD
extra/xfce4-mount-plugin/PKGBUILD
extra/xfce4-mpc-plugin/PKGBUILD
extra/xfce4-smartbookmark-plugin/PKGBUILD
multilib/lib32-atk/PKGBUILD
multilib/lib32-cairo/PKGBUILD
multilib/lib32-e2fsprogs/PKGBUILD
multilib/lib32-gmp/PKGBUILD
multilib/lib32-libldap/PKGBUILD
multilib/lib32-libssh2/PKGBUILD
multilib/lib32-libxi/PKGBUILD
multilib/lib32-mpg123/PKGBUILD
multilib/lib32-openssl/PKGBUILD
multilib/lib32-v4l-utils/PKGBUILD
testing/glib2/PKGBUILD
testing/openmpi/PKGBUILD
Diffstat (limited to 'community/lazarus')
-rw-r--r-- | community/lazarus/ChangeLog | 5 | ||||
-rw-r--r-- | community/lazarus/PKGBUILD | 19 | ||||
-rw-r--r-- | community/lazarus/lazcontrols2.diff | 46 |
3 files changed, 65 insertions, 5 deletions
diff --git a/community/lazarus/ChangeLog b/community/lazarus/ChangeLog index d435cb744..1e4776b1d 100644 --- a/community/lazarus/ChangeLog +++ b/community/lazarus/ChangeLog @@ -1,3 +1,8 @@ +2012-05-15 BlackIkeEagle + * fix lazcontrols failure + see: http://doublecmd.sourceforge.net/mantisbt/view.php?id=347 + * add compiled files again + 2012-05-08 BlackIkeEagle * fix FS#29807 * should not have removed Makefiles diff --git a/community/lazarus/PKGBUILD b/community/lazarus/PKGBUILD index 97c9c1c7c..a79b15671 100644 --- a/community/lazarus/PKGBUILD +++ b/community/lazarus/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 70466 2012-05-08 18:21:20Z idevolder $ +# $Id: PKGBUILD 70728 2012-05-15 20:37:13Z idevolder $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jens Adam (byte/jra) <j_adam@web.de> # Contributor: BlackIkeEagle <ike DOT devolder AT gmail DOT com> @@ -6,18 +6,27 @@ pkgbase=lazarus pkgname=('lazarus' 'lazarus-gtk2' 'lazarus-qt') pkgver=0.9.30.4 -pkgrel=3 +pkgrel=4 url='http://www.lazarus.freepascal.org/' license=('GPL2' 'MPL' 'custom:LGPL') arch=('i686' 'x86_64' 'mips64el') makedepends=('fpc' 'fpc-src' 'gtk2' 'qt4pas' 'rsync') options=('!emptydirs' '!makeflags') -source=(http://downloads.sourceforge.net/project/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20$pkgver/lazarus-$pkgver-src.tar.bz2) -md5sums=('ebd40cdfdfc4b66d1ced7a0d48d6da84') +source=("http://downloads.sourceforge.net/project/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20$pkgver/lazarus-$pkgver-src.tar.bz2" + 'lazcontrols2.diff' +) +md5sums=('ebd40cdfdfc4b66d1ced7a0d48d6da84' + '288bca6ad5ade79deec34c3602daaaa9' +) build() { cd $srcdir/${pkgbase} + ( # patch lazcontrols + cd components/lazcontrols + patch -p0 -i "$srcdir/lazcontrols2.diff" + ) + # build gtk2 ide make FPC=/usr/bin/fpc LCL_PLATFORM=gtk2 clean bigide # move gtk binaries @@ -51,7 +60,7 @@ package_lazarus() { --exclude="*.rst" --exclude=".#*" \ --exclude="*.~*" --exclude="*.bak" \ --exclude="*.orig" --exclude="*.rej" \ - --exclude=".xvpics" --exclude="*.compiled" \ + --exclude=".xvpics" \ --exclude="killme*" --exclude=".gdb_hist*" \ --exclude="debian" --exclude="COPYING*" \ --exclude="*.app" --exclude="tools/install" \ diff --git a/community/lazarus/lazcontrols2.diff b/community/lazarus/lazcontrols2.diff new file mode 100644 index 000000000..4748ae380 --- /dev/null +++ b/community/lazarus/lazcontrols2.diff @@ -0,0 +1,46 @@ +Index: Makefile.fpc +=================================================================== +--- Makefile.fpc (wersja 37097) ++++ Makefile.fpc (kopia robocza) +@@ -51,6 +51,6 @@ + -$(DEL) $(COMPILER_UNITTARGETDIR)/lazcontrols$(PPUEXT) + + compiled: +- $(COPY) Makefile.compiled $(COMPILER_UNITTARGETDIR)/LazControls.compiled ++ $(CPPROG) -f Makefile.compiled $(COMPILER_UNITTARGETDIR)/LazControls.compiled + + all: cleartarget $(COMPILER_UNITTARGETDIR) lazcontrols$(PPUEXT) compiled +Index: Makefile.compiled +=================================================================== +--- Makefile.compiled (wersja 37097) ++++ Makefile.compiled (kopia robocza) +@@ -1,5 +1,5 @@ + <?xml version="1.0"?> + <CONFIG> + <Makefile Value="True"/> +- <Params Value=" -MObjFPC -Scghi -O1 -gl -vewnhi -l -Fu../../lcl/units/%(CPU_TARGET)-%(OS_TARGET);../../lcl/units/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);../../packager/units/%(CPU_TARGET)-%(OS_TARGET);. -Fi. -dLCL -dLCL%(LCL_PLATFORM)"/> ++ <Params Value=" -MObjFPC -Scghi -O1 -gl -vewnhi -l -Fu../../lcl/units/%(CPU_TARGET)-%(OS_TARGET);../../lcl/units/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);../../packager/units/%(CPU_TARGET)-%(OS_TARGET);.;.;lib/%(CPU_TARGET)-%(OS_TARGET) -Fi. -dLCL -dLCL%(LCL_PLATFORM) lazcontrols.pas"/> + </CONFIG> +Index: Makefile +=================================================================== +--- Makefile (wersja 37097) ++++ Makefile (kopia robocza) +@@ -2961,5 +2961,5 @@ + cleartarget: + -$(DEL) $(COMPILER_UNITTARGETDIR)/lazcontrols$(PPUEXT) + compiled: +- $(COPY) Makefile.compiled $(COMPILER_UNITTARGETDIR)/LazControls.compiled ++ $(CPPROG) -f Makefile.compiled $(COMPILER_UNITTARGETDIR)/LazControls.compiled + all: cleartarget $(COMPILER_UNITTARGETDIR) lazcontrols$(PPUEXT) compiled +Index: lazcontrols.lpk +=================================================================== +--- lazcontrols.lpk (wersja 37097) ++++ lazcontrols.lpk (kopia robocza) +@@ -10,6 +10,7 @@ + <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/> + </SearchPaths> + <Other> ++ <CustomOptions Value="$(IDEBuildOptions)"/> + <CompilerPath Value="$(CompPath)"/> + </Other> + </CompilerOptions> |