From 47ebf7c84c0d9590649c2b98aa742a0d77d084b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Kr=C3=BCger?= Date: Fri, 12 Apr 2013 21:51:55 +0200 Subject: [PATCH 1/4] .gitignore: add /pak --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 596972e..e938936 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ testsuite qcvm gmqcc +pak distro/arch/* !distro/archlinux/git/PKGBUILD From 5bb10260b32bd5a32bdb4ed34434531ee5e473f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Kr=C3=BCger?= Date: Fri, 12 Apr 2013 22:08:10 +0200 Subject: [PATCH 2/4] PKGBUILD: git: fix for pacman 4.1.0 --- distro/archlinux/git/PKGBUILD | 31 +++++++++++-------------------- 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/distro/archlinux/git/PKGBUILD b/distro/archlinux/git/PKGBUILD index 4a9127c..4687a74 100644 --- a/distro/archlinux/git/PKGBUILD +++ b/distro/archlinux/git/PKGBUILD @@ -1,50 +1,41 @@ # Contributor: matthiaskrgr pkgname=gmqcc-git -pkgver=20130127 +pkgver=0.2.524.gc6bd5e6 +pkgver(){ + cd gmqcc + git describe --tags | sed -e 's/^gmqcc\-//' -e 's/-/./g' +} pkgrel=1 pkgdesc="An Improved Quake C Compiler" arch=('i686' 'x86_64') depends=('glibc') conflicts=('gmqcc') -provides=('gmqcc=0.2.4') +provides=('gmqcc=0.2.4')v makedepends=('git') url="https://github.com/graphitemaster/gmqcc.git" license=('MIT') +source=('gmqcc::git://github.com/graphitemaster/gmqcc.git') +sha1sums=('SKIP') -_gitroot="git://github.com/graphitemaster/gmqcc.git" -_gitname="gmqcc" build() { cd $srcdir - msg "Connecting to the GIT server..." - if [[ -d $srcdir/$_gitname ]] ; then - cd $_gitname - msg "Removing build files..." - git clean -dfx - msg "Updating..." - git pull --no-tags - msg "The local files are updated." - else - msg "Cloning..." - git clone $_gitroot $_gitname --depth 1 - msg "Clone done." - fi msg "Starting compilation..." - cd "$srcdir"/"$_gitname" + cd "$srcdir"/"gmqcc" msg "Compiling..." make } check() { - cd "$srcdir"/"$_gitname" + cd "$srcdir"/"gmqcc" make check } package() { - cd "$srcdir"/"$_gitname" + cd "$srcdir"/"gmqcc" msg "Compiling and installing to pkgdir this time..." make install DESTDIR=$pkgdir PREFIX=/usr msg "Compiling done." From f5ba2e825ff6a2143c4c7b03bcedfbdc3b53f464 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Kr=C3=BCger?= Date: Sat, 13 Apr 2013 11:19:48 +0200 Subject: [PATCH 3/4] PKGBUILD: release: fix sha1sum, minor cleanup --- distro/archlinux/git/PKGBUILD | 4 +--- distro/archlinux/release/PKGBUILD | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/distro/archlinux/git/PKGBUILD b/distro/archlinux/git/PKGBUILD index 4687a74..0ac2423 100644 --- a/distro/archlinux/git/PKGBUILD +++ b/distro/archlinux/git/PKGBUILD @@ -11,7 +11,7 @@ pkgdesc="An Improved Quake C Compiler" arch=('i686' 'x86_64') depends=('glibc') conflicts=('gmqcc') -provides=('gmqcc=0.2.4')v +provides=('gmqcc=0.2.4') makedepends=('git') url="https://github.com/graphitemaster/gmqcc.git" license=('MIT') @@ -20,8 +20,6 @@ sha1sums=('SKIP') build() { - cd $srcdir - msg "Starting compilation..." cd "$srcdir"/"gmqcc" diff --git a/distro/archlinux/release/PKGBUILD b/distro/archlinux/release/PKGBUILD index 1f8f66e..ef7de8f 100644 --- a/distro/archlinux/release/PKGBUILD +++ b/distro/archlinux/release/PKGBUILD @@ -9,7 +9,7 @@ depends=('glibc') url="https://github.com/graphitemaster/gmqcc.git" license=('MIT') source=(gmqcc-$pkgver.zip::https://github.com/graphitemaster/gmqcc/zipball/$pkgver) -sha1sums=('8cd91dc13f70cd9d3767602bf3eb47a1906d9353') +sha1sums=('e0fe99af9a55d36cd9e0909a96d1b14f2db8b757') _gitname=graphitemaster-gmqcc-de24486/ From 7b3bbf05b91c7c6451035033dd801cd1729649f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Kr=C3=BCger?= Date: Sat, 13 Apr 2013 11:23:10 +0200 Subject: [PATCH 4/4] gitignore: ignore pkg.tar.xz packages in distro/arch{linux/bsd} --- .gitignore | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e938936..342039c 100644 --- a/.gitignore +++ b/.gitignore @@ -9,9 +9,10 @@ qcvm gmqcc pak -distro/arch/* +distro/archlinux/* +distro/archbsd/* !distro/archlinux/git/PKGBUILD !distro/archlinux/release/PKGBUILD !distro/archbsd/release/PKGBUILD !distro/archbsd/git/PKGBUILD -!distro/arch/this/Makefile +!distro/archlinux/this/Makefile