[arch-commits] Commit in linux/trunk (CVE-2012-0056.patch PKGBUILD)

2012-01-23 Thread Pierre Schmitz
Date: Monday, January 23, 2012 @ 08:09:16
  Author: pierre
Revision: 147146

upgpkg: linux 3.2.1-2

fix CVE-2012-0056

Added:
  linux/trunk/CVE-2012-0056.patch
Modified:
  linux/trunk/PKGBUILD

-+
 CVE-2012-0056.patch |  268 ++
 PKGBUILD|   12 +-
 2 files changed, 277 insertions(+), 3 deletions(-)

Added: CVE-2012-0056.patch
===
--- CVE-2012-0056.patch (rev 0)
+++ CVE-2012-0056.patch 2012-01-23 13:09:16 UTC (rev 147146)
@@ -0,0 +1,268 @@
+From e268337dfe26dfc7efd422a804dbb27977a3 Mon Sep 17 00:00:00 2001
+From: Linus Torvalds torva...@linux-foundation.org
+Date: Tue, 17 Jan 2012 15:21:19 -0800
+Subject: [PATCH] proc: clean up and fix /proc/pid/mem handling
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
+
+Jüri Aedla reported that the /proc/pid/mem handling really isn't very
+robust, and it also doesn't match the permission checking of any of the
+other related files.
+
+This changes it to do the permission checks at open time, and instead of
+tracking the process, it tracks the VM at the time of the open.  That
+simplifies the code a lot, but does mean that if you hold the file
+descriptor open over an execve(), you'll continue to read from the _old_
+VM.
+
+That is different from our previous behavior, but much simpler.  If
+somebody actually finds a load where this matters, we'll need to revert
+this commit.
+
+I suspect that nobody will ever notice - because the process mapping
+addresses will also have changed as part of the execve.  So you cannot
+actually usefully access the fd across a VM change simply because all
+the offsets for IO would have changed too.
+
+Reported-by: Jüri Aedla a...@ut.ee
+Cc: Al Viro v...@zeniv.linux.org.uk
+Signed-off-by: Linus Torvalds torva...@linux-foundation.org
+---
+ fs/proc/base.c |  145 +++-
+ 1 files changed, 39 insertions(+), 106 deletions(-)
+
+diff --git a/fs/proc/base.c b/fs/proc/base.c
+index 5485a53..662ddf2 100644
+--- a/fs/proc/base.c
 b/fs/proc/base.c
+@@ -198,65 +198,7 @@ static int proc_root_link(struct dentry *dentry, struct 
path *path)
+   return result;
+ }
+ 
+-static struct mm_struct *__check_mem_permission(struct task_struct *task)
+-{
+-  struct mm_struct *mm;
+-
+-  mm = get_task_mm(task);
+-  if (!mm)
+-  return ERR_PTR(-EINVAL);
+-
+-  /*
+-   * A task can always look at itself, in case it chooses
+-   * to use system calls instead of load instructions.
+-   */
+-  if (task == current)
+-  return mm;
+-
+-  /*
+-   * If current is actively ptrace'ing, and would also be
+-   * permitted to freshly attach with ptrace now, permit it.
+-   */
+-  if (task_is_stopped_or_traced(task)) {
+-  int match;
+-  rcu_read_lock();
+-  match = (ptrace_parent(task) == current);
+-  rcu_read_unlock();
+-  if (match  ptrace_may_access(task, PTRACE_MODE_ATTACH))
+-  return mm;
+-  }
+-
+-  /*
+-   * No one else is allowed.
+-   */
+-  mmput(mm);
+-  return ERR_PTR(-EPERM);
+-}
+-
+-/*
+- * If current may access user memory in @task return a reference to the
+- * corresponding mm, otherwise ERR_PTR.
+- */
+-static struct mm_struct *check_mem_permission(struct task_struct *task)
+-{
+-  struct mm_struct *mm;
+-  int err;
+-
+-  /*
+-   * Avoid racing if task exec's as we might get a new mm but validate
+-   * against old credentials.
+-   */
+-  err = mutex_lock_killable(task-signal-cred_guard_mutex);
+-  if (err)
+-  return ERR_PTR(err);
+-
+-  mm = __check_mem_permission(task);
+-  mutex_unlock(task-signal-cred_guard_mutex);
+-
+-  return mm;
+-}
+-
+-struct mm_struct *mm_for_maps(struct task_struct *task)
++static struct mm_struct *mm_access(struct task_struct *task, unsigned int 
mode)
+ {
+   struct mm_struct *mm;
+   int err;
+@@ -267,7 +209,7 @@ struct mm_struct *mm_for_maps(struct task_struct *task)
+ 
+   mm = get_task_mm(task);
+   if (mm  mm != current-mm 
+-  !ptrace_may_access(task, PTRACE_MODE_READ)) {
++  !ptrace_may_access(task, mode)) {
+   mmput(mm);
+   mm = ERR_PTR(-EACCES);
+   }
+@@ -276,6 +218,11 @@ struct mm_struct *mm_for_maps(struct task_struct *task)
+   return mm;
+ }
+ 
++struct mm_struct *mm_for_maps(struct task_struct *task)
++{
++  return mm_access(task, PTRACE_MODE_READ);
++}
++
+ static int proc_pid_cmdline(struct task_struct *task, char * buffer)
+ {
+   int res = 0;
+@@ -752,38 +699,39 @@ static const struct file_operations 
proc_single_file_operations = {
+ 
+ static int mem_open(struct inode* inode, struct file* file)
+ {
+- 

[arch-commits] Commit in linux/repos (20 files)

2012-01-23 Thread Pierre Schmitz
Date: Monday, January 23, 2012 @ 08:10:32
  Author: pierre
Revision: 147147

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  linux/repos/testing-i686/
  linux/repos/testing-i686/CVE-2012-0056.patch
(from rev 147146, linux/trunk/CVE-2012-0056.patch)
  linux/repos/testing-i686/PKGBUILD
(from rev 147146, linux/trunk/PKGBUILD)
  linux/repos/testing-i686/change-default-console-loglevel.patch
(from rev 147146, linux/trunk/change-default-console-loglevel.patch)
  linux/repos/testing-i686/config
(from rev 147146, linux/trunk/config)
  linux/repos/testing-i686/config.x86_64
(from rev 147146, linux/trunk/config.x86_64)
  linux/repos/testing-i686/i915-fix-ghost-tv-output.patch
(from rev 147146, linux/trunk/i915-fix-ghost-tv-output.patch)
  linux/repos/testing-i686/i915-gpu-finish.patch
(from rev 147146, linux/trunk/i915-gpu-finish.patch)
  linux/repos/testing-i686/linux.install
(from rev 147146, linux/trunk/linux.install)
  linux/repos/testing-i686/linux.preset
(from rev 147146, linux/trunk/linux.preset)
  linux/repos/testing-x86_64/
  linux/repos/testing-x86_64/CVE-2012-0056.patch
(from rev 147146, linux/trunk/CVE-2012-0056.patch)
  linux/repos/testing-x86_64/PKGBUILD
(from rev 147146, linux/trunk/PKGBUILD)
  linux/repos/testing-x86_64/change-default-console-loglevel.patch
(from rev 147146, linux/trunk/change-default-console-loglevel.patch)
  linux/repos/testing-x86_64/config
(from rev 147146, linux/trunk/config)
  linux/repos/testing-x86_64/config.x86_64
(from rev 147146, linux/trunk/config.x86_64)
  linux/repos/testing-x86_64/i915-fix-ghost-tv-output.patch
(from rev 147146, linux/trunk/i915-fix-ghost-tv-output.patch)
  linux/repos/testing-x86_64/i915-gpu-finish.patch
(from rev 147146, linux/trunk/i915-gpu-finish.patch)
  linux/repos/testing-x86_64/linux.install
(from rev 147146, linux/trunk/linux.install)
  linux/repos/testing-x86_64/linux.preset
(from rev 147146, linux/trunk/linux.preset)

--+
 testing-i686/CVE-2012-0056.patch |  268 
 testing-i686/PKGBUILD|  303 
 testing-i686/change-default-console-loglevel.patch   |   12 
 testing-i686/config  | 5913 +
 testing-i686/config.x86_64   | 5673 
 testing-i686/i915-fix-ghost-tv-output.patch  |   26 
 testing-i686/i915-gpu-finish.patch   |   55 
 testing-i686/linux.install   |   62 
 testing-i686/linux.preset|   14 
 testing-x86_64/CVE-2012-0056.patch   |  268 
 testing-x86_64/PKGBUILD  |  303 
 testing-x86_64/change-default-console-loglevel.patch |   12 
 testing-x86_64/config| 5913 +
 testing-x86_64/config.x86_64 | 5673 
 testing-x86_64/i915-fix-ghost-tv-output.patch|   26 
 testing-x86_64/i915-gpu-finish.patch |   55 
 testing-x86_64/linux.install |   62 
 testing-x86_64/linux.preset  |   14 
 18 files changed, 24652 insertions(+)

The diff is longer than the limit of 200KB.
Use svn diff -r 147146:147147 to see the changes.


[arch-commits] Commit in linux-lts/trunk (CVE-2012-0056.patch PKGBUILD)

2012-01-23 Thread Pierre Schmitz
Date: Monday, January 23, 2012 @ 08:13:39
  Author: pierre
Revision: 147148

fix CVE-2012-0056

Added:
  linux-lts/trunk/CVE-2012-0056.patch
Modified:
  linux-lts/trunk/PKGBUILD

-+
 CVE-2012-0056.patch |  268 ++
 PKGBUILD|   12 +-
 2 files changed, 277 insertions(+), 3 deletions(-)

Added: CVE-2012-0056.patch
===
--- CVE-2012-0056.patch (rev 0)
+++ CVE-2012-0056.patch 2012-01-23 13:13:39 UTC (rev 147148)
@@ -0,0 +1,268 @@
+From e268337dfe26dfc7efd422a804dbb27977a3 Mon Sep 17 00:00:00 2001
+From: Linus Torvalds torva...@linux-foundation.org
+Date: Tue, 17 Jan 2012 15:21:19 -0800
+Subject: [PATCH] proc: clean up and fix /proc/pid/mem handling
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
+
+Jüri Aedla reported that the /proc/pid/mem handling really isn't very
+robust, and it also doesn't match the permission checking of any of the
+other related files.
+
+This changes it to do the permission checks at open time, and instead of
+tracking the process, it tracks the VM at the time of the open.  That
+simplifies the code a lot, but does mean that if you hold the file
+descriptor open over an execve(), you'll continue to read from the _old_
+VM.
+
+That is different from our previous behavior, but much simpler.  If
+somebody actually finds a load where this matters, we'll need to revert
+this commit.
+
+I suspect that nobody will ever notice - because the process mapping
+addresses will also have changed as part of the execve.  So you cannot
+actually usefully access the fd across a VM change simply because all
+the offsets for IO would have changed too.
+
+Reported-by: Jüri Aedla a...@ut.ee
+Cc: Al Viro v...@zeniv.linux.org.uk
+Signed-off-by: Linus Torvalds torva...@linux-foundation.org
+---
+ fs/proc/base.c |  145 +++-
+ 1 files changed, 39 insertions(+), 106 deletions(-)
+
+diff --git a/fs/proc/base.c b/fs/proc/base.c
+index 5485a53..662ddf2 100644
+--- a/fs/proc/base.c
 b/fs/proc/base.c
+@@ -198,65 +198,7 @@ static int proc_root_link(struct dentry *dentry, struct 
path *path)
+   return result;
+ }
+ 
+-static struct mm_struct *__check_mem_permission(struct task_struct *task)
+-{
+-  struct mm_struct *mm;
+-
+-  mm = get_task_mm(task);
+-  if (!mm)
+-  return ERR_PTR(-EINVAL);
+-
+-  /*
+-   * A task can always look at itself, in case it chooses
+-   * to use system calls instead of load instructions.
+-   */
+-  if (task == current)
+-  return mm;
+-
+-  /*
+-   * If current is actively ptrace'ing, and would also be
+-   * permitted to freshly attach with ptrace now, permit it.
+-   */
+-  if (task_is_stopped_or_traced(task)) {
+-  int match;
+-  rcu_read_lock();
+-  match = (ptrace_parent(task) == current);
+-  rcu_read_unlock();
+-  if (match  ptrace_may_access(task, PTRACE_MODE_ATTACH))
+-  return mm;
+-  }
+-
+-  /*
+-   * No one else is allowed.
+-   */
+-  mmput(mm);
+-  return ERR_PTR(-EPERM);
+-}
+-
+-/*
+- * If current may access user memory in @task return a reference to the
+- * corresponding mm, otherwise ERR_PTR.
+- */
+-static struct mm_struct *check_mem_permission(struct task_struct *task)
+-{
+-  struct mm_struct *mm;
+-  int err;
+-
+-  /*
+-   * Avoid racing if task exec's as we might get a new mm but validate
+-   * against old credentials.
+-   */
+-  err = mutex_lock_killable(task-signal-cred_guard_mutex);
+-  if (err)
+-  return ERR_PTR(err);
+-
+-  mm = __check_mem_permission(task);
+-  mutex_unlock(task-signal-cred_guard_mutex);
+-
+-  return mm;
+-}
+-
+-struct mm_struct *mm_for_maps(struct task_struct *task)
++static struct mm_struct *mm_access(struct task_struct *task, unsigned int 
mode)
+ {
+   struct mm_struct *mm;
+   int err;
+@@ -267,7 +209,7 @@ struct mm_struct *mm_for_maps(struct task_struct *task)
+ 
+   mm = get_task_mm(task);
+   if (mm  mm != current-mm 
+-  !ptrace_may_access(task, PTRACE_MODE_READ)) {
++  !ptrace_may_access(task, mode)) {
+   mmput(mm);
+   mm = ERR_PTR(-EACCES);
+   }
+@@ -276,6 +218,11 @@ struct mm_struct *mm_for_maps(struct task_struct *task)
+   return mm;
+ }
+ 
++struct mm_struct *mm_for_maps(struct task_struct *task)
++{
++  return mm_access(task, PTRACE_MODE_READ);
++}
++
+ static int proc_pid_cmdline(struct task_struct *task, char * buffer)
+ {
+   int res = 0;
+@@ -752,38 +699,39 @@ static const struct file_operations 
proc_single_file_operations = {
+ 
+ static int mem_open(struct inode* inode, struct file* file)
+ {
+-  

[arch-commits] Commit in linux-lts/trunk (CVE-2012-0056.patch PKGBUILD)

2012-01-23 Thread Pierre Schmitz
Date: Monday, January 23, 2012 @ 08:30:56
  Author: pierre
Revision: 147149

Use the patch that was actually meant for the 3.0 series

Modified:
  linux-lts/trunk/CVE-2012-0056.patch
  linux-lts/trunk/PKGBUILD

-+
 CVE-2012-0056.patch |   41 +
 PKGBUILD|2 +-
 2 files changed, 22 insertions(+), 21 deletions(-)

Modified: CVE-2012-0056.patch
===
--- CVE-2012-0056.patch 2012-01-23 13:13:39 UTC (rev 147148)
+++ CVE-2012-0056.patch 2012-01-23 13:30:56 UTC (rev 147149)
@@ -1,12 +1,16 @@
 From e268337dfe26dfc7efd422a804dbb27977a3 Mon Sep 17 00:00:00 2001
 From: Linus Torvalds torva...@linux-foundation.org
 Date: Tue, 17 Jan 2012 15:21:19 -0800
-Subject: [PATCH] proc: clean up and fix /proc/pid/mem handling
+Subject: proc: clean up and fix /proc/pid/mem handling
 MIME-Version: 1.0
-Content-Type: text/plain; charset=utf8
+Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
-Jüri Aedla reported that the /proc/pid/mem handling really isn't very
+From: Linus Torvalds torva...@linux-foundation.org
+
+commit e268337dfe26dfc7efd422a804dbb27977a3 upstream.
+
+Jüri Aedla reported that the /proc/pid/mem handling really isn't very
 robust, and it also doesn't match the permission checking of any of the
 other related files.
 
@@ -25,18 +29,18 @@
 actually usefully access the fd across a VM change simply because all
 the offsets for IO would have changed too.
 
-Reported-by: Jüri Aedla a...@ut.ee
+Reported-by: Jüri Aedla a...@ut.ee
 Cc: Al Viro v...@zeniv.linux.org.uk
 Signed-off-by: Linus Torvalds torva...@linux-foundation.org
+Signed-off-by: Greg Kroah-Hartman gre...@suse.de
+
 ---
- fs/proc/base.c |  145 +++-
- 1 files changed, 39 insertions(+), 106 deletions(-)
+ fs/proc/base.c |  145 
+++--
+ 1 file changed, 39 insertions(+), 106 deletions(-)
 
-diff --git a/fs/proc/base.c b/fs/proc/base.c
-index 5485a53..662ddf2 100644
 --- a/fs/proc/base.c
 +++ b/fs/proc/base.c
-@@ -198,65 +198,7 @@ static int proc_root_link(struct dentry *dentry, struct 
path *path)
+@@ -194,65 +194,7 @@ static int proc_root_link(struct inode *
return result;
  }
  
@@ -62,7 +66,7 @@
 -  if (task_is_stopped_or_traced(task)) {
 -  int match;
 -  rcu_read_lock();
--  match = (ptrace_parent(task) == current);
+-  match = (tracehook_tracer_task(task) == current);
 -  rcu_read_unlock();
 -  if (match  ptrace_may_access(task, PTRACE_MODE_ATTACH))
 -  return mm;
@@ -103,7 +107,7 @@
  {
struct mm_struct *mm;
int err;
-@@ -267,7 +209,7 @@ struct mm_struct *mm_for_maps(struct task_struct *task)
+@@ -263,7 +205,7 @@ struct mm_struct *mm_for_maps(struct tas
  
mm = get_task_mm(task);
if (mm  mm != current-mm 
@@ -112,7 +116,7 @@
mmput(mm);
mm = ERR_PTR(-EACCES);
}
-@@ -276,6 +218,11 @@ struct mm_struct *mm_for_maps(struct task_struct *task)
+@@ -272,6 +214,11 @@ struct mm_struct *mm_for_maps(struct tas
return mm;
  }
  
@@ -124,7 +128,7 @@
  static int proc_pid_cmdline(struct task_struct *task, char * buffer)
  {
int res = 0;
-@@ -752,38 +699,39 @@ static const struct file_operations 
proc_single_file_operations = {
+@@ -816,38 +763,39 @@ static const struct file_operations proc
  
  static int mem_open(struct inode* inode, struct file* file)
  {
@@ -182,7 +186,7 @@
  
ret = 0;
   
-@@ -810,13 +758,7 @@ static ssize_t mem_read(struct file * file, char __user * 
buf,
+@@ -874,13 +822,7 @@ static ssize_t mem_read(struct file * fi
}
*ppos = src;
  
@@ -196,7 +200,7 @@
return ret;
  }
  
-@@ -825,27 +767,15 @@ static ssize_t mem_write(struct file * file, const char 
__user *buf,
+@@ -889,27 +831,15 @@ static ssize_t mem_write(struct file * f
  {
int copied;
char *page;
@@ -228,7 +232,7 @@
  
copied = 0;
while (count  0) {
-@@ -869,13 +799,7 @@ static ssize_t mem_write(struct file * file, const char 
__user *buf,
+@@ -933,13 +863,7 @@ static ssize_t mem_write(struct file * f
}
*ppos = dst;
  
@@ -242,7 +246,7 @@
return copied;
  }
  
-@@ -895,11 +819,20 @@ loff_t mem_lseek(struct file *file, loff_t offset, int 
orig)
+@@ -959,11 +883,20 @@ loff_t mem_lseek(struct file *file, loff
return file-f_pos;
  }
  
@@ -263,6 +267,3 @@
  };
  
  static ssize_t environ_read(struct file *file, char __user *buf,
--- 
-1.7.6.5
-

Modified: PKGBUILD
===
--- PKGBUILD2012-01-23 13:13:39 UTC (rev 147148)
+++ PKGBUILD2012-01-23 13:30:56 UTC (rev 147149)
@@ -30,7 +30,7 @@
  '21a33df5fba2da2f56e447fb171f02c0'
  

[arch-commits] Commit in linux-lts/repos (18 files)

2012-01-23 Thread Pierre Schmitz
Date: Monday, January 23, 2012 @ 08:48:54
  Author: pierre
Revision: 147150

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  linux-lts/repos/testing-i686/
  linux-lts/repos/testing-i686/CVE-2012-0056.patch
(from rev 147149, linux-lts/trunk/CVE-2012-0056.patch)
  linux-lts/repos/testing-i686/PKGBUILD
(from rev 147149, linux-lts/trunk/PKGBUILD)
  linux-lts/repos/testing-i686/change-default-console-loglevel.patch
(from rev 147149, linux-lts/trunk/change-default-console-loglevel.patch)
  linux-lts/repos/testing-i686/config
(from rev 147149, linux-lts/trunk/config)
  linux-lts/repos/testing-i686/config.x86_64
(from rev 147149, linux-lts/trunk/config.x86_64)
  linux-lts/repos/testing-i686/i915-fix-ghost-tv-output.patch
(from rev 147149, linux-lts/trunk/i915-fix-ghost-tv-output.patch)
  linux-lts/repos/testing-i686/linux-lts.install
(from rev 147149, linux-lts/trunk/linux-lts.install)
  linux-lts/repos/testing-i686/linux-lts.preset
(from rev 147149, linux-lts/trunk/linux-lts.preset)
  linux-lts/repos/testing-x86_64/
  linux-lts/repos/testing-x86_64/CVE-2012-0056.patch
(from rev 147149, linux-lts/trunk/CVE-2012-0056.patch)
  linux-lts/repos/testing-x86_64/PKGBUILD
(from rev 147149, linux-lts/trunk/PKGBUILD)
  linux-lts/repos/testing-x86_64/change-default-console-loglevel.patch
(from rev 147149, linux-lts/trunk/change-default-console-loglevel.patch)
  linux-lts/repos/testing-x86_64/config
(from rev 147149, linux-lts/trunk/config)
  linux-lts/repos/testing-x86_64/config.x86_64
(from rev 147149, linux-lts/trunk/config.x86_64)
  linux-lts/repos/testing-x86_64/i915-fix-ghost-tv-output.patch
(from rev 147149, linux-lts/trunk/i915-fix-ghost-tv-output.patch)
  linux-lts/repos/testing-x86_64/linux-lts.install
(from rev 147149, linux-lts/trunk/linux-lts.install)
  linux-lts/repos/testing-x86_64/linux-lts.preset
(from rev 147149, linux-lts/trunk/linux-lts.preset)

--+
 testing-i686/CVE-2012-0056.patch |  269 
 testing-i686/PKGBUILD|  279 
 testing-i686/change-default-console-loglevel.patch   |   12 
 testing-i686/config  | 5832 +
 testing-i686/config.x86_64   | 5571 
 testing-i686/i915-fix-ghost-tv-output.patch  |   26 
 testing-i686/linux-lts.install   |   62 
 testing-i686/linux-lts.preset|   14 
 testing-x86_64/CVE-2012-0056.patch   |  269 
 testing-x86_64/PKGBUILD  |  279 
 testing-x86_64/change-default-console-loglevel.patch |   12 
 testing-x86_64/config| 5832 +
 testing-x86_64/config.x86_64 | 5571 
 testing-x86_64/i915-fix-ghost-tv-output.patch|   26 
 testing-x86_64/linux-lts.install |   62 
 testing-x86_64/linux-lts.preset  |   14 
 16 files changed, 24130 insertions(+)

The diff is longer than the limit of 200KB.
Use svn diff -r 147149:147150 to see the changes.


[arch-commits] Commit in freeglut/repos (5 files)

2012-01-23 Thread Jan Steffens
Date: Monday, January 23, 2012 @ 09:29:58
  Author: heftig
Revision: 147151

db-move: moved freeglut from [testing] to [extra] (i686)

Added:
  freeglut/repos/extra-i686/PKGBUILD
(from rev 147150, freeglut/repos/testing-i686/PKGBUILD)
Deleted:
  freeglut/repos/extra-i686/2.6.0-GFX_radeon.patch
  freeglut/repos/extra-i686/ChangeLog
  freeglut/repos/extra-i686/PKGBUILD
  freeglut/repos/testing-i686/

+
 2.6.0-GFX_radeon.patch |   28 
 ChangeLog  |8 -
 PKGBUILD   |   63 +++
 3 files changed, 31 insertions(+), 68 deletions(-)

Deleted: extra-i686/2.6.0-GFX_radeon.patch
===
--- extra-i686/2.6.0-GFX_radeon.patch   2012-01-23 13:48:54 UTC (rev 147150)
+++ extra-i686/2.6.0-GFX_radeon.patch   2012-01-23 14:29:58 UTC (rev 147151)
@@ -1,28 +0,0 @@
-Index: src/freeglut_window.c
-===
 src/freeglut_window.c  (Revision 832)
-+++ src/freeglut_window.c  (Arbeitskopie)
-@@ -594,10 +594,9 @@
- #if TARGET_HOST_POSIX_X11
- if ( window )
- {
--glXMakeContextCurrent(
-+glXMakeCurrent(
- fgDisplay.Display,
- window-Window.Handle,
--window-Window.Handle,
- window-Window.Context
- );
- 
-@@ -932,10 +932,9 @@
- XSetWMProtocols( fgDisplay.Display, window-Window.Handle,
-  fgDisplay.DeleteWindow, 1 );
- 
--glXMakeContextCurrent(
-+glXMakeCurrent(
- fgDisplay.Display,
- window-Window.Handle,
--window-Window.Handle,
- window-Window.Context
- );
- 

Deleted: extra-i686/ChangeLog
===
--- extra-i686/ChangeLog2012-01-23 13:48:54 UTC (rev 147150)
+++ extra-i686/ChangeLog2012-01-23 14:29:58 UTC (rev 147151)
@@ -1,8 +0,0 @@
-2009-12-30  Eric Belanger  e...@archlinux.org
-
-   * freeglut 2.6.0-1
-   * Upstream update
-   * Added libxi depends
-   * Changed license to MIT
-   * Added patch to fix an issue with the radeon[hd] ATI opensource drivers
-   * Added ChangeLog

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-01-23 13:48:54 UTC (rev 147150)
+++ extra-i686/PKGBUILD 2012-01-23 14:29:58 UTC (rev 147151)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Eric Belanger e...@archlinux.org
-# Contributor: Tom Newsom jeeps...@gmx.co.uk
-
-pkgname=freeglut
-pkgver=2.6.0
-pkgrel=1
-pkgdesc=Provides functionality for small OpenGL programs
-arch=('i686' 'x86_64')
-url=http://freeglut.sourceforge.net/;
-license=('MIT')
-depends=('libxxf86vm' 'mesa' 'libxi')
-replaces=('glut')
-provides=('glut')
-conflicts=('glut')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/freeglut/${pkgname}-${pkgver}.tar.gz \
-2.6.0-GFX_radeon.patch)
-md5sums=('39f0f2de89f399529d2b981188082218' '6d0a018fe4f0bc9ace2b244ca59514d3')
-sha1sums=('68306c4486c13d005a4e4d54035e0c0b1bdc220b' 
'2e392c7d0b60016ec89e6a5edf504f5722351b95')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-# fixes an issue with the radeon[hd] ATI opensource drivers
-# ref: http://bugs.gentoo.org/show_bug.cgi?id=295163
-  patch -p0 -i ${srcdir}/2.6.0-GFX_radeon.patch || return 1
-
-  ./configure --prefix=/usr || return 1
-  make all || return 1
-  make DESTDIR=${pkgdir} install || return 1
-  install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE 
|| return 1
-}

Copied: freeglut/repos/extra-i686/PKGBUILD (from rev 147150, 
freeglut/repos/testing-i686/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-01-23 14:29:58 UTC (rev 147151)
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Eric Belanger e...@archlinux.org
+# Contributor: Tom Newsom jeeps...@gmx.co.uk
+
+pkgname=freeglut
+pkgver=2.8.0
+pkgrel=1
+pkgdesc=Provides functionality for small OpenGL programs
+arch=('i686' 'x86_64')
+url=http://freeglut.sourceforge.net/;
+license=('MIT')
+depends=('libxxf86vm' 'mesa' 'libxi')
+replaces=('glut')
+provides=('glut')
+conflicts=('glut')
+options=('!libtool')
+source=(http://downloads.sourceforge.net/freeglut/${pkgname}-${pkgver}.tar.gz)
+md5sums=('5db8651af306bc403fbfd36934a20e1d')
+sha1sums=('4debbe559c6c9841ce1abaddc9d461d17c6083b1')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr --disable-static
+  make all
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+  install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+}



[arch-commits] Commit in freeglut/repos (5 files)

2012-01-23 Thread Jan Steffens
Date: Monday, January 23, 2012 @ 09:30:00
  Author: heftig
Revision: 147152

db-move: moved freeglut from [testing] to [extra] (x86_64)

Added:
  freeglut/repos/extra-x86_64/PKGBUILD
(from rev 147150, freeglut/repos/testing-x86_64/PKGBUILD)
Deleted:
  freeglut/repos/extra-x86_64/2.6.0-GFX_radeon.patch
  freeglut/repos/extra-x86_64/ChangeLog
  freeglut/repos/extra-x86_64/PKGBUILD
  freeglut/repos/testing-x86_64/

+
 2.6.0-GFX_radeon.patch |   28 
 ChangeLog  |8 -
 PKGBUILD   |   63 +++
 3 files changed, 31 insertions(+), 68 deletions(-)

Deleted: extra-x86_64/2.6.0-GFX_radeon.patch
===
--- extra-x86_64/2.6.0-GFX_radeon.patch 2012-01-23 14:29:58 UTC (rev 147151)
+++ extra-x86_64/2.6.0-GFX_radeon.patch 2012-01-23 14:30:00 UTC (rev 147152)
@@ -1,28 +0,0 @@
-Index: src/freeglut_window.c
-===
 src/freeglut_window.c  (Revision 832)
-+++ src/freeglut_window.c  (Arbeitskopie)
-@@ -594,10 +594,9 @@
- #if TARGET_HOST_POSIX_X11
- if ( window )
- {
--glXMakeContextCurrent(
-+glXMakeCurrent(
- fgDisplay.Display,
- window-Window.Handle,
--window-Window.Handle,
- window-Window.Context
- );
- 
-@@ -932,10 +932,9 @@
- XSetWMProtocols( fgDisplay.Display, window-Window.Handle,
-  fgDisplay.DeleteWindow, 1 );
- 
--glXMakeContextCurrent(
-+glXMakeCurrent(
- fgDisplay.Display,
- window-Window.Handle,
--window-Window.Handle,
- window-Window.Context
- );
- 

Deleted: extra-x86_64/ChangeLog
===
--- extra-x86_64/ChangeLog  2012-01-23 14:29:58 UTC (rev 147151)
+++ extra-x86_64/ChangeLog  2012-01-23 14:30:00 UTC (rev 147152)
@@ -1,8 +0,0 @@
-2009-12-30  Eric Belanger  e...@archlinux.org
-
-   * freeglut 2.6.0-1
-   * Upstream update
-   * Added libxi depends
-   * Changed license to MIT
-   * Added patch to fix an issue with the radeon[hd] ATI opensource drivers
-   * Added ChangeLog

Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2012-01-23 14:29:58 UTC (rev 147151)
+++ extra-x86_64/PKGBUILD   2012-01-23 14:30:00 UTC (rev 147152)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Eric Belanger e...@archlinux.org
-# Contributor: Tom Newsom jeeps...@gmx.co.uk
-
-pkgname=freeglut
-pkgver=2.6.0
-pkgrel=1
-pkgdesc=Provides functionality for small OpenGL programs
-arch=('i686' 'x86_64')
-url=http://freeglut.sourceforge.net/;
-license=('MIT')
-depends=('libxxf86vm' 'mesa' 'libxi')
-replaces=('glut')
-provides=('glut')
-conflicts=('glut')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/freeglut/${pkgname}-${pkgver}.tar.gz \
-2.6.0-GFX_radeon.patch)
-md5sums=('39f0f2de89f399529d2b981188082218' '6d0a018fe4f0bc9ace2b244ca59514d3')
-sha1sums=('68306c4486c13d005a4e4d54035e0c0b1bdc220b' 
'2e392c7d0b60016ec89e6a5edf504f5722351b95')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-# fixes an issue with the radeon[hd] ATI opensource drivers
-# ref: http://bugs.gentoo.org/show_bug.cgi?id=295163
-  patch -p0 -i ${srcdir}/2.6.0-GFX_radeon.patch || return 1
-
-  ./configure --prefix=/usr || return 1
-  make all || return 1
-  make DESTDIR=${pkgdir} install || return 1
-  install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE 
|| return 1
-}

Copied: freeglut/repos/extra-x86_64/PKGBUILD (from rev 147150, 
freeglut/repos/testing-x86_64/PKGBUILD)
===
--- extra-x86_64/PKGBUILD   (rev 0)
+++ extra-x86_64/PKGBUILD   2012-01-23 14:30:00 UTC (rev 147152)
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Eric Belanger e...@archlinux.org
+# Contributor: Tom Newsom jeeps...@gmx.co.uk
+
+pkgname=freeglut
+pkgver=2.8.0
+pkgrel=1
+pkgdesc=Provides functionality for small OpenGL programs
+arch=('i686' 'x86_64')
+url=http://freeglut.sourceforge.net/;
+license=('MIT')
+depends=('libxxf86vm' 'mesa' 'libxi')
+replaces=('glut')
+provides=('glut')
+conflicts=('glut')
+options=('!libtool')
+source=(http://downloads.sourceforge.net/freeglut/${pkgname}-${pkgver}.tar.gz)
+md5sums=('5db8651af306bc403fbfd36934a20e1d')
+sha1sums=('4debbe559c6c9841ce1abaddc9d461d17c6083b1')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr --disable-static
+  make all
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+  install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+}



[arch-commits] Commit in sdl/repos (10 files)

2012-01-23 Thread Jan Steffens
Date: Monday, January 23, 2012 @ 09:30:03
  Author: heftig
Revision: 147153

db-move: moved sdl from [testing] to [extra] (i686)

Added:
  sdl/repos/extra-i686/PKGBUILD
(from rev 147150, sdl/repos/testing-i686/PKGBUILD)
  sdl/repos/extra-i686/sdl-1.2.14-disable-mmx.patch
(from rev 147150, sdl/repos/testing-i686/sdl-1.2.14-disable-mmx.patch)
  sdl/repos/extra-i686/sdl-1.2.14-fix-mouse-clicking.patch
(from rev 147150, 
sdl/repos/testing-i686/sdl-1.2.14-fix-mouse-clicking.patch)
Deleted:
  sdl/repos/extra-i686/PKGBUILD
  sdl/repos/extra-i686/fs27469.patch
  sdl/repos/extra-i686/sdl-1.2.14-disable-mmx.patch
  sdl/repos/extra-i686/sdl-1.2.14-fix-disappearing-cursor.patch
  sdl/repos/extra-i686/sdl-1.2.14-fix-mouse-clicking.patch
  sdl/repos/extra-i686/sdl-1.2.14-joystick-crash.diff
  sdl/repos/testing-i686/

--+
 PKGBUILD |   79 +++---
 fs27469.patch|   23 ---
 sdl-1.2.14-disable-mmx.patch |   86 -
 sdl-1.2.14-fix-disappearing-cursor.patch |   17 -
 sdl-1.2.14-fix-mouse-clicking.patch  |   46 +++
 sdl-1.2.14-joystick-crash.diff   |   14 
 6 files changed, 71 insertions(+), 194 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-01-23 14:30:00 UTC (rev 147152)
+++ extra-i686/PKGBUILD 2012-01-23 14:30:03 UTC (rev 147153)
@@ -1,44 +0,0 @@
-# $Id$
-# Maintainer: Jan heftig Steffens jan.steff...@gmail.com
-# Contributor: Allan McRae al...@archlinux.org
-# Contributor: dorphell dorph...@archlinux.org
-
-pkgname=sdl
-pkgver=1.2.14
-pkgrel=10
-pkgdesc=A library for portable low-level access to a video framebuffer, audio 
output, mouse, and keyboard
-arch=('i686' 'x86_64')
-url=http://www.libsdl.org;
-license=('LGPL')
-depends=('glibc' 'libxext' 'libxrender' 'libx11')
-makedepends=('alsa-lib' 'mesa' 'libpulse')
-options=('!libtool')
-source=(http://www.libsdl.org/release/SDL-${pkgver}.tar.gz
-sdl-1.2.14-joystick-crash.diff
-sdl-1.2.14-fix-mouse-clicking.patch
-sdl-1.2.14-fix-disappearing-cursor.patch
-sdl-1.2.14-disable-mmx.patch
-fs27469.patch)
-md5sums=('e52086d1b508fa0b76c52ee30b55bec4'
- '9d8890b3817736a5d365f7497f096634'
- '04d8c179f125e04bcd4c9d60e013c2d7'
- 'a6cf3e71b653aa97d0d8ae6c0a789807'
- '9ffecb9932a132ee5cefb4112e950761'
- '89091617e27fcad64451bc0b28e48501')
-
-build() {
-  cd ${srcdir}/SDL-${pkgver}
-  patch -Np1 -i $srcdir/sdl-1.2.14-joystick-crash.diff
-  patch -Np1 -i $srcdir/sdl-1.2.14-fix-mouse-clicking.patch
-  patch -Np1 -i $srcdir/sdl-1.2.14-fix-disappearing-cursor.patch
-  patch -Np1 -i $srcdir/sdl-1.2.14-disable-mmx.patch
-  patch -Np1 -i $srcdir/fs27469.patch
-  ./configure --prefix=/usr --disable-nasm --enable-alsa --enable-esd \
-  --with-x --disable-rpath
-  make
-}
-
-package() {
-  cd ${srcdir}/SDL-${pkgver}
-  make DESTDIR=${pkgdir} install
-}

Copied: sdl/repos/extra-i686/PKGBUILD (from rev 147150, 
sdl/repos/testing-i686/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-01-23 14:30:03 UTC (rev 147153)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) jan.steff...@gmail.com
+# Contributor: Allan McRae al...@archlinux.org
+# Contributor: dorphell dorph...@archlinux.org
+
+pkgname=sdl
+pkgver=1.2.15
+pkgrel=1
+pkgdesc=A library for portable low-level access to a video framebuffer, audio 
output, mouse, and keyboard
+arch=('i686' 'x86_64')
+url=http://www.libsdl.org;
+license=('LGPL')
+depends=('glibc' 'libxext' 'libxrender' 'libx11')
+makedepends=('alsa-lib' 'mesa' 'libpulse')
+options=('!libtool')
+source=(http://www.libsdl.org/release/SDL-${pkgver}.tar.gz
+sdl-1.2.14-fix-mouse-clicking.patch
+sdl-1.2.14-disable-mmx.patch)
+md5sums=('9d96df8417572a2afb781a7c4c811a85'
+ '04d8c179f125e04bcd4c9d60e013c2d7'
+ 'e5c16b7611f62c7cb25f0534eff68852')
+
+build() {
+  cd ${srcdir}/SDL-${pkgver}
+  patch -Np1 -i $srcdir/sdl-1.2.14-fix-mouse-clicking.patch
+  patch -Np1 -i $srcdir/sdl-1.2.14-disable-mmx.patch
+  ./configure --prefix=/usr --disable-nasm --enable-alsa --enable-esd \
+  --with-x --disable-rpath --disable-static
+  make
+}
+
+package() {
+  cd ${srcdir}/SDL-${pkgver}
+  make DESTDIR=${pkgdir} install
+}

Deleted: extra-i686/fs27469.patch
===
--- extra-i686/fs27469.patch2012-01-23 14:30:00 UTC (rev 147152)
+++ extra-i686/fs27469.patch2012-01-23 14:30:03 UTC (rev 147153)
@@ -1,23 +0,0 @@
-
-# HG changeset patch
-# User Sam Lantinga slou...@libsdl.org
-# Date 1297938710 28800
-# Node ID d898ee5431f52dd630e311b325eb5a42c8607a60
-# Parent  

[arch-commits] Commit in sdl/repos (10 files)

2012-01-23 Thread Jan Steffens
Date: Monday, January 23, 2012 @ 09:30:05
  Author: heftig
Revision: 147154

db-move: moved sdl from [testing] to [extra] (x86_64)

Added:
  sdl/repos/extra-x86_64/PKGBUILD
(from rev 147150, sdl/repos/testing-x86_64/PKGBUILD)
  sdl/repos/extra-x86_64/sdl-1.2.14-disable-mmx.patch
(from rev 147150, sdl/repos/testing-x86_64/sdl-1.2.14-disable-mmx.patch)
  sdl/repos/extra-x86_64/sdl-1.2.14-fix-mouse-clicking.patch
(from rev 147150, 
sdl/repos/testing-x86_64/sdl-1.2.14-fix-mouse-clicking.patch)
Deleted:
  sdl/repos/extra-x86_64/PKGBUILD
  sdl/repos/extra-x86_64/fs27469.patch
  sdl/repos/extra-x86_64/sdl-1.2.14-disable-mmx.patch
  sdl/repos/extra-x86_64/sdl-1.2.14-fix-disappearing-cursor.patch
  sdl/repos/extra-x86_64/sdl-1.2.14-fix-mouse-clicking.patch
  sdl/repos/extra-x86_64/sdl-1.2.14-joystick-crash.diff
  sdl/repos/testing-x86_64/

--+
 PKGBUILD |   79 +++---
 fs27469.patch|   23 ---
 sdl-1.2.14-disable-mmx.patch |   86 -
 sdl-1.2.14-fix-disappearing-cursor.patch |   17 -
 sdl-1.2.14-fix-mouse-clicking.patch  |   46 +++
 sdl-1.2.14-joystick-crash.diff   |   14 
 6 files changed, 71 insertions(+), 194 deletions(-)

Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2012-01-23 14:30:03 UTC (rev 147153)
+++ extra-x86_64/PKGBUILD   2012-01-23 14:30:05 UTC (rev 147154)
@@ -1,44 +0,0 @@
-# $Id$
-# Maintainer: Jan heftig Steffens jan.steff...@gmail.com
-# Contributor: Allan McRae al...@archlinux.org
-# Contributor: dorphell dorph...@archlinux.org
-
-pkgname=sdl
-pkgver=1.2.14
-pkgrel=10
-pkgdesc=A library for portable low-level access to a video framebuffer, audio 
output, mouse, and keyboard
-arch=('i686' 'x86_64')
-url=http://www.libsdl.org;
-license=('LGPL')
-depends=('glibc' 'libxext' 'libxrender' 'libx11')
-makedepends=('alsa-lib' 'mesa' 'libpulse')
-options=('!libtool')
-source=(http://www.libsdl.org/release/SDL-${pkgver}.tar.gz
-sdl-1.2.14-joystick-crash.diff
-sdl-1.2.14-fix-mouse-clicking.patch
-sdl-1.2.14-fix-disappearing-cursor.patch
-sdl-1.2.14-disable-mmx.patch
-fs27469.patch)
-md5sums=('e52086d1b508fa0b76c52ee30b55bec4'
- '9d8890b3817736a5d365f7497f096634'
- '04d8c179f125e04bcd4c9d60e013c2d7'
- 'a6cf3e71b653aa97d0d8ae6c0a789807'
- '9ffecb9932a132ee5cefb4112e950761'
- '89091617e27fcad64451bc0b28e48501')
-
-build() {
-  cd ${srcdir}/SDL-${pkgver}
-  patch -Np1 -i $srcdir/sdl-1.2.14-joystick-crash.diff
-  patch -Np1 -i $srcdir/sdl-1.2.14-fix-mouse-clicking.patch
-  patch -Np1 -i $srcdir/sdl-1.2.14-fix-disappearing-cursor.patch
-  patch -Np1 -i $srcdir/sdl-1.2.14-disable-mmx.patch
-  patch -Np1 -i $srcdir/fs27469.patch
-  ./configure --prefix=/usr --disable-nasm --enable-alsa --enable-esd \
-  --with-x --disable-rpath
-  make
-}
-
-package() {
-  cd ${srcdir}/SDL-${pkgver}
-  make DESTDIR=${pkgdir} install
-}

Copied: sdl/repos/extra-x86_64/PKGBUILD (from rev 147150, 
sdl/repos/testing-x86_64/PKGBUILD)
===
--- extra-x86_64/PKGBUILD   (rev 0)
+++ extra-x86_64/PKGBUILD   2012-01-23 14:30:05 UTC (rev 147154)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) jan.steff...@gmail.com
+# Contributor: Allan McRae al...@archlinux.org
+# Contributor: dorphell dorph...@archlinux.org
+
+pkgname=sdl
+pkgver=1.2.15
+pkgrel=1
+pkgdesc=A library for portable low-level access to a video framebuffer, audio 
output, mouse, and keyboard
+arch=('i686' 'x86_64')
+url=http://www.libsdl.org;
+license=('LGPL')
+depends=('glibc' 'libxext' 'libxrender' 'libx11')
+makedepends=('alsa-lib' 'mesa' 'libpulse')
+options=('!libtool')
+source=(http://www.libsdl.org/release/SDL-${pkgver}.tar.gz
+sdl-1.2.14-fix-mouse-clicking.patch
+sdl-1.2.14-disable-mmx.patch)
+md5sums=('9d96df8417572a2afb781a7c4c811a85'
+ '04d8c179f125e04bcd4c9d60e013c2d7'
+ 'e5c16b7611f62c7cb25f0534eff68852')
+
+build() {
+  cd ${srcdir}/SDL-${pkgver}
+  patch -Np1 -i $srcdir/sdl-1.2.14-fix-mouse-clicking.patch
+  patch -Np1 -i $srcdir/sdl-1.2.14-disable-mmx.patch
+  ./configure --prefix=/usr --disable-nasm --enable-alsa --enable-esd \
+  --with-x --disable-rpath --disable-static
+  make
+}
+
+package() {
+  cd ${srcdir}/SDL-${pkgver}
+  make DESTDIR=${pkgdir} install
+}

Deleted: extra-x86_64/fs27469.patch
===
--- extra-x86_64/fs27469.patch  2012-01-23 14:30:03 UTC (rev 147153)
+++ extra-x86_64/fs27469.patch  2012-01-23 14:30:05 UTC (rev 147154)
@@ -1,23 +0,0 @@
-
-# HG changeset patch
-# User Sam Lantinga slou...@libsdl.org
-# Date 1297938710 28800
-# Node ID 

[arch-commits] Commit in perl-alien-sdl/repos (3 files)

2012-01-23 Thread Jan Steffens
Date: Monday, January 23, 2012 @ 09:30:06
  Author: heftig
Revision: 147155

db-move: moved perl-alien-sdl from [testing] to [extra] (i686)

Added:
  perl-alien-sdl/repos/extra-i686/PKGBUILD
(from rev 147150, perl-alien-sdl/repos/testing-i686/PKGBUILD)
Deleted:
  perl-alien-sdl/repos/extra-i686/PKGBUILD
  perl-alien-sdl/repos/testing-i686/

--+
 PKGBUILD |   62 ++---
 1 file changed, 31 insertions(+), 31 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-01-23 14:30:05 UTC (rev 147154)
+++ extra-i686/PKGBUILD 2012-01-23 14:30:06 UTC (rev 147155)
@@ -1,31 +0,0 @@
-# $Id$
-# Maintainer: Jan heftig Steffens jan.steff...@gmail.com
-# Contributor: Allan McRae al...@archlinux.org
-# Contributor: Sarah Hay sarah...@mb.sympatico.ca
-
-# This package must not by any arch.
-# Requires rebuild with every change to sdl-config
-
-pkgname=perl-alien-sdl
-_realname=Alien-SDL
-pkgver=1.426
-pkgrel=1
-pkgdesc=Building, finding and using SDL binaries
-arch=(i686 x86_64)
-license=(PerlArtistic GPL)
-url=http://search.cpan.org/dist/Alien-SDL/;
-depends=(sdl=1.2.14 perl-file-sharedir perl-capture-tiny)
-makedepends=(perl-file-which perl-text-patch)
-options=(!emptydirs)
-source=(http://search.cpan.org/CPAN/authors/id/F/FR/FROGGS/$_realname-$pkgver.tar.gz)
-md5sums=('ab5e1167934418f4a7b3285a9d05c89b')
-
-package() {
-  cd $srcdir/$_realname-$pkgver
-
-  # install module in vendor directories
-  perl Build.PL installdirs=vendor destdir=$pkgdir --with-sdl-config
-
-  perl Build
-  perl Build install
-}

Copied: perl-alien-sdl/repos/extra-i686/PKGBUILD (from rev 147150, 
perl-alien-sdl/repos/testing-i686/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-01-23 14:30:06 UTC (rev 147155)
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) jan.steff...@gmail.com
+# Contributor: Allan McRae al...@archlinux.org
+# Contributor: Sarah Hay sarah...@mb.sympatico.ca
+
+# This package must not by any arch.
+# Requires rebuild with every change to sdl-config
+
+pkgname=perl-alien-sdl
+_realname=Alien-SDL
+pkgver=1.430
+pkgrel=1
+pkgdesc=Building, finding and using SDL binaries
+arch=(i686 x86_64)
+license=(PerlArtistic GPL)
+url=http://search.cpan.org/dist/Alien-SDL/;
+depends=(sdl=1.2.15 perl-file-sharedir perl-capture-tiny)
+makedepends=(perl-file-which perl-text-patch)
+options=(!emptydirs)
+source=(http://search.cpan.org/CPAN/authors/id/F/FR/FROGGS/$_realname-$pkgver.tar.gz)
+md5sums=('9d7774212fb4e1c46325746c953a808b')
+
+package() {
+  cd $srcdir/$_realname-$pkgver
+
+  # install module in vendor directories
+  perl Build.PL installdirs=vendor destdir=$pkgdir --with-sdl-config
+
+  perl Build
+  perl Build install
+}



[arch-commits] Commit in perl-alien-sdl/repos (3 files)

2012-01-23 Thread Jan Steffens
Date: Monday, January 23, 2012 @ 09:30:07
  Author: heftig
Revision: 147156

db-move: moved perl-alien-sdl from [testing] to [extra] (x86_64)

Added:
  perl-alien-sdl/repos/extra-x86_64/PKGBUILD
(from rev 147150, perl-alien-sdl/repos/testing-x86_64/PKGBUILD)
Deleted:
  perl-alien-sdl/repos/extra-x86_64/PKGBUILD
  perl-alien-sdl/repos/testing-x86_64/

--+
 PKGBUILD |   62 ++---
 1 file changed, 31 insertions(+), 31 deletions(-)

Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2012-01-23 14:30:06 UTC (rev 147155)
+++ extra-x86_64/PKGBUILD   2012-01-23 14:30:07 UTC (rev 147156)
@@ -1,31 +0,0 @@
-# $Id$
-# Maintainer: Jan heftig Steffens jan.steff...@gmail.com
-# Contributor: Allan McRae al...@archlinux.org
-# Contributor: Sarah Hay sarah...@mb.sympatico.ca
-
-# This package must not by any arch.
-# Requires rebuild with every change to sdl-config
-
-pkgname=perl-alien-sdl
-_realname=Alien-SDL
-pkgver=1.426
-pkgrel=1
-pkgdesc=Building, finding and using SDL binaries
-arch=(i686 x86_64)
-license=(PerlArtistic GPL)
-url=http://search.cpan.org/dist/Alien-SDL/;
-depends=(sdl=1.2.14 perl-file-sharedir perl-capture-tiny)
-makedepends=(perl-file-which perl-text-patch)
-options=(!emptydirs)
-source=(http://search.cpan.org/CPAN/authors/id/F/FR/FROGGS/$_realname-$pkgver.tar.gz)
-md5sums=('ab5e1167934418f4a7b3285a9d05c89b')
-
-package() {
-  cd $srcdir/$_realname-$pkgver
-
-  # install module in vendor directories
-  perl Build.PL installdirs=vendor destdir=$pkgdir --with-sdl-config
-
-  perl Build
-  perl Build install
-}

Copied: perl-alien-sdl/repos/extra-x86_64/PKGBUILD (from rev 147150, 
perl-alien-sdl/repos/testing-x86_64/PKGBUILD)
===
--- extra-x86_64/PKGBUILD   (rev 0)
+++ extra-x86_64/PKGBUILD   2012-01-23 14:30:07 UTC (rev 147156)
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) jan.steff...@gmail.com
+# Contributor: Allan McRae al...@archlinux.org
+# Contributor: Sarah Hay sarah...@mb.sympatico.ca
+
+# This package must not by any arch.
+# Requires rebuild with every change to sdl-config
+
+pkgname=perl-alien-sdl
+_realname=Alien-SDL
+pkgver=1.430
+pkgrel=1
+pkgdesc=Building, finding and using SDL binaries
+arch=(i686 x86_64)
+license=(PerlArtistic GPL)
+url=http://search.cpan.org/dist/Alien-SDL/;
+depends=(sdl=1.2.15 perl-file-sharedir perl-capture-tiny)
+makedepends=(perl-file-which perl-text-patch)
+options=(!emptydirs)
+source=(http://search.cpan.org/CPAN/authors/id/F/FR/FROGGS/$_realname-$pkgver.tar.gz)
+md5sums=('9d7774212fb4e1c46325746c953a808b')
+
+package() {
+  cd $srcdir/$_realname-$pkgver
+
+  # install module in vendor directories
+  perl Build.PL installdirs=vendor destdir=$pkgdir --with-sdl-config
+
+  perl Build
+  perl Build install
+}



[arch-commits] Commit in iproute2/repos (6 files)

2012-01-23 Thread Ionut Biru
Date: Monday, January 23, 2012 @ 10:27:36
  Author: ibiru
Revision: 147157

db-move: moved iproute2 from [testing] to [core] (i686)

Added:
  iproute2/repos/core-i686/PKGBUILD
(from rev 147156, iproute2/repos/testing-i686/PKGBUILD)
  iproute2/repos/core-i686/fix-ip-l.patch
(from rev 147156, iproute2/repos/testing-i686/fix-ip-l.patch)
  iproute2/repos/core-i686/iproute2-fhs.patch
(from rev 147156, iproute2/repos/testing-i686/iproute2-fhs.patch)
Deleted:
  iproute2/repos/core-i686/PKGBUILD
  iproute2/repos/core-i686/iproute2-fhs.patch
  iproute2/repos/testing-i686/

+
 PKGBUILD   |  106 
 fix-ip-l.patch |   27 
 iproute2-fhs.patch |  168 +--
 3 files changed, 166 insertions(+), 135 deletions(-)

Deleted: core-i686/PKGBUILD
===
--- core-i686/PKGBUILD  2012-01-23 14:30:07 UTC (rev 147156)
+++ core-i686/PKGBUILD  2012-01-23 15:27:36 UTC (rev 147157)
@@ -1,51 +0,0 @@
-# $Id$
-# Maintainer: Ronald van Haren ronald.archlinux.org
-# Contributor: Judd Vinet jvi...@zeroflux.org
-
-pkgname=iproute2
-pkgver=3.2.0
-pkgrel=1
-pkgdesc=IP Routing Utilities
-arch=('i686' 'x86_64')
-license=('GPL2')
-url=http://www.linux-foundation.org/en/Net:Iproute2;
-depends=('glibc' 'db')
-makedepends=('linux-atm')
-optdepends=('linux-atm: ATM support')
-provides=('iproute')
-conflicts=('iproute')
-replaces=('iproute')
-options=('!makeflags')
-backup=('etc/iproute2/ematch_map' 'etc/iproute2/rt_dsfield' 
'etc/iproute2/rt_protos' \
-   'etc/iproute2/rt_realms' 'etc/iproute2/rt_scopes' 
'etc/iproute2/rt_tables')
-source=(http://www.kernel.org/pub/linux/utils/net/$pkgname/$pkgname-$pkgver.tar.xz
-   iproute2-fhs.patch)
-sha1sums=('1e217f22b0bbfc870ddf746de883ee375cd9e533'
-  '2416b11252364d7a6c742eabb4a6924a75637a46')
-
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-
-  # set correct fhs structure
-  patch -Np1 -i $srcdir/iproute2-fhs.patch
-
-  ./configure
-
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-
-  make DESTDIR=$pkgdir install
-
-  # allow loopback to be started before /usr is mounted, this may not be 
supported in the future
-  mkdir -p $pkgdir/sbin
-  mv $pkgdir/usr/sbin/ip $pkgdir/sbin/ip
-  ln -s /sbin/ip $pkgdir/usr/sbin/ip
-
-  # libnetlink isn't installed, install it FS#19385
-  install -Dm644 include/libnetlink.h $pkgdir/usr/include/libnetlink.h
-  install -Dm644 lib/libnetlink.a $pkgdir/usr/lib/libnetlink.a
-}

Copied: iproute2/repos/core-i686/PKGBUILD (from rev 147156, 
iproute2/repos/testing-i686/PKGBUILD)
===
--- core-i686/PKGBUILD  (rev 0)
+++ core-i686/PKGBUILD  2012-01-23 15:27:36 UTC (rev 147157)
@@ -0,0 +1,55 @@
+# $Id$
+# Maintainer: Ronald van Haren ronald.archlinux.org
+# Contributor: Judd Vinet jvi...@zeroflux.org
+
+pkgname=iproute2
+pkgver=3.2.0
+pkgrel=2
+pkgdesc=IP Routing Utilities
+arch=('i686' 'x86_64')
+license=('GPL2')
+url=http://www.linux-foundation.org/en/Net:Iproute2;
+depends=('glibc' 'db')
+makedepends=('linux-atm')
+optdepends=('linux-atm: ATM support')
+provides=('iproute')
+conflicts=('iproute')
+replaces=('iproute')
+options=('!makeflags')
+backup=('etc/iproute2/ematch_map' 'etc/iproute2/rt_dsfield' 
'etc/iproute2/rt_protos' \
+   'etc/iproute2/rt_realms' 'etc/iproute2/rt_scopes' 
'etc/iproute2/rt_tables')
+source=(http://www.kernel.org/pub/linux/utils/net/$pkgname/$pkgname-$pkgver.tar.xz
+   iproute2-fhs.patch
+fix-ip-l.patch)
+sha1sums=('1e217f22b0bbfc870ddf746de883ee375cd9e533'
+  '2416b11252364d7a6c742eabb4a6924a75637a46'
+  '2ec5513c44f89046438d65e2cda1a014010e3b73')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+
+  # set correct fhs structure
+  patch -Np1 -i $srcdir/iproute2-fhs.patch
+
+  #upstream fixes
+  patch -Np1 -i $srcdir/fix-ip-l.patch
+
+  ./configure
+
+  make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+
+  make DESTDIR=$pkgdir install
+
+  # allow loopback to be started before /usr is mounted, this may not be 
supported in the future
+  mkdir -p $pkgdir/sbin
+  mv $pkgdir/usr/sbin/ip $pkgdir/sbin/ip
+  ln -s /sbin/ip $pkgdir/usr/sbin/ip
+
+  # libnetlink isn't installed, install it FS#19385
+  install -Dm644 include/libnetlink.h $pkgdir/usr/include/libnetlink.h
+  install -Dm644 lib/libnetlink.a $pkgdir/usr/lib/libnetlink.a
+}

Copied: iproute2/repos/core-i686/fix-ip-l.patch (from rev 147156, 
iproute2/repos/testing-i686/fix-ip-l.patch)
===
--- core-i686/fix-ip-l.patch(rev 0)
+++ core-i686/fix-ip-l.patch2012-01-23 15:27:36 UTC (rev 147157)
@@ -0,0 +1,27 @@
+From 5aa08f6bf4107f8aec43c0678466a314dbd0d054 Mon Sep 17 00:00:00 2001
+From: Stephen Hemminger shemmin...@vyatta.com
+Date: Fri, 20 Jan 2012 08:16:02 -0800
+Subject: [PATCH] ip: 

[arch-commits] Commit in iproute2/repos (6 files)

2012-01-23 Thread Ionut Biru
Date: Monday, January 23, 2012 @ 10:27:38
  Author: ibiru
Revision: 147158

db-move: moved iproute2 from [testing] to [core] (x86_64)

Added:
  iproute2/repos/core-x86_64/PKGBUILD
(from rev 147156, iproute2/repos/testing-x86_64/PKGBUILD)
  iproute2/repos/core-x86_64/fix-ip-l.patch
(from rev 147156, iproute2/repos/testing-x86_64/fix-ip-l.patch)
  iproute2/repos/core-x86_64/iproute2-fhs.patch
(from rev 147156, iproute2/repos/testing-x86_64/iproute2-fhs.patch)
Deleted:
  iproute2/repos/core-x86_64/PKGBUILD
  iproute2/repos/core-x86_64/iproute2-fhs.patch
  iproute2/repos/testing-x86_64/

+
 PKGBUILD   |  106 
 fix-ip-l.patch |   27 
 iproute2-fhs.patch |  168 +--
 3 files changed, 166 insertions(+), 135 deletions(-)

Deleted: core-x86_64/PKGBUILD
===
--- core-x86_64/PKGBUILD2012-01-23 15:27:36 UTC (rev 147157)
+++ core-x86_64/PKGBUILD2012-01-23 15:27:38 UTC (rev 147158)
@@ -1,51 +0,0 @@
-# $Id$
-# Maintainer: Ronald van Haren ronald.archlinux.org
-# Contributor: Judd Vinet jvi...@zeroflux.org
-
-pkgname=iproute2
-pkgver=3.2.0
-pkgrel=1
-pkgdesc=IP Routing Utilities
-arch=('i686' 'x86_64')
-license=('GPL2')
-url=http://www.linux-foundation.org/en/Net:Iproute2;
-depends=('glibc' 'db')
-makedepends=('linux-atm')
-optdepends=('linux-atm: ATM support')
-provides=('iproute')
-conflicts=('iproute')
-replaces=('iproute')
-options=('!makeflags')
-backup=('etc/iproute2/ematch_map' 'etc/iproute2/rt_dsfield' 
'etc/iproute2/rt_protos' \
-   'etc/iproute2/rt_realms' 'etc/iproute2/rt_scopes' 
'etc/iproute2/rt_tables')
-source=(http://www.kernel.org/pub/linux/utils/net/$pkgname/$pkgname-$pkgver.tar.xz
-   iproute2-fhs.patch)
-sha1sums=('1e217f22b0bbfc870ddf746de883ee375cd9e533'
-  '2416b11252364d7a6c742eabb4a6924a75637a46')
-
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-
-  # set correct fhs structure
-  patch -Np1 -i $srcdir/iproute2-fhs.patch
-
-  ./configure
-
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-
-  make DESTDIR=$pkgdir install
-
-  # allow loopback to be started before /usr is mounted, this may not be 
supported in the future
-  mkdir -p $pkgdir/sbin
-  mv $pkgdir/usr/sbin/ip $pkgdir/sbin/ip
-  ln -s /sbin/ip $pkgdir/usr/sbin/ip
-
-  # libnetlink isn't installed, install it FS#19385
-  install -Dm644 include/libnetlink.h $pkgdir/usr/include/libnetlink.h
-  install -Dm644 lib/libnetlink.a $pkgdir/usr/lib/libnetlink.a
-}

Copied: iproute2/repos/core-x86_64/PKGBUILD (from rev 147156, 
iproute2/repos/testing-x86_64/PKGBUILD)
===
--- core-x86_64/PKGBUILD(rev 0)
+++ core-x86_64/PKGBUILD2012-01-23 15:27:38 UTC (rev 147158)
@@ -0,0 +1,55 @@
+# $Id$
+# Maintainer: Ronald van Haren ronald.archlinux.org
+# Contributor: Judd Vinet jvi...@zeroflux.org
+
+pkgname=iproute2
+pkgver=3.2.0
+pkgrel=2
+pkgdesc=IP Routing Utilities
+arch=('i686' 'x86_64')
+license=('GPL2')
+url=http://www.linux-foundation.org/en/Net:Iproute2;
+depends=('glibc' 'db')
+makedepends=('linux-atm')
+optdepends=('linux-atm: ATM support')
+provides=('iproute')
+conflicts=('iproute')
+replaces=('iproute')
+options=('!makeflags')
+backup=('etc/iproute2/ematch_map' 'etc/iproute2/rt_dsfield' 
'etc/iproute2/rt_protos' \
+   'etc/iproute2/rt_realms' 'etc/iproute2/rt_scopes' 
'etc/iproute2/rt_tables')
+source=(http://www.kernel.org/pub/linux/utils/net/$pkgname/$pkgname-$pkgver.tar.xz
+   iproute2-fhs.patch
+fix-ip-l.patch)
+sha1sums=('1e217f22b0bbfc870ddf746de883ee375cd9e533'
+  '2416b11252364d7a6c742eabb4a6924a75637a46'
+  '2ec5513c44f89046438d65e2cda1a014010e3b73')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+
+  # set correct fhs structure
+  patch -Np1 -i $srcdir/iproute2-fhs.patch
+
+  #upstream fixes
+  patch -Np1 -i $srcdir/fix-ip-l.patch
+
+  ./configure
+
+  make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+
+  make DESTDIR=$pkgdir install
+
+  # allow loopback to be started before /usr is mounted, this may not be 
supported in the future
+  mkdir -p $pkgdir/sbin
+  mv $pkgdir/usr/sbin/ip $pkgdir/sbin/ip
+  ln -s /sbin/ip $pkgdir/usr/sbin/ip
+
+  # libnetlink isn't installed, install it FS#19385
+  install -Dm644 include/libnetlink.h $pkgdir/usr/include/libnetlink.h
+  install -Dm644 lib/libnetlink.a $pkgdir/usr/lib/libnetlink.a
+}

Copied: iproute2/repos/core-x86_64/fix-ip-l.patch (from rev 147156, 
iproute2/repos/testing-x86_64/fix-ip-l.patch)
===
--- core-x86_64/fix-ip-l.patch  (rev 0)
+++ core-x86_64/fix-ip-l.patch  2012-01-23 15:27:38 UTC (rev 147158)
@@ -0,0 +1,27 @@
+From 5aa08f6bf4107f8aec43c0678466a314dbd0d054 Mon Sep 17 00:00:00 2001
+From: Stephen Hemminger shemmin...@vyatta.com

[arch-commits] Commit in btrfs-progs/repos (core-i686 core-i686/PKGBUILD testing-i686)

2012-01-23 Thread Ionut Biru
Date: Monday, January 23, 2012 @ 10:27:39
  Author: ibiru
Revision: 147159

db-move: moved btrfs-progs from [testing] to [core] (i686)

Added:
  btrfs-progs/repos/core-i686/
  btrfs-progs/repos/core-i686/PKGBUILD
(from rev 147156, btrfs-progs/repos/testing-i686/PKGBUILD)
Deleted:
  btrfs-progs/repos/testing-i686/

--+
 PKGBUILD |   31 +++
 1 file changed, 31 insertions(+)

Copied: btrfs-progs/repos/core-i686/PKGBUILD (from rev 147156, 
btrfs-progs/repos/testing-i686/PKGBUILD)
===
--- core-i686/PKGBUILD  (rev 0)
+++ core-i686/PKGBUILD  2012-01-23 15:27:39 UTC (rev 147159)
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Tom Gundersen t...@jklm.no
+# Contributor: Tobias Powalowski tp...@archlinux.org
+pkgname=btrfs-progs
+pkgver=0.19.20120110
+pkgrel=2
+pkgdesc=btrfs filesystem utilities
+arch=(i686 x86_64)
+depends=('glibc' 'e2fsprogs')
+source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz)
+url=http://btrfs.wiki.kernel.org/;
+replaces=('btrfs-progs-unstable')
+conflicts=('btrfs-progs-unstable')
+provides=('btrfs-progs-unstable')
+license=('GPL2')
+
+build() {
+   cd $srcdir/$pkgname
+   make CFLAGS=$CFLAGS all convert
+}
+
+package() {
+   cd $srcdir/$pkgname
+   make prefix=$pkgdir/usr install
+   # fix manpage
+   mkdir -p $pkgdir/usr/share/
+   mv $pkgdir/usr/man $pkgdir/usr/share/man
+   mkdir -p ${pkgdir}/sbin
+   ln -sf /usr/bin/btrfs ${pkgdir}/sbin/btrfs
+}
+md5sums=('a3f6fbeb166f8e6b5c06833888d4ecf2')



[arch-commits] Commit in btrfs-progs/repos (3 files)

2012-01-23 Thread Ionut Biru
Date: Monday, January 23, 2012 @ 10:27:41
  Author: ibiru
Revision: 147160

db-move: moved btrfs-progs from [testing] to [core] (x86_64)

Added:
  btrfs-progs/repos/core-x86_64/
  btrfs-progs/repos/core-x86_64/PKGBUILD
(from rev 147156, btrfs-progs/repos/testing-x86_64/PKGBUILD)
Deleted:
  btrfs-progs/repos/testing-x86_64/

--+
 PKGBUILD |   31 +++
 1 file changed, 31 insertions(+)

Copied: btrfs-progs/repos/core-x86_64/PKGBUILD (from rev 147156, 
btrfs-progs/repos/testing-x86_64/PKGBUILD)
===
--- core-x86_64/PKGBUILD(rev 0)
+++ core-x86_64/PKGBUILD2012-01-23 15:27:41 UTC (rev 147160)
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Tom Gundersen t...@jklm.no
+# Contributor: Tobias Powalowski tp...@archlinux.org
+pkgname=btrfs-progs
+pkgver=0.19.20120110
+pkgrel=2
+pkgdesc=btrfs filesystem utilities
+arch=(i686 x86_64)
+depends=('glibc' 'e2fsprogs')
+source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz)
+url=http://btrfs.wiki.kernel.org/;
+replaces=('btrfs-progs-unstable')
+conflicts=('btrfs-progs-unstable')
+provides=('btrfs-progs-unstable')
+license=('GPL2')
+
+build() {
+   cd $srcdir/$pkgname
+   make CFLAGS=$CFLAGS all convert
+}
+
+package() {
+   cd $srcdir/$pkgname
+   make prefix=$pkgdir/usr install
+   # fix manpage
+   mkdir -p $pkgdir/usr/share/
+   mv $pkgdir/usr/man $pkgdir/usr/share/man
+   mkdir -p ${pkgdir}/sbin
+   ln -sf /usr/bin/btrfs ${pkgdir}/sbin/btrfs
+}
+md5sums=('a3f6fbeb166f8e6b5c06833888d4ecf2')



[arch-commits] Commit in linux/repos (18 files)

2012-01-23 Thread Pierre Schmitz
Date: Monday, January 23, 2012 @ 12:57:30
  Author: pierre
Revision: 147161

db-move: moved linux from [testing] to [core] (i686)

Added:
  linux/repos/core-i686/CVE-2012-0056.patch
(from rev 147160, linux/repos/testing-i686/CVE-2012-0056.patch)
  linux/repos/core-i686/PKGBUILD
(from rev 147160, linux/repos/testing-i686/PKGBUILD)
  linux/repos/core-i686/change-default-console-loglevel.patch
(from rev 147160, 
linux/repos/testing-i686/change-default-console-loglevel.patch)
  linux/repos/core-i686/config
(from rev 147160, linux/repos/testing-i686/config)
  linux/repos/core-i686/config.x86_64
(from rev 147160, linux/repos/testing-i686/config.x86_64)
  linux/repos/core-i686/i915-fix-ghost-tv-output.patch
(from rev 147160, linux/repos/testing-i686/i915-fix-ghost-tv-output.patch)
  linux/repos/core-i686/i915-gpu-finish.patch
(from rev 147160, linux/repos/testing-i686/i915-gpu-finish.patch)
  linux/repos/core-i686/linux.install
(from rev 147160, linux/repos/testing-i686/linux.install)
  linux/repos/core-i686/linux.preset
(from rev 147160, linux/repos/testing-i686/linux.preset)
Deleted:
  linux/repos/core-i686/PKGBUILD
  linux/repos/core-i686/change-default-console-loglevel.patch
  linux/repos/core-i686/config
  linux/repos/core-i686/config.x86_64
  linux/repos/core-i686/i915-fix-ghost-tv-output.patch
  linux/repos/core-i686/i915-gpu-finish.patch
  linux/repos/core-i686/linux.install
  linux/repos/core-i686/linux.preset
  linux/repos/testing-i686/

---+
 CVE-2012-0056.patch   |  268 
 PKGBUILD  |  600 -
 change-default-console-loglevel.patch |   24 
 config|11826 
 config.x86_64 |11346 +++---
 i915-fix-ghost-tv-output.patch|   52 
 i915-gpu-finish.patch |  110 
 linux.install |  124 
 linux.preset  |   28 
 9 files changed, 12326 insertions(+), 12052 deletions(-)

The diff is longer than the limit of 200KB.
Use svn diff -r 147160:147161 to see the changes.


[arch-commits] Commit in linux/repos (18 files)

2012-01-23 Thread Pierre Schmitz
Date: Monday, January 23, 2012 @ 12:57:32
  Author: pierre
Revision: 147162

db-move: moved linux from [testing] to [core] (x86_64)

Added:
  linux/repos/core-x86_64/CVE-2012-0056.patch
(from rev 147160, linux/repos/testing-x86_64/CVE-2012-0056.patch)
  linux/repos/core-x86_64/PKGBUILD
(from rev 147160, linux/repos/testing-x86_64/PKGBUILD)
  linux/repos/core-x86_64/change-default-console-loglevel.patch
(from rev 147160, 
linux/repos/testing-x86_64/change-default-console-loglevel.patch)
  linux/repos/core-x86_64/config
(from rev 147160, linux/repos/testing-x86_64/config)
  linux/repos/core-x86_64/config.x86_64
(from rev 147160, linux/repos/testing-x86_64/config.x86_64)
  linux/repos/core-x86_64/i915-fix-ghost-tv-output.patch
(from rev 147160, linux/repos/testing-x86_64/i915-fix-ghost-tv-output.patch)
  linux/repos/core-x86_64/i915-gpu-finish.patch
(from rev 147160, linux/repos/testing-x86_64/i915-gpu-finish.patch)
  linux/repos/core-x86_64/linux.install
(from rev 147160, linux/repos/testing-x86_64/linux.install)
  linux/repos/core-x86_64/linux.preset
(from rev 147160, linux/repos/testing-x86_64/linux.preset)
Deleted:
  linux/repos/core-x86_64/PKGBUILD
  linux/repos/core-x86_64/change-default-console-loglevel.patch
  linux/repos/core-x86_64/config
  linux/repos/core-x86_64/config.x86_64
  linux/repos/core-x86_64/i915-fix-ghost-tv-output.patch
  linux/repos/core-x86_64/i915-gpu-finish.patch
  linux/repos/core-x86_64/linux.install
  linux/repos/core-x86_64/linux.preset
  linux/repos/testing-x86_64/

---+
 CVE-2012-0056.patch   |  268 
 PKGBUILD  |  600 -
 change-default-console-loglevel.patch |   24 
 config|11826 
 config.x86_64 |11346 +++---
 i915-fix-ghost-tv-output.patch|   52 
 i915-gpu-finish.patch |  110 
 linux.install |  124 
 linux.preset  |   28 
 9 files changed, 12326 insertions(+), 12052 deletions(-)

The diff is longer than the limit of 200KB.
Use svn diff -r 147161:147162 to see the changes.


[arch-commits] Commit in memcached/trunk (PKGBUILD)

2012-01-23 Thread Dan McGee
Date: Monday, January 23, 2012 @ 14:15:47
  Author: dan
Revision: 147163

upgpkg: memcached 1.4.11-1

Modified:
  memcached/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-01-23 17:57:32 UTC (rev 147162)
+++ PKGBUILD2012-01-23 19:15:47 UTC (rev 147163)
@@ -3,7 +3,7 @@
 # Contributor: Michael Irwin 6d6...@gmail.com
 
 pkgname=memcached
-pkgver=1.4.10
+pkgver=1.4.11
 pkgrel=1
 pkgdesc=A distributed memory object caching system
 arch=(i686 x86_64)
@@ -16,7 +16,7 @@
 memcached.conf
memcached.sh)
 changelog=ChangeLog
-sha256sums=('2cc3de341b561464da29fc5d5e2a4facc0f6aafc151f0e1d94228705e0758fdf'
+sha256sums=('e3dcc4ff29d2b3f3c66f2b5b95a1bcef0163a65b588d6ba92a56cd6c8d73e83e'
 '0e57a0f528b387f1f04f628ec74856c615d82d44f4d6bc041c33b3814ce13d0a'
 '72efa639c5a39c7c14f07cc51731ebbf82299870d9cf31cf3aaa981bc084b4eb')
 



[arch-commits] Commit in memcached/repos (16 files)

2012-01-23 Thread Dan McGee
Date: Monday, January 23, 2012 @ 14:16:26
  Author: dan
Revision: 147164

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  memcached/repos/extra-i686/ChangeLog
(from rev 147163, memcached/trunk/ChangeLog)
  memcached/repos/extra-i686/PKGBUILD
(from rev 147163, memcached/trunk/PKGBUILD)
  memcached/repos/extra-i686/memcached.conf
(from rev 147163, memcached/trunk/memcached.conf)
  memcached/repos/extra-i686/memcached.sh
(from rev 147163, memcached/trunk/memcached.sh)
  memcached/repos/extra-x86_64/ChangeLog
(from rev 147163, memcached/trunk/ChangeLog)
  memcached/repos/extra-x86_64/PKGBUILD
(from rev 147163, memcached/trunk/PKGBUILD)
  memcached/repos/extra-x86_64/memcached.conf
(from rev 147163, memcached/trunk/memcached.conf)
  memcached/repos/extra-x86_64/memcached.sh
(from rev 147163, memcached/trunk/memcached.sh)
Deleted:
  memcached/repos/extra-i686/ChangeLog
  memcached/repos/extra-i686/PKGBUILD
  memcached/repos/extra-i686/memcached.conf
  memcached/repos/extra-i686/memcached.sh
  memcached/repos/extra-x86_64/ChangeLog
  memcached/repos/extra-x86_64/PKGBUILD
  memcached/repos/extra-x86_64/memcached.conf
  memcached/repos/extra-x86_64/memcached.sh

-+
 extra-i686/ChangeLog|   48 
 extra-i686/PKGBUILD |   76 -
 extra-i686/memcached.conf   |8 +-
 extra-i686/memcached.sh |  126 +-
 extra-x86_64/ChangeLog  |   48 
 extra-x86_64/PKGBUILD   |   76 -
 extra-x86_64/memcached.conf |8 +-
 extra-x86_64/memcached.sh   |  126 +-
 8 files changed, 258 insertions(+), 258 deletions(-)

Deleted: extra-i686/ChangeLog
===
--- extra-i686/ChangeLog2012-01-23 19:15:47 UTC (rev 147163)
+++ extra-i686/ChangeLog2012-01-23 19:16:26 UTC (rev 147164)
@@ -1,24 +0,0 @@
-2011-02-07 Ionut Biru ib...@archlinux.org
-   * Rebuild 1.4.5 against libevent 2.0.10
-
-2011-01-31 Dan McGee d...@archlinux.org
-   * Rebuild 1.4.5 with gcc 4.5.X patch accepted upstream
-
-2009-11-14 Dan McGee d...@archlinux.org
-   * Bump to 1.4.3
-   * Added memcached-tool to package
-
-2009-09-13 Dan McGee d...@archlinux.org
-   * Bump to 1.4.1
-   * Add new required conf.d option MEMCACHED_USER
-   * Rework the way we store the PID for init script usage
-
-2009-04-12 Dan McGee d...@archlinux.org
-   * Bump to 1.2.8
-
-2009-04-05 Dan McGee d...@archlinux.org
-   * Bump to 1.2.7
-
-2008-12-13 Dan McGee d...@archlinux.org
-   * Added conf file to backup array
-   * Fixed the not quite right default config

Copied: memcached/repos/extra-i686/ChangeLog (from rev 147163, 
memcached/trunk/ChangeLog)
===
--- extra-i686/ChangeLog(rev 0)
+++ extra-i686/ChangeLog2012-01-23 19:16:26 UTC (rev 147164)
@@ -0,0 +1,24 @@
+2011-02-07 Ionut Biru ib...@archlinux.org
+   * Rebuild 1.4.5 against libevent 2.0.10
+
+2011-01-31 Dan McGee d...@archlinux.org
+   * Rebuild 1.4.5 with gcc 4.5.X patch accepted upstream
+
+2009-11-14 Dan McGee d...@archlinux.org
+   * Bump to 1.4.3
+   * Added memcached-tool to package
+
+2009-09-13 Dan McGee d...@archlinux.org
+   * Bump to 1.4.1
+   * Add new required conf.d option MEMCACHED_USER
+   * Rework the way we store the PID for init script usage
+
+2009-04-12 Dan McGee d...@archlinux.org
+   * Bump to 1.2.8
+
+2009-04-05 Dan McGee d...@archlinux.org
+   * Bump to 1.2.7
+
+2008-12-13 Dan McGee d...@archlinux.org
+   * Added conf file to backup array
+   * Fixed the not quite right default config

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-01-23 19:15:47 UTC (rev 147163)
+++ extra-i686/PKGBUILD 2012-01-23 19:16:26 UTC (rev 147164)
@@ -1,38 +0,0 @@
-# $Id$
-# Maintainer: Dan McGee d...@archlinux.org
-# Contributor: Michael Irwin 6d6...@gmail.com
-
-pkgname=memcached
-pkgver=1.4.10
-pkgrel=1
-pkgdesc=A distributed memory object caching system
-arch=(i686 x86_64)
-url=http://memcached.org/;
-license=('GPL')
-depends=('libevent')
-optdepends=('perl: for memcached-tool usage')
-backup=('etc/conf.d/memcached')
-source=(http://memcached.googlecode.com/files/$pkgname-$pkgver.tar.gz
-memcached.conf
-   memcached.sh)
-changelog=ChangeLog
-sha256sums=('2cc3de341b561464da29fc5d5e2a4facc0f6aafc151f0e1d94228705e0758fdf'
-'0e57a0f528b387f1f04f628ec74856c615d82d44f4d6bc041c33b3814ce13d0a'
-'72efa639c5a39c7c14f07cc51731ebbf82299870d9cf31cf3aaa981bc084b4eb')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make 

[arch-commits] Commit in pekwm/trunk (PKGBUILD)

2012-01-23 Thread Eric Bélanger
Date: Monday, January 23, 2012 @ 15:21:56
  Author: eric
Revision: 147165

upgpkg: pekwm 0.1.13-2

Rebuild against libpng 1.5 and libtiff 4.0

Modified:
  pekwm/trunk/PKGBUILD

--+
 PKGBUILD |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-01-23 19:16:26 UTC (rev 147164)
+++ PKGBUILD2012-01-23 20:21:56 UTC (rev 147165)
@@ -4,7 +4,7 @@
 
 pkgname=pekwm
 pkgver=0.1.13
-pkgrel=1
+pkgrel=2
 pkgdesc=A small, fast, functional, and flexible window manager
 arch=(i686 x86_64)
 license=('GPL')
@@ -24,7 +24,7 @@
  '075bf1b9d32bf94780329499e4fa40e3')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd ${srcdir}/${pkgname}-${pkgver}
 #  patch -p1  ../libpng-1.4.patch || return 1
   # Default settings:
   #--enable-shape --enable-xinerama --enable-menus \
@@ -37,9 +37,9 @@
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-  install -D -m644 ${srcdir}/${pkgname}.desktop \
-   ${pkgdir}/usr/share/xsessions/${pkgname}.desktop
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+  install -D -m644 ${srcdir}/${pkgname}.desktop \
+   ${pkgdir}/usr/share/xsessions/${pkgname}.desktop
 }
 # vim: ts=2 sw=2 et ft=sh



[arch-commits] Commit in pekwm/repos (8 files)

2012-01-23 Thread Eric Bélanger
Date: Monday, January 23, 2012 @ 15:22:29
  Author: eric
Revision: 147166

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  pekwm/repos/staging-i686/
  pekwm/repos/staging-i686/PKGBUILD
(from rev 147165, pekwm/trunk/PKGBUILD)
  pekwm/repos/staging-i686/libpng-1.4.patch
(from rev 147165, pekwm/trunk/libpng-1.4.patch)
  pekwm/repos/staging-i686/pekwm.desktop
(from rev 147165, pekwm/trunk/pekwm.desktop)
  pekwm/repos/staging-x86_64/
  pekwm/repos/staging-x86_64/PKGBUILD
(from rev 147165, pekwm/trunk/PKGBUILD)
  pekwm/repos/staging-x86_64/libpng-1.4.patch
(from rev 147165, pekwm/trunk/libpng-1.4.patch)
  pekwm/repos/staging-x86_64/pekwm.desktop
(from rev 147165, pekwm/trunk/pekwm.desktop)

-+
 staging-i686/PKGBUILD   |   45 ++
 staging-i686/libpng-1.4.patch   |   21 +
 staging-i686/pekwm.desktop  |8 ++
 staging-x86_64/PKGBUILD |   45 ++
 staging-x86_64/libpng-1.4.patch |   21 +
 staging-x86_64/pekwm.desktop|8 ++
 6 files changed, 148 insertions(+)

Copied: pekwm/repos/staging-i686/PKGBUILD (from rev 147165, 
pekwm/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2012-01-23 20:22:29 UTC (rev 147166)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer: Kevin Piche ke...@archlinux.org
+# Contributor: Eddie Lozon almostlu...@attbi.com
+
+pkgname=pekwm
+pkgver=0.1.13
+pkgrel=2
+pkgdesc=A small, fast, functional, and flexible window manager
+arch=(i686 x86_64)
+license=('GPL')
+url=http://pekwm.org/;
+depends=('gcc-libs' 'libjpeg=7' 'libpng' 'libxft' 'libxinerama' 'libxpm'
+'libxrandr')
+backup=(etc/pekwm/config
+  etc/pekwm/vars
+  etc/pekwm/autoproperties
+  etc/pekwm/start
+  etc/pekwm/keys
+  etc/pekwm/mouse
+  etc/pekwm/menu)
+source=(http://www.pekwm.org/projects/pekwm/files/${pkgname}-${pkgver}.tar.bz2
+pekwm.desktop libpng-1.4.patch)
+md5sums=('51a3f9030817df0304cc1da5110e493a' '5a78fc6653fbb0b7282ecf7f1f81e2c5'
+ '075bf1b9d32bf94780329499e4fa40e3')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+#  patch -p1  ../libpng-1.4.patch || return 1
+  # Default settings:
+  #--enable-shape --enable-xinerama --enable-menus \
+  #--enable-harbour --disable-debug --disable-pedantic \
+  #--enable-xft --enable-image-xpm --enable-image-jpeg \
+  #--enable-image-png --enable-xrandr
+  ./configure --prefix=/usr --sysconfdir=/etc
+
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+  install -D -m644 ${srcdir}/${pkgname}.desktop \
+   ${pkgdir}/usr/share/xsessions/${pkgname}.desktop
+}
+# vim: ts=2 sw=2 et ft=sh

Copied: pekwm/repos/staging-i686/libpng-1.4.patch (from rev 147165, 
pekwm/trunk/libpng-1.4.patch)
===
--- staging-i686/libpng-1.4.patch   (rev 0)
+++ staging-i686/libpng-1.4.patch   2012-01-23 20:22:29 UTC (rev 147166)
@@ -0,0 +1,21 @@
+diff -Naur pekwm-0.1.11-orig/src/PImageLoaderPng.cc 
pekwm-0.1.11/src/PImageLoaderPng.cc
+--- pekwm-0.1.11-orig/src/PImageLoaderPng.cc   2010-01-22 01:57:08.0 
-0500
 pekwm-0.1.11/src/PImageLoaderPng.cc2010-01-22 02:00:02.0 
-0500
+@@ -108,7 +108,7 @@
+ 
+ // gray - 8 bit gray
+ if (color_type == PNG_COLOR_TYPE_GRAY  (bpp  8)) {
+-png_set_gray_1_2_4_to_8(png_ptr);
++png_set_expand_gray_1_2_4_to_8(png_ptr);
+ }
+ 
+ if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) {
+@@ -179,7 +179,7 @@
+ 
+ status = fread(sig, 1, PImageLoaderPng::PNG_SIG_BYTES, fp);
+ if (status == PImageLoaderPng::PNG_SIG_BYTES) {
+-return (png_check_sig(sig, PImageLoaderPng::PNG_SIG_BYTES) != 0);
++  return (png_sig_cmp(sig, 0, PImageLoaderPng::PNG_SIG_BYTES) == 0);
+ }
+ return false;
+ }

Copied: pekwm/repos/staging-i686/pekwm.desktop (from rev 147165, 
pekwm/trunk/pekwm.desktop)
===
--- staging-i686/pekwm.desktop  (rev 0)
+++ staging-i686/pekwm.desktop  2012-01-23 20:22:29 UTC (rev 147166)
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Pekwm
+Comment=The pekwm window manager
+Exec=pekwm
+# no icon yet, only the top three are currently used
+Icon=
+Type=Application

Copied: pekwm/repos/staging-x86_64/PKGBUILD (from rev 147165, 
pekwm/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2012-01-23 20:22:29 UTC (rev 147166)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer: Kevin Piche ke...@archlinux.org
+# Contributor: Eddie Lozon almostlu...@attbi.com
+
+pkgname=pekwm
+pkgver=0.1.13

[arch-commits] Commit in pygtk/trunk (PKGBUILD)

2012-01-23 Thread Eric Bélanger
Date: Monday, January 23, 2012 @ 16:15:27
  Author: eric
Revision: 147167

upgpkg: pygtk 2.24.0-3

Rebuild against libpng 1.5 and libtiff 4.0, Fix python scripts

Modified:
  pygtk/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-01-23 20:22:29 UTC (rev 147166)
+++ PKGBUILD2012-01-23 21:15:27 UTC (rev 147167)
@@ -4,7 +4,7 @@
 
 pkgname=pygtk
 pkgver=2.24.0
-pkgrel=2
+pkgrel=3
 pkgdesc=Python bindings for the GTK widget set
 arch=('i686' 'x86_64')
 license=('LGPL')
@@ -24,7 +24,7 @@
   #https://bugzilla.gnome.org/show_bug.cgi?id=623965
   patch -Np1 -i ${srcdir}/python27.patch
 
-  PYTHON=python2 ./configure --prefix=/usr
+  PYTHON=/usr/bin/python2 ./configure --prefix=/usr
   make
 }
 



[arch-commits] Commit in pygtk/repos (6 files)

2012-01-23 Thread Eric Bélanger
Date: Monday, January 23, 2012 @ 16:15:41
  Author: eric
Revision: 147168

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  pygtk/repos/staging-i686/
  pygtk/repos/staging-i686/PKGBUILD
(from rev 147167, pygtk/trunk/PKGBUILD)
  pygtk/repos/staging-i686/python27.patch
(from rev 147167, pygtk/trunk/python27.patch)
  pygtk/repos/staging-x86_64/
  pygtk/repos/staging-x86_64/PKGBUILD
(from rev 147167, pygtk/trunk/PKGBUILD)
  pygtk/repos/staging-x86_64/python27.patch
(from rev 147167, pygtk/trunk/python27.patch)

---+
 staging-i686/PKGBUILD |   37 +
 staging-i686/python27.patch   |   50 
 staging-x86_64/PKGBUILD   |   37 +
 staging-x86_64/python27.patch |   50 
 4 files changed, 174 insertions(+)

Copied: pygtk/repos/staging-i686/PKGBUILD (from rev 147167, 
pygtk/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2012-01-23 21:15:41 UTC (rev 147168)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+# Contributor: Sarah Hay sarah...@mb.sympatico.ca
+
+pkgname=pygtk
+pkgver=2.24.0
+pkgrel=3
+pkgdesc=Python bindings for the GTK widget set
+arch=('i686' 'x86_64')
+license=('LGPL')
+depends=('libglade' 'python2-cairo' 'pygobject')
+makedepends=('python2-numpy' 'pygobject2-devel')
+optdepends=('python2-numpy')
+options=('!libtool')
+url=http://www.pygtk.org/;
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
+python27.patch)
+sha256sums=('cd1c1ea265bd63ff669e92a2d3c2a88eb26bcd9e5363e0f82c896e649f206912'
+'39a30456cba055a452bb55c74ef1ff2f5f7bfaad22855b4dd569ab009b56b682')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+
+  #https://bugzilla.gnome.org/show_bug.cgi?id=623965
+  patch -Np1 -i ${srcdir}/python27.patch
+
+  PYTHON=/usr/bin/python2 ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+  install -m644 gtk/gtk-extrafuncs.defs ${pkgdir}/usr/share/pygtk/2.0/defs/
+
+  sed -i -e 's#env python$#env python2#' 
${pkgdir}/usr/lib/pygtk/2.0/{,demos/}*.py
+}

Copied: pygtk/repos/staging-i686/python27.patch (from rev 147167, 
pygtk/trunk/python27.patch)
===
--- staging-i686/python27.patch (rev 0)
+++ staging-i686/python27.patch 2012-01-23 21:15:41 UTC (rev 147168)
@@ -0,0 +1,50 @@
+diff --git a/gtk/gtkmodule.c b/gtk/gtkmodule.c
+index c0e1493..aa8cf10 100644
+--- a/gtk/gtkmodule.c
 b/gtk/gtkmodule.c
+@@ -227,8 +227,12 @@ init_gtk(void)
+ pygtk_add_stock_items(d);
+ 
+ /* extension API */
+-PyDict_SetItemString(d, _PyGtk_API,
+-   o=PyCObject_FromVoidPtr(functions, NULL));
++#if PY_VERSION_HEX = 0x0207
++o = PyCapsule_New(functions, gtk._gtk._PyGtk_API, NULL);
++#else
++o = PyCObject_FromVoidPtr(functions, NULL);
++#endif
++PyDict_SetItemString(d, _PyGtk_API, o);
+ Py_DECREF(o);
+   
+ PyGtkDeprecationWarning = PyErr_NewException(gtk.GtkDeprecationWarning,
+diff --git a/gtk/pygtk.h b/gtk/pygtk.h
+index 573c3b9..e4c680f 100644
+--- a/gtk/pygtk.h
 b/gtk/pygtk.h
+@@ -60,6 +60,18 @@ struct _PyGtk_FunctionStruct *_PyGtk_API;
+ 
+ 
+ /* a function to initialise the pygtk functions */
++
++/* Python 2.7 introduced the PyCapsule API and deprecated the CObject API */
++#if PY_VERSION_HEX = 0x0207
++#define init_pygtk() G_STMT_START { \
++void *capsule = PyCapsule_Import(gtk._gtk._PyGtk_API, 0); \
++if (!capsule) { \
++return; \
++} \
++_PyGtk_API = (struct _PyGtk_FunctionStruct*)capsule; \
++} G_STMT_END
++#else /* PY_VERSION_HEX */
++/* Python 2.6 and earlier use the CObject API */
+ #define init_pygtk() G_STMT_START { \
+ PyObject *pygtk = PyImport_ImportModule(gtk); \
+ if (pygtk != NULL) { \
+@@ -79,6 +91,7 @@ struct _PyGtk_FunctionStruct *_PyGtk_API;
+ return; \
+ } \
+ } G_STMT_END
++#endif /* PY_VERSION_HEX */
+ 
+ #endif
+ 

Copied: pygtk/repos/staging-x86_64/PKGBUILD (from rev 147167, 
pygtk/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2012-01-23 21:15:41 UTC (rev 147168)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+# Contributor: Sarah Hay sarah...@mb.sympatico.ca
+
+pkgname=pygtk
+pkgver=2.24.0
+pkgrel=3
+pkgdesc=Python bindings for the GTK widget set
+arch=('i686' 'x86_64')
+license=('LGPL')
+depends=('libglade' 'python2-cairo' 'pygobject')
+makedepends=('python2-numpy' 'pygobject2-devel')
+optdepends=('python2-numpy')
+options=('!libtool')

[arch-commits] Commit in imlib2/trunk (PKGBUILD)

2012-01-23 Thread Eric Bélanger
Date: Monday, January 23, 2012 @ 16:18:01
  Author: eric
Revision: 147169

upgpkg: imlib2 1.4.5-2

Rebuild against libpng 1.5 and libtiff 4.0

Modified:
  imlib2/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-01-23 21:15:41 UTC (rev 147168)
+++ PKGBUILD2012-01-23 21:18:01 UTC (rev 147169)
@@ -5,7 +5,7 @@
 
 pkgname=imlib2
 pkgver=1.4.5
-pkgrel=1
+pkgrel=2
 pkgdesc=Library that does image file loading and saving as well as rendering, 
manipulation, arbitrary polygon support
 url=http://sourceforge.net/projects/enlightenment/;
 arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@
 sha1sums=('af86a2c38f4bc3806db57e64e74dc9814ad474a0')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd $srcdir/$pkgname-$pkgver
 
   # disable optimizations, they cause problems (e.g. FS#12268)
   [ $CARCH = i686 ]  EXTRAOPTS=--disable-mmx
@@ -30,9 +30,9 @@
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install
 
   # Install License
-  install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
+  install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
 }



[arch-commits] Commit in imlib2/repos (4 files)

2012-01-23 Thread Eric Bélanger
Date: Monday, January 23, 2012 @ 16:18:18
  Author: eric
Revision: 147170

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  imlib2/repos/staging-i686/
  imlib2/repos/staging-i686/PKGBUILD
(from rev 147169, imlib2/trunk/PKGBUILD)
  imlib2/repos/staging-x86_64/
  imlib2/repos/staging-x86_64/PKGBUILD
(from rev 147169, imlib2/trunk/PKGBUILD)

-+
 staging-i686/PKGBUILD   |   38 ++
 staging-x86_64/PKGBUILD |   38 ++
 2 files changed, 76 insertions(+)

Copied: imlib2/repos/staging-i686/PKGBUILD (from rev 147169, 
imlib2/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2012-01-23 21:18:18 UTC (rev 147170)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Ronald van Haren ronald.archlinux.org
+# Contributor: Arjan Timmerman arjan.archlinux.org
+# Contributor: Tom Newsom Jeepster.gmx.co.uk
+
+pkgname=imlib2
+pkgver=1.4.5
+pkgrel=2
+pkgdesc=Library that does image file loading and saving as well as rendering, 
manipulation, arbitrary polygon support
+url=http://sourceforge.net/projects/enlightenment/;
+arch=('i686' 'x86_64')
+license=('BSD')
+depends=('libtiff' 'giflib' 'bzip2' 'freetype2' 'libxext' 'libpng' 'libid3tag' 
'libjpeg-turbo')
+options=('!libtool')
+source=(http://downloads.sourceforge.net/enlightenment/$pkgname-$pkgver.tar.bz2;)
+sha1sums=('af86a2c38f4bc3806db57e64e74dc9814ad474a0')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+
+  # disable optimizations, they cause problems (e.g. FS#12268)
+  [ $CARCH = i686 ]  EXTRAOPTS=--disable-mmx
+  [ $CARCH = x86_64 ]  EXTRAOPTS=--disable-amd64
+
+  # Configure and Build
+  ./configure --prefix=/usr \
+  --sysconfdir=/etc/imlib2 \
+  --x-libraries=/usr/lib $EXTRAOPTS
+  make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install
+
+  # Install License
+  install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
+}

Copied: imlib2/repos/staging-x86_64/PKGBUILD (from rev 147169, 
imlib2/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2012-01-23 21:18:18 UTC (rev 147170)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Ronald van Haren ronald.archlinux.org
+# Contributor: Arjan Timmerman arjan.archlinux.org
+# Contributor: Tom Newsom Jeepster.gmx.co.uk
+
+pkgname=imlib2
+pkgver=1.4.5
+pkgrel=2
+pkgdesc=Library that does image file loading and saving as well as rendering, 
manipulation, arbitrary polygon support
+url=http://sourceforge.net/projects/enlightenment/;
+arch=('i686' 'x86_64')
+license=('BSD')
+depends=('libtiff' 'giflib' 'bzip2' 'freetype2' 'libxext' 'libpng' 'libid3tag' 
'libjpeg-turbo')
+options=('!libtool')
+source=(http://downloads.sourceforge.net/enlightenment/$pkgname-$pkgver.tar.bz2;)
+sha1sums=('af86a2c38f4bc3806db57e64e74dc9814ad474a0')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+
+  # disable optimizations, they cause problems (e.g. FS#12268)
+  [ $CARCH = i686 ]  EXTRAOPTS=--disable-mmx
+  [ $CARCH = x86_64 ]  EXTRAOPTS=--disable-amd64
+
+  # Configure and Build
+  ./configure --prefix=/usr \
+  --sysconfdir=/etc/imlib2 \
+  --x-libraries=/usr/lib $EXTRAOPTS
+  make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install
+
+  # Install License
+  install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
+}



[arch-commits] Commit in gcc/trunk (PKGBUILD)

2012-01-23 Thread Allan McRae
Date: Monday, January 23, 2012 @ 16:33:14
  Author: allan
Revision: 147171

upgpkg: gcc 4.6.2-6

new upstream snapshot (fixes some ICE), add symlnks for plugin headers, add 
--enable-libstdcxx-time

Modified:
  gcc/trunk/PKGBUILD

--+
 PKGBUILD |   14 ++
 1 file changed, 10 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-01-23 21:18:18 UTC (rev 147170)
+++ PKGBUILD2012-01-23 21:33:14 UTC (rev 147171)
@@ -6,8 +6,8 @@
 
 pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada' 'gcc-go')
 pkgver=4.6.2
-pkgrel=5
-_snapshot=4.6-20111223
+pkgrel=6
+_snapshot=4.6-20120120
 _libstdcppmanver=20111215  # Note: check source directory name 
when updating this
 pkgdesc=The GNU Compiler Collection
 arch=('i686' 'x86_64')
@@ -21,7 +21,7 @@

ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-man.${_libstdcppmanver}.tar.bz2
gcc_pure64.patch
gcc-hash-style-both.patch)
-md5sums=('4755b9f6ac0abecbaa2097ed9738406a'
+md5sums=('f7ca5d9f7a07216577f81318b7cf56ef'
  '450772ce32daed97d7383199f8797f33'
  '4030ee1c08dd1e843c0225b772360e76'
  '4df25b623799b148a0703eaeec8fdf3f')
@@ -59,11 +59,12 @@
   --enable-shared --enable-threads=posix \
   --with-system-zlib --enable-__cxa_atexit \
   --disable-libunwind-exceptions --enable-clocale=gnu \
+  --disable-libstdcxx-pch --enable-libstdcxx-time \
   --enable-gnu-unique-object --enable-linker-build-id \
   --with-ppl --enable-cloog-backend=isl \
   --enable-lto --enable-gold --enable-ld=default \
   --enable-plugin --with-plugin-ld=ld.gold \
-  --disable-multilib --disable-libssp --disable-libstdcxx-pch \
+  --disable-multilib --disable-libssp \
   --enable-checking=release
   make
 }
@@ -144,6 +145,11 @@
   install -m755 gcc/build/gengtype $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/
   install -m644 gcc/gtype.state $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/
 
+  # plugin headers are all over the place at the moment...
+  for i in common objc pragma pretty-print; do
+ln -sf ../c-$i.h 
$pkgdir/usr/lib/gcc/$CHOST/${pkgver}/plugin/include/c-family/c-$i.h
+  done
+
   # POSIX conformance launcher scripts for c89 and c99
   cat  $pkgdir/usr/bin/c89 EOF
 #!/bin/sh



[arch-commits] Commit in gcc/repos (18 files)

2012-01-23 Thread Allan McRae
Date: Monday, January 23, 2012 @ 16:35:31
  Author: allan
Revision: 147172

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  gcc/repos/testing-i686/
  gcc/repos/testing-i686/PKGBUILD
(from rev 147171, gcc/trunk/PKGBUILD)
  gcc/repos/testing-i686/gcc-ada.install
(from rev 147171, gcc/trunk/gcc-ada.install)
  gcc/repos/testing-i686/gcc-fortran.install
(from rev 147171, gcc/trunk/gcc-fortran.install)
  gcc/repos/testing-i686/gcc-go.install
(from rev 147171, gcc/trunk/gcc-go.install)
  gcc/repos/testing-i686/gcc-hash-style-both.patch
(from rev 147171, gcc/trunk/gcc-hash-style-both.patch)
  gcc/repos/testing-i686/gcc-libs.install
(from rev 147171, gcc/trunk/gcc-libs.install)
  gcc/repos/testing-i686/gcc.install
(from rev 147171, gcc/trunk/gcc.install)
  gcc/repos/testing-i686/gcc_pure64.patch
(from rev 147171, gcc/trunk/gcc_pure64.patch)
  gcc/repos/testing-x86_64/
  gcc/repos/testing-x86_64/PKGBUILD
(from rev 147171, gcc/trunk/PKGBUILD)
  gcc/repos/testing-x86_64/gcc-ada.install
(from rev 147171, gcc/trunk/gcc-ada.install)
  gcc/repos/testing-x86_64/gcc-fortran.install
(from rev 147171, gcc/trunk/gcc-fortran.install)
  gcc/repos/testing-x86_64/gcc-go.install
(from rev 147171, gcc/trunk/gcc-go.install)
  gcc/repos/testing-x86_64/gcc-hash-style-both.patch
(from rev 147171, gcc/trunk/gcc-hash-style-both.patch)
  gcc/repos/testing-x86_64/gcc-libs.install
(from rev 147171, gcc/trunk/gcc-libs.install)
  gcc/repos/testing-x86_64/gcc.install
(from rev 147171, gcc/trunk/gcc.install)
  gcc/repos/testing-x86_64/gcc_pure64.patch
(from rev 147171, gcc/trunk/gcc_pure64.patch)

--+
 testing-i686/PKGBUILD|  260 +
 testing-i686/gcc-ada.install |   20 ++
 testing-i686/gcc-fortran.install |   16 +
 testing-i686/gcc-go.install  |   20 ++
 testing-i686/gcc-hash-style-both.patch   |  122 +
 testing-i686/gcc-libs.install|   16 +
 testing-i686/gcc.install |   20 ++
 testing-i686/gcc_pure64.patch|   26 ++
 testing-x86_64/PKGBUILD  |  260 +
 testing-x86_64/gcc-ada.install   |   20 ++
 testing-x86_64/gcc-fortran.install   |   16 +
 testing-x86_64/gcc-go.install|   20 ++
 testing-x86_64/gcc-hash-style-both.patch |  122 +
 testing-x86_64/gcc-libs.install  |   16 +
 testing-x86_64/gcc.install   |   20 ++
 testing-x86_64/gcc_pure64.patch  |   26 ++
 16 files changed, 1000 insertions(+)

Copied: gcc/repos/testing-i686/PKGBUILD (from rev 147171, gcc/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2012-01-23 21:35:31 UTC (rev 147172)
@@ -0,0 +1,260 @@
+# $Id$
+# Maintainer: Allan McRae al...@archlinux.org
+
+# toolchain build order: 
linux-api-headers-glibc-binutils-gcc-binutils-glibc
+# NOTE: libtool requires rebuilt with each new gcc version
+
+pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada' 'gcc-go')
+pkgver=4.6.2
+pkgrel=6
+_snapshot=4.6-20120120
+_libstdcppmanver=20111215  # Note: check source directory name 
when updating this
+pkgdesc=The GNU Compiler Collection
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL' 'custom')
+url=http://gcc.gnu.org;
+makedepends=('binutils=2.22' 'libmpc' 'cloog' 'ppl' 'gcc-ada')
+checkdepends=('dejagnu')
+options=('!libtool' '!emptydirs')
+source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
+   
ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2
+   
ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-man.${_libstdcppmanver}.tar.bz2
+   gcc_pure64.patch
+   gcc-hash-style-both.patch)
+md5sums=('f7ca5d9f7a07216577f81318b7cf56ef'
+ '450772ce32daed97d7383199f8797f33'
+ '4030ee1c08dd1e843c0225b772360e76'
+ '4df25b623799b148a0703eaeec8fdf3f')
+
+if [ -n ${_snapshot} ]; then
+  _basedir=${srcdir}/gcc-${_snapshot}
+else
+  _basedir=${srcdir}/gcc-${pkgver}
+fi
+
+build() {
+  cd ${_basedir}
+
+  # Do not install libiberty
+  sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in
+
+  # Do not run fixincludes
+  sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
+
+  if [ ${CARCH} = x86_64 ]; then
+patch -Np1 -i ${srcdir}/gcc_pure64.patch
+  fi
+  patch -Np0 -i ${srcdir}/gcc-hash-style-both.patch
+
+  echo ${pkgver}  gcc/BASE-VER
+
+  cd ${srcdir}
+  mkdir gcc-build  cd gcc-build
+
+  ${_basedir}/configure --prefix=/usr \
+  --libdir=/usr/lib --libexecdir=/usr/lib \
+  --mandir=/usr/share/man --infodir=/usr/share/info \
+  --with-bugurl=https://bugs.archlinux.org/ \
+  --enable-languages=c,c++,ada,fortran,go,lto,objc,obj-c++ \
+  --enable-shared --enable-threads=posix \
+  

[arch-commits] Commit in pilot-link/trunk (PKGBUILD)

2012-01-23 Thread Eric Bélanger
Date: Monday, January 23, 2012 @ 16:42:28
  Author: eric
Revision: 147173

upgpkg: pilot-link 0.12.5-3

Rebuild against libpng 1.5 and libtiff 4.0

Modified:
  pilot-link/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-01-23 21:35:31 UTC (rev 147172)
+++ PKGBUILD2012-01-23 21:42:28 UTC (rev 147173)
@@ -6,13 +6,13 @@
 
 pkgname=pilot-link
 pkgver=0.12.5
-pkgrel=2
+pkgrel=3
 pkgdesc=A suite of tools for connecting to PalmOS handheld devices
 arch=(i686 x86_64)
 license=('GPL' 'LGPL')
-depends=('readline=6.0' 'libpng=1.4.0' 'libusb-compat' 'popt' 'bluez=4.59')
+depends=('readline=6.0' 'libpng=1.5.0' 'libusb-compat' 'popt' 'bluez=4.59')
 options=('!libtool')
-url=http://www.pilot-link.org/
+url=http://www.pilot-link.org/;
 source=(http://downloads.pilot-link.org/${pkgname}-${pkgver}.tar.bz2
 pilot-link-png14.patch)
 md5sums=('568c55bf504b044f6fbd50baa407c990'



[arch-commits] Commit in pilot-link/repos (6 files)

2012-01-23 Thread Eric Bélanger
Date: Monday, January 23, 2012 @ 16:43:03
  Author: eric
Revision: 147174

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  pilot-link/repos/staging-i686/
  pilot-link/repos/staging-i686/PKGBUILD
(from rev 147173, pilot-link/trunk/PKGBUILD)
  pilot-link/repos/staging-i686/pilot-link-png14.patch
(from rev 147173, pilot-link/trunk/pilot-link-png14.patch)
  pilot-link/repos/staging-x86_64/
  pilot-link/repos/staging-x86_64/PKGBUILD
(from rev 147173, pilot-link/trunk/PKGBUILD)
  pilot-link/repos/staging-x86_64/pilot-link-png14.patch
(from rev 147173, pilot-link/trunk/pilot-link-png14.patch)

---+
 staging-i686/PKGBUILD |   32 ++
 staging-i686/pilot-link-png14.patch   |  100 
 staging-x86_64/PKGBUILD   |   32 ++
 staging-x86_64/pilot-link-png14.patch |  100 
 4 files changed, 264 insertions(+)

Copied: pilot-link/repos/staging-i686/PKGBUILD (from rev 147173, 
pilot-link/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2012-01-23 21:43:03 UTC (rev 147174)
@@ -0,0 +1,32 @@
+# $Id$
+# Maintainer: dale d...@archlinux.org
+
+# todo: add perl support, DESTDIR has no affect on perl
+# and it seems that moving the files manually doesn't work
+
+pkgname=pilot-link
+pkgver=0.12.5
+pkgrel=3
+pkgdesc=A suite of tools for connecting to PalmOS handheld devices
+arch=(i686 x86_64)
+license=('GPL' 'LGPL')
+depends=('readline=6.0' 'libpng=1.5.0' 'libusb-compat' 'popt' 'bluez=4.59')
+options=('!libtool')
+url=http://www.pilot-link.org/;
+source=(http://downloads.pilot-link.org/${pkgname}-${pkgver}.tar.bz2
+pilot-link-png14.patch)
+md5sums=('568c55bf504b044f6fbd50baa407c990'
+ 'a21a2eeb01544a8a261a75e64a3120c3')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/pilot-link-png14.patch
+  ./configure --prefix=/usr --enable-conduits --enable-libusb \
+--with-libiconv --with-libpng
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+}

Copied: pilot-link/repos/staging-i686/pilot-link-png14.patch (from rev 147173, 
pilot-link/trunk/pilot-link-png14.patch)
===
--- staging-i686/pilot-link-png14.patch (rev 0)
+++ staging-i686/pilot-link-png14.patch 2012-01-23 21:43:03 UTC (rev 147174)
@@ -0,0 +1,100 @@
+diff -ru pilot-link-0.12.4/src/pilot-read-notepad.c 
pilot-link-0.12.4.png14/src/pilot-read-notepad.c
+--- pilot-link-0.12.4/src/pilot-read-notepad.c 2007-02-05 00:06:02.0 
+0100
 pilot-link-0.12.4.png14/src/pilot-read-notepad.c   2010-01-17 
15:04:33.0 +0100
+@@ -39,10 +39,6 @@
+ 
+ #ifdef HAVE_PNG
+ #include png.h
+-#if (PNG_LIBPNG_VER  10201)
+- #define png_voidp_NULL (png_voidp)NULL
+- #define png_error_ptr_NULL (png_error_ptr)NULL
+-#endif
+ #endif
+ 
+ const char *progname;
+@@ -166,8 +162,8 @@
+width = n-body.width + 8;
+ 
+png_ptr = png_create_write_struct
+- ( PNG_LIBPNG_VER_STRING, png_voidp_NULL,
+-   png_error_ptr_NULL, png_error_ptr_NULL);
++ ( PNG_LIBPNG_VER_STRING, NULL,
++   NULL, NULL);
+ 
+if(!png_ptr)
+  return;
+diff -ru pilot-link-0.12.4/src/pilot-read-palmpix.c 
pilot-link-0.12.4.png14/src/pilot-read-palmpix.c
+--- pilot-link-0.12.4/src/pilot-read-palmpix.c 2007-02-05 00:06:03.0 
+0100
 pilot-link-0.12.4.png14/src/pilot-read-palmpix.c   2010-01-17 
15:03:20.0 +0100
+@@ -42,10 +42,6 @@
+ 
+ #ifdef HAVE_PNG
+ #include png.h
+-#if (PNG_LIBPNG_VER  10201)
+- #define png_voidp_NULL (png_voidp)NULL
+- #define png_error_ptr_NULL (png_error_ptr)NULL
+-#endif
+ #endif
+ 
+ const char *progname;
+@@ -223,8 +219,8 @@
+   png_infop info_ptr;
+ 
+   png_ptr = png_create_write_struct
+-  ( PNG_LIBPNG_VER_STRING, png_voidp_NULL,
+-  png_error_ptr_NULL, png_error_ptr_NULL);
++  ( PNG_LIBPNG_VER_STRING, NULL,
++  NULL, NULL);
+ 
+   if(!png_ptr)
+   return;
+diff -ru pilot-link-0.12.4/src/pilot-read-screenshot.c 
pilot-link-0.12.4.png14/src/pilot-read-screenshot.c
+--- pilot-link-0.12.4/src/pilot-read-screenshot.c  2006-11-02 
15:54:31.0 +0100
 pilot-link-0.12.4.png14/src/pilot-read-screenshot.c2010-01-17 
15:03:52.0 +0100
+@@ -40,10 +40,6 @@
+ 
+ #ifdef HAVE_PNG
+ # include png.h
+-# if (PNG_LIBPNG_VER  10201)
+-#  define png_voidp_NULL (png_voidp)NULL
+-#  define png_error_ptr_NULL (png_error_ptr)NULL
+-# endif
+ #endif
+ 
+ #define pi_mktag(c1,c2,c3,c4) (((c1)24)|((c2)16)|((c3)8)|(c4))
+@@ -87,8 +83,8 @@
+   gray_buf = malloc( state-w );
+ 
+   png_ptr = png_create_write_struct
+-  (PNG_LIBPNG_VER_STRING, png_voidp_NULL,
+-  

[arch-commits] Commit in xawtv/trunk (PKGBUILD)

2012-01-23 Thread Eric Bélanger
Date: Monday, January 23, 2012 @ 18:35:40
  Author: eric
Revision: 147175

upgpkg: xawtv 3.101-2

Rebuild against libpng 1.5 and libtiff 4.0, Add libxxf86vm depends

Modified:
  xawtv/trunk/PKGBUILD

--+
 PKGBUILD |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-01-23 21:43:03 UTC (rev 147174)
+++ PKGBUILD2012-01-23 23:35:40 UTC (rev 147175)
@@ -5,12 +5,12 @@
 
 pkgname=xawtv
 pkgver=3.101
-pkgrel=1
+pkgrel=2
 pkgdesc=A simple Xaw-based TV program which uses the bttv driver or 
video4linux
 arch=('i686' 'x86_64')
 url=http://git.linuxtv.org/xawtv3.git;
 license=('GPL')
-depends=('aalib' 'v4l-utils' 'libxv' 'libxxf86dga' 'libxrandr' 'libgl' 'libdv' 
'zvbi' 'libxinerama' 'lirc-utils' 'libxft' 'libxaw' 'xorg-fonts-misc')
+depends=('aalib' 'v4l-utils' 'libxv' 'libxxf86dga' 'libxrandr' 'libgl' 'libdv' 
'zvbi' 'libxinerama' 'lirc-utils' 'libxft' 'libxaw' 'xorg-fonts-misc' 
'libxxf86vm')
 makedepends=('mesa')
 source=(http://linuxtv.org/downloads/xawtv/xawtv-${pkgver}.tar.bz2)
 md5sums=('330ce1789595e370be34ad4cae3dc3fa')
@@ -21,5 +21,9 @@
   autoheader
   ./configure --prefix=/usr --disable-motif --disable-quicktime
   make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
 }



[arch-commits] Commit in xawtv/repos (4 files)

2012-01-23 Thread Eric Bélanger
Date: Monday, January 23, 2012 @ 18:36:01
  Author: eric
Revision: 147176

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  xawtv/repos/staging-i686/
  xawtv/repos/staging-i686/PKGBUILD
(from rev 147175, xawtv/trunk/PKGBUILD)
  xawtv/repos/staging-x86_64/
  xawtv/repos/staging-x86_64/PKGBUILD
(from rev 147175, xawtv/trunk/PKGBUILD)

-+
 staging-i686/PKGBUILD   |   29 +
 staging-x86_64/PKGBUILD |   29 +
 2 files changed, 58 insertions(+)

Copied: xawtv/repos/staging-i686/PKGBUILD (from rev 147175, 
xawtv/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2012-01-23 23:36:01 UTC (rev 147176)
@@ -0,0 +1,29 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+# Contributor: Sarah Hay sarah...@mb.sympatico.ca
+# Contributor: Jason Chu ja...@archlinux.org
+
+pkgname=xawtv
+pkgver=3.101
+pkgrel=2
+pkgdesc=A simple Xaw-based TV program which uses the bttv driver or 
video4linux
+arch=('i686' 'x86_64')
+url=http://git.linuxtv.org/xawtv3.git;
+license=('GPL')
+depends=('aalib' 'v4l-utils' 'libxv' 'libxxf86dga' 'libxrandr' 'libgl' 'libdv' 
'zvbi' 'libxinerama' 'lirc-utils' 'libxft' 'libxaw' 'xorg-fonts-misc' 
'libxxf86vm')
+makedepends=('mesa')
+source=(http://linuxtv.org/downloads/xawtv/xawtv-${pkgver}.tar.bz2)
+md5sums=('330ce1789595e370be34ad4cae3dc3fa')
+  
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  autoconf
+  autoheader
+  ./configure --prefix=/usr --disable-motif --disable-quicktime
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+}

Copied: xawtv/repos/staging-x86_64/PKGBUILD (from rev 147175, 
xawtv/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2012-01-23 23:36:01 UTC (rev 147176)
@@ -0,0 +1,29 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+# Contributor: Sarah Hay sarah...@mb.sympatico.ca
+# Contributor: Jason Chu ja...@archlinux.org
+
+pkgname=xawtv
+pkgver=3.101
+pkgrel=2
+pkgdesc=A simple Xaw-based TV program which uses the bttv driver or 
video4linux
+arch=('i686' 'x86_64')
+url=http://git.linuxtv.org/xawtv3.git;
+license=('GPL')
+depends=('aalib' 'v4l-utils' 'libxv' 'libxxf86dga' 'libxrandr' 'libgl' 'libdv' 
'zvbi' 'libxinerama' 'lirc-utils' 'libxft' 'libxaw' 'xorg-fonts-misc' 
'libxxf86vm')
+makedepends=('mesa')
+source=(http://linuxtv.org/downloads/xawtv/xawtv-${pkgver}.tar.bz2)
+md5sums=('330ce1789595e370be34ad4cae3dc3fa')
+  
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  autoconf
+  autoheader
+  ./configure --prefix=/usr --disable-motif --disable-quicktime
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+}



[arch-commits] Commit in xorg-xcursorgen/trunk (PKGBUILD)

2012-01-23 Thread Eric Bélanger
Date: Monday, January 23, 2012 @ 20:21:31
  Author: eric
Revision: 147177

upgpkg: xorg-xcursorgen 1.0.4-3

Rebuild against libpng 1.5 and libtiff 4.0

Modified:
  xorg-xcursorgen/trunk/PKGBUILD

--+
 PKGBUILD |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-01-23 23:36:01 UTC (rev 147176)
+++ PKGBUILD2012-01-24 01:21:31 UTC (rev 147177)
@@ -3,7 +3,7 @@
 
 pkgname=xorg-xcursorgen
 pkgver=1.0.4
-pkgrel=2
+pkgrel=3
 pkgdesc=Create an X cursor file from PNG images
 arch=(i686 x86_64)
 url=http://xorg.freedesktop.org/;
@@ -18,6 +18,10 @@
   cd ${srcdir}/xcursorgen-${pkgver}
   ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd ${srcdir}/xcursorgen-${pkgver}
   make DESTDIR=${pkgdir} install
   install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
   install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/



[arch-commits] Commit in xorg-xcursorgen/repos (4 files)

2012-01-23 Thread Eric Bélanger
Date: Monday, January 23, 2012 @ 20:21:47
  Author: eric
Revision: 147178

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  xorg-xcursorgen/repos/staging-i686/
  xorg-xcursorgen/repos/staging-i686/PKGBUILD
(from rev 147177, xorg-xcursorgen/trunk/PKGBUILD)
  xorg-xcursorgen/repos/staging-x86_64/
  xorg-xcursorgen/repos/staging-x86_64/PKGBUILD
(from rev 147177, xorg-xcursorgen/trunk/PKGBUILD)

-+
 staging-i686/PKGBUILD   |   28 
 staging-x86_64/PKGBUILD |   28 
 2 files changed, 56 insertions(+)

Copied: xorg-xcursorgen/repos/staging-i686/PKGBUILD (from rev 147177, 
xorg-xcursorgen/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2012-01-24 01:21:47 UTC (rev 147178)
@@ -0,0 +1,28 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xorg-xcursorgen
+pkgver=1.0.4
+pkgrel=3
+pkgdesc=Create an X cursor file from PNG images
+arch=(i686 x86_64)
+url=http://xorg.freedesktop.org/;
+license=('custom')
+depends=('libx11' 'libxcursor' 'libpng')
+makedepends=('xorg-util-macros')
+groups=('xorg-apps' 'xorg')
+source=(http://xorg.freedesktop.org/archive/individual/app/xcursorgen-${pkgver}.tar.bz2)
+sha1sums=('244c180aae8cc07175b93f314d5bbbf24171658a')
+
+build() {
+  cd ${srcdir}/xcursorgen-${pkgver}
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${srcdir}/xcursorgen-${pkgver}
+  make DESTDIR=${pkgdir} install
+  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
+}

Copied: xorg-xcursorgen/repos/staging-x86_64/PKGBUILD (from rev 147177, 
xorg-xcursorgen/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2012-01-24 01:21:47 UTC (rev 147178)
@@ -0,0 +1,28 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xorg-xcursorgen
+pkgver=1.0.4
+pkgrel=3
+pkgdesc=Create an X cursor file from PNG images
+arch=(i686 x86_64)
+url=http://xorg.freedesktop.org/;
+license=('custom')
+depends=('libx11' 'libxcursor' 'libpng')
+makedepends=('xorg-util-macros')
+groups=('xorg-apps' 'xorg')
+source=(http://xorg.freedesktop.org/archive/individual/app/xcursorgen-${pkgver}.tar.bz2)
+sha1sums=('244c180aae8cc07175b93f314d5bbbf24171658a')
+
+build() {
+  cd ${srcdir}/xcursorgen-${pkgver}
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${srcdir}/xcursorgen-${pkgver}
+  make DESTDIR=${pkgdir} install
+  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
+}



[arch-commits] Commit in opengtl/trunk (PKGBUILD)

2012-01-23 Thread Evangelos Foutras
Date: Monday, January 23, 2012 @ 20:24:53
  Author: foutrelis
Revision: 147179

upgpkg: opengtl 0.9.16-1

New upstream release. libpng 1.5 rebuild.

Modified:
  opengtl/trunk/PKGBUILD

--+
 PKGBUILD |9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-01-24 01:21:47 UTC (rev 147178)
+++ PKGBUILD2012-01-24 01:24:53 UTC (rev 147179)
@@ -3,18 +3,17 @@
 # Contributor: Andries Radu admir...@live.it
 
 pkgname=opengtl
-pkgver=0.9.15.1
+pkgver=0.9.16
 pkgrel=1
 pkgdesc=A set of library for using and integrating transformation algorithms 
(such as filter or color conversion) in graphics applications
 url=http://www.opengtl.org;
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('gcc-libs')
-makedepends=('cmake' 'llvm' 'libpng')
+depends=('gcc-libs' 'llvm')
+makedepends=('cmake' 'libpng')
 optdepends=('libpng: for using the png extension')
 source=(http://download.opengtl.org/OpenGTL-${pkgver}.tar.bz2)
-md5sums=('052fc8504ced601e356e4d20621699f7')
-sha1sums=('ddd25b1f5eb11ae0b438c67d5a2a73481e919a0a')
+sha1sums=('3cfe4a08e5778c13f7e74dfc822adb68f97ad048')
 
 build() {
   cd ${srcdir}



[arch-commits] Commit in opengtl/repos (4 files)

2012-01-23 Thread Evangelos Foutras
Date: Monday, January 23, 2012 @ 20:25:15
  Author: foutrelis
Revision: 147180

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  opengtl/repos/staging-i686/
  opengtl/repos/staging-i686/PKGBUILD
(from rev 147179, opengtl/trunk/PKGBUILD)
  opengtl/repos/staging-x86_64/
  opengtl/repos/staging-x86_64/PKGBUILD
(from rev 147179, opengtl/trunk/PKGBUILD)

-+
 staging-i686/PKGBUILD   |   32 
 staging-x86_64/PKGBUILD |   32 
 2 files changed, 64 insertions(+)

Copied: opengtl/repos/staging-i686/PKGBUILD (from rev 147179, 
opengtl/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2012-01-24 01:25:15 UTC (rev 147180)
@@ -0,0 +1,32 @@
+# $Id$
+# Maintainer: Ronald van Haren ronald.archlinux.org
+# Contributor: Andries Radu admir...@live.it
+
+pkgname=opengtl
+pkgver=0.9.16
+pkgrel=1
+pkgdesc=A set of library for using and integrating transformation algorithms 
(such as filter or color conversion) in graphics applications
+url=http://www.opengtl.org;
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('gcc-libs' 'llvm')
+makedepends=('cmake' 'libpng')
+optdepends=('libpng: for using the png extension')
+source=(http://download.opengtl.org/OpenGTL-${pkgver}.tar.bz2)
+sha1sums=('3cfe4a08e5778c13f7e74dfc822adb68f97ad048')
+
+build() {
+  cd ${srcdir}
+  mkdir build
+  cd build
+  cmake ../OpenGTL-${pkgver} \
+-DCMAKE_BUILD_TYPE=Release \
+-DCMAKE_SKIP_RPATH=ON \
+   -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd ${srcdir}/build
+  make DESTDIR=${pkgdir} install
+}

Copied: opengtl/repos/staging-x86_64/PKGBUILD (from rev 147179, 
opengtl/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2012-01-24 01:25:15 UTC (rev 147180)
@@ -0,0 +1,32 @@
+# $Id$
+# Maintainer: Ronald van Haren ronald.archlinux.org
+# Contributor: Andries Radu admir...@live.it
+
+pkgname=opengtl
+pkgver=0.9.16
+pkgrel=1
+pkgdesc=A set of library for using and integrating transformation algorithms 
(such as filter or color conversion) in graphics applications
+url=http://www.opengtl.org;
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('gcc-libs' 'llvm')
+makedepends=('cmake' 'libpng')
+optdepends=('libpng: for using the png extension')
+source=(http://download.opengtl.org/OpenGTL-${pkgver}.tar.bz2)
+sha1sums=('3cfe4a08e5778c13f7e74dfc822adb68f97ad048')
+
+build() {
+  cd ${srcdir}
+  mkdir build
+  cd build
+  cmake ../OpenGTL-${pkgver} \
+-DCMAKE_BUILD_TYPE=Release \
+-DCMAKE_SKIP_RPATH=ON \
+   -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd ${srcdir}/build
+  make DESTDIR=${pkgdir} install
+}



[arch-commits] Commit in skanlite/trunk (PKGBUILD)

2012-01-23 Thread Evangelos Foutras
Date: Monday, January 23, 2012 @ 20:29:02
  Author: foutrelis
Revision: 147181

upgpkg: skanlite 0.8-2

libpng 1.5 rebuild.

Modified:
  skanlite/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-01-24 01:25:15 UTC (rev 147180)
+++ PKGBUILD2012-01-24 01:29:02 UTC (rev 147181)
@@ -4,7 +4,7 @@
 
 pkgname=skanlite
 pkgver=0.8
-pkgrel=1
+pkgrel=2
 pkgdesc=Image Scanning Application for KDE
 arch=('i686' 'x86_64')
 url='http://kde-apps.org/content/show.php?content=109803'



[arch-commits] Commit in skanlite/repos (4 files)

2012-01-23 Thread Evangelos Foutras
Date: Monday, January 23, 2012 @ 20:29:19
  Author: foutrelis
Revision: 147182

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  skanlite/repos/staging-i686/
  skanlite/repos/staging-i686/PKGBUILD
(from rev 147181, skanlite/trunk/PKGBUILD)
  skanlite/repos/staging-x86_64/
  skanlite/repos/staging-x86_64/PKGBUILD
(from rev 147181, skanlite/trunk/PKGBUILD)

-+
 staging-i686/PKGBUILD   |   30 ++
 staging-x86_64/PKGBUILD |   30 ++
 2 files changed, 60 insertions(+)

Copied: skanlite/repos/staging-i686/PKGBUILD (from rev 147181, 
skanlite/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2012-01-24 01:29:19 UTC (rev 147182)
@@ -0,0 +1,30 @@
+# $Id$
+# Maintainer: Andrea Scarpino and...@archlinux.org
+# Contributor: Pierre Schmitz pie...@archlinux.de
+
+pkgname=skanlite
+pkgver=0.8
+pkgrel=2
+pkgdesc=Image Scanning Application for KDE
+arch=('i686' 'x86_64')
+url='http://kde-apps.org/content/show.php?content=109803'
+license=('GPL')
+depends=('kdebase-runtime' 'libksane')
+makedepends=('pkgconfig' 'cmake' 'automoc4')
+source=(http://downloads.sourceforge.net/sanewidget/${pkgname}-${pkgver}.tar.bz2;)
+md5sums=('baa43dbc78be696e121969b0a3d88929')
+
+build() {
+  cd ${srcdir}
+  mkdir build
+  cd build
+  cmake ../${pkgname}-${pkgver} \
+-DCMAKE_BUILD_TYPE=Release \
+-DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd ${srcdir}/build
+  make DESTDIR=${pkgdir} install
+}

Copied: skanlite/repos/staging-x86_64/PKGBUILD (from rev 147181, 
skanlite/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2012-01-24 01:29:19 UTC (rev 147182)
@@ -0,0 +1,30 @@
+# $Id$
+# Maintainer: Andrea Scarpino and...@archlinux.org
+# Contributor: Pierre Schmitz pie...@archlinux.de
+
+pkgname=skanlite
+pkgver=0.8
+pkgrel=2
+pkgdesc=Image Scanning Application for KDE
+arch=('i686' 'x86_64')
+url='http://kde-apps.org/content/show.php?content=109803'
+license=('GPL')
+depends=('kdebase-runtime' 'libksane')
+makedepends=('pkgconfig' 'cmake' 'automoc4')
+source=(http://downloads.sourceforge.net/sanewidget/${pkgname}-${pkgver}.tar.bz2;)
+md5sums=('baa43dbc78be696e121969b0a3d88929')
+
+build() {
+  cd ${srcdir}
+  mkdir build
+  cd build
+  cmake ../${pkgname}-${pkgver} \
+-DCMAKE_BUILD_TYPE=Release \
+-DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd ${srcdir}/build
+  make DESTDIR=${pkgdir} install
+}



[arch-commits] Commit in libgnomecanvas/trunk (PKGBUILD)

2012-01-23 Thread Eric Bélanger
Date: Monday, January 23, 2012 @ 22:06:10
  Author: eric
Revision: 147183

upgpkg: libgnomecanvas 2.30.3-2

Rebuild against libpng 1.5 and libtiff 4.0

Modified:
  libgnomecanvas/trunk/PKGBUILD

--+
 PKGBUILD |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-01-24 01:29:19 UTC (rev 147182)
+++ PKGBUILD2012-01-24 03:06:10 UTC (rev 147183)
@@ -3,12 +3,12 @@
 
 pkgname=libgnomecanvas
 pkgver=2.30.3
-pkgrel=1
+pkgrel=2
 pkgdesc=The GNOME Canvas library
 arch=(i686 x86_64)
 license=('LGPL')
 depends=('libglade=2.6.4' 'libart-lgpl=2.3.21')
-makedepends=('pkgconfig' 'intltool')
+makedepends=('pkg-config' 'intltool')
 options=('!libtool')
 url=http://www.gnome.org;
 
source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.30/${pkgname}-${pkgver}.tar.bz2)
@@ -19,5 +19,9 @@
   ./configure --prefix=/usr --disable-static \
   --enable-glade
   make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
 }



[arch-commits] Commit in libgnomecanvas/repos (4 files)

2012-01-23 Thread Eric Bélanger
Date: Monday, January 23, 2012 @ 22:06:37
  Author: eric
Revision: 147184

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  libgnomecanvas/repos/staging-i686/
  libgnomecanvas/repos/staging-i686/PKGBUILD
(from rev 147183, libgnomecanvas/trunk/PKGBUILD)
  libgnomecanvas/repos/staging-x86_64/
  libgnomecanvas/repos/staging-x86_64/PKGBUILD
(from rev 147183, libgnomecanvas/trunk/PKGBUILD)

-+
 staging-i686/PKGBUILD   |   27 +++
 staging-x86_64/PKGBUILD |   27 +++
 2 files changed, 54 insertions(+)

Copied: libgnomecanvas/repos/staging-i686/PKGBUILD (from rev 147183, 
libgnomecanvas/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2012-01-24 03:06:37 UTC (rev 147184)
@@ -0,0 +1,27 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=libgnomecanvas
+pkgver=2.30.3
+pkgrel=2
+pkgdesc=The GNOME Canvas library
+arch=(i686 x86_64)
+license=('LGPL')
+depends=('libglade=2.6.4' 'libart-lgpl=2.3.21')
+makedepends=('pkg-config' 'intltool')
+options=('!libtool')
+url=http://www.gnome.org;
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.30/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('859b78e08489fce4d5c15c676fec1cd79782f115f516e8ad8bed6abcb8dedd40')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr --disable-static \
+  --enable-glade
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+}

Copied: libgnomecanvas/repos/staging-x86_64/PKGBUILD (from rev 147183, 
libgnomecanvas/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2012-01-24 03:06:37 UTC (rev 147184)
@@ -0,0 +1,27 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=libgnomecanvas
+pkgver=2.30.3
+pkgrel=2
+pkgdesc=The GNOME Canvas library
+arch=(i686 x86_64)
+license=('LGPL')
+depends=('libglade=2.6.4' 'libart-lgpl=2.3.21')
+makedepends=('pkg-config' 'intltool')
+options=('!libtool')
+url=http://www.gnome.org;
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.30/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('859b78e08489fce4d5c15c676fec1cd79782f115f516e8ad8bed6abcb8dedd40')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr --disable-static \
+  --enable-glade
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+}



[arch-commits] Commit in gtksourceview2/trunk (PKGBUILD)

2012-01-23 Thread Eric Bélanger
Date: Monday, January 23, 2012 @ 22:16:17
  Author: eric
Revision: 147185

upgpkg: gtksourceview2 2.10.5-2

Rebuild against libpng 1.5 and libtiff 4.0

Modified:
  gtksourceview2/trunk/PKGBUILD

--+
 PKGBUILD |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-01-24 03:06:37 UTC (rev 147184)
+++ PKGBUILD2012-01-24 03:16:17 UTC (rev 147185)
@@ -3,12 +3,12 @@
 
 pkgname=gtksourceview2
 pkgver=2.10.5
-pkgrel=1
+pkgrel=2
 pkgdesc=A text widget adding syntax highlighting and more to GNOME
 arch=('i686' 'x86_64')
 license=('GPL')
 depends=('gtk2=2.22.0' 'libxml2=2.7.7')
-makedepends=('intltool' 'pkgconfig')
+makedepends=('intltool' 'pkg-config')
 options=('!libtool')
 url=http://www.gnome.org;
 
source=(http://ftp.gnome.org/pub/gnome/sources/gtksourceview/2.10/gtksourceview-${pkgver}.tar.bz2)
@@ -20,5 +20,9 @@
   ./configure --prefix=/usr --sysconfdir=/etc \
   --localstatedir=/var --disable-static
   make
+}
+
+package() {
+  cd ${srcdir}/gtksourceview-${pkgver}
   make DESTDIR=${pkgdir} install
 }



[arch-commits] Commit in gtksourceview2/repos (4 files)

2012-01-23 Thread Eric Bélanger
Date: Monday, January 23, 2012 @ 22:16:31
  Author: eric
Revision: 147186

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  gtksourceview2/repos/staging-i686/
  gtksourceview2/repos/staging-i686/PKGBUILD
(from rev 147185, gtksourceview2/trunk/PKGBUILD)
  gtksourceview2/repos/staging-x86_64/
  gtksourceview2/repos/staging-x86_64/PKGBUILD
(from rev 147185, gtksourceview2/trunk/PKGBUILD)

-+
 staging-i686/PKGBUILD   |   28 
 staging-x86_64/PKGBUILD |   28 
 2 files changed, 56 insertions(+)

Copied: gtksourceview2/repos/staging-i686/PKGBUILD (from rev 147185, 
gtksourceview2/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2012-01-24 03:16:31 UTC (rev 147186)
@@ -0,0 +1,28 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=gtksourceview2
+pkgver=2.10.5
+pkgrel=2
+pkgdesc=A text widget adding syntax highlighting and more to GNOME
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('gtk2=2.22.0' 'libxml2=2.7.7')
+makedepends=('intltool' 'pkg-config')
+options=('!libtool')
+url=http://www.gnome.org;
+source=(http://ftp.gnome.org/pub/gnome/sources/gtksourceview/2.10/gtksourceview-${pkgver}.tar.bz2)
+sha256sums=('c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e')
+
+build() {
+  cd ${srcdir}/gtksourceview-${pkgver}
+  sed -i 's#python#python2#' gtksourceview/language-specs/convert.py
+  ./configure --prefix=/usr --sysconfdir=/etc \
+  --localstatedir=/var --disable-static
+  make
+}
+
+package() {
+  cd ${srcdir}/gtksourceview-${pkgver}
+  make DESTDIR=${pkgdir} install
+}

Copied: gtksourceview2/repos/staging-x86_64/PKGBUILD (from rev 147185, 
gtksourceview2/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2012-01-24 03:16:31 UTC (rev 147186)
@@ -0,0 +1,28 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=gtksourceview2
+pkgver=2.10.5
+pkgrel=2
+pkgdesc=A text widget adding syntax highlighting and more to GNOME
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('gtk2=2.22.0' 'libxml2=2.7.7')
+makedepends=('intltool' 'pkg-config')
+options=('!libtool')
+url=http://www.gnome.org;
+source=(http://ftp.gnome.org/pub/gnome/sources/gtksourceview/2.10/gtksourceview-${pkgver}.tar.bz2)
+sha256sums=('c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e')
+
+build() {
+  cd ${srcdir}/gtksourceview-${pkgver}
+  sed -i 's#python#python2#' gtksourceview/language-specs/convert.py
+  ./configure --prefix=/usr --sysconfdir=/etc \
+  --localstatedir=/var --disable-static
+  make
+}
+
+package() {
+  cd ${srcdir}/gtksourceview-${pkgver}
+  make DESTDIR=${pkgdir} install
+}



[arch-commits] Commit in gtk-engines/trunk (PKGBUILD)

2012-01-23 Thread Eric Bélanger
Date: Monday, January 23, 2012 @ 22:19:45
  Author: eric
Revision: 147187

upgpkg: gtk-engines 2.20.2-2

Rebuild against libpng 1.5 and libtiff 4.0

Modified:
  gtk-engines/trunk/PKGBUILD

--+
 PKGBUILD |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-01-24 03:16:31 UTC (rev 147186)
+++ PKGBUILD2012-01-24 03:19:45 UTC (rev 147187)
@@ -3,12 +3,12 @@
 
 pkgname=gtk-engines
 pkgver=2.20.2
-pkgrel=1
+pkgrel=2
 pkgdesc=Theme engines for GTK+ 2
 arch=(i686 x86_64)
 license=('GPL' 'LGPL')
 depends=('gtk2=2.22.0')
-makedepends=('pkgconfig' 'intltool')
+makedepends=('pkg-config' 'intltool')
 options=('!libtool')
 url=http://live.gnome.org/GnomeArt;
 
source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.20/${pkgname}-${pkgver}.tar.bz2)
@@ -20,5 +20,9 @@
   cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --prefix=/usr --enable-animation
   make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
 }



[arch-commits] Commit in gtk-engines/repos (4 files)

2012-01-23 Thread Eric Bélanger
Date: Monday, January 23, 2012 @ 22:20:02
  Author: eric
Revision: 147188

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  gtk-engines/repos/staging-i686/
  gtk-engines/repos/staging-i686/PKGBUILD
(from rev 147187, gtk-engines/trunk/PKGBUILD)
  gtk-engines/repos/staging-x86_64/
  gtk-engines/repos/staging-x86_64/PKGBUILD
(from rev 147187, gtk-engines/trunk/PKGBUILD)

-+
 staging-i686/PKGBUILD   |   28 
 staging-x86_64/PKGBUILD |   28 
 2 files changed, 56 insertions(+)

Copied: gtk-engines/repos/staging-i686/PKGBUILD (from rev 147187, 
gtk-engines/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2012-01-24 03:20:02 UTC (rev 147188)
@@ -0,0 +1,28 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=gtk-engines
+pkgver=2.20.2
+pkgrel=2
+pkgdesc=Theme engines for GTK+ 2
+arch=(i686 x86_64)
+license=('GPL' 'LGPL')
+depends=('gtk2=2.22.0')
+makedepends=('pkg-config' 'intltool')
+options=('!libtool')
+url=http://live.gnome.org/GnomeArt;
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.20/${pkgname}-${pkgver}.tar.bz2)
+conflicts=('lighthouse-gtk2' 'clearlooks-gtk2')
+replaces=('lighthouse-gtk2')
+sha256sums=('15b680abca6c773ecb85253521fa100dd3b8549befeecc7595b10209d62d66b5')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr --enable-animation
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+}

Copied: gtk-engines/repos/staging-x86_64/PKGBUILD (from rev 147187, 
gtk-engines/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2012-01-24 03:20:02 UTC (rev 147188)
@@ -0,0 +1,28 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=gtk-engines
+pkgver=2.20.2
+pkgrel=2
+pkgdesc=Theme engines for GTK+ 2
+arch=(i686 x86_64)
+license=('GPL' 'LGPL')
+depends=('gtk2=2.22.0')
+makedepends=('pkg-config' 'intltool')
+options=('!libtool')
+url=http://live.gnome.org/GnomeArt;
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.20/${pkgname}-${pkgver}.tar.bz2)
+conflicts=('lighthouse-gtk2' 'clearlooks-gtk2')
+replaces=('lighthouse-gtk2')
+sha256sums=('15b680abca6c773ecb85253521fa100dd3b8549befeecc7595b10209d62d66b5')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr --enable-animation
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+}



[arch-commits] Commit in gtkmm/trunk (PKGBUILD)

2012-01-23 Thread Eric Bélanger
Date: Monday, January 23, 2012 @ 23:22:29
  Author: eric
Revision: 147189

upgpkg: gtkmm 2.24.2-2

Rebuild against libpng 1.5 and libtiff 4.0

Modified:
  gtkmm/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-01-24 03:20:02 UTC (rev 147188)
+++ PKGBUILD2012-01-24 04:22:29 UTC (rev 147189)
@@ -5,7 +5,7 @@
 pkgbase=gtkmm
 pkgname=('gtkmm' 'gtkmm-docs')
 pkgver=2.24.2
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 makedepends=('gtk2' 'pangomm' 'atkmm' 'glibmm-docs')
 license=('LGPL')



[arch-commits] Commit in gtkmm/repos (4 files)

2012-01-23 Thread Eric Bélanger
Date: Monday, January 23, 2012 @ 23:22:44
  Author: eric
Revision: 147190

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  gtkmm/repos/staging-i686/
  gtkmm/repos/staging-i686/PKGBUILD
(from rev 147189, gtkmm/trunk/PKGBUILD)
  gtkmm/repos/staging-x86_64/
  gtkmm/repos/staging-x86_64/PKGBUILD
(from rev 147189, gtkmm/trunk/PKGBUILD)

-+
 staging-i686/PKGBUILD   |   38 ++
 staging-x86_64/PKGBUILD |   38 ++
 2 files changed, 76 insertions(+)

Copied: gtkmm/repos/staging-i686/PKGBUILD (from rev 147189, 
gtkmm/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2012-01-24 04:22:44 UTC (rev 147190)
@@ -0,0 +1,38 @@
+# $Id$
+# Contributor: Tom Newsom jeeps...@gmx.co.uk
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgbase=gtkmm
+pkgname=('gtkmm' 'gtkmm-docs')
+pkgver=2.24.2
+pkgrel=2
+arch=('i686' 'x86_64')
+makedepends=('gtk2' 'pangomm' 'atkmm' 'glibmm-docs')
+license=('LGPL')
+options=('!libtool' '!emptydirs')
+url=http://gtkmm.sourceforge.net/;
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/2.24/${pkgbase}-${pkgver}.tar.xz)
+sha256sums=('c90c7a29c20dd6d795925bd66ad1ff40be07cea0e4c03f4d6105a8c07448953d')
+
+build() {
+  cd ${srcdir}/${pkgbase}-${pkgver}
+  ./configure --prefix=/usr
+  make
+}
+
+package_gtkmm() {
+  pkgdesc=C++ bindings for gtk2
+  depends=('gtk2' 'pangomm' 'atkmm')
+  cd ${srcdir}/${pkgbase}-${pkgver}
+
+  sed -i -e 's/^doc_subdirs/#doc_subdirs/' Makefile
+
+  make DESTDIR=${pkgdir} install
+}
+
+package_gtkmm-docs() {
+  pkgdesc=Developer documentation for gtkmm v2
+
+  cd ${srcdir}/${pkgbase}-${pkgver}
+  make -C docs DESTDIR=${pkgdir} install
+}

Copied: gtkmm/repos/staging-x86_64/PKGBUILD (from rev 147189, 
gtkmm/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2012-01-24 04:22:44 UTC (rev 147190)
@@ -0,0 +1,38 @@
+# $Id$
+# Contributor: Tom Newsom jeeps...@gmx.co.uk
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgbase=gtkmm
+pkgname=('gtkmm' 'gtkmm-docs')
+pkgver=2.24.2
+pkgrel=2
+arch=('i686' 'x86_64')
+makedepends=('gtk2' 'pangomm' 'atkmm' 'glibmm-docs')
+license=('LGPL')
+options=('!libtool' '!emptydirs')
+url=http://gtkmm.sourceforge.net/;
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/2.24/${pkgbase}-${pkgver}.tar.xz)
+sha256sums=('c90c7a29c20dd6d795925bd66ad1ff40be07cea0e4c03f4d6105a8c07448953d')
+
+build() {
+  cd ${srcdir}/${pkgbase}-${pkgver}
+  ./configure --prefix=/usr
+  make
+}
+
+package_gtkmm() {
+  pkgdesc=C++ bindings for gtk2
+  depends=('gtk2' 'pangomm' 'atkmm')
+  cd ${srcdir}/${pkgbase}-${pkgver}
+
+  sed -i -e 's/^doc_subdirs/#doc_subdirs/' Makefile
+
+  make DESTDIR=${pkgdir} install
+}
+
+package_gtkmm-docs() {
+  pkgdesc=Developer documentation for gtkmm v2
+
+  cd ${srcdir}/${pkgbase}-${pkgver}
+  make -C docs DESTDIR=${pkgdir} install
+}



[arch-commits] Commit in gtkhtml/trunk (PKGBUILD)

2012-01-23 Thread Eric Bélanger
Date: Monday, January 23, 2012 @ 23:23:49
  Author: eric
Revision: 147191

upgpkg: gtkhtml 3.32.2-3

Rebuild against libpng 1.5 and libtiff 4.0

Modified:
  gtkhtml/trunk/PKGBUILD

--+
 PKGBUILD |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-01-24 04:22:44 UTC (rev 147190)
+++ PKGBUILD2012-01-24 04:23:49 UTC (rev 147191)
@@ -3,7 +3,7 @@
 
 pkgname=gtkhtml
 pkgver=3.32.2
-pkgrel=2
+pkgrel=3
 pkgdesc=A lightweight HTML renderer/editor widget for GTK2
 arch=(i686 x86_64)
 license=('GPL')
@@ -21,6 +21,10 @@
   --localstatedir=/var --disable-static \
   --disable-deprecated-warning-flags
   make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
 
   rm -f ${pkgdir}/usr/bin/gtkhtml-editor-test



[arch-commits] Commit in gtkhtml/repos (4 files)

2012-01-23 Thread Eric Bélanger
Date: Monday, January 23, 2012 @ 23:25:29
  Author: eric
Revision: 147192

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  gtkhtml/repos/staging-i686/
  gtkhtml/repos/staging-i686/PKGBUILD
(from rev 147191, gtkhtml/trunk/PKGBUILD)
  gtkhtml/repos/staging-x86_64/
  gtkhtml/repos/staging-x86_64/PKGBUILD
(from rev 147191, gtkhtml/trunk/PKGBUILD)

-+
 staging-i686/PKGBUILD   |   31 +++
 staging-x86_64/PKGBUILD |   31 +++
 2 files changed, 62 insertions(+)

Copied: gtkhtml/repos/staging-i686/PKGBUILD (from rev 147191, 
gtkhtml/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2012-01-24 04:25:29 UTC (rev 147192)
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=gtkhtml
+pkgver=3.32.2
+pkgrel=3
+pkgdesc=A lightweight HTML renderer/editor widget for GTK2
+arch=(i686 x86_64)
+license=('GPL')
+depends=('gconf' 'gtk2' 'gnome-icon-theme' 'enchant' 'iso-codes' 'libsoup')
+makedepends=('intltool')
+url=http://www.gnome.org;
+options=('!libtool')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.32/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('8746053cf709e1de37c7ac775ab1364ddda4b75167660ed7f98a237b3797e39f')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr --sysconfdir=/etc \
+  --libexecdir=/usr/lib/gtkhtml \
+  --localstatedir=/var --disable-static \
+  --disable-deprecated-warning-flags
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+
+  rm -f ${pkgdir}/usr/bin/gtkhtml-editor-test
+}

Copied: gtkhtml/repos/staging-x86_64/PKGBUILD (from rev 147191, 
gtkhtml/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2012-01-24 04:25:29 UTC (rev 147192)
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=gtkhtml
+pkgver=3.32.2
+pkgrel=3
+pkgdesc=A lightweight HTML renderer/editor widget for GTK2
+arch=(i686 x86_64)
+license=('GPL')
+depends=('gconf' 'gtk2' 'gnome-icon-theme' 'enchant' 'iso-codes' 'libsoup')
+makedepends=('intltool')
+url=http://www.gnome.org;
+options=('!libtool')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.32/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('8746053cf709e1de37c7ac775ab1364ddda4b75167660ed7f98a237b3797e39f')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr --sysconfdir=/etc \
+  --libexecdir=/usr/lib/gtkhtml \
+  --localstatedir=/var --disable-static \
+  --disable-deprecated-warning-flags
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+
+  rm -f ${pkgdir}/usr/bin/gtkhtml-editor-test
+}



[arch-commits] Commit in avahi/trunk (PKGBUILD)

2012-01-23 Thread Gaetan Bisson
Date: Monday, January 23, 2012 @ 23:54:29
  Author: bisson
Revision: 147193

rebuild for libpng-1.5

Modified:
  avahi/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-01-24 04:25:29 UTC (rev 147192)
+++ PKGBUILD2012-01-24 04:54:29 UTC (rev 147193)
@@ -4,7 +4,7 @@
 
 pkgname=avahi
 pkgver=0.6.30
-pkgrel=6
+pkgrel=7
 pkgdesc='A multicast/unicast DNS-SD framework'
 arch=('i686' 'x86_64')
 url='http://www.avahi.org/'



[arch-commits] Commit in avahi/repos (10 files)

2012-01-23 Thread Gaetan Bisson
Date: Monday, January 23, 2012 @ 23:55:03
  Author: bisson
Revision: 147194

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  avahi/repos/staging-i686/
  avahi/repos/staging-i686/PKGBUILD
(from rev 147193, avahi/trunk/PKGBUILD)
  avahi/repos/staging-i686/gnome-nettool.png
(from rev 147193, avahi/trunk/gnome-nettool.png)
  avahi/repos/staging-i686/install
(from rev 147193, avahi/trunk/install)
  avahi/repos/staging-i686/rc.d.patch
(from rev 147193, avahi/trunk/rc.d.patch)
  avahi/repos/staging-x86_64/
  avahi/repos/staging-x86_64/PKGBUILD
(from rev 147193, avahi/trunk/PKGBUILD)
  avahi/repos/staging-x86_64/gnome-nettool.png
(from rev 147193, avahi/trunk/gnome-nettool.png)
  avahi/repos/staging-x86_64/install
(from rev 147193, avahi/trunk/install)
  avahi/repos/staging-x86_64/rc.d.patch
(from rev 147193, avahi/trunk/rc.d.patch)

---+
 staging-i686/PKGBUILD |   75 
 staging-i686/install  |   21 
 staging-i686/rc.d.patch   |   11 ++
 staging-x86_64/PKGBUILD   |   75 
 staging-x86_64/install|   21 
 staging-x86_64/rc.d.patch |   11 ++
 6 files changed, 214 insertions(+)

Copied: avahi/repos/staging-i686/PKGBUILD (from rev 147193, 
avahi/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2012-01-24 04:55:03 UTC (rev 147194)
@@ -0,0 +1,75 @@
+# $Id$
+# Contributor: Douglas Soares de Andrade doug...@archlinux.org
+# Maintainer: Gaetan Bisson bis...@archlinux.org
+
+pkgname=avahi
+pkgver=0.6.30
+pkgrel=7
+pkgdesc='A multicast/unicast DNS-SD framework'
+arch=('i686' 'x86_64')
+url='http://www.avahi.org/'
+license=('LGPL')
+depends=('expat' 'libdaemon' 'glib2' 'dbus' 'libcap' 'gdbm')
+optdepends=('gtk3: avahi-discover-standalone, bshell, bssh, bvnc'
+'gtk2: gtk2 bindings'
+'qt3: qt3 bindings'
+'qt: qt bindings'
+'pygtk: avahi-bookmarks, avahi-discover'
+'twisted: avahi-bookmarks'
+'mono: mono bindings'
+'dbus-python: avahi-discover'
+'nss-mdns: NSS support for mDNS')
+makedepends=('qt' 'qt3' 'pygtk' 'mono' 'intltool' 'dbus-python'
+ 'gtk-sharp-2' 'gobject-introspection' 'gtk3')
+backup=(etc/avahi/avahi-daemon.conf etc/avahi/services/{sftp-,}ssh.service)
+install=install
+conflicts=('howl' 'mdnsresponder')
+provides=('howl' 'mdnsresponder')
+replaces=('howl' 'mdnsresponder')
+options=('!libtool')
+source=(http://www.avahi.org/download/avahi-${pkgver}.tar.gz;
+'gnome-nettool.png'
+'rc.d.patch')
+sha1sums=('5b77443537600a00770e4c77e3c443eeb5861d06'
+  'cf56387c88aed246b9f435efc182ef44de4d52f3'
+  '625ad7c131c0c1c383caeddef18fc7a32d8f3ab9')
+
+build() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+
+   sed -i 's/netdev/network/g' avahi-daemon/avahi-dbus.conf
+   patch -p1 -i ../rc.d.patch
+
+   # pygtk requires python2; make it explicit in case other python are 
installed: FS#21865
+   PYTHON=python2 \
+   PKG_CONFIG_PATH=/opt/qt/lib/pkgconfig \
+   ./configure \
+   --prefix=/usr \
+   --sysconfdir=/etc \
+   --localstatedir=/var \
+   --disable-static \
+   --disable-monodoc \
+   --disable-doxygen-doc \
+   --disable-xmltoman \
+   --enable-compat-libdns_sd \
+   --enable-compat-howl \
+   --with-distro=archlinux \
+   --with-avahi-priv-access-group=network \
+   --with-autoipd-user=avahi \
+   --with-autoipd-group=avahi \
+   --with-systemdsystemunitdir=/lib/systemd/system # See FS#20999
+
+   make
+}
+
+package() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   make DESTDIR=${pkgdir} install
+   install -D -m 644 ../gnome-nettool.png 
${pkgdir}/usr/share/pixmaps/gnome-nettool.png
+
+   cd ${pkgdir}
+   sed -i '1c #!/usr/bin/python2' usr/bin/avahi-{bookmarks,discover}
+   # howl and mdnsresponder compatability
+   (cd usr/include; ln -s avahi-compat-libdns_sd/dns_sd.h dns_sd.h; ln -s 
avahi-compat-howl howl)
+   (cd usr/lib/pkgconfig; ln -s avahi-compat-howl.pc howl.pc)
+}

Copied: avahi/repos/staging-i686/gnome-nettool.png (from rev 147193, 
avahi/trunk/gnome-nettool.png)
===
(Binary files differ)

Copied: avahi/repos/staging-i686/install (from rev 147193, avahi/trunk/install)
===
--- staging-i686/install(rev 0)
+++ staging-i686/install2012-01-24 04:55:03 UTC (rev 147194)
@@ -0,0 +1,21 @@
+post_install() {
+  getent group avahi /dev/null || groupadd -r -g 

[arch-commits] Commit in glade-perl/trunk (PKGBUILD)

2012-01-23 Thread Eric Bélanger
Date: Tuesday, January 24, 2012 @ 00:13:11
  Author: eric
Revision: 147195

upgpkg: glade-perl 1.007-5

Rebuild against libpng 1.5 and libtiff 4.0

Modified:
  glade-perl/trunk/PKGBUILD

--+
 PKGBUILD |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-01-24 04:55:03 UTC (rev 147194)
+++ PKGBUILD2012-01-24 05:13:11 UTC (rev 147195)
@@ -4,7 +4,7 @@
 pkgname=glade-perl
 _realname=Gtk2-GladeXML
 pkgver=1.007
-pkgrel=4
+pkgrel=5
 pkgdesc=Gtk2-GladeXML perl bindings for glade 2.x
 arch=(i686 x86_64)
 license=('LGPL')
@@ -19,5 +19,9 @@
   cd ${srcdir}/${_realname}-${pkgver}
   perl Makefile.PL INSTALLDIRS=vendor
   make
+}
+
+package() {
+  cd ${srcdir}/${_realname}-${pkgver}
   make DESTDIR=${pkgdir} install
 }



[arch-commits] Commit in glade-perl/repos (4 files)

2012-01-23 Thread Eric Bélanger
Date: Tuesday, January 24, 2012 @ 00:13:43
  Author: eric
Revision: 147196

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  glade-perl/repos/staging-i686/
  glade-perl/repos/staging-i686/PKGBUILD
(from rev 147195, glade-perl/trunk/PKGBUILD)
  glade-perl/repos/staging-x86_64/
  glade-perl/repos/staging-x86_64/PKGBUILD
(from rev 147195, glade-perl/trunk/PKGBUILD)

-+
 staging-i686/PKGBUILD   |   27 +++
 staging-x86_64/PKGBUILD |   27 +++
 2 files changed, 54 insertions(+)

Copied: glade-perl/repos/staging-i686/PKGBUILD (from rev 147195, 
glade-perl/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2012-01-24 05:13:43 UTC (rev 147196)
@@ -0,0 +1,27 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=glade-perl
+_realname=Gtk2-GladeXML
+pkgver=1.007
+pkgrel=5
+pkgdesc=Gtk2-GladeXML perl bindings for glade 2.x
+arch=(i686 x86_64)
+license=('LGPL')
+url=http://gtk2-perl.sourceforge.net/;
+makedepends=('perl-extutils-pkgconfig' 'perl-extutils-depends')
+depends=('libglade' 'gtk2-perl' 'perl')
+options=('!emptydirs')
+source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/${_realname}-${pkgver}.tar.gz)
+md5sums=('e6ca234e2a9f0221263acd2a593c583b')
+
+build() {
+  cd ${srcdir}/${_realname}-${pkgver}
+  perl Makefile.PL INSTALLDIRS=vendor
+  make
+}
+
+package() {
+  cd ${srcdir}/${_realname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+}

Copied: glade-perl/repos/staging-x86_64/PKGBUILD (from rev 147195, 
glade-perl/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2012-01-24 05:13:43 UTC (rev 147196)
@@ -0,0 +1,27 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=glade-perl
+_realname=Gtk2-GladeXML
+pkgver=1.007
+pkgrel=5
+pkgdesc=Gtk2-GladeXML perl bindings for glade 2.x
+arch=(i686 x86_64)
+license=('LGPL')
+url=http://gtk2-perl.sourceforge.net/;
+makedepends=('perl-extutils-pkgconfig' 'perl-extutils-depends')
+depends=('libglade' 'gtk2-perl' 'perl')
+options=('!emptydirs')
+source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/${_realname}-${pkgver}.tar.gz)
+md5sums=('e6ca234e2a9f0221263acd2a593c583b')
+
+build() {
+  cd ${srcdir}/${_realname}-${pkgver}
+  perl Makefile.PL INSTALLDIRS=vendor
+  make
+}
+
+package() {
+  cd ${srcdir}/${_realname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+}



[arch-commits] Commit in libbonoboui/trunk (PKGBUILD)

2012-01-23 Thread Eric Bélanger
Date: Tuesday, January 24, 2012 @ 00:14:46
  Author: eric
Revision: 147197

upgpkg: libbonoboui 2.24.5-2

Rebuild against libpng 1.5 and libtiff 4.0

Modified:
  libbonoboui/trunk/PKGBUILD

--+
 PKGBUILD |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-01-24 05:13:43 UTC (rev 147196)
+++ PKGBUILD2012-01-24 05:14:46 UTC (rev 147197)
@@ -3,12 +3,12 @@
 
 pkgname=libbonoboui
 pkgver=2.24.5
-pkgrel=1
+pkgrel=2
 pkgdesc=User Interface library for Bonobo
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL')
 depends=('libgnomecanvas' 'libgnome')
-makedepends=('intltool' 'pkgconfig')
+makedepends=('intltool' 'pkg-config')
 options=('!libtool' '!emptydirs')
 url=http://www.gnome.org;
 
source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.24/${pkgname}-${pkgver}.tar.bz2)
@@ -19,6 +19,10 @@
   ./configure --prefix=/usr --sysconfdir=/etc \
   --localstatedir=/var --disable-static
   make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
   rm -f ${pkgdir}/usr/share/applications/bonobo-browser.desktop
 }



[arch-commits] Commit in libbonoboui/repos (4 files)

2012-01-23 Thread Eric Bélanger
Date: Tuesday, January 24, 2012 @ 00:15:13
  Author: eric
Revision: 147198

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  libbonoboui/repos/staging-i686/
  libbonoboui/repos/staging-i686/PKGBUILD
(from rev 147197, libbonoboui/trunk/PKGBUILD)
  libbonoboui/repos/staging-x86_64/
  libbonoboui/repos/staging-x86_64/PKGBUILD
(from rev 147197, libbonoboui/trunk/PKGBUILD)

-+
 staging-i686/PKGBUILD   |   28 
 staging-x86_64/PKGBUILD |   28 
 2 files changed, 56 insertions(+)

Copied: libbonoboui/repos/staging-i686/PKGBUILD (from rev 147197, 
libbonoboui/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2012-01-24 05:15:13 UTC (rev 147198)
@@ -0,0 +1,28 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=libbonoboui
+pkgver=2.24.5
+pkgrel=2
+pkgdesc=User Interface library for Bonobo
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL')
+depends=('libgnomecanvas' 'libgnome')
+makedepends=('intltool' 'pkg-config')
+options=('!libtool' '!emptydirs')
+url=http://www.gnome.org;
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.24/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('fab5f2ac6c842d949861c07cb520afe5bee3dce55805151ce9cd01be0ec46fcd')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr --sysconfdir=/etc \
+  --localstatedir=/var --disable-static
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+  rm -f ${pkgdir}/usr/share/applications/bonobo-browser.desktop
+}

Copied: libbonoboui/repos/staging-x86_64/PKGBUILD (from rev 147197, 
libbonoboui/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2012-01-24 05:15:13 UTC (rev 147198)
@@ -0,0 +1,28 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=libbonoboui
+pkgver=2.24.5
+pkgrel=2
+pkgdesc=User Interface library for Bonobo
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL')
+depends=('libgnomecanvas' 'libgnome')
+makedepends=('intltool' 'pkg-config')
+options=('!libtool' '!emptydirs')
+url=http://www.gnome.org;
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.24/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('fab5f2ac6c842d949861c07cb520afe5bee3dce55805151ce9cd01be0ec46fcd')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr --sysconfdir=/etc \
+  --localstatedir=/var --disable-static
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+  rm -f ${pkgdir}/usr/share/applications/bonobo-browser.desktop
+}



[arch-commits] Commit in inkscape/trunk (PKGBUILD libpng15.patch)

2012-01-23 Thread Gaetan Bisson
Date: Tuesday, January 24, 2012 @ 01:18:18
  Author: bisson
Revision: 147199

rebuild for libpng-1.5

Added:
  inkscape/trunk/libpng15.patch
Modified:
  inkscape/trunk/PKGBUILD

+
 PKGBUILD   |   10 +++---
 libpng15.patch |   40 
 2 files changed, 47 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-01-24 05:15:13 UTC (rev 147198)
+++ PKGBUILD2012-01-24 06:18:18 UTC (rev 147199)
@@ -5,7 +5,7 @@
 
 pkgname=inkscape
 pkgver=0.48.2
-pkgrel=5
+pkgrel=6
 pkgdesc='Vector graphics editor using the SVG file format'
 url='http://inkscape.sourceforge.net/'
 arch=('i686' 'x86_64')
@@ -20,8 +20,10 @@
 'pyxml: some extensions'
 'uniconvertor: reading/writing to some proprietary formats')
 options=('!libtool')
-source=(http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz;)
-sha1sums=('422a4bacd4dc42adafa203244bc9816783cba4d3')
+source=(http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz;
+'libpng15.patch')
+sha1sums=('422a4bacd4dc42adafa203244bc9816783cba4d3'
+  'd6512f3cb38ca8e2436dc485aa652490d17b3a52')
 
 install=install
 
@@ -34,6 +36,8 @@
sed -i 's|python -c|python2 -c|g' configure share/extensions/uniconv*.py
sed -i 's|python|python2|g' src/main.cpp
 
+   patch -p1 -i ../libpng15.patch
+
./configure --prefix=/usr \
--with-python \
--with-perl \

Added: libpng15.patch
===
--- libpng15.patch  (rev 0)
+++ libpng15.patch  2012-01-24 06:18:18 UTC (rev 147199)
@@ -0,0 +1,40 @@
+--- inkscape-0.48.1/src/extension/internal/pdfinput/svg-builder.cpp
 inkscape-0.48.1-mod//src/extension/internal/pdfinput/svg-builder.cpp
+@@ -1443,7 +1443,7 @@
+ return NULL;
+ }
+ // Set error handler
+-if (setjmp(png_ptr-jmpbuf)) {
++if (setjmp(png_jmpbuf(png_ptr))) {
+ png_destroy_write_struct(png_ptr, info_ptr);
+ return NULL;
+ }
+--- inkscape-0.48.1/src/helper/png-write.cpp
 inkscape-0.48.1-mod//src/helper/png-write.cpp
+@@ -165,7 +165,7 @@
+ /* Set error handling.  REQUIRED if you aren't supplying your own
+  * error hadnling functions in the png_create_write_struct() call.
+  */
+-if (setjmp(png_ptr-jmpbuf)) {
++if (setjmp(png_jmpbuf(png_ptr))) {
+ /* If we get here, we had a problem reading the file */
+ fclose(fp);
+ png_destroy_write_struct(png_ptr, info_ptr);
+--- inkscape-0.48.1/src/sp-image.cpp
 inkscape-0.48.1-mod//src/sp-image.cpp
+@@ -386,9 +386,13 @@
+ 
+ #if defined(PNG_iCCP_SUPPORTED)
+ {
+-char* name = 0;
++png_charp name = 0;
+ int compression_type = 0;
+-char* profile = 0;
++#if (PNG_LIBPNG_VER  10500)
++png_charp profile = 0;
++#else
++png_bytep profile = 0;
++#endif
+ png_uint_32 proflen = 0;
+ if ( png_get_iCCP(pngPtr, infoPtr, name, 
compression_type, profile, proflen) ) {
+ // g_message(Found an iCCP chunk 
named [%s] with %d bytes and comp %d, name, proflen, compression_type);



[arch-commits] Commit in inkscape/repos (8 files)

2012-01-23 Thread Gaetan Bisson
Date: Tuesday, January 24, 2012 @ 01:18:56
  Author: bisson
Revision: 147200

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  inkscape/repos/staging-i686/
  inkscape/repos/staging-i686/PKGBUILD
(from rev 147199, inkscape/trunk/PKGBUILD)
  inkscape/repos/staging-i686/install
(from rev 147199, inkscape/trunk/install)
  inkscape/repos/staging-i686/libpng15.patch
(from rev 147199, inkscape/trunk/libpng15.patch)
  inkscape/repos/staging-x86_64/
  inkscape/repos/staging-x86_64/PKGBUILD
(from rev 147199, inkscape/trunk/PKGBUILD)
  inkscape/repos/staging-x86_64/install
(from rev 147199, inkscape/trunk/install)
  inkscape/repos/staging-x86_64/libpng15.patch
(from rev 147199, inkscape/trunk/libpng15.patch)

---+
 staging-i686/PKGBUILD |   57 
 staging-i686/install  |   13 +
 staging-i686/libpng15.patch   |   40 
 staging-x86_64/PKGBUILD   |   57 
 staging-x86_64/install|   13 +
 staging-x86_64/libpng15.patch |   40 
 6 files changed, 220 insertions(+)

Copied: inkscape/repos/staging-i686/PKGBUILD (from rev 147199, 
inkscape/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2012-01-24 06:18:56 UTC (rev 147200)
@@ -0,0 +1,57 @@
+# $Id$
+# Contributor: tobias tob...@archlinux.org
+# Contributor: Tobias Kieslich tob...@justdreams.de
+# Maintainer: Gaetan Bisson bis...@archlinux.org
+
+pkgname=inkscape
+pkgver=0.48.2
+pkgrel=6
+pkgdesc='Vector graphics editor using the SVG file format'
+url='http://inkscape.sourceforge.net/'
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL')
+makedepends=('boost' 'pkg-config' 'intltool')
+depends=('gc' 'gtkmm' 'poppler-glib' 'libxslt' 'gsl' 'popt' 'python2'
+ 'gtkspell' 'imagemagick' 'desktop-file-utils' 'hicolor-icon-theme')
+optdepends=('pstoedit: latex formulas'
+'texlive-core: latex formulas'
+'python2-numpy: some extensions'
+'python-lxml: some extensions and filters'
+'pyxml: some extensions'
+'uniconvertor: reading/writing to some proprietary formats')
+options=('!libtool')
+source=(http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz;
+'libpng15.patch')
+sha1sums=('422a4bacd4dc42adafa203244bc9816783cba4d3'
+  'd6512f3cb38ca8e2436dc485aa652490d17b3a52')
+
+install=install
+
+build() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+
+   sed -i 's|/usr/bin/python\|/usr/bin/python2|g' cxxtest/*.py
+   sed -i 's|/usr/bin/env python\|/usr/bin/env python2|g' 
share/*/{test/,}*.py
+   sed -i 's|python },|python2 },|g' 
src/extension/implementation/script.cpp
+   sed -i 's|python -c|python2 -c|g' configure share/extensions/uniconv*.py
+   sed -i 's|python|python2|g' src/main.cpp
+
+   patch -p1 -i ../libpng15.patch
+
+   ./configure --prefix=/usr \
+   --with-python \
+   --with-perl \
+   --without-gnome-vfs \
+   --with-xft \
+   --enable-lcms \
+   --enable-poppler-cairo \
+   --disable-dependency-tracking \
+
+   make
+}
+
+package() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+
+   make DESTDIR=${pkgdir} install
+}

Copied: inkscape/repos/staging-i686/install (from rev 147199, 
inkscape/trunk/install)
===
--- staging-i686/install(rev 0)
+++ staging-i686/install2012-01-24 06:18:56 UTC (rev 147200)
@@ -0,0 +1,13 @@
+post_install() {
+   update-desktop-database -q
+   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+   post_install
+}
+
+
+post_remove() {
+   post_install
+}

Copied: inkscape/repos/staging-i686/libpng15.patch (from rev 147199, 
inkscape/trunk/libpng15.patch)
===
--- staging-i686/libpng15.patch (rev 0)
+++ staging-i686/libpng15.patch 2012-01-24 06:18:56 UTC (rev 147200)
@@ -0,0 +1,40 @@
+--- inkscape-0.48.1/src/extension/internal/pdfinput/svg-builder.cpp
 inkscape-0.48.1-mod//src/extension/internal/pdfinput/svg-builder.cpp
+@@ -1443,7 +1443,7 @@
+ return NULL;
+ }
+ // Set error handler
+-if (setjmp(png_ptr-jmpbuf)) {
++if (setjmp(png_jmpbuf(png_ptr))) {
+ png_destroy_write_struct(png_ptr, info_ptr);
+ return NULL;
+ }
+--- inkscape-0.48.1/src/helper/png-write.cpp
 inkscape-0.48.1-mod//src/helper/png-write.cpp
+@@ -165,7 +165,7 @@
+ /* Set error handling.  REQUIRED if you aren't supplying your own
+  * error hadnling functions in the png_create_write_struct() 

[arch-commits] Commit in filesystem/trunk (PKGBUILD)

2012-01-23 Thread Gaetan Bisson
Date: Tuesday, January 24, 2012 @ 01:36:12
  Author: bisson
Revision: 147201

implement FS#26419

Modified:
  filesystem/trunk/PKGBUILD

--+
 PKGBUILD |2 --
 1 file changed, 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-01-24 06:18:56 UTC (rev 147200)
+++ PKGBUILD2012-01-24 06:36:12 UTC (rev 147201)
@@ -72,8 +72,6 @@
ln -s /var/spool/mail ${pkgdir}/var/mail
ln -s /run ${pkgdir}/var/run
ln -s /run/lock ${pkgdir}/var/lock
-   # prevent pacman from removing directory (FS#16886)
-   touch ${pkgdir}/var/empty/.keep
 
#
# setup /usr hierarchy



[arch-commits] Commit in dbus-core/trunk (PKGBUILD)

2012-01-23 Thread Gaetan Bisson
Date: Tuesday, January 24, 2012 @ 01:36:37
  Author: bisson
Revision: 147202

implement FS#26419

Modified:
  dbus-core/trunk/PKGBUILD

--+
 PKGBUILD |6 --
 1 file changed, 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-01-24 06:36:12 UTC (rev 147201)
+++ PKGBUILD2012-01-24 06:36:37 UTC (rev 147202)
@@ -46,12 +46,6 @@
   #Fix configuration file
   sed -i -e 's|user81/user|userdbus/user|' 
${pkgdir}/etc/dbus-1/system.conf
 
-  #install .keep files so pacman doesn't delete empty dirs
-  touch ${pkgdir}/usr/share/dbus-1/services/.keep
-  touch ${pkgdir}/usr/share/dbus-1/system-services/.keep
-  touch ${pkgdir}/etc/dbus-1/session.d/.keep
-  touch ${pkgdir}/etc/dbus-1/system.d/.keep
-
   install -d -m755 ${pkgdir}/usr/share/licenses/dbus-core
   install -m644 COPYING ${pkgdir}/usr/share/licenses/dbus-core/
 }