void/void-packages
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'dave/master'

Browse source 
* dave/master:
  chromium: update version in patches
  chromium: grr, update nacl checksum
  chromium: update tarball checksum
  chromium: update to 20.0.1132.47
  nano: revbump to trigger buildbot, lol
  wine-unstable: update distfile checksum
  wine-unstable: update to 1.5.7
  buildbot-slave: use /bin/tail in logwatcher.py
  buildbot: use /bin/tail in logwatcher.py
This commit is contained in:
Juan RP 2012-06-29 08:17:07 +02:00
commit b4dba3a78b
7 changed files with 28 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

6
srcpkgs/buildbot-slave/template
View file

@ -1,7 +1,7 @@
# Template file for 'buildbot-slave' # Template file for 'buildbot-slave'
pkgname=buildbot-slave pkgname=buildbot-slave
version=0.8.6p1 version=0.8.6p1
revision=1 revision=2
noarch=yes noarch=yes
build_style=python-module build_style=python-module
fulldepends="python Twisted" fulldepends="python Twisted"
@ -27,3 +27,7 @@ long_desc="
This package contains only the buildslave implementation. The buildbot master This package contains only the buildslave implementation. The buildbot master
is available in the buildbot package." is available in the buildbot package."
pre_install() {
sed -i -e "s|usr/bin/tail|bin/tail|g" buildslave/scripts/logwatcher.py
}

6
srcpkgs/buildbot/template
View file

@ -1,7 +1,7 @@
# Template file for 'buildbot' # Template file for 'buildbot'
pkgname=buildbot pkgname=buildbot
version=0.8.6p1 version=0.8.6p1
revision=2 revision=3
noarch=yes noarch=yes
build_style=python-module build_style=python-module
fulldepends="python python-jinja sqlalchemy-migrate python-simplejson Twisted" fulldepends="python python-jinja sqlalchemy-migrate python-simplejson Twisted"
@ -25,6 +25,10 @@ long_desc="
lint checks, image size, compile time, and other build parameters can be lint checks, image size, compile time, and other build parameters can be
tracked over time, are more visible, and are therefore easier to improve." tracked over time, are more visible, and are therefore easier to improve."
pre_install() {
sed -i -e "s|usr/bin/tail|bin/tail|g" buildbot/scripts/logwatcher.py
}
post_install() { post_install() {
# Install all contrib modules. # Install all contrib modules.
local contribdir=${DESTDIR}/usr/share/buildbot/contrib local contribdir=${DESTDIR}/usr/share/buildbot/contrib

20
srcpkgs/chromium/patches/chromium-gcc47.patch
View file

@ -1,5 +1,5 @@
--- chromium-20.0.1132.43/base/message_pump_libevent.cc.gcc47 2012-02-17 14:52:00.527217354 -0500 --- chromium-20.0.1132.47/base/message_pump_libevent.cc.gcc47 2012-02-17 14:52:00.527217354 -0500
+++ chromium-20.0.1132.43/base/message_pump_libevent.cc 2012-02-17 14:52:10.172135400 -0500 +++ chromium-20.0.1132.47/base/message_pump_libevent.cc 2012-02-17 14:52:10.172135400 -0500
@@ -6,6 +6,7 @@ @@ -6,6 +6,7 @@
#include <errno.h> #include <errno.h>
@ -8,8 +8,8 @@
#include "base/auto_reset.h" #include "base/auto_reset.h"
#include "base/compiler_specific.h" #include "base/compiler_specific.h"
--- chromium-20.0.1132.43/chrome/browser/policy/policy_path_parser_linux.cc.gcc47 2012-02-17 15:26:32.086746278 -0500 --- chromium-20.0.1132.47/chrome/browser/policy/policy_path_parser_linux.cc.gcc47 2012-02-17 15:26:32.086746278 -0500
+++ chromium-20.0.1132.43/chrome/browser/policy/policy_path_parser_linux.cc 2012-02-17 15:26:53.039544290 -0500 +++ chromium-20.0.1132.47/chrome/browser/policy/policy_path_parser_linux.cc 2012-02-17 15:26:53.039544290 -0500
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
// found in the LICENSE file. // found in the LICENSE file.
@ -18,8 +18,8 @@
#include "chrome/browser/policy/policy_path_parser.h" #include "chrome/browser/policy/policy_path_parser.h"
--- chromium-20.0.1132.43/ipc/ipc_channel.h.gcc47 2012-01-27 03:02:07.000000000 -0500 --- chromium-20.0.1132.47/ipc/ipc_channel.h.gcc47 2012-01-27 03:02:07.000000000 -0500
+++ chromium-20.0.1132.43/ipc/ipc_channel.h 2012-02-17 14:46:31.821010460 -0500 +++ chromium-20.0.1132.47/ipc/ipc_channel.h 2012-02-17 14:46:31.821010460 -0500
@@ -9,6 +9,7 @@ @@ -9,6 +9,7 @@
#include "base/process.h" #include "base/process.h"
#include "ipc/ipc_channel_handle.h" #include "ipc/ipc_channel_handle.h"
@ -28,8 +28,8 @@
namespace IPC { namespace IPC {
--- chromium-20.0.1132.43/ipc/ipc_platform_file.cc.gcc47 2012-01-27 03:02:07.000000000 -0500 --- chromium-20.0.1132.47/ipc/ipc_platform_file.cc.gcc47 2012-01-27 03:02:07.000000000 -0500
+++ chromium-20.0.1132.43/ipc/ipc_platform_file.cc 2012-02-17 14:46:31.824010435 -0500 +++ chromium-20.0.1132.47/ipc/ipc_platform_file.cc 2012-02-17 14:46:31.824010435 -0500
@@ -3,10 +3,7 @@ @@ -3,10 +3,7 @@
// found in the LICENSE file. // found in the LICENSE file.
@ -41,8 +41,8 @@
namespace IPC { namespace IPC {
--- chromium-20.0.1132.43/seccompsandbox/library.h.gcc47 2012-01-27 03:03:35.000000000 -0500 --- chromium-20.0.1132.47/seccompsandbox/library.h.gcc47 2012-01-27 03:03:35.000000000 -0500
+++ chromium-20.0.1132.43/seccompsandbox/library.h 2012-02-17 14:46:31.826010418 -0500 +++ chromium-20.0.1132.47/seccompsandbox/library.h 2012-02-17 14:46:31.826010418 -0500
@@ -12,6 +12,7 @@ @@ -12,6 +12,7 @@
#include <string> #include <string>
#include <string.h> #include <string.h>

4
srcpkgs/chromium/patches/sqlite-3.7.6.3-fix-out-of-scope-memory-reference.patch
View file

@ -1,5 +1,5 @@
--- chromium-20.0.1132.43/third_party/sqlite/src/ext/fts3/fts3_write.c.orig 2012-05-08 21:05:03.000000000 +0300 --- chromium-20.0.1132.47/third_party/sqlite/src/ext/fts3/fts3_write.c.orig 2012-05-08 21:05:03.000000000 +0300
+++ chromium-20.0.1132.43/third_party/sqlite/src/ext/fts3/fts3_write.c 2012-05-08 21:07:08.000000000 +0300 +++ chromium-20.0.1132.47/third_party/sqlite/src/ext/fts3/fts3_write.c 2012-05-08 21:07:08.000000000 +0300
@@ -1238,13 +1238,13 @@ int sqlite3Fts3SegReaderPending( @@ -1238,13 +1238,13 @@ int sqlite3Fts3SegReaderPending(
Fts3SegReader **ppReader /* OUT: SegReader for pending-terms */ Fts3SegReader **ppReader /* OUT: SegReader for pending-terms */
){ ){

6
srcpkgs/chromium/template
View file

@ -1,6 +1,6 @@
# Template file for 'chromium' # Template file for 'chromium'
pkgname=chromium pkgname=chromium
version=20.0.1132.43 version=20.0.1132.47
revision=1 revision=1
wrksrc=$pkgname wrksrc=$pkgname
create_wrksrc=yes create_wrksrc=yes
@ -28,8 +28,8 @@ distfiles="
${_url_base}/chromium-browser-official/$pkgname-$version.tar.bz2 ${_url_base}/chromium-browser-official/$pkgname-$version.tar.bz2
${_url_base}/nativeclient-mirror/nacl/nacl_sdk/$version/naclsdk_linux.bz2" ${_url_base}/nativeclient-mirror/nacl/nacl_sdk/$version/naclsdk_linux.bz2"
checksum=" checksum="
c21bdee0ec136102e10c527a0d98e3a29e40406d8f7eb63e8e0ac23801722824 a34e87ae916c1146b506090d30ac901dbfa88a55db90f8b2250eb29eaca3a1e5
aa836ba493e659f028e8624764ba7662ef4eccd609be4c6812a7901eaf63f6e4" ac371e9e8312f01856e892b29c788acfa03cbb79aaabe0b5a3ae0cd2f8399a91"
long_desc=" long_desc="
Chromium is an open-source browser project that aims to build a safer, Chromium is an open-source browser project that aims to build a safer,
faster, and more stable way for all Internet users to experience the web. faster, and more stable way for all Internet users to experience the web.

2
srcpkgs/nano/template
View file

@ -1,7 +1,7 @@
# Template file for 'nano' # Template file for 'nano'
pkgname=nano pkgname=nano
version=2.3.1 version=2.3.1
revision=2 revision=3
distfiles="http://www.nano-editor.org/dist/v2.3/$pkgname-$version.tar.gz" distfiles="http://www.nano-editor.org/dist/v2.3/$pkgname-$version.tar.gz"
build_style=gnu-configure build_style=gnu-configure
makedepends="file-devel glibc-devel ncurses-devel groff" makedepends="file-devel glibc-devel ncurses-devel groff"

4
srcpkgs/wine-unstable/template
View file

@ -1,7 +1,7 @@
# Template file for 'wine-unstable' # Template file for 'wine-unstable'
__pkgname=wine __pkgname=wine
pkgname=${__pkgname}-unstable pkgname=${__pkgname}-unstable
version=1.5.6 version=1.5.7
wrksrc=${__pkgname}-${version} wrksrc=${__pkgname}-${version}
build_style=gnu-configure build_style=gnu-configure
configure_args="--with-x" configure_args="--with-x"
@ -14,7 +14,7 @@ revision=1
short_desc="Run Windows applications on Linux, BSD, Solaris and Mac OS X. (unstable)" short_desc="Run Windows applications on Linux, BSD, Solaris and Mac OS X. (unstable)"
maintainer="davehome <davehome@redthumb.info.tm>" maintainer="davehome <davehome@redthumb.info.tm>"
license="LGPL-2.1" license="LGPL-2.1"
checksum=b178bc34a69341a8f0a7ff73f7dadf2562ed2e5eb03dc0522b7c4d6002e53994 checksum=c4cafaa6e8f67d548ee5f35cd486699350404b02b448dd8fd48d664b9c5f0b07
long_desc=" long_desc="
Wine lets you run Windows software on other operating systems. With Wine, Wine lets you run Windows software on other operating systems. With Wine,
you can install and run these applications just like you would in you can install and run these applications just like you would in