diff options
Diffstat (limited to 'extra')
106 files changed, 1610 insertions, 593 deletions
diff --git a/extra/abiword/abiword-2.8.6-no-undefined.patch b/extra/abiword/abiword-2.8.6-no-undefined.patch new file mode 100644 index 000000000..c07000edb --- /dev/null +++ b/extra/abiword/abiword-2.8.6-no-undefined.patch @@ -0,0 +1,21 @@ +diff -u -r abiword-2.8.6.orig/src/Makefile.am abiword-2.8.6/src/Makefile.am +--- abiword-2.8.6.orig/src/Makefile.am 2009-09-09 15:11:01.000000000 +0200 ++++ abiword-2.8.6/src/Makefile.am 2011-08-02 23:35:51.904761961 +0200 +@@ -107,7 +107,7 @@ + + AbiWord_LDFLAGS = \ + $(DEPS_LIBS) \ +- --no-undefined \ ++ -Wl,--no-undefined \ + -avoid-version \ + -export-dynamic \ + -headerpad_max_install_names +@@ -129,7 +129,7 @@ + + abiword_LDFLAGS = \ + $(platform_ldflags) \ +- --no-undefined \ ++ -Wl,--no-undefined \ + -avoid-version \ + -export-dynamic + diff --git a/extra/abiword/abiword.install b/extra/abiword/abiword.install new file mode 100644 index 000000000..2eaa60550 --- /dev/null +++ b/extra/abiword/abiword.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/extra/alsa-utils/PKGBUILD b/extra/alsa-utils/PKGBUILD index 8b94b8949..b19663a19 100644 --- a/extra/alsa-utils/PKGBUILD +++ b/extra/alsa-utils/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 134698 2011-08-07 16:20:42Z dreisner $ +# $Id: PKGBUILD 135667 2011-08-17 07:46:33Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=alsa-utils pkgver=1.0.24.2 -pkgrel=2 +pkgrel=3 pkgdesc="An alternative implementation of Linux sound support" arch=('i686' 'x86_64' 'mips64el') url="http://www.alsa-project.org" @@ -18,11 +18,6 @@ source=(ftp://ftp.alsa-project.org/pub/utils/$pkgname-${pkgver}.tar.bz2 alsa.conf.d 90alsa) backup=(etc/conf.d/alsa) -md5sums=('8238cd57cb301d1c36bcf0ecb59ce6b2' - '2ba1a1cbf653bf1a69f8a720fd6549da' - '62ebef77d5617d0036012cc541dcf23c' - '4c8ae9f976c7df5e271a4cb91ccc7767' - '529216f6a46e61a546640e08ea7a0879') build() { cd ${srcdir}/${pkgname}-${pkgver} @@ -40,3 +35,8 @@ package() { # dir where to save ALSA state install -d ${pkgdir}/var/lib/alsa } +md5sums=('8238cd57cb301d1c36bcf0ecb59ce6b2' + '2ba1a1cbf653bf1a69f8a720fd6549da' + '7521bf20f5b3501a510ec4462ae4a934' + '4c8ae9f976c7df5e271a4cb91ccc7767' + '529216f6a46e61a546640e08ea7a0879') diff --git a/extra/alsa-utils/alsaconf.patch b/extra/alsa-utils/alsaconf.patch index ec79fe93f..48037fd3e 100644 --- a/extra/alsa-utils/alsaconf.patch +++ b/extra/alsa-utils/alsaconf.patch @@ -5,7 +5,7 @@ diff -Naur alsa-utils-1.0.9a-orig/alsaconf/alsaconf.in alsa-utils-1.0.9a/alsacon distribution="redhat" elif test -f /etc/fedora-release && grep -q "Fedora" /etc/fedora-release; then distribution="fedora" -+elif test -f /etc/arch-release && grep -q "Arch" /etc/arch-release; then ++elif test -f /etc/arch-release; then + distribution="arch" elif [ -f /etc/slackware-version -o -f /etc/slamd64-version ]; then distribution="slackware" diff --git a/extra/claws-mail/PKGBUILD b/extra/claws-mail/PKGBUILD index f68c15b6d..726f0f271 100644 --- a/extra/claws-mail/PKGBUILD +++ b/extra/claws-mail/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 127579 2011-06-16 17:10:43Z andyrtr $ +# $Id: PKGBUILD 135774 2011-08-18 15:03:56Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=claws-mail pkgver=3.7.9 -pkgrel=4 +pkgrel=5 pkgdesc="A GTK+ based e-mail client." arch=('i686' 'x86_64' 'mips64el') license=('GPL3') diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD index 932d6bc0a..85464033f 100644 --- a/extra/cups/PKGBUILD +++ b/extra/cups/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 134554 2011-08-05 18:35:01Z andyrtr $ +# $Id: PKGBUILD 135776 2011-08-18 15:04:02Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase="cups" pkgname=('libcups' 'cups') pkgver=1.4.8 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.cups.org/" diff --git a/extra/eject/PKGBUILD b/extra/eject/PKGBUILD index 3ec0bd9c2..dfb974f82 100644 --- a/extra/eject/PKGBUILD +++ b/extra/eject/PKGBUILD @@ -1,29 +1,50 @@ -# $Id: PKGBUILD 122087 2011-05-02 06:23:02Z andrea $ -# Maintainer: +# $Id: PKGBUILD 135944 2011-08-20 17:05:11Z tomegun $ +# Maintainer: Tom Gundersen <teg@jlkm.no> +# Contributor: Natrio <natrio@list.ru> # Contributor: dorphell <dorphell@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=eject pkgver=2.1.5 -pkgrel=5 +pkgrel=7 pkgdesc="A program for ejecting removable media under software control" arch=('i686' 'x86_64' 'mips64el') url="http://eject.sourceforge.net/" license=('GPL') depends=('glibc') -source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2" - 'eject-2.1.5-handle-spaces.patch') +source=("ftp://ftp.archlinux.org/other/eject/eject-${pkgver}.tar.bz2" + 'eject-2.1.1-verbose.patch' + 'eject-2.1.5-lock.patch' + 'eject-2.1.5-spaces.patch' + 'eject-2.1.5-umount.patch' + 'eject-timeout.patch' + 'eject-2.1.5-unlock.patch' + 'eject-2.1.5-openrw.patch') md5sums=('5a6cab2184ae4ed21128054d931d558f' - '595b97c3bd56fd41e3b01b07885f81dc') + '4fb81806de181d5f353a459b7f122081' + '7d18c14f7b1bb50149fd2b41215dc4f2' + '64f5c54dac064e6dbc427025d919221b' + '34221248a269703d3a47a8d2a6fdd2e2' + 'f6b1b702ef9174e2fd05a56ee2de850e' + 'f384f98fa689b087d99217a7403bf706' + 'e74d742540e4f399d348af495bf00e85') build() { - cd "${srcdir}/${pkgname}" - patch -Np0 -i "${srcdir}/eject-2.1.5-handle-spaces.patch" - ./configure --prefix=/usr --mandir=/usr/share/man + cd "${srcdir}/eject" + patch -p1 -i "${srcdir}/eject-2.1.1-verbose.patch" + patch -p1 -i "${srcdir}/eject-2.1.5-lock.patch" + patch -p1 -i "${srcdir}/eject-2.1.5-spaces.patch" + patch -p1 -i "${srcdir}/eject-2.1.5-umount.patch" + patch -p1 -i "${srcdir}/eject-timeout.patch" + patch -p1 -i "${srcdir}/eject-2.1.5-unlock.patch" + patch -p1 -i "${srcdir}/eject-2.1.5-openrw.patch" + ./configure --prefix=/usr \ + --mandir=/usr/share/man \ + --enable-default-device=sr0 make } package() { - cd "${srcdir}/${pkgname}" + cd "${srcdir}/eject" make DESTDIR="${pkgdir}" install } diff --git a/extra/eject/eject-2.1.1-verbose.patch b/extra/eject/eject-2.1.1-verbose.patch new file mode 100644 index 000000000..44c05d881 --- /dev/null +++ b/extra/eject/eject-2.1.1-verbose.patch @@ -0,0 +1,15 @@ +diff --git a/eject.c b/eject.c +index b14d5f2..662ba54 100644 +--- a/eject.c ++++ b/eject.c +@@ -709,7 +709,9 @@ static int EjectScsi(int fd) + unsigned char sense_buffer[32]; + + if ((ioctl(fd, SG_GET_VERSION_NUM, &k) < 0) || (k < 30000)) { +- printf("not an sg device, or old sg driver\n"); ++ if (v_option) { ++ printf(_("not an sg device, or old sg driver\n")); ++ } + return 0; + } + diff --git a/extra/eject/eject-2.1.5-lock.patch b/extra/eject/eject-2.1.5-lock.patch new file mode 100644 index 000000000..25f84651e --- /dev/null +++ b/extra/eject/eject-2.1.5-lock.patch @@ -0,0 +1,171 @@ + eject.1 | 13 +++++++++++-- + eject.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- + 2 files changed, 63 insertions(+), 4 deletions(-) + +diff --git a/eject.1 b/eject.1 +index 3c388c6..315dc6d 100644 +--- a/eject.1 ++++ b/eject.1 +@@ -17,6 +17,8 @@ eject [\-vn] \-a on|off|1|0 [<name>] + .br + eject [\-vn] \-c slot [<name>] + .br ++eject [\-vn] \-i on|off|1|0 [<name>] ++.br + eject [\-vn] \-t [<name>] + .br + eject [\-vn] \-T [<name>] +@@ -83,6 +85,13 @@ for a change request to work. Please also note that the first slot of + the changer is referred to as 0, not 1. + + .TP 0.5i ++.B \-i on|1|off|0 ++This option controls locking of the hardware eject button. When ++enabled, the drive will not be ejected when the button is pressed. ++This is useful when you are carrying a laptop in a bag or case and ++don't want it to eject if the button is inadvertently pressed. ++ ++.TP 0.5i + .B \-t + With this option the drive is given a CD-ROM tray close command. Not + all devices support this command. +@@ -121,8 +130,8 @@ performed. + .B \-r + This option specifies that the drive should be ejected using a + CDROM eject command. +-.TP 0.5i + ++.TP 0.5i + .B \-s + This option specifies that the drive should be ejected using + SCSI commands. +@@ -145,7 +154,7 @@ also passes the \-n option to umount(1). + .TP 0.5i + .B \-m + This option allows eject to work with device drivers which automatically +-mount removable media and therefore must be always mount()ed. ++mount removable media and therefore must be always mount(1)ed. + The option tells eject to not try to unmount the given device, + even if it is mounted according to /etc/mtab or /proc/mounts. + +diff --git a/eject.c b/eject.c +index f7b2a2e..4175756 100644 +--- a/eject.c ++++ b/eject.c +@@ -116,6 +116,7 @@ int d_option = 0; + int f_option = 0; + int h_option = 0; + int n_option = 0; ++int i_option = 0; + int q_option = 0; + int r_option = 0; + int s_option = 0; +@@ -129,6 +130,7 @@ int m_option = 0; + int a_arg = 0; + int c_arg = 0; + int x_arg = 0; ++int i_arg = 0; + static char *programName; /* used in error messages */ + + /* +@@ -163,6 +165,7 @@ static void usage() + " eject [-vn] -c <slot> [<name>] -- switch discs on a CD-ROM changer\n" + " eject [-vn] -t [<name>] -- close tray\n" + " eject [-vn] -T [<name>] -- toggle tray\n" ++" eject [-vn] -i on|off|1|0 [<name>] -- toggle manual eject protection on/off\n" + " eject [-vn] -x <speed> [<name>] -- set CD-ROM max speed\n" + " eject [-vn] -X [<name>] -- list CD-ROM available speeds\n" + "Options:\n" +@@ -200,7 +203,7 @@ static void usage() + #endif + "\n" + " -n --noop -V --version\n" +-" -p --proc -m --no-unmount -T --traytoggle\n")); ++" -p --proc -m --no-unmount -T --traytoggle -i --manualeject\n")); + #endif /* GETOPTLONG */ + fprintf(stderr,_( + "Parameter <name> can be a device file or a mount point.\n" +@@ -214,7 +217,7 @@ static void usage() + /* Handle command line options. */ + static void parse_args(int argc, char **argv, char **device) + { +- const char *flags = "a:c:x:dfhnqrstTXvVpm"; ++ const char *flags = "a:c:x:i:dfhnqrstTXvVpm"; + #ifdef GETOPTLONG + static struct option long_options[] = + { +@@ -223,6 +226,7 @@ static void parse_args(int argc, char **argv, char **device) + {"default", no_argument, NULL, 'd'}, + {"auto", required_argument, NULL, 'a'}, + {"changerslot", required_argument, NULL, 'c'}, ++ {"manualeject", required_argument, NULL, 'i'}, + {"trayclose", no_argument, NULL, 't'}, + {"traytoggle", no_argument, NULL, 'T'}, + {"cdspeed", required_argument, NULL, 'x'}, +@@ -297,6 +301,21 @@ static void parse_args(int argc, char **argv, char **device) + usage(); + exit(0); + break; ++ case 'i': ++ i_option = 1; ++ if (!strcmp(optarg, "0")) ++ i_arg = 0; ++ else if (!strcmp(optarg, "off")) ++ i_arg = 0; ++ else if (!strcmp(optarg, "1")) ++ i_arg = 1; ++ else if (!strcmp(optarg, "on")) ++ i_arg = 1; ++ else { ++ fprintf(stderr, _("%s: invalid argument to -i option\n"), programName); ++ exit(1); ++ } ++ break; + case 'm': + m_option = 1; + break; +@@ -482,6 +501,30 @@ static char *FindDevice(const char *name) + } + + ++/* ++ * Stops CDROM from opening on manual eject pressing the button. ++ * This can be useful when you carry your laptop ++ * in your bag while it's on and no CD inserted in it's drive. ++ * Implemented as found in Documentation/ioctl/cdrom.txt ++ * ++ * TODO: Maybe we should check this also: ++ * EDRIVE_CANT_DO_THIS Door lock function not supported. ++ * EBUSY Attempt to unlock when multiple users ++ * have the drive open and not CAP_SYS_ADMIN ++ */ ++static void ManualEject(int fd, int onOff) ++{ ++ if (ioctl(fd, CDROM_LOCKDOOR, onOff) < 0) { ++ perror("ioctl on CDROM_LOCKDOOR"); ++ } else { ++ if (onOff) ++ printf("CD-Drive may NOT be ejected with device button\n"); ++ else ++ printf("CD-Drive may be ejected with device button\n"); ++ } ++} ++ ++ + /* Set or clear auto-eject mode. */ + static void AutoEject(int fd, int onOff) + { +@@ -1233,6 +1276,13 @@ int main(int argc, char **argv) + exit(0); + } + ++ /* handle -i option */ ++ if (i_option) { ++ fd = OpenDevice(deviceName); ++ ManualEject(fd, i_arg); ++ exit(0); ++ } ++ + /* handle -a option */ + if (a_option) { + if (v_option) { diff --git a/extra/eject/eject-2.1.5-openrw.patch b/extra/eject/eject-2.1.5-openrw.patch new file mode 100644 index 000000000..092bfcfda --- /dev/null +++ b/extra/eject/eject-2.1.5-openrw.patch @@ -0,0 +1,17 @@ +diff -pur eject-1/eject.c eject/eject.c +--- eject-1/eject.c 2011-08-19 11:42:22.697388647 +0400 ++++ eject/eject.c 2011-08-19 11:57:27.636724026 +0400 +@@ -911,7 +911,12 @@ static void Unmount(const char *fullName + /* Open a device file. */ + static int OpenDevice(const char *fullName) + { +- int fd = open(fullName, O_RDONLY|O_NONBLOCK); ++ int fd = open(fullName, O_RDWR|O_NONBLOCK); ++ if (fd == -1 && errno == EACCES) { ++ if (v_option) ++ printf(_("%s: unable to open `%s' for R/W, SCSI commands can be fail. Trying Read-Only\n"), programName, fullName); ++ fd = open(fullName, O_RDONLY|O_NONBLOCK); ++ } + if (fd == -1) { + fprintf(stderr, _("%s: unable to open `%s'\n"), programName, fullName); + exit(1); diff --git a/extra/eject/eject-2.1.5-spaces.patch b/extra/eject/eject-2.1.5-spaces.patch new file mode 100644 index 000000000..40834d902 --- /dev/null +++ b/extra/eject/eject-2.1.5-spaces.patch @@ -0,0 +1,62 @@ +diff --git a/eject.c b/eject.c +index d67089c..f7b2a2e 100644 +--- a/eject.c ++++ b/eject.c +@@ -370,6 +370,30 @@ static int FileExists(const char *name, const int try, int *found) + + + /* ++ * Linux mangles spaces in mount points by changing them to an octal string ++ * of '\040'. So lets scan the mount point and fix it up by replacing all ++ * occurrences off '\0##' with the ASCII value of 0##. Requires a writable ++ * string as input as we mangle in place. Some of this was taken from the ++ * util-linux package. ++ */ ++#define octalify(a) ((a) & 7) ++#define tooctal(s) (64*octalify(s[1]) + 8*octalify(s[2]) + octalify(s[3])) ++#define isoctal(a) (((a) & ~7) == '0') ++static char *DeMangleMount(char *s) ++{ ++ char *tmp = s; ++ while ((tmp = strchr(tmp, '\\')) != NULL) { ++ if (isoctal(tmp[1]) && isoctal(tmp[2]) && isoctal(tmp[3])) { ++ tmp[0] = tooctal(tmp); ++ memmove(tmp+1, tmp+4, strlen(tmp)-3); ++ } ++ ++tmp; ++ } ++ return s; ++} ++ ++ ++/* + * Given name, such as foo, see if any of the following exist: + * + * foo (if foo starts with '.' or '/') +@@ -882,6 +906,8 @@ static int MountedDevice(const char *name, char **mountName, char **deviceName) + rc = sscanf(line, "%1023s %1023s", s1, s2); + if (rc >= 2) { + int mtabmaj, mtabmin; ++ DeMangleMount(s1); ++ DeMangleMount(s2); + GetMajorMinor(s1, &mtabmaj, &mtabmin); + if (((strcmp(s1, name) == 0) || (strcmp(s2, name) == 0)) || + ((maj != -1) && (maj == mtabmaj) && (min == mtabmin))) { +@@ -928,6 +954,8 @@ static int MountableDevice(const char *name, char **mountName, char **deviceName + + while (fgets(line, sizeof(line), fp) != 0) { + rc = sscanf(line, "%1023s %1023s", s1, s2); ++ DeMangleMount(s1); ++ DeMangleMount(s2); + if (rc >= 2 && s1[0] != '#' && strcmp(s2, name) == 0) { + FCLOSE(fp); + *deviceName = strdup(s1); +@@ -968,6 +996,8 @@ static void UnmountDevices(const char *pattern) + while (fgets(line, sizeof(line), fp) != 0) { + status = sscanf(line, "%1023s %1023s", s1, s2); + if (status >= 2) { ++ DeMangleMount(s1); ++ DeMangleMount(s2); + status = regexec(&preg, s1, 0, 0, 0); + if (status == 0) { + if (v_option) diff --git a/extra/eject/eject-2.1.5-umount.patch b/extra/eject/eject-2.1.5-umount.patch new file mode 100644 index 000000000..2c588a01d --- /dev/null +++ b/extra/eject/eject-2.1.5-umount.patch @@ -0,0 +1,176 @@ +diff --git a/eject.c b/eject.c +index 4175756..057d2ea 100644 +--- a/eject.c ++++ b/eject.c +@@ -42,6 +42,7 @@ + #include <string.h> + #include <fcntl.h> + #include <limits.h> ++#include <dirent.h> + + #ifdef GETOPTLONG + #include <getopt.h> +@@ -1133,6 +1134,145 @@ static char *MultiplePartitions(const char *name) + return 0; + } + ++/* ++ * Find device name in /sys/block/. Returns NULL if not ++ * found. The returned pointer must be free()'d. ++ */ ++static char* FindDeviceSysBlock(const char* deviceName) ++{ ++ DIR *dir = opendir("/sys/block"); ++ struct dirent *d; ++ const char *baseName = strrchr(deviceName, '/'); ++ char *device; ++ int len; ++ ++ baseName = baseName ? baseName + 1 : deviceName; ++ if (!dir) { ++ fprintf(stderr, _("%s: can not open directory /sys/block/"), programName); ++ return NULL; ++ } ++ while ((d = readdir(dir)) != NULL) { ++ if (d->d_type != DT_DIR && d->d_type != DT_LNK && d->d_type != DT_UNKNOWN) ++ continue; ++ len = strlen(d->d_name); ++ if (!strncmp(baseName, d->d_name, len)) { ++ if ((*(baseName+len) >= '0' && ++ *(baseName+len) <= '9') || ++ *(baseName+len) == '\0') { ++ device = strdup(d->d_name); ++ closedir(dir); ++ return device; ++ } ++ } ++ } ++ closedir(dir); ++ return NULL; ++} ++ ++/* ++ * From given path gets a subsystem. Returns subsystem if any found ++ * otherwise returns NULL. Returned value must not be free()'d ++ */ ++static char *GetSubSystem(const char *sysfspath) ++{ ++ static char subsystem[PATH_MAX]; ++ char link_subsystem[PATH_MAX]; ++ struct stat buf; ++ char *pos; ++ ++ snprintf(link_subsystem, sizeof(link_subsystem), "%s/subsystem", sysfspath); ++ ++ if (lstat(link_subsystem, &buf) == -1) ++ return NULL; ++ if (!S_ISLNK(buf.st_mode)) ++ return NULL; ++ if (readlink(link_subsystem, subsystem, sizeof(subsystem)) == -1) ++ return NULL; ++ if ((pos = strrchr(subsystem, '/')) == NULL) ++ return NULL; ++ strncpy(subsystem, pos+1, sizeof(subsystem)); ++ ++ return subsystem; ++} ++ ++/* ++ * Check content of /sys/block/<dev>/removable. Returns 1 if the file ++ * contains '1' otherwise returns 0. ++ */ ++static int CheckRemovable(const char* deviceName) ++{ ++ FILE *fp; ++ int removable = 0; ++ char *device; ++ char path[PATH_MAX]; ++ ++ if ((device = FindDeviceSysBlock(deviceName)) == NULL) { ++ fprintf(stderr, ++ _("%s: did not find a device %s in /sys/block/\n"), ++ programName, deviceName); ++ exit(1); ++ } ++ snprintf(path, sizeof(path), "/sys/block/%s/removable", device); ++ free(device); ++ if((fp = fopen(path, "r")) == NULL) ++ return removable; ++ if (fgetc(fp) == '1') ++ removable = 1; ++ ++ fclose(fp); ++ return removable; ++} ++ ++/* Check if a device is on hotpluggable subsystem. Returns 1 if is ++ * otherwise returns 0. ++ */ ++static int CheckHotpluggable(const char* deviceName) ++{ ++ int hotpluggable = 0; ++ char *device; ++ char path[PATH_MAX]; ++ char *device_chain; ++ struct stat buf; ++ char *subsystem; ++ char *pos; ++ ++ if ((device = FindDeviceSysBlock(deviceName)) == NULL) { ++ fprintf(stderr, _("%s: did not find a device %s in /sys/block/\n"), ++ programName, deviceName); ++ exit(1); ++ } ++ snprintf(path, sizeof(path), "/sys/block/%s/device", device); ++ free(device); ++ ++ if (lstat(path, &buf) == -1) ++ return hotpluggable; ++ if (!S_ISLNK(buf.st_mode)) ++ return hotpluggable; ++ if ((device_chain = SymLink(path)) == NULL) ++ return hotpluggable; ++ while ( strncmp(device_chain, "", sizeof(device_chain) != 0)) { ++ subsystem = GetSubSystem(device_chain); ++ if (subsystem) { ++ /* as hotpluggable we assume devices on these buses */ ++ if (strncmp("usb", subsystem, sizeof("usb")) == 0 || ++ strncmp("ieee1394", subsystem, sizeof("ieee1394")) == 0 || ++ strncmp("pcmcia", subsystem, sizeof("pcmcia")) == 0 || ++ strncmp("mmc", subsystem, sizeof("mmc")) == 0 || ++ strncmp("ccw", subsystem, sizeof("ccw")) == 0) { ++ hotpluggable = 1; ++ break; ++ } ++ } ++ /* remove one member from devicechain */ ++ pos = strrchr(device_chain, '/'); ++ if (pos) ++ pos[0] = '\0'; ++ else ++ device_chain[0] = '\0'; ++ } ++ ++ return hotpluggable; ++} + + /* handle -x option */ + static void HandleXOption(char *deviceName) +@@ -1276,6 +1416,17 @@ int main(int argc, char **argv) + exit(0); + } + ++ /* Check if device has removable flag*/ ++ if (v_option) ++ printf(_("%s: checking if device \"%s\" has a removable or hotpluggable flag\n"), ++ programName, deviceName); ++ if (!CheckRemovable(deviceName) && !CheckHotpluggable(deviceName)) ++ { ++ fprintf(stderr, _("%s: device \"%s\" doesn't have a removable or hotpluggable flag\n"), ++ programName, deviceName); ++ exit(1); ++ } ++ + /* handle -i option */ + if (i_option) { + fd = OpenDevice(deviceName); diff --git a/extra/eject/eject-2.1.5-unlock.patch b/extra/eject/eject-2.1.5-unlock.patch new file mode 100644 index 000000000..d554f9bdf --- /dev/null +++ b/extra/eject/eject-2.1.5-unlock.patch @@ -0,0 +1,59 @@ +diff -pur eject-orig/eject.c eject/eject.c +--- eject-orig/eject.c 2006-02-11 04:54:38.000000000 +0300 ++++ eject/eject.c 2011-08-11 13:12:16.568112725 +0400 +@@ -527,6 +527,25 @@ static void CloseTray(int fd) + } + + /* ++ * Unlock tray using CDROM_LOCKDOOR ioctl. ++ * New kernels doesn't automatically unlock tray before ejecting, ++ * and the new udev automatically locks it. ++ */ ++static int UnlockCdrom(int fd) ++{ ++ int status = -1; ++ ++ if (v_option) ++ printf(_("%s: unlocking tray using CDROM_LOCKDOOR ioctl\n"), programName); ++ ++ status = ioctl(fd, CDROM_LOCKDOOR, 0); ++ if (v_option && status != 0) ++ printf(_("%s: CDROM_LOCKDOOR ioctl failed\n"), programName); ++ ++ return (status == 0); ++} ++ ++/* + * Toggle tray. + * + * Written by Benjamin Schwenk <benjaminschwenk@yahoo.de> and +@@ -543,6 +562,8 @@ static void ToggleTray(int fd) + + #ifdef CDROMCLOSETRAY + ++ UnlockCdrom(fd); ++ + /* Try to open the CDROM tray and measure the time therefor + * needed. In my experience the function needs less than 0.05 + * seconds if the tray was already open, and at least 1.5 seconds +@@ -566,7 +587,11 @@ static void ToggleTray(int fd) + * was already open. In this case, close it now. Else the tray was + * closed before. This would mean that we are done. */ + if (time_elapsed < TRAY_WAS_ALREADY_OPEN_USECS) ++ { ++ if (v_option) ++ printf(_("%s: CD-ROM tray was already open, closing it\n"), programName); + CloseTray(fd); ++ } + + #else + fprintf(stderr, _("%s: CD-ROM tray toggle command not supported by this kernel\n"), programName); +@@ -681,7 +706,7 @@ static void ListSpeedCdrom(const char *f + static int EjectCdrom(int fd) + { + int status = -1; +- ++ UnlockCdrom(fd); + #if defined(CDROMEJECT) + status = ioctl(fd, CDROMEJECT); + #elif defined(CDIOCEJECT) diff --git a/extra/eject/eject-timeout.patch b/extra/eject/eject-timeout.patch new file mode 100644 index 000000000..a542d2c2f --- /dev/null +++ b/extra/eject/eject-timeout.patch @@ -0,0 +1,11 @@ +--- eject/eject.c.orig 2006-08-07 16:35:15.000000000 +0200 ++++ eject/eject.c 2006-08-07 16:35:54.000000000 +0200 +@@ -723,7 +723,7 @@ + io_hdr.dxfer_len = 0; + io_hdr.dxferp = inqBuff; + io_hdr.sbp = sense_buffer; +- io_hdr.timeout = 2000; ++ io_hdr.timeout = 10000; + + io_hdr.cmdp = allowRmBlk; + status = ioctl(fd, SG_IO, (void *)&io_hdr); diff --git a/extra/emacs/PKGBUILD b/extra/emacs/PKGBUILD index ba5563f56..3deab745a 100644 --- a/extra/emacs/PKGBUILD +++ b/extra/emacs/PKGBUILD @@ -1,50 +1,50 @@ -# $Id: PKGBUILD 134523 2011-08-05 07:55:30Z juergen $ +# $Id: PKGBUILD 135954 2011-08-21 02:30:32Z eric $ # Maintainer: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Renchi Raju <renchi@green.tam.uiuc.edu> pkgname=emacs -pkgver=23.3a -pkgrel=1 -pkgdesc="The Emacs Editor" -arch=(i686 x86_64 'mips64el') +_majorver=23.3 +_minorver=a +# We want something like "23.3.a" so pacman version comparison works, but +# upstream uses "23.3a", which is a bit silly and interpreted as alpha. +pkgver=$_majorver.$_minorver +_realver=$_majorver$_minorver +pkgrel=2 +pkgdesc="The extensible, customizable, self-documenting real-time display editor" +arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/emacs/emacs.html" -license=('GPL') -options=(docs) -replaces=(cedet) -depends=('dbus-core' 'librsvg' 'gpm' 'giflib' 'libtiff' 'libxpm' 'libjpeg' 'gtk2' 'texinfo' 'hicolor-icon-theme' 'gconf') -source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.gz emacs.desktop) +license=('GPL3') +depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'gtk2' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils') +install=emacs.install +source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$_realver.tar.gz emacs.desktop) md5sums=('20aef9ea5b5bf8050d39f8b1e96a1c04' '8af038d2ba4561271e935bb444ceb4e3') -install=emacs.install build() { - cd $startdir/src/$pkgname-${pkgver%[a-z]} - mandir=/usr/share/man - - # gcc 4.5 Workaround: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43904 - CFLAGS="${CFLAGS} -fno-optimize-sibling-calls"\ - ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ - --localstatedir=/var --mandir=${mandir} --without-sound --with-x-toolkit=gtk + cd "$srcdir"/$pkgname-$_majorver + ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ + --localstatedir=/var --without-sound --with-x-toolkit=gtk --with-xft make - make DESTDIR=$startdir/pkg install +} + +package() { + cd "$srcdir"/$pkgname-$_majorver + make DESTDIR="$pkgdir" install # remove conflict with ctags package - mv $startdir/pkg/usr/bin/{ctags,ctags.emacs} - mv $startdir/pkg/usr/bin/{etags,etags.emacs} - mv $startdir/pkg${mandir}/man1/{etags.1,etags.emacs.1} - mv $startdir/pkg${mandir}/man1/{ctags.1,ctags.emacs.1} + mv "$pkgdir"/usr/bin/{ctags,ctags.emacs} + mv "$pkgdir"/usr/share/man/man1/{ctags.1,ctags.emacs.1} # fix all the 777 perms on directories - find $startdir/pkg/usr/share/emacs/${pkgver%[a-z]} -type d -exec chmod 755 {} \; + find "$pkgdir"/usr/share/emacs/$_majorver -type d -exec chmod 755 {} \; # fix user/root permissions on usr/share files - find $startdir/pkg/usr/share/emacs/${pkgver%[a-z]} -exec chown root.root {} \; + find "$pkgdir"/usr/share/emacs/$_majorver -exec chown root:root {} \; # fix perms on /var/games - chmod 775 ${startdir}/pkg/var/games - chmod 775 ${startdir}/pkg/var/games/emacs - chmod 664 ${startdir}/pkg/var/games/emacs/* - chown -R root:50 ${startdir}/pkg/var/games - + chmod 775 "$pkgdir"/var/games + chmod 775 "$pkgdir"/var/games/emacs + chmod 664 "$pkgdir"/var/games/emacs/* + chown -R root:games "$pkgdir"/var/games # fix FS#9253 - mkdir -p $startdir/pkg/usr/share/pixmaps ${startdir}/pkg/usr/share/applications - install -D -m644 ${startdir}/src/${pkgname}.desktop ${startdir}/pkg/usr/share/applications - ln -s ../emacs/${pkgver%[a-z]}/etc/images/icons/hicolor/48x48/apps/emacs.png $startdir/pkg/usr/share/pixmaps/emacs-icon.png + mkdir -p "$pkgdir"/usr/share/pixmaps "$pkgdir"/usr/share/applications + install -D -m644 "$srcdir"/$pkgname.desktop "$pkgdir"/usr/share/applications + ln -s ../emacs/$_majorver/etc/images/icons/hicolor/48x48/apps/emacs.png "$pkgdir"/usr/share/pixmaps/emacs-icon.png } diff --git a/extra/emacs/emacs.install b/extra/emacs/emacs.install index 80bcb20bf..d84f1de14 100644 --- a/extra/emacs/emacs.install +++ b/extra/emacs/emacs.install @@ -1,15 +1,17 @@ -ICON_PATH=/usr/share/icons/hicolor -INFO_DIR=/usr/share/info +ICON_PATH=usr/share/icons/hicolor +INFO_DIR=usr/share/info INFO_FILES=(ada-mode auth autotype calc ccmode cl dbus dired-x ebrowse -ediff efaq eintr elisp emacs emacs-mime epa erc eshell eudc flymake +ede ediff edt efaq eieio eintr elisp emacs emacs-mime epa erc eshell eudc flymake forms gnus idlwave info mairix-el message mh-e newsticker nxml-mode -org pcl-cvs pgg rcirc reftex remember sasl sc ses sieve smtpmail +org pcl-cvs pgg rcirc reftex remember sasl sc semantic ses sieve smtpmail speedbar tramp url vip viper widget woman) post_install() { gtk-update-icon-cache -q -t -f ${ICON_PATH} + update-desktop-database -q + [[ -x usr/bin/install-info ]] || return 0 for f in ${INFO_FILES[@]}; do install-info ${INFO_DIR}/$f.gz ${INFO_DIR}/dir 2> /dev/null done @@ -21,7 +23,9 @@ post_upgrade() { pre_remove() { gtk-update-icon-cache -q -t -f ${ICON_PATH} + update-desktop-database -q + [[ -x usr/bin/install-info ]] || return 0 for f in ${INFO_FILES[@]}; do install-info --delete ${INFO_DIR}/$f.gz ${INFO_DIR}/dir 2> /dev/null done diff --git a/extra/empathy/PKGBUILD b/extra/empathy/PKGBUILD index 9bce420a0..93cd1d87a 100644 --- a/extra/empathy/PKGBUILD +++ b/extra/empathy/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 131265 2011-07-12 13:19:41Z ibiru $ +# $Id: PKGBUILD 135778 2011-08-18 15:04:05Z andyrtr $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=empathy pkgver=3.0.2 -pkgrel=1 +pkgrel=2 pkgdesc="A GNOME instant messaging client using the Telepathy framework." arch=('i686' 'x86_64' 'mips64el') url="http://live.gnome.org/Empathy" diff --git a/extra/evilwm/LICENSE b/extra/evilwm/LICENSE new file mode 100644 index 000000000..6778ede8c --- /dev/null +++ b/extra/evilwm/LICENSE @@ -0,0 +1,40 @@ +LICENCE + +evilwm 1.1 +Copyright (C) 1999-2011 Ciaran Anscomb <evilwm@6809.org.uk> + +This is free software. You can do what you want to it, but if it +breaks something, you get to pay for the counselling. The code was +originally based on aewm, so this is distributed under the same terms, +which follow. + + +AEWM LICENCE + +Copyright (c) 1998-2000 Decklin Foster. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS", WITHOUT ANY EXPRESS +OR IMPLIED WARRANTIES OF ANY KIND. IN NO EVENT SHALL THE AUTHOR BE +HELD LIABLE FOR ANY DAMAGES CONNECTED WITH THE USE OF THIS PROGRAM. + +You are granted permission to copy, publish, distribute, and/or sell +copies of this program and any modified versions or derived works, +provided that this copyright and notice are not removed or altered. + +Portions of the code were based on 9wm, which contains this license: + +> 9wm is free software, and is Copyright (c) 1994 by David Hogan. +> Permission is granted to all sentient beings to use this software, +> to make copies of it, and to distribute those copies, provided +> that: +> +> (1) the copyright and licence notices are left intact +> (2) the recipients are aware that it is free software +> (3) any unapproved changes in functionality are either +> (i) only distributed as patches +> or (ii) distributed as a new program which is not called 9wm +> and whose documentation gives credit where it is due +> (4) the author is not held responsible for any defects +> or shortcomings in the software, or damages caused by it. +> +> There is no warranty for this software. Have a nice day. diff --git a/extra/evilwm/PKGBUILD b/extra/evilwm/PKGBUILD index 0e36f70db..d86cabd4b 100644 --- a/extra/evilwm/PKGBUILD +++ b/extra/evilwm/PKGBUILD @@ -1,23 +1,26 @@ -# $Id: PKGBUILD 45303 2009-07-09 17:59:42Z giovanni $ +# $Id: PKGBUILD 136041 2011-08-22 00:36:55Z eric $ # Maintainer: Kevin Piche <kevin@archlinux.org> # Contributor: Jochem Kossen <j.kossen@home.nl> pkgname=evilwm -pkgver=1.0.1 +pkgver=1.1.0 pkgrel=1 pkgdesc="A minimalist but usable window manager for the X Window System." arch=('i686' 'x86_64' 'mips64el') -depends=('libxrandr') url="http://evilwm.sourceforge.net" -source=(http://www.6809.org.uk/evilwm/$pkgname-$pkgver.tar.gz evilwm.desktop) -license=(custom) -md5sums=('8fd9256c635cce2289b648a01d54202c' 'fd404c0f0787fbf99b8b3270f639128c') +license=('custom') +depends=('libxrandr') +source=(http://www.6809.org.uk/evilwm/$pkgname-$pkgver.tar.gz LICENSE) +md5sums=('5f14cc3019320860c85bb07c60a76bd7' + '0941ad3e96597ef75c6310f43a0342a0') build() { - cd $startdir/src/$pkgname-$pkgver - /usr/bin/make || return 1 - /usr/bin/make DESTDIR=$startdir/pkg install - install -D -m644 $startdir/evilwm.desktop \ - $startdir/pkg/etc/X11/sessions/evilwm.desktop - install -D -m644 README $startdir/pkg/usr/share/licenses/$pkgname/README + cd "$srcdir"/$pkgname-$pkgver + make +} + +package() { + cd "$srcdir"/$pkgname-$pkgver + make DESTDIR="$pkgdir" desktopfilesdir=/usr/share/xsessions install + install -D -m644 "$srcdir"/LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE } diff --git a/extra/facile/PKGBUILD b/extra/facile/PKGBUILD index ada0648c4..6d48f77bd 100644 --- a/extra/facile/PKGBUILD +++ b/extra/facile/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 88117 2010-08-19 14:40:05Z tpowa $ +# $Id: PKGBUILD 135660 2011-08-17 06:53:34Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=facile pkgver=1.1 -pkgrel=12 +pkgrel=13 pkgdesc="A Functional Constraint Library" arch=(i686 x86_64 'mips64el') url="http://www.recherche.enac.fr/opti/facile/" diff --git a/extra/fam/PKGBUILD b/extra/fam/PKGBUILD index 295b69dfe..4f2560625 100644 --- a/extra/fam/PKGBUILD +++ b/extra/fam/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 124073 2011-05-16 14:51:09Z andrea $ +# $Id: PKGBUILD 136014 2011-08-21 14:26:17Z eric $ # Maintainer: # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=fam pkgver=2.7.0 -pkgrel=15 +pkgrel=16 pkgdesc="File Alteration Monitor" arch=('i686' 'x86_64' 'mips64el') license=('LGPL' 'GPL') depends=('rpcbind' 'gcc-libs' 'bash') url="http://oss.sgi.com/projects/fam/" backup=('etc/fam/fam.conf') -options=('!makeflags') # Don't !libtool +options=('!makeflags' 'libtool') source=(ftp://oss.sgi.com/projects/fam/download/stable/${pkgname}-${pkgver}.tar.gz fam-2.7.0-dnotify.patch fam-2.7.0-largefiles.patch @@ -24,7 +24,7 @@ md5sums=('1bf3ae6c0c58d3201afc97c6a4834e39' '47b41e0b0498793af004696a096d7da1' '2638b8ffacb9f03b6e438e08ea7b290a' 'fc0cabc0ac4f819680401eb3090c29c9' - '92a37f9eb6ad0e60ded9c70e9ad93a88') + 'ec50139679bc31508a843cafa47cd298') build() { cd "${srcdir}"/${pkgname}-${pkgver} diff --git a/extra/fam/fam b/extra/fam/fam index 5fc54a6df..69a049730 100755 --- a/extra/fam/fam +++ b/extra/fam/fam @@ -6,13 +6,10 @@ PID=`pidof -o %PPID /usr/sbin/famd` case "$1" in start) - #Check for running portmap, start when not running - ck_daemon rpcbind && /etc/rc.d/rpcbind start stat_busy "Starting File Alteration Monitor" if ck_daemon rpcbind; then - stat_fail - echo "ERROR: rpcbind is not running" - exit 1 + echo "ERROR: Refusing to start fam without rpcbind running!" >&2 + stat_die fi if [ -z "$PID" ]; then /usr/sbin/famd -T 0 -c /etc/fam/fam.conf diff --git a/extra/fbset/PKGBUILD b/extra/fbset/PKGBUILD index 8e0669fa3..787008d0f 100644 --- a/extra/fbset/PKGBUILD +++ b/extra/fbset/PKGBUILD @@ -1,29 +1,29 @@ -# $Id: PKGBUILD 49864 2009-08-16 19:15:47Z jgc $ +# $Id: PKGBUILD 135993 2011-08-21 06:02:11Z eric $ # Maintainer: Aaron Griffin <aaron@archlinux.org> # Contributor: Paul Mattal <pjmattal@elys.com> pkgname=fbset pkgver=2.1 -pkgrel=3 -pkgdesc="Framebuffer setup util" -arch=(i686 x86_64 'mips64el') +pkgrel=4 +pkgdesc="Framebuffer setup utility" +arch=('i686' 'x86_64' 'mips64el') url="http://users.telenet.be/geertu/Linux/fbdev/" license=('GPL') depends=('glibc') -backup=(etc/fb.modes) -options=(!makeflags) +backup=('etc/fb.modes') +options=('!makeflags') source=(http://users.telenet.be/geertu/Linux/fbdev/fbset-${pkgver}.tar.gz) md5sums=('e547cfcbb8c1a4f2a6b8ba4acb8b7164') build() { cd "${srcdir}/${pkgname}-${pkgver}" - make || return 1 - install -m755 -d "${pkgdir}/etc" - install -m755 -d "${pkgdir}/usr/sbin" - install -m755 -d "${pkgdir}/usr/share/man/man5" - install -m755 -d "${pkgdir}/usr/share/man/man8" - install -m755 fbset "${pkgdir}/usr/sbin/" || return 1 - install -m644 fb.modes.5 "${pkgdir}/usr/share/man/man5/" || return 1 - install -m644 fbset.8 "${pkgdir}/usr/share/man/man8/" || return 1 - install -m644 etc/fb.modes.ATI "${pkgdir}/etc/fb.modes" || return 1 + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + install -D -m755 fbset "${pkgdir}/usr/sbin/fbset" + install -D -m644 fb.modes.5 "${pkgdir}/usr/share/man/man5/fb.modes.5" + install -D -m644 fbset.8 "${pkgdir}/usr/share/man/man8/fbset.8" + install -D -m644 etc/fb.modes.ATI "${pkgdir}/etc/fb.modes" } diff --git a/extra/feh/PKGBUILD b/extra/feh/PKGBUILD index ca9dc271e..c9eddff1b 100644 --- a/extra/feh/PKGBUILD +++ b/extra/feh/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 135558 2011-08-15 17:17:19Z bisson $ +# $Id: PKGBUILD 135645 2011-08-16 22:40:28Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=feh -pkgver=1.15 +pkgver=1.15.1 pkgrel=1 pkgdesc='Fast, lightweight image viewer which uses imlib2' arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ depends=('giblib' 'curl' 'libxinerama') optdepends=('perl: feh-cam, webcam wrapper for feh') makedepends=('libxt') source=("${url}${pkgname}-${pkgver}.tar.bz2") -sha1sums=('fb926ba90d494f890f271243ae599063b76c9957') +sha1sums=('0c098f2656b4ad8d178bc57a3692b06045b000ec') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/fetchmail/PKGBUILD b/extra/fetchmail/PKGBUILD index fdd1acd02..9c177a697 100644 --- a/extra/fetchmail/PKGBUILD +++ b/extra/fetchmail/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 126713 2011-06-06 20:27:56Z eric $ +# $Id: PKGBUILD 136047 2011-08-22 03:29:54Z eric $ # Maintainer: Aaron Griffin <aaron@archlinux.org> pkgname=fetchmail -pkgver=6.3.20 +pkgver=6.3.21 pkgrel=1 pkgdesc="A remote-mail retrieval utility" arch=('i686' 'x86_64' 'mips64el') @@ -15,10 +15,10 @@ options=('!makeflags') install=fetchmail.install source=(http://download2.berlios.de/fetchmail/${pkgname}-${pkgver}.tar.bz2 fetchmail.rc fetchmail.conf) -md5sums=('9176a9005a816946f766774bc4cbc642' +md5sums=('0ad8eac47e85bd0ae63870daa09992af' '89fdde15bf81b3a5c065949322b5d138' '8fcd6a22dfbc247755fdd050c5c5c4d3') -sha1sums=('797b5b0050763ad111c244aba606b2fcb4dfdaad' +sha1sums=('e32a0d40ec133d651782543ecd7bc9bbee52dff7' '910ec21ad0a619db67e4665189dc46d2a0634ea5' '30401729386d6f774c6c36ab8530842166de54a8') diff --git a/extra/freeciv/PKGBUILD b/extra/freeciv/PKGBUILD index 7a961be54..97f181e2a 100644 --- a/extra/freeciv/PKGBUILD +++ b/extra/freeciv/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 132082 2011-07-19 22:17:46Z eric $ +# $Id: PKGBUILD 135708 2011-08-18 01:12:48Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=freeciv -pkgver=2.2.7 +pkgver=2.3.0 pkgrel=1 pkgdesc="A multiuser clone of the famous Microprose game of Civilization" arch=('i686' 'x86_64' 'mips64el') @@ -12,8 +12,8 @@ depends=('gtk2' 'sdl_mixer' 'bzip2' 'hicolor-icon-theme') options=('!libtool') install=freeciv.install source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('db61c36222ad0bd1de233cf29226ff27') -sha1sums=('b7cf680a25e9006cb3a289a2e5c786dd385577cb') +md5sums=('70fd4285f2da7d41bdadac43458e62c9') +sha1sums=('d4e871ad749e1807957df4e353fbb8f5510b7248') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/freenx/PKGBUILD b/extra/freenx/PKGBUILD index c32183eda..986183143 100644 --- a/extra/freenx/PKGBUILD +++ b/extra/freenx/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 108550 2011-02-01 08:10:47Z tpowa $ +# $Id: PKGBUILD 135657 2011-08-17 06:43:27Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> #Contributed: eliott <eliott@solarblue.net>, Andre Naumann <anaumann@SPARCed.org> pkgname=freenx pkgver=0.7.3 -pkgrel=8 +pkgrel=9 pkgdesc="Free Software (GPL) Implementation of the NX Server" arch=(i686 x86_64 'mips64el') url="http://freenx.berlios.de" license=('GPL') -depends=('nxserver' 'gnu-netcat' 'openssh' 'expect' 'xorg-xauth' 'xorg-apps' 'xorg-fonts-misc' 'coreutils' 'xorg-xmessage') +depends=('nxserver' 'gnu-netcat' 'openssh' 'expect' 'xorg-xauth' 'xorg-fonts-misc' 'coreutils' 'xorg-xmessage' 'xorg-xrdb' 'xorg-xpr' 'xorg-xset' 'xorg-sessreg') backup=(opt/NX/etc/node.conf) install=freenx.install source=(http://download.berlios.de/freenx/$pkgname-server-$pkgver.tar.gz diff --git a/extra/ghex/PKGBUILD b/extra/ghex/PKGBUILD index c398d96a7..ee47e61fc 100644 --- a/extra/ghex/PKGBUILD +++ b/extra/ghex/PKGBUILD @@ -1,33 +1,30 @@ -# $Id: PKGBUILD 135083 2011-08-10 07:36:19Z ibiru $ +# $Id: PKGBUILD 135591 2011-08-16 08:47:35Z ibiru $ # Maintainer: tobias <tobias@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> pkgname=ghex -pkgver=2.90.0 +pkgver=2.90.1 pkgrel=1 pkgdesc="A simple binary editor for the Gnome desktop" arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://live.gnome.org/Ghex" -depends=('gtk3' 'gconf' 'hicolor-icon-theme') +depends=('gtk3' 'hicolor-icon-theme') makedepends=('intltool' 'gnome-doc-utils') options=('!libtool' '!emptydirs') install=ghex.install source=(http://ftp.gnome.org/pub/GNOME/sources/ghex/2.90/${pkgname}-${pkgver}.tar.xz) -sha256sums=('2edeedcf1973c221d2f5ea1397099fbfc054b60cf2ebff5cb1ca9e83fd6c4974') +sha256sums=('e736a322c3e25d0733bee72848f586c6477c11c0f0a63a77069be9048a66ec9a') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static + --localstatedir=/var --disable-static \ + --disable-schemas-compile make } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install - - install -d -m755 "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema ${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas --domain ghex-3.0 "${pkgdir}"/etc/gconf/schemas/*.schemas - rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas + make DESTDIR="${pkgdir}" install } diff --git a/extra/ghex/ghex.install b/extra/ghex/ghex.install index d2fd968ea..084bc82ee 100644 --- a/extra/ghex/ghex.install +++ b/extra/ghex/ghex.install @@ -1,22 +1,20 @@ pkgname=ghex post_install() { - usr/sbin/gconfpkg --install ${pkgname} - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + glib-compile-schemas usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor } pre_upgrade() { - pre_remove $1 + if [ -f usr/share/gconf/schemas/$pkgname.schemas ]; then + gconfpkg --uninstall $pkgname + fi } post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} + post_install $1 } post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + post_install $1 } diff --git a/extra/glib-networking/PKGBUILD b/extra/glib-networking/PKGBUILD index c789f208b..dbc40bd10 100644 --- a/extra/glib-networking/PKGBUILD +++ b/extra/glib-networking/PKGBUILD @@ -1,23 +1,26 @@ -# $Id: PKGBUILD 124675 2011-05-23 20:43:54Z ibiru $ +# $Id: PKGBUILD 135780 2011-08-18 15:04:08Z andyrtr $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=glib-networking pkgver=2.28.7 -pkgrel=1 +pkgrel=4 pkgdesc="Network-related giomodules for glib" arch=('i686' 'x86_64' 'mips64el') url="http://www.gtk.org/" license=('GPL2') -depends=('glib2' 'libproxy' 'gnutls' 'ca-certificates' 'gsettings-desktop-schemas') +depends=('glib2' 'libproxy' 'gnutls' 'libgcrypt' 'ca-certificates' 'gsettings-desktop-schemas') makedepends=('intltool') options=('!libtool') install=glib-networking.install -source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.bz2) -sha256sums=('98bedfbd530c4b1b53c91025fe82290bafd289d249e4eb549c3b90d23a76021c') +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.bz2 + glib-networking-2.29.9-port-gnutls3-API.patch) +sha256sums=('98bedfbd530c4b1b53c91025fe82290bafd289d249e4eb549c3b90d23a76021c' + '101daf107773f84d08d7ab55a354875e2e021c3b5dd3cdc259fb544f94a8beee') build() { cd "$srcdir/$pkgname-$pkgver" + patch -Np0 -i "$srcdir/glib-networking-2.29.9-port-gnutls3-API.patch" ./configure \ - --prefix=/usr --sysconfdir=/etc \ + --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/glib-networking --disable-static make } diff --git a/extra/glib-networking/glib-networking-2.29.9-port-gnutls3-API.patch b/extra/glib-networking/glib-networking-2.29.9-port-gnutls3-API.patch new file mode 100644 index 000000000..19a168638 --- /dev/null +++ b/extra/glib-networking/glib-networking-2.29.9-port-gnutls3-API.patch @@ -0,0 +1,17 @@ +Index: tls/gnutls/gtlsconnection-gnutls.c +=================================================================== +--- tls/gnutls/gtlsconnection-gnutls.c ++++ tls/gnutls/gtlsconnection-gnutls.c 2011-08-04 00:40:33.194189789 +0200 +@@ -860,9 +860,10 @@ + + if (peer_certificate) + { +- int status; ++ int verify_ret; ++ unsigned int status; + +- status = gnutls_certificate_verify_peers (gnutls->priv->session); ++ verify_ret = gnutls_certificate_verify_peers2 (gnutls->priv->session, &status); + peer_certificate_errors = g_tls_certificate_gnutls_convert_flags (status); + if (peer_certificate_errors) + { diff --git a/extra/gmpc/PKGBUILD b/extra/gmpc/PKGBUILD index b4356d300..0b62bd0f1 100644 --- a/extra/gmpc/PKGBUILD +++ b/extra/gmpc/PKGBUILD @@ -1,15 +1,16 @@ -# $Id: PKGBUILD 80683 2010-05-20 18:05:37Z ibiru $ +# $Id: PKGBUILD 135824 2011-08-18 21:27:02Z eric $ # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Kieslich <tobias@archlinux.org> pkgname=gmpc pkgver=0.20.0 -pkgrel=1 +pkgrel=2 pkgdesc="A GTK2 client for MPD" arch=('i686' 'x86_64' 'mips64el') -url="http://gmpc.wikia.com/wiki/Gnome_Music_Player_Client" -license=("GPL") -depends=('libglade' 'libmpd>=0.20.0' 'curl' 'libsm' 'libsoup' 'libsexy' 'hicolor-icon-theme') +url="http://gmpclient.org/home" +license=('GPL') +depends=('libglade' 'libmpd>=0.20.0' 'libsoup' 'libsexy' 'sqlite3' \ + 'hicolor-icon-theme' 'xdg-utils') makedepends=('gob2' 'intltool' 'vala') options=('!libtool') install=gmpc.install @@ -17,11 +18,14 @@ source=(http://download.sarine.nl/Programs/${pkgname}/${pkgver}/${pkgname}-${pkg md5sums=('902fd69b0b6bb40abb647604080dd7ef') build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr \ - --enable-system-libsexy - make || return 1 - sed -i 's|GNOME;Application;AudioVideo;|GTK;Application;AudioVideo;Player;|' \ - data/${pkgname}.desktop - make DESTDIR=${pkgdir} install + cd "${srcdir}/${pkgname}-${pkgver}" + sed -i 's|GNOME;AudioVideo;|GTK;AudioVideo;Player;|' \ + data/gmpc.desktop.in + ./configure --prefix=/usr --enable-system-libsexy + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/gnome-alsamixer/PKGBUILD b/extra/gnome-alsamixer/PKGBUILD index d438a1e27..272287501 100644 --- a/extra/gnome-alsamixer/PKGBUILD +++ b/extra/gnome-alsamixer/PKGBUILD @@ -1,24 +1,33 @@ -# $Id: PKGBUILD 49919 2009-08-16 21:30:55Z jgc $ -# Maintainer: damir <damir@archlinux.org> -# Contributor: Ben <ben@benmazer.net> +# $Id: PKGBUILD 136003 2011-08-21 09:18:58Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=gnome-alsamixer pkgver=0.9.6 -pkgrel=3 +pkgrel=4 pkgdesc="Gnome ALSA mixer" arch=('i686' 'x86_64' 'mips64el') -url="http://www.paw.za.org" +url="https://launchpad.net/gnome-alsamixer" license=('GPL') -depends=('libgnomeui>=2.24.1') +depends=('libgnomeui') source=(ftp://ftp.archlinux.org/other/gnome-alsamixer/${pkgname}-${pkgver}.tar.gz - gnome-alsamixer-0.9.6-gtk24.patch) + gnome-alsamixer-0.9.6-gtk24.patch gnome-alsamixer.desktop) md5sums=('387623cfeb079d78325eed2d6bc94251' - '82b95a0df43429da5098b4da883f6bd0') + '82b95a0df43429da5098b4da883f6bd0' + 'c7dbc44207bede96e4fafc24a7c7beb3') +sha1sums=('faece601a4329d2b01b9efe65200021538fc066d' + 'b4e3b871676025600170ba54f59db4977b853c08' + '31639f7932d088ca76a18c79839682be811f23d0') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/gnome-alsamixer-0.9.6-gtk24.patch" || return 1 - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + patch -Np1 -i "${srcdir}/gnome-alsamixer-0.9.6-gtk24.patch" + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -D -m644 "${srcdir}/gnome-alsamixer.desktop" \ + "${pkgdir}/usr/share/applications/gnome-alsamixer.desktop" } diff --git a/extra/gnome-alsamixer/gnome-alsamixer.desktop b/extra/gnome-alsamixer/gnome-alsamixer.desktop new file mode 100644 index 000000000..861a22849 --- /dev/null +++ b/extra/gnome-alsamixer/gnome-alsamixer.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Name=GNOME ALSA Mixer +Comment=ALSA sound mixer for GNOME +Comment[es]=Mezclador de sonido ALSA para GNOME +Comment[fr]=Mélangeur de son ALSA pour GNOME +Exec=gnome-alsamixer +Icon=/usr/share/pixmaps/gnome-alsamixer/gnome-alsamixer-icon.png +Terminal=false +Type=Application +Categories=Application;AudioVideo; +StartupNotify=true diff --git a/extra/gnome-vfs/PKGBUILD b/extra/gnome-vfs/PKGBUILD index d3d81d091..912b25ec6 100644 --- a/extra/gnome-vfs/PKGBUILD +++ b/extra/gnome-vfs/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 132804 2011-07-26 10:40:38Z ibiru $ +# $Id: PKGBUILD 135782 2011-08-18 15:04:11Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-vfs pkgver=2.24.4 -pkgrel=4 +pkgrel=5 pkgdesc="The GNOME Virtual File System" arch=(i686 x86_64 'mips64el') license=('LGPL') diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD index c8358321c..eccfb9f99 100644 --- a/extra/gnutls/PKGBUILD +++ b/extra/gnutls/PKGBUILD @@ -1,32 +1,34 @@ -# $Id: PKGBUILD 130900 2011-07-08 17:01:10Z andyrtr $ +# $Id: PKGBUILD 135996 2011-08-21 08:10:46Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnutls -pkgver=2.12.7 -pkgrel=2 +pkgver=3.0.1 +pkgrel=1 pkgdesc="A library which provides a secure layer over a reliable transport layer" arch=('i686' 'x86_64' 'mips64el') license=('GPL3' 'LGPL') url="http://www.gnu.org/software/gnutls/" install=gnutls.install options=('!libtool' '!zipman') -depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle') -source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.bz2) -md5sums=(4b48aa3119f549d30d550bf4162c721b'') +depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle>=2.2') +makedepends=('valgrind') +source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz) +md5sums=('23d86dbb3ef9985ce7d2b8dc37fa17a3') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr \ --with-zlib \ --disable-static \ - --disable-guile + --disable-guile \ + --without-p11-kit \ + --disable-valgrind-tests # breaks make check. errors have been reported upstream make } check() { cd "${srcdir}/${pkgname}-${pkgver}" - #make check # passes all || /bin/true - make check # || /bin/true # see https://lists.gnu.org/archive/html/gnutls-devel/2011-06/msg00007.html + make check # passes all || /bin/true } package() { diff --git a/extra/gnutls/align.patch b/extra/gnutls/align.patch new file mode 100644 index 000000000..dce5cf408 --- /dev/null +++ b/extra/gnutls/align.patch @@ -0,0 +1,64 @@ +diff --git a/lib/accelerated/intel/aes-x86.c b/lib/accelerated/intel/aes-x86.c +index 6801e7e..ff5b714 100644 +--- a/lib/accelerated/intel/aes-x86.c ++++ b/lib/accelerated/intel/aes-x86.c +@@ -40,6 +40,10 @@ struct aes_ctx + uint8_t iv[16]; + }; + ++#define AESNI_MIN_ALIGN 16 ++#define AESNI_ALIGN(x) \ ++ ((void *)(((size_t)(x)+AESNI_MIN_ALIGN-1)&~(AESNI_MIN_ALIGN-1))) ++ + static int + aes_cipher_init (gnutls_cipher_algorithm_t algorithm, void **_ctx) + { +@@ -69,11 +73,11 @@ aes_cipher_setkey (void *_ctx, const void *userkey, size_t keysize) + struct aes_ctx *ctx = _ctx; + int ret; + +- ret = aesni_set_encrypt_key (userkey, keysize * 8, &ctx->expanded_key); ++ ret = aesni_set_encrypt_key (userkey, keysize * 8, AESNI_ALIGN(&ctx->expanded_key)); + if (ret != 0) + return gnutls_assert_val (GNUTLS_E_ENCRYPTION_FAILED); + +- ret = aesni_set_decrypt_key (userkey, keysize * 8, &ctx->expanded_key_dec); ++ ret = aesni_set_decrypt_key (userkey, keysize * 8, AESNI_ALIGN(&ctx->expanded_key_dec)); + if (ret != 0) + return gnutls_assert_val (GNUTLS_E_ENCRYPTION_FAILED); + +@@ -95,7 +99,7 @@ aes_encrypt (void *_ctx, const void *src, size_t src_size, + { + struct aes_ctx *ctx = _ctx; + +- aesni_cbc_encrypt (src, dst, src_size, &ctx->expanded_key, ctx->iv, 1); ++ aesni_cbc_encrypt (src, dst, src_size, AESNI_ALIGN(&ctx->expanded_key), ctx->iv, 1); + return 0; + } + +@@ -105,7 +109,7 @@ aes_decrypt (void *_ctx, const void *src, size_t src_size, + { + struct aes_ctx *ctx = _ctx; + +- aesni_cbc_encrypt (src, dst, src_size, &ctx->expanded_key_dec, ctx->iv, 0); ++ aesni_cbc_encrypt (src, dst, src_size, AESNI_ALIGN(&ctx->expanded_key_dec), ctx->iv, 0); + + return 0; + } +diff --git a/lib/accelerated/intel/aes-x86.h b/lib/accelerated/intel/aes-x86.h +index 8f49ff3..20a169e 100644 +--- a/lib/accelerated/intel/aes-x86.h ++++ b/lib/accelerated/intel/aes-x86.h +@@ -11,10 +11,11 @@ void register_x86_crypto (void); + # define ALIGN16 + #endif + ++#define AES_KEY_ALIGN_SIZE 8 + #define AES_MAXNR 14 + typedef struct + { +- uint32_t ALIGN16 rd_key[4 * (AES_MAXNR + 1)]; ++ uint32_t rd_key[4 * (AES_MAXNR + 1)+AES_KEY_ALIGN_SIZE]; + int rounds; + } AES_KEY; + diff --git a/extra/gpsd/PKGBUILD b/extra/gpsd/PKGBUILD index 26a2a8b0d..cea2fc70f 100644 --- a/extra/gpsd/PKGBUILD +++ b/extra/gpsd/PKGBUILD @@ -1,45 +1,44 @@ -# $Id: PKGBUILD 116032 2011-03-22 16:23:53Z andrea $ +# $Id: PKGBUILD 136033 2011-08-21 23:13:31Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org # Contributor: Giacomo Rizzo <alt@free-os.it> pkgname=gpsd -pkgver=2.96 -pkgrel=1 +pkgver=3.0 +pkgrel=3 pkgdesc="GPS daemon and library to support USB/serial GPS devices" arch=('i686' 'x86_64' 'mips64el') url="http://gpsd.berlios.de" license=('BSD') -depends=('lesstif' 'libxaw' 'python2' 'pth' 'libusb' 'desktop-file-utils') +depends=('python2' 'libusb' 'bluez' 'desktop-file-utils') optdepends=('php: generate a PHP status page for your GPS' 'php-gd: image support for the PHP status page') -makedepends=('docbook-xsl') +makedepends=('scons' 'docbook-xsl' 'chrpath') backup=('etc/conf.d/gpsd' 'lib/udev/rules.d/99-gpsd-usb.rules') -options=('!libtool') +options=('!libtool' '!buildflags') install="${pkgname}.install" source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 'gpsd' 'LICENSE') -md5sums=('26a7a04d4298bc3a3a5d89fef4582b64' - 'f929322fc4670543fcb36dafc7bb9e03' - 'd217a23f408e91c94359447735bc1800') + 'gpsd' 'gpsd.conf.d') +md5sums=('c63d41a26868e9bdd48d9e311a9cc42c' + '1f3402f8e33a7032b9ae6dfd077234f7' + '3e963df3f9f7ef3572ecc648ae829315') build() { cd "${srcdir}/${pkgname}-${pkgver}" - # install python to the same DESTDIR given make - sed -i 's|--prefix=${prefix} # --root=$(DESTDIR)|--prefix=${prefix} --root=$(DESTDIR)|' Makefile.am Makefile.in - # fix python 2.7 path - sed -i 's|/usr/bin/python|/usr/bin/python2|' gpsd.hotplug{,.wrapper} - sed -i 's|/usr/bin/python2.6|/usr/bin/python2|' valgrind-audit - sed -i 's|/usr/bin/env python|/usr/bin/env python2|' gpscat \ - gpsfake gpsprof xgps xgpsspeed gps/gps.py - - PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ - --disable-libQgpsmm \ - --disable-static - make + sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \ + -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ + $(find . -name '*.py') + sed -i 's|/usr/bin/env python|/usr/bin/env python2|' gegps gpscat gpsfake \ + gpsprof xgps xgpsspeed + + scons prefix=/usr \ + systemd=yes \ + libQgpsmm=no \ + PYTHONPATH=/usr/bin/python2 + scons build } package() { @@ -48,30 +47,29 @@ package() { # Fix man pages path (FS#21715) sed -i 's|.so gps.1|.so man1/gps.1|' cgps.1 lcdgps.1 xgps.1 xgpsspeed.1 - make DESTDIR="${pkgdir}" install + export DESTDIR="${pkgdir}" + scons install - # Our own udev-install since the Makefile uses absolute paths - # Original file names are [mostly] unmodified: useful to match process name in case of error - # Following the switch from hotplug to udev helper scripts now live in /lib/udev/ instead of /etc/hotplug/ - sed -i 's|GPSD_OPTIONS=""|GPSD_OPTIONS="-P /var/run/gpsd.pid"|' packaging/deb/etc_default_gpsd - sed -i 's|"/var/run/gpsd.sock"|"/var/run/gpsd/gpsd.sock"|' packaging/deb/etc_default_gpsd - install -D -m644 "packaging/deb/etc_default_gpsd" "${pkgdir}/etc/conf.d/gpsd" + install -D -m644 "${srcdir}/gpsd.conf.d" "${pkgdir}/etc/conf.d/gpsd" - sed -i 's|Id: gpsd.rules|Id: 99-gpsd-usb.rules|' gpsd.rules install -D -m644 "gpsd.rules" "${pkgdir}/lib/udev/rules.d/99-gpsd-usb.rules" - sed -i 's|/etc/default/gpsd|/etc/conf.d/gpsd|' gpsd.hotplug.wrapper - install -D -m755 gpsd.hotplug.wrapper "${pkgdir}/lib/udev/gpsd.hotplug.wrapper" - - # Patch a path bug. Check to see if fixed in ensuing releases - sed -i 's|gpsdcmd = "gpsd %s|gpsdcmd = "/usr/sbin/gpsd %s|' gpsd.hotplug + sed -i 's|/etc/default/gpsd|/etc/conf.d/gpsd|' gpsd.hotplug install -D -m755 gpsd.hotplug "${pkgdir}/lib/udev/gpsd.hotplug" - install -D -m644 packaging/X11/xgps.desktop ${pkgdir}/usr/share/applications/xgps.desktop - install -D -m644 packaging/X11/xgpsspeed.desktop ${pkgdir}/usr/share/applications/xgpsspeed.desktop - install -D -m644 packaging/X11/gpsd-logo.png ${pkgdir}/usr/share/gpsd/gpsd-logo.png + # GPSD needs RPATH + chrpath -r /usr/lib/ "${pkgdir}"/usr/lib/libgps{,d}.so.20.0.0 + chrpath -r /usr/lib/ "${pkgdir}"/usr/bin/{gpsdecode,gpsctl,gpspipe,gpxlogger,lcdgps} + chrpath -r /usr/lib/ "${pkgdir}"/usr/sbin/{gpsd,gpsdctl} + + install -D -m644 packaging/X11/xgps.desktop \ + "${pkgdir}/usr/share/applications/xgps.desktop" + install -D -m644 packaging/X11/xgpsspeed.desktop \ + "${pkgdir}/usr/share/applications/xgpsspeed.desktop" + install -D -m644 packaging/X11/gpsd-logo.png \ + "${pkgdir}/usr/share/gpsd/gpsd-logo.png" install -D -m755 "${srcdir}/gpsd" "${pkgdir}/etc/rc.d/gpsd" - install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/gpsd/gpsd b/extra/gpsd/gpsd index b0f22c735..b510a7542 100755 --- a/extra/gpsd/gpsd +++ b/extra/gpsd/gpsd @@ -1,4 +1,4 @@ -#! /bin/sh +#!/bin/bash . /etc/rc.conf . /etc/rc.d/functions @@ -6,29 +6,30 @@ NAME=gpsd DAEMON=/usr/sbin/$NAME -PID=$(pidof -o %PPID /usr/sbin/gpsd) +PIDFILE=/var/run/$NAME/$NAME.pid +PID=$(cat $PIDFILE 2>/dev/null) case "$1" in start) - stat_busy "Starting gpsd" - [ ! -d /var/run/gpsd ] && install -d /var/run/gpsd - [ -z "$PID" ] && "$DAEMON" ${GPSD_OPTIONS} -F ${GPSD_SOCKET} ${DEVICES} + stat_busy "Starting $NAME" + [ ! -d /var/run/$NAME ] && install -d /var/run/$NAME + [ -z "$PID" ] && "$DAEMON" -P $PIDFILE -F /var/run/$NAME/$NAME.sock ${GPSD_OPTIONS} ${DEVICES} if [ $? -gt 0 ]; then stat_fail else - add_daemon gpsd + add_daemon $NAME stat_done fi ;; stop) - stat_busy "Stopping gpsd" + stat_busy "Stopping $NAME" [ ! -z "$PID" ] && kill $PID &> /dev/null if [ $? -gt 0 ]; then stat_fail else - rm -f /var/run/$PID.pid &>/dev/null - rm_daemon gpsd - stat_done + rm -f $PIDFILE &>/dev/null + rm_daemon $NAME + stat_done fi ;; diff --git a/extra/gpsd/gpsd.conf.d b/extra/gpsd/gpsd.conf.d new file mode 100644 index 000000000..9fef72cb9 --- /dev/null +++ b/extra/gpsd/gpsd.conf.d @@ -0,0 +1,5 @@ +# Default settings for gpsd. +START_DAEMON="true" +GPSD_OPTIONS="" +DEVICES="" +USBAUTO="true" diff --git a/extra/gtk-vnc/PKGBUILD b/extra/gtk-vnc/PKGBUILD index a7e0372fb..a9c4b83ea 100644 --- a/extra/gtk-vnc/PKGBUILD +++ b/extra/gtk-vnc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 110311 2011-02-18 20:01:10Z heftig $ +# $Id: PKGBUILD 135784 2011-08-18 15:04:13Z andyrtr $ # Maintainer: # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Allan McRae <mcrae_allan@hotmail.com> @@ -6,7 +6,7 @@ pkgname=gtk-vnc pkgver=0.4.3 -pkgrel=1 +pkgrel=2 pkgdesc="A VNC viewer widget for GTK" arch=('i686' 'x86_64' 'mips64el') url="http://live.gnome.org/gtk-vnc" diff --git a/extra/gtkpod/PKGBUILD b/extra/gtkpod/PKGBUILD index f97093a3d..d15c96d67 100644 --- a/extra/gtkpod/PKGBUILD +++ b/extra/gtkpod/PKGBUILD @@ -1,18 +1,20 @@ -# $Id: PKGBUILD 96753 2010-10-24 16:27:54Z ibiru $ +# $Id: PKGBUILD 136044 2011-08-22 03:18:52Z eric $ # Maintainer: Kevin Piche <kevin@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=gtkpod pkgver=1.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="A platform independent GUI for Apple's iPod using GTK2" arch=('i686' 'x86_64' 'mips64el') -license=('GPL') url="http://gtkpod.sourceforge.net" -install=gtkpod.install -depends=('libgpod>=0.8.0' 'libid3tag' 'flac' 'libvorbis' 'curl' 'libglade' 'hicolor-icon-theme') -optdepends=('libmp4v2: MP4/h264 support') +license=('GPL') +depends=('awk' 'libgpod>=0.8.0' 'libid3tag' 'flac' 'libvorbis' 'curl' 'libglade' 'hicolor-icon-theme') makedepends=('intltool') +optdepends=('libmp4v2: MP4/h264 support' + 'vorbis-tools: OGG support' + 'id3v2: mp3 conversion support') +install=gtkpod.install source=(http://downloads.sourceforge.net/gtkpod/${pkgname}-${pkgver}.tar.gz) md5sums=('cadd402dcd1cfbedda0357bf24965a7c') diff --git a/extra/i8kutils/PKGBUILD b/extra/i8kutils/PKGBUILD index eba677659..8badfd5a5 100644 --- a/extra/i8kutils/PKGBUILD +++ b/extra/i8kutils/PKGBUILD @@ -1,6 +1,6 @@ -# $Id: PKGBUILD 66619 2010-02-01 02:26:09Z giovanni $ -# Contributor: Eric Johnson <eric@coding-zone.com> +# $Id: PKGBUILD 135896 2011-08-20 04:45:48Z eric $ # Maintainer: Thayer Williams <thayer@archlinux.org> +# Contributor: Eric Johnson <eric@coding-zone.com> pkgname=i8kutils pkgver=1.33 @@ -10,7 +10,7 @@ url="http://people.debian.org/~dz/i8k/" license=('GPL2') arch=('i686' 'x86_64' 'mips64el') depends=('glibc') -source=(http://ftp.archlinux.org/other/i8kutils/$pkgname\_$pkgver.tar.gz) +source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}_${pkgver}.tar.gz) md5sums=('1ab077b301dbb0f4be8ef52eb3b97628') build() { diff --git a/extra/kdepim/PKGBUILD b/extra/kdepim/PKGBUILD index df93dcef2..8c62275db 100644 --- a/extra/kdepim/PKGBUILD +++ b/extra/kdepim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 132630 2011-07-25 00:15:32Z andrea $ +# $Id: PKGBUILD 135830 2011-08-19 07:32:11Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -21,7 +21,7 @@ pkgname=('kdepim-akonadiconsole' 'kdepim-libkdepim' 'kdepim-wizards') pkgver=4.7.0 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url='http://pim.kde.org' license=('GPL' 'LGPL' 'FDL') @@ -145,7 +145,7 @@ package_kdepim-kmail() { 'kdepim-mimelib' 'kdepim-plugins') optdepends=('cyrus-sasl-plugins: CRAM-MD5 authentication') for i in kmail doc/kmail kmailcvt ksendemail libksieve mailcommon \ - nepomuk_email_feeder ontologies templateparser kontact/plugins/kmail; do + nepomuk_email_feeder ontologies kontact/plugins/kmail; do cd "${srcdir}"/build/${i} make DESTDIR="${pkgdir}" install done @@ -237,7 +237,8 @@ package_kdepim-libkdepim() { for i in akonadi_next calendarsupport calendarviews incidenceeditor-ng \ kdgantt2 libkdepim libkdepimdbusinterfaces libkleo libkpgp \ messagecomposer messagecore messagelist messageviewer icons \ - strigi-analyzer plugins/messageviewer plugins/ktexteditor; do + strigi-analyzer templateparser plugins/messageviewer \ + plugins/ktexteditor; do cd "${srcdir}"/build/${i} make DESTDIR="${pkgdir}" install done diff --git a/extra/kdevelop/PKGBUILD b/extra/kdevelop/PKGBUILD index a47b0cbd2..3f336f03d 100644 --- a/extra/kdevelop/PKGBUILD +++ b/extra/kdevelop/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 128650 2011-06-25 11:00:37Z andrea $ +# $Id: PKGBUILD 135608 2011-08-16 16:20:17Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=kdevelop pkgver=4.2.3 -pkgrel=1 +pkgrel=2 pkgdesc="A C/C++ development environment for KDE" arch=('i686' 'x86_64' 'mips64el') url="http://www.kdevelop.org/" license=('GPL') -depends=('kdebase-workspace' 'kdevplatform' 'kdesdk-okteta') +depends=('kdebase-workspace' 'kdevplatform' 'kdesdk-okteta' 'kdebase-kwrite') makedepends=('cmake' 'automoc4' 'perl') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") diff --git a/extra/kdevelop/kdevelop.install b/extra/kdevelop/kdevelop.install index 951710b86..5c1338e67 100644 --- a/extra/kdevelop/kdevelop.install +++ b/extra/kdevelop/kdevelop.install @@ -1,6 +1,7 @@ post_install() { xdg-icon-resource forceupdate --theme hicolor &> /dev/null update-mime-database usr/share/mime &> /dev/null + update-desktop-database -q } post_upgrade() { diff --git a/extra/kile/PKGBUILD b/extra/kile/PKGBUILD index 30079213d..7be9788fd 100644 --- a/extra/kile/PKGBUILD +++ b/extra/kile/PKGBUILD @@ -1,32 +1,31 @@ -# $Id: PKGBUILD 127274 2011-06-12 09:04:19Z ronald $ +# $Id: PKGBUILD 135613 2011-08-16 16:22:12Z andrea $ # Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor : Damir Perisa <damir.perisa@bluewin.ch> +# Contributor: Damir Perisa <damir.perisa@bluewin.ch> pkgname=kile pkgver=2.1 -pkgrel=1 -pkgdesc="A user friendly TeX/LaTeX frontend for KDE." +pkgrel=2 +pkgdesc="A user friendly TeX/LaTeX frontend for KDE" arch=("i686" "x86_64" 'mips64el') license=('GPL2') url="http://kile.sourceforge.net/" -depends=('kdebase-runtime' 'texlive-core') -makedepends=('cmake' 'automoc4' 'docbook-xml' 'docbook-xsl') -install=kile.install +depends=('kdebase-runtime' 'texlive-core' 'kdebase-kwrite') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2") sha1sums=('860ac96b68b6026f48b8a9c401c6024ba78e3cdf') build() { - cd ${srcdir} - mkdir build - cd build + cd "${srcdir}" + mkdir build + cd build cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ -DCMAKE_INSTALL_PREFIX=/usr make } package() { - cd ${srcdir}/build - make DESTDIR=$pkgdir install + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install } diff --git a/extra/ktorrent/PKGBUILD b/extra/ktorrent/PKGBUILD index af2e9d96d..086bbd42f 100644 --- a/extra/ktorrent/PKGBUILD +++ b/extra/ktorrent/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 123660 2011-05-12 07:33:28Z ronald $ +# $Id: PKGBUILD 135681 2011-08-17 08:07:39Z andrea $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Travis Willard <travisw@wmpub.ca> # Contributor: Georg Grabler <ggrabler@gmail.com> pkgname=ktorrent -pkgver=4.1.1 -pkgrel=2 +pkgver=4.1.2 +pkgrel=1 pkgdesc="A powerful BitTorrent client for KDE" arch=('i686' 'x86_64' 'mips64el') url="http://ktorrent.org" @@ -16,7 +16,7 @@ source=("http://ktorrent.org/downloads/${pkgver}/${pkgname}-${pkgver}.tar.bz2" 'httpserver.patch') install=${pkgname}.install options=('libtool') -md5sums=('affadf7c7198e5aa430e91ab75800296' +md5sums=('8026d9f75257f2e52ac5ba3ce4720d55' '1f25b94615b0bbfa0457c99fb20de3e6') build() { diff --git a/extra/ktorrent/ktorrent.install b/extra/ktorrent/ktorrent.install index c3f65a3dc..91944a30f 100644 --- a/extra/ktorrent/ktorrent.install +++ b/extra/ktorrent/ktorrent.install @@ -1,6 +1,6 @@ post_install() { xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-mime-database usr/share/mime &> /dev/null + update-mime-database usr/share/mime &> /dev/null update-desktop-database -q } diff --git a/extra/lablgtk2/PKGBUILD b/extra/lablgtk2/PKGBUILD index d6a04e9e2..20a6b9985 100644 --- a/extra/lablgtk2/PKGBUILD +++ b/extra/lablgtk2/PKGBUILD @@ -1,15 +1,16 @@ -# $Id: PKGBUILD 132150 2011-07-21 11:38:25Z tpowa $ +# $Id: PKGBUILD 135692 2011-08-17 10:30:13Z tpowa $ #Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=lablgtk2 pkgver=2.14.2 -pkgrel=3 +pkgrel=4 pkgdesc=" An Objective Caml interface to gtk2" arch=(i686 x86_64 'mips64el') license=('LGPL') url="http://lablgtk.forge.ocamlcore.org/" depends=('gtk2' 'gtkspell' 'libgnomecanvas' 'librsvg' 'libgnomeui' 'gtksourceview2') makedepends=('ocaml') +optdepends=('ocaml: for using the tools') source=(https://forge.ocamlcore.org/frs/download.php/561/lablgtk-${pkgver}.tar.gz) options=(!makeflags) md5sums=('bad77680a72dab8b915cae99d1ec9b1f') @@ -21,5 +22,4 @@ build() { make opt make DESTDIR="${pkgdir}" install install -m644 META "${pkgdir}/usr/lib/ocaml/lablgtk2/" - rm -r "${pkgdir}/usr/bin" } diff --git a/extra/lensfun/PKGBUILD b/extra/lensfun/PKGBUILD index 2cf69b129..8435e0a45 100644 --- a/extra/lensfun/PKGBUILD +++ b/extra/lensfun/PKGBUILD @@ -1,21 +1,32 @@ -# $Id: PKGBUILD 81449 2010-05-30 16:39:15Z tpowa $ +# $Id: PKGBUILD 135705 2011-08-17 16:07:55Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=lensfun pkgver=0.2.5 -pkgrel=1 +pkgrel=2 pkgdesc="Database of photographic lenses and a library that allows advanced access to the database" arch=(i686 x86_64 'mips64el') url="http://lensfun.berlios.de/" license=('LGPL3') depends=('glibc' 'glib2') -makedepends=('python' 'libpng') -source=(http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.bz2) +makedepends=('python' 'libpng' 'doxygen') +source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.bz2" + "runtime.cpu.detection.fix.backport.patch") build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --libdir=/usr/lib || return 1 - make all || return 1 - make INSTALL_PREFIX="$pkgdir" install || return 1 + sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' configure + patch -p0 -i "${srcdir}/runtime.cpu.detection.fix.backport.patch" + ./configure \ + --prefix=/usr \ + --libdir=/usr/lib + make all } -md5sums=('a10438dffae68a5988fc54b0393a3755') + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make INSTALL_PREFIX="$pkgdir" install +} + +md5sums=('a10438dffae68a5988fc54b0393a3755' + 'a2033928f263db319de78182ab12fb7d') diff --git a/extra/lftp/PKGBUILD b/extra/lftp/PKGBUILD index eb01995ca..ed8773c8a 100644 --- a/extra/lftp/PKGBUILD +++ b/extra/lftp/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 129514 2011-06-28 15:35:00Z andyrtr $ +# $Id: PKGBUILD 135786 2011-08-18 15:04:15Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=lftp pkgver=4.3.1 -pkgrel=1 +pkgrel=2 pkgdesc="Sophisticated command line based FTP client" arch=('i686' 'x86_64' 'mips64el') license=('GPL3') -depends=('gcc-libs' 'readline>=6.2' "gnutls>=2.12" "expat>=2.0.1-4" 'sh') +depends=('gcc-libs' 'readline>=6.2' "gnutls" "expat>=2.0.1-4" 'sh') optdepends=('perl: needed for convert-netscape-cookies and verify-file') makedepends=('autoconf') url="http://lftp.yar.ru/" diff --git a/extra/libepc/PKGBUILD b/extra/libepc/PKGBUILD index 5d2c7c688..2aab6c6fc 100644 --- a/extra/libepc/PKGBUILD +++ b/extra/libepc/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 73829 2010-03-28 19:11:48Z jgc $ +# $Id: PKGBUILD 135788 2011-08-18 15:04:18Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libepc pkgver=0.3.11 -pkgrel=1 +pkgrel=2 pkgdesc="Easy Publish and Consume Library" arch=(i686 x86_64 'mips64el') license=('LGPL') url="http://live.gnome.org/libepc" -depends=('gtk2>=2.20.0' 'avahi>=0.6.25' 'libsoup>=2.29.91') +depends=('gtk2' 'avahi' 'libsoup') makedepends=('intltool') options=('!libtool' '!makeflags') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.3/${pkgname}-${pkgver}.tar.bz2) @@ -17,7 +17,11 @@ sha256sums=('ec38fe4206fab7a8939fb351d7b419cc681ac44afcdd5aab9bdb8fc3386df25c') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + --localstatedir=/var --disable-static + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/libgnomecups/PKGBUILD b/extra/libgnomecups/PKGBUILD index 8a8739700..b7aeb2302 100644 --- a/extra/libgnomecups/PKGBUILD +++ b/extra/libgnomecups/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 122592 2011-05-04 18:48:08Z ibiru $ +# $Id: PKGBUILD 135790 2011-08-18 15:04:20Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Paulius Palevicius <paulius@birzai.com> pkgname=libgnomecups pkgver=0.2.3 -pkgrel=8 +pkgrel=9 pkgdesc="GNOME cups library" arch=(i686 x86_64 'mips64el') license=('LGPL' 'GPL') diff --git a/extra/libgnomeprint/PKGBUILD b/extra/libgnomeprint/PKGBUILD index 4779db9b4..21134e3f4 100644 --- a/extra/libgnomeprint/PKGBUILD +++ b/extra/libgnomeprint/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 122595 2011-05-04 18:55:04Z ibiru $ +# $Id: PKGBUILD 135792 2011-08-18 15:04:23Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libgnomeprint pkgver=2.18.8 -pkgrel=2 +pkgrel=3 pkgdesc="Printing routines for GNOME" arch=(i686 x86_64 'mips64el') license=('LGPL' 'GPL') -depends=('pango' 'libart-lgpl' 'libxml2' 'libgnomecups' 'krb5' 'gnutls') +depends=('pango' 'libart-lgpl' 'libxml2' 'libgnomecups' 'krb5' 'gnutls' 'libgcrypt' 'bzip2') makedepends=('intltool' 'pkgconfig') replaces=('libgnomeprint-cups') conflicts=('libgnomeprint-cups') diff --git a/extra/libgpod/PKGBUILD b/extra/libgpod/PKGBUILD index f88c65b64..95f2500a8 100644 --- a/extra/libgpod/PKGBUILD +++ b/extra/libgpod/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 134225 2011-08-02 15:30:18Z jgc $ +# $Id: PKGBUILD 135794 2011-08-18 15:04:25Z andyrtr $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=libgpod pkgver=0.8.2 -pkgrel=1 +pkgrel=2 pkgdesc="A shared library to access the contents of an iPod" arch=(i686 x86_64 'mips64el') license=('LGPL') -depends=('gtk2' 'mutagen' 'sg3_utils' 'libimobiledevice') +depends=('gdk-pixbuf2' 'mutagen' 'sg3_utils' 'libimobiledevice') makedepends=('intltool' 'swig' 'docbook-xsl' 'pygobject-devel' 'gtk-sharp-2') optdepends=('gtk-sharp-2: Mono bindings') url="http://www.gtkpod.org/libgpod/" diff --git a/extra/libimobiledevice/PKGBUILD b/extra/libimobiledevice/PKGBUILD index dbad1b497..49dded344 100644 --- a/extra/libimobiledevice/PKGBUILD +++ b/extra/libimobiledevice/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 132259 2011-07-22 09:16:48Z ibiru $ +# $Id: PKGBUILD 135796 2011-08-18 15:04:27Z andyrtr $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Gabriel Martinez < reitaka at gmail dot com > pkgname=libimobiledevice pkgver=1.1.1 -pkgrel=1 +pkgrel=2 pkgdesc="Is a software library that talks the protocols to support iPhone and iPod Touch devices on Linux" url="http://libimobiledevice.org/" arch=('i686' 'x86_64' 'mips64el') license=('GPL2' 'LGPL2.1') -depends=('gnutls' 'glib2' 'libplist' 'usbmuxd') +depends=('glib2' 'gnutls' 'libgcrypt' 'libplist' 'usbmuxd') makedepends=('swig' 'python2') options=('!libtool') source=(http://libimobiledevice.org/downloads/${pkgname}-${pkgver}.tar.bz2 @@ -21,7 +21,7 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" # SWIG version check is wrong (still not fixed upstream) patch -p1 -i "$srcdir"/swig-version-check.patch - ./configure --prefix=/usr + PYTHON=/usr/bin/python2 ./configure --prefix=/usr make } diff --git a/extra/libktorrent/PKGBUILD b/extra/libktorrent/PKGBUILD index b39a2dc82..82008c65f 100644 --- a/extra/libktorrent/PKGBUILD +++ b/extra/libktorrent/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 122107 2011-05-02 07:24:22Z andrea $ +# $Id: PKGBUILD 135670 2011-08-17 07:49:37Z andrea $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libktorrent -pkgver=1.1.1 +pkgver=1.1.2 pkgrel=1 pkgdesc="A BitTorrent protocol implementation" arch=('i686' 'x86_64' 'mips64el') url="http://ktorrent.org" license=('GPL2') depends=('kdelibs') -makedepends=('automoc4' 'cmake' 'boost') -source=("http://ktorrent.org/downloads/4.1.1/${pkgname}-${pkgver}.tar.bz2") +makedepends=('automoc4' 'cmake' 'boost' 'doxygen') +source=("http://ktorrent.org/downloads/4.1.2/${pkgname}-${pkgver}.tar.bz2") options=('libtool') -md5sums=('96de8dd6d6cea4255ce946bb4cd69836') +md5sums=('471b25afc48e195723ac1e264c8a0fc5') build() { cd "${srcdir}" diff --git a/extra/libssh/PKGBUILD b/extra/libssh/PKGBUILD index d9c8031e0..041f16b89 100644 --- a/extra/libssh/PKGBUILD +++ b/extra/libssh/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 126134 2011-06-01 18:06:44Z andrea $ +# $Id: PKGBUILD 135676 2011-08-17 07:52:28Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: ice-man <icemanf@gmail.com> # Contributor: sergeantspoon <sergeantspoon@archlinux.us> pkgname=libssh -pkgver=0.5.0 +pkgver=0.5.1 pkgrel=1 pkgdesc="Library for accessing ssh client services through C libraries" url="http://www.libssh.org/" @@ -13,7 +13,7 @@ arch=('i686' 'x86_64' 'mips64el') depends=('openssl') makedepends=('cmake' 'doxygen') source=("http://www.libssh.org/files/0.5/${pkgname}-${pkgver}.tar.gz") -md5sums=('9b37f45751c0ae7ba66099c1fb136946') +md5sums=('0cd8bc9336398e23a76f4e25c1412eb4') build() { cd "${srcdir}" diff --git a/extra/libvncserver/PKGBUILD b/extra/libvncserver/PKGBUILD index 446e2bf63..86a9b7bf8 100644 --- a/extra/libvncserver/PKGBUILD +++ b/extra/libvncserver/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 124232 2011-05-17 19:20:06Z andrea $ +# $Id: PKGBUILD 135798 2011-08-18 15:04:30Z andyrtr $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=libvncserver pkgver=0.9.8 -pkgrel=2 +pkgrel=4 pkgdesc="A cross-platform C libraries that allow you to easily implement VNC server" arch=('i686' 'x86_64' 'mips64el') url="http://libvncserver.sourceforge.net/" license=('GPL') -depends=('libjpeg' 'zlib' 'gnutls') +depends=('libjpeg' 'gnutls' 'libgcrypt') options=('!libtool') source=("http://downloads.sourceforge.net/${pkgname}/LibVNCServer-${pkgver}.tar.gz") md5sums=('dda9e75a1d5d7c37bb57d90ead7b32b3') diff --git a/extra/libvpx/PKGBUILD b/extra/libvpx/PKGBUILD index d92813ea2..fe6c58d41 100644 --- a/extra/libvpx/PKGBUILD +++ b/extra/libvpx/PKGBUILD @@ -1,7 +1,8 @@ -# $Id: PKGBUILD 134545 2011-08-05 13:19:02Z ibiru $ +# $Id: PKGBUILD 135632 2011-08-16 21:19:30Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=libvpx -pkgver=0.9.7 +pkgver=0.9.7.p1 +realver=0.9.7-p1 pkgrel=1 pkgdesc="The VP8 Codec SDK" arch=('i686' 'x86_64' 'mips64el') @@ -9,13 +10,13 @@ url="http://www.webmproject.org/" license=('BSD') depends=('glibc') makedepends=('yasm') -source=(http://webm.googlecode.com/files/${pkgname}-v${pkgver}.tar.bz2 +source=(http://webm.googlecode.com/files/${pkgname}-v${realver}.tar.bz2 mips64el.patch) -sha1sums=('639596df7182a93db83f61af8f5bb5b6a13dcf63' +sha1sums=('dacfefaf3363f781de43858f09cdd0b0d469e6fc' '4fd775826a4d737102f831c451235a58947f2cde') build() { - cd "${srcdir}/${pkgname}-v${pkgver}" + cd "${srcdir}/${pkgname}-v${realver}" if [ "$CARCH" = "mips64el" ]; then extra="--target=mips64el-linux-gcc" @@ -33,7 +34,7 @@ build() { } package() { - cd "${srcdir}/${pkgname}-v${pkgver}" + cd "${srcdir}/${pkgname}-v${realver}" make DIST_DIR="$pkgdir/usr" install install -D -m 0644 LICENSE "$pkgdir/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/loudmouth/PKGBUILD b/extra/loudmouth/PKGBUILD index 62a25f5e1..17cbb2b01 100644 --- a/extra/loudmouth/PKGBUILD +++ b/extra/loudmouth/PKGBUILD @@ -1,16 +1,16 @@ - $Id: PKGBUILD,v 1.3 2003/11/06 08:27:17 dorphell Exp +# $Id # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: damir <damir@archlinux.org> # Contributor: Brice Carpentier <brice.carpentier@orange.fr> pkgname=loudmouth pkgver=1.4.3 -pkgrel=2 +pkgrel=3 pkgdesc="A lightweight Jabber client library written in C/Glib" arch=('i686' 'x86_64' 'mips64el') license=('LGPL') url="http://groups.google.com/group/loudmouth-dev" -depends=('glib2>=2.24.1' 'gnutls>=2.8.6' 'libidn>=1.16') +depends=('glib2' 'gnutls' 'libidn') options=('!libtool') makedepends=('intltool' 'pkgconfig' 'gtk-doc') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.4/${pkgname}-${pkgver}.tar.bz2 @@ -31,5 +31,9 @@ build() { autoreconf ./configure --prefix=/usr --disable-static make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install } diff --git a/extra/memcached/PKGBUILD b/extra/memcached/PKGBUILD index 458f173f9..800c619b9 100644 --- a/extra/memcached/PKGBUILD +++ b/extra/memcached/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 133031 2011-07-27 01:25:28Z dan $ +# $Id: PKGBUILD 135720 2011-08-18 03:34:00Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> # Contributor: Michael Irwin <6d6469@gmail.com> pkgname=memcached -pkgver=1.4.6 +pkgver=1.4.7 pkgrel=1 pkgdesc="A distributed memory object caching system" arch=(i686 x86_64 'mips64el') @@ -16,7 +16,7 @@ source=(http://memcached.googlecode.com/files/$pkgname-$pkgver.tar.gz memcached.conf memcached.sh) changelog=ChangeLog -sha256sums=('4dba55457e4e7f5a3e8255325671bf1e1efbe89ee224fcc6993fcd659956d3f7' +sha256sums=('925837a4cf440e3cb451e338413ed9ad1429fd0d80ba4d903955f5fed8da7be6' '0e57a0f528b387f1f04f628ec74856c615d82d44f4d6bc041c33b3814ce13d0a' '72efa639c5a39c7c14f07cc51731ebbf82299870d9cf31cf3aaa981bc084b4eb') diff --git a/extra/msmtp/PKGBUILD b/extra/msmtp/PKGBUILD index ff1e47629..a3b75136f 100644 --- a/extra/msmtp/PKGBUILD +++ b/extra/msmtp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 127745 2011-06-18 02:59:47Z eric $ +# $Id: PKGBUILD 135802 2011-08-18 15:04:35Z andyrtr $ # Maintainer: tobias <tobias@archlinux.org> # Contributor: Ben Mazer <blm@groknil.org> pkgname=msmtp pkgver=1.4.24 -pkgrel=2 +pkgrel=3 pkgdesc="A mini smtp client" arch=('i686' 'x86_64' 'mips64el') license=('GPL3') diff --git a/extra/net-snmp/PKGBUILD b/extra/net-snmp/PKGBUILD index 68bd5942d..1055f6d5f 100644 --- a/extra/net-snmp/PKGBUILD +++ b/extra/net-snmp/PKGBUILD @@ -1,30 +1,31 @@ -# $Id: PKGBUILD 131650 2011-07-13 08:13:14Z andrea $ -# Maintainer: Eric Belanger <eric@archlinux.org> +# $Id: PKGBUILD 136011 2011-08-21 12:39:53Z eric $ +# Maintainer: # Contributor: Dale Blount <dale@archlinux.org> pkgname=net-snmp pkgver=5.6.1 -pkgrel=3 +pkgrel=4 pkgdesc="A suite of applications used to implement SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6" arch=('i686' 'x86_64' 'mips64el') url="http://www.net-snmp.org/" license=('custom') depends=('openssl' 'libnl') -makedepends=('setuptools') +makedepends=('python2-distribute') optdepends=('perl-term-readkey: for snmpcheck application' 'perl-tk: for snmpcheck and tkmib applications' 'python2: for the python modules') provides=('ucd-snmp') options=('!libtool' '!makeflags' '!emptydirs') -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 'snmpd.rc') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz + snmpd.confd snmpd.rc) md5sums=('b4e30ead5783b0bb1d280172c6095ea4' - '9f0d13676ba1fae1eb7eb178edd85b43') + '37bc5db8707004fe284c202437c6aa7d' + 'edab44a12f76045e41340d433a79dcec') build() { cd "${srcdir}/${pkgname}-${pkgver}" sed -i -e "s:\(install --basedir=\$\$dir\):\1 --root='${pkgdir}':" Makefile.in - ./configure --prefix=/usr \ + PYTHONPROG=/usr/bin/python2 ./configure --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ --enable-ucd-snmp-compatibility \ @@ -35,14 +36,14 @@ build() { --with-sys-location="Unknown" \ --with-logfile="/var/log/snmpd.log" \ --with-mib-modules="host misc/ipfwacc ucd-snmp/diskio tunnel ucd-snmp/dlmod" \ - --with-persistent-directory="/var/net-snmp" \ - PYTHONPROG=/usr/bin/python2 - make NETSNMP_DONT_CHECK_VERSION=1 LDFLAGS+="-Wl,-rpath -Wl,/usr/lib/perl5/core_perl/CORE" + --with-persistent-directory="/var/net-snmp" + make NETSNMP_DONT_CHECK_VERSION=1 } package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" INSTALL_PREFIX="${pkgdir}" INSTALLDIRS=vendor install install -D -m755 "${srcdir}/snmpd.rc" "${pkgdir}/etc/rc.d/snmpd" + install -D -m644 "${srcdir}/snmpd.confd" "${pkgdir}/etc/conf.d/snmpd" install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/net-snmp/snmpd.confd b/extra/net-snmp/snmpd.confd new file mode 100644 index 000000000..926b09bbf --- /dev/null +++ b/extra/net-snmp/snmpd.confd @@ -0,0 +1,5 @@ +# +# Parameters to be passed to snmpd +# +SNMPD_ARGS="" + diff --git a/extra/net-snmp/snmpd.rc b/extra/net-snmp/snmpd.rc index 9f1b83f64..b00c09f4f 100644 --- a/extra/net-snmp/snmpd.rc +++ b/extra/net-snmp/snmpd.rc @@ -2,12 +2,13 @@ . /etc/rc.conf . /etc/rc.d/functions +. /etc/conf.d/snmpd PID=`pidof -o %PPID /usr/sbin/snmpd` case "$1" in start) stat_busy "Starting Net-SNMP" - [ -z "$PID" ] && /usr/sbin/snmpd + [ -z "$PID" ] && /usr/sbin/snmpd $SNMPD_ARGS if [ $? -gt 0 ]; then stat_fail else diff --git a/extra/nettle/PKGBUILD b/extra/nettle/PKGBUILD index 19a701f17..a72ef0427 100644 --- a/extra/nettle/PKGBUILD +++ b/extra/nettle/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 130897 2011-07-08 16:53:06Z andyrtr $ +# $Id: PKGBUILD 135770 2011-08-18 15:03:50Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: bender02 at gmx dot com pkgname=nettle -pkgver=2.1 +pkgver=2.2 pkgrel=1 pkgdesc="A low-level cryptographic library" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('GPL2') install=$pkgname.install depends=('gmp') source=(ftp://ftp.lysator.liu.se/pub/security/lsh/$pkgname-$pkgver.tar.gz) -md5sums=('2bfaf16234a5d8deb96cd23f53a682bb') +md5sums=('9a9c6102eb9909019f8a13b67578cdfe') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/oprofile/PKGBUILD b/extra/oprofile/PKGBUILD index ab6f17e81..52adcf953 100644 --- a/extra/oprofile/PKGBUILD +++ b/extra/oprofile/PKGBUILD @@ -1,27 +1,25 @@ -# $Id: PKGBUILD 107149 2011-01-21 19:58:21Z eric $ +# $Id: PKGBUILD 135638 2011-08-16 21:35:38Z eric $ # Maintainer : Aaron Griffin <aaron@archlinux.org> pkgname=oprofile -pkgver=0.9.6 -pkgrel=3 +pkgver=0.9.7 +pkgrel=1 pkgdesc="A system-wide profiler for Linux systems, capable of profiling all running code at low overhead" arch=('i686' 'x86_64' 'mips64el') url="http://oprofile.sourceforge.net" license=('GPL') -depends=('popt') -makedepends=('qt3') -optdepends=('qt3: for oprof_start gui') +depends=('popt' 'gcc-libs' 'zlib' 'sh') +makedepends=('qt') +optdepends=('qt: for oprof_start gui') options=('!libtool') -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('4e407093ac06200185d5a5e6437d7242') -sha1sums=('cc62cc58c574e235bc146c8ddc9d9a9af0972fd1') +install=oprofile.install +source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz) +md5sums=('8b5d1d9b65f84420bcc3234777ad3be3') +sha1sums=('f5befd8aafc77d449e955f0585216f5d7b967de2') build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr \ - --mandir=/usr/share/man \ - --with-kernel-support \ - --with-x + ./configure --prefix=/usr --with-kernel-support --with-x --enable-gui=qt4 make } @@ -29,7 +27,7 @@ package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install -# installing development libraries +# installing development libraries - FS#20089 install -m644 libutil/op_types.h libop/op_sample_file.h libutil/op_list.h libop/op_events.h libop/op_cpu_type.h libop/op_config.h libdb/odb.h "$pkgdir/usr/include" install -m644 libop/libop.a libdb/libodb.a "$pkgdir/usr/lib/" install -m644 libabi/libabi.a "$pkgdir/usr/lib/libopabi.a" diff --git a/extra/oprofile/oprofile.install b/extra/oprofile/oprofile.install new file mode 100644 index 000000000..025c9725a --- /dev/null +++ b/extra/oprofile/oprofile.install @@ -0,0 +1,18 @@ +post_install(){ + groupadd -g 492 oprofile &>/dev/null + useradd -u 492 -g oprofile -s /bin/false oprofile &>/dev/null +} + +post_upgrade(){ + getent group oprofile >/dev/null 2>&1 || groupadd -g 492 oprofile &>/dev/null + getent passwd oprofile >/dev/null 2>&1 || useradd -u 492 -g oprofile -s /bin/false oprofile &>/dev/null +} + +post_remove(){ + if getent passwd oprofile >/dev/null 2>&1; then + userdel oprofile + fi + if getent group oprofile >/dev/null 2>&1; then + groupdel oprofile + fi +} diff --git a/extra/php-apc/PKGBUILD b/extra/php-apc/PKGBUILD index a878b42b5..0d9027829 100644 --- a/extra/php-apc/PKGBUILD +++ b/extra/php-apc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 123989 2011-05-15 16:00:20Z pierre $ +# $Id: PKGBUILD 135862 2011-08-19 20:05:54Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=php-apc pkgver=3.1.9 -pkgrel=1 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') pkgdesc='A free, open, and robust framework for caching and optimizing PHP intermediate code' url='http://pecl.php.net/package/APC' diff --git a/extra/php-suhosin/PKGBUILD b/extra/php-suhosin/PKGBUILD index 924dec114..9eccbe76d 100644 --- a/extra/php-suhosin/PKGBUILD +++ b/extra/php-suhosin/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 86069 2010-07-25 11:35:16Z pierre $ +# $Id: PKGBUILD 135864 2011-08-19 20:05:56Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=php-suhosin pkgver=0.9.32.1 -pkgrel=1 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') pkgdesc='An advanced protection system for PHP installations' url='http://www.hardened-php.net/suhosin/' diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD index 1f5d3465f..734fe9e2e 100644 --- a/extra/php/PKGBUILD +++ b/extra/php/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 127446 2011-06-15 08:33:01Z pierre $ +# $Id: PKGBUILD 135860 2011-08-19 20:05:50Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgbase=php @@ -7,7 +7,6 @@ pkgname=('php' 'php-apache' 'php-fpm' 'php-embed' - 'php-pear' 'php-curl' 'php-enchant' 'php-gd' @@ -15,7 +14,7 @@ pkgname=('php' 'php-intl' 'php-ldap' 'php-mcrypt' - 'php-mssql' + 'php-mssql' 'php-odbc' 'php-pgsql' 'php-pspell' @@ -23,33 +22,29 @@ pkgname=('php' 'php-sqlite' 'php-tidy' 'php-xsl') -pkgver=5.3.6 -pkgrel=5 +pkgver=5.3.7 _suhosinver=${pkgver}-0.9.10 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') license=('PHP') url='http://www.php.net' -makedepends=('apache' 'imap' 'postgresql-libs' 'mysql' 'libldap' 'postfix' +makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' 'sqlite3' 'unixodbc' 'net-snmp' 'libzip' 'enchant' 'file' 'freetds' 'libmcrypt' 'tidyhtml' 'aspell' 'libtool' 'libpng' 'libjpeg' 'icu' 'curl' 'libxslt' 'openssl' 'bzip2' 'db' 'gmp' 'freetype2') source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2" - "suhosin-patch-${_suhosinver}.patch.gz" + "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz" 'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch' 'logrotate.d.php-fpm') -md5sums=('2286f5a82a6e8397955a0025c1c2ad98' - 'fff1a38877142f3ae6036dbe5a85d0a6' +md5sums=('2d47d003c96de4e88863ff38da61af33' + '08582e502fed8221c6577042ca45ddb8' '39eaa70d276fc3d45d6bcf6cd5ae1106' 'dec2cbaad64e3abf4f0ec70e1de4e8e9' 'b01be5f816988fcee7e78225836e5e27' - 'd50ff349da08110a7cc8c691ce2d0423' + '09005dabd90c48ddd392b3dbf05f8a82' '07c4e412909ac65a44ec90e7a2c4bade') build() { - # ldap-sasl does not compile with --as-needed - export LDFLAGS="${LDFLAGS//-Wl,--as-needed}" - export LDFLAGS="${LDFLAGS//,--as-needed}" - phpconfig="--srcdir=../${pkgbase}-${pkgver} \ --prefix=/usr \ --sysconfdir=/etc/php \ @@ -196,17 +191,6 @@ build() { --enable-embed=shared \ ${phpextensions} make - - # pear - cp -a ${srcdir}/build-php ${srcdir}/build-pear - cd ${srcdir}/build-pear - ./configure ${phpconfig} \ - --disable-cgi \ - --with-readline \ - --enable-pcntl \ - --with-pear \ - ${phpextensions} - make } # check() { @@ -272,19 +256,6 @@ package_php-embed() { install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/sapi/embed/php_embed.h ${pkgdir}/usr/include/php/sapi/embed/php_embed.h } -package_php-pear() { - pkgdesc='PHP Extension and Application Repository' - depends=('php' 'bash') - backup=('etc/php/pear.conf') - - cd ${srcdir}/build-pear - make -j1 install-pear INSTALL_ROOT=${pkgdir} - local i - while read i; do - [ ! -e "$i" ] || rm -rf "$i" - done < <(find ${pkgdir} -name '.*') -} - package_php-curl() { depends=('php' 'curl') pkgdesc='curl module for PHP' diff --git a/extra/php/php-fpm.conf.in.patch b/extra/php/php-fpm.conf.in.patch index 93c62430a..b4dd32f96 100644 --- a/extra/php/php-fpm.conf.in.patch +++ b/extra/php/php-fpm.conf.in.patch @@ -1,5 +1,5 @@ ---- sapi/fpm/php-fpm.conf.in 2010-12-11 08:31:47.695294987 +0100 -+++ sapi/fpm/php-fpm.conf.in 2010-12-11 08:31:55.907812237 +0100 +--- sapi/fpm/php-fpm.conf.in 2011-07-04 23:22:56.000000000 +0200 ++++ sapi/fpm/php-fpm.conf.in 2011-08-12 16:56:23.686606725 +0200 @@ -12,7 +12,7 @@ ; Relative path can also be used. They will be prefixed by: ; - the global prefix if it's been set (-p arguement) @@ -18,7 +18,7 @@ ; Error log file ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@ -@@ -93,7 +93,8 @@ +@@ -102,7 +102,8 @@ ; specific port; ; '/path/to/unix/socket' - to listen on a unix socket. ; Note: This value is mandatory. @@ -28,7 +28,7 @@ ; Set listen(2) backlog. A value of '-1' means unlimited. ; Default Value: 128 (-1 on FreeBSD and OpenBSD) -@@ -112,9 +113,9 @@ +@@ -121,9 +122,9 @@ ; BSD-derived systems allow connections regardless of permissions. ; Default Values: user and group are set as the running user ; mode is set to 0666 @@ -41,7 +41,7 @@ ; Unix user/group of processes ; Note: The user is mandatory. If the group is not set, the default user's group -@@ -154,23 +155,23 @@ +@@ -163,23 +164,23 @@ ; The number of child processes created on startup. ; Note: Used only when pm is set to 'dynamic' ; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2 @@ -69,7 +69,7 @@ ; The URI to view the FPM status page. If this value is not set, no URI will be ; recognized as a status page. By default, the status page shows the following -@@ -264,7 +265,7 @@ +@@ -333,7 +334,7 @@ ; Chdir to this directory at the start. ; Note: relative path can be used. ; Default Value: current directory or / when chroot diff --git a/extra/pidgin/PKGBUILD b/extra/pidgin/PKGBUILD index afb279677..4b497871f 100644 --- a/extra/pidgin/PKGBUILD +++ b/extra/pidgin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 135431 2011-08-13 11:30:30Z foutrelis $ +# $Id: PKGBUILD 135966 2011-08-21 02:57:32Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -6,8 +6,8 @@ # Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl> pkgname=('pidgin' 'libpurple' 'finch') -pkgver=2.9.0 -pkgrel=3 +pkgver=2.10.0 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://pidgin.im/" license=('GPL') @@ -17,11 +17,9 @@ makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm' 'networkmanager') options=('!libtool') source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 - nm09-more.patch - ticket-14351-multiple-display-of-room-members.patch) -md5sums=('2cd285c7a40f93b7a51bfe733971d3a6' - 'a673659d86c7a65aa710f7c8c7feda82' - '47f16f838b741cfdeda18d7b08a7b816') + nm09-more.patch) +md5sums=('e1453c9093c4f32beec19abd14069a3f' + 'a673659d86c7a65aa710f7c8c7feda82') build() { cd "$srcdir/$pkgname-$pkgver" @@ -30,10 +28,6 @@ build() { # http://developer.pidgin.im/ticket/13859 patch -Np1 -i "$srcdir/nm09-more.patch" - # Fix upstream issue #14351: multiple display of room members - # http://developer.pidgin.im/ticket/14351 - patch -Np0 -i "$srcdir/ticket-14351-multiple-display-of-room-members.patch" - # Use Python 2 sed -i 's/env python$/\02/' */plugins/*.py \ libpurple/purple-{remote,notifications-example,url-handler} diff --git a/extra/potrace/PKGBUILD b/extra/potrace/PKGBUILD index 749e2cd23..751780b31 100644 --- a/extra/potrace/PKGBUILD +++ b/extra/potrace/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 104345 2011-01-01 13:50:24Z bisson $ -# Maintainer: damir <damir@archlinux.org> -# Contributor: Damir Perisa <damir.perisa@bluewin.ch> +# $Id: PKGBUILD 135877 2011-08-20 01:28:52Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: Damir Perisa <damir@archlinux.org> pkgname=potrace -pkgver=1.9 -pkgrel=2 -pkgdesc='Utility for tracing a bitmap. Input: PBM, PGM, PPM, or BMP. Output: EPS, PostScript, PDF, SVG, Xfig, Gimppath, or PGM.' -arch=('i686' 'x86_64' 'mips64el') +pkgver=1.10 +pkgrel=1 +pkgdesc='Utility for tracing a bitmap (input: PBM,PGM,PPM,BMP; output: EPS,PS,PDF,SVG,DXF,PGM,Gimppath,XFig)' url='http://potrace.sourceforge.net/' +arch=('i686' 'x86_64' 'mips64el') license=('GPL') depends=('zlib') options=('!libtool') source=("http://potrace.sourceforge.net/download/${pkgname}-${pkgver}.tar.gz") -sha1sums=('c3ace609c24a0d5e03bbab5f22478c2af69cf1c4') +sha1sums=('e6e8b64d85d30b4695d197a79187ac98c2b236f9') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/qemu-kvm/PKGBUILD b/extra/qemu-kvm/PKGBUILD index e1016b0c9..d5e74a955 100644 --- a/extra/qemu-kvm/PKGBUILD +++ b/extra/qemu-kvm/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 135290 2011-08-12 09:22:48Z tpowa $ +# $Id: PKGBUILD 135806 2011-08-18 15:04:40Z andyrtr $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=qemu-kvm pkgver=0.15.0 -pkgrel=1 +pkgrel=2 pkgdesc="Latest KVM QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation." arch=(i686 x86_64 'mips64el') license=('GPL2' 'LGPL2.1') diff --git a/extra/qemu/PKGBUILD b/extra/qemu/PKGBUILD index 61389e8e7..bdad22843 100644 --- a/extra/qemu/PKGBUILD +++ b/extra/qemu/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 135285 2011-08-12 09:21:08Z tpowa $ +# $Id: PKGBUILD 135804 2011-08-18 15:04:37Z andyrtr $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=qemu pkgver=0.15.0 -pkgrel=1 +pkgrel=2 pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation." arch=('i686' 'x86_64' 'mips64el') license=('GPL2' 'LGPL2.1') diff --git a/extra/racket/PKGBUILD b/extra/racket/PKGBUILD index f3388e186..4e5384815 100644 --- a/extra/racket/PKGBUILD +++ b/extra/racket/PKGBUILD @@ -1,25 +1,22 @@ -# $Id: PKGBUILD 134452 2011-08-03 23:25:25Z eric $ +# $Id: PKGBUILD 135654 2011-08-17 02:18:35Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=racket -pkgver=5.1.2 +pkgver=5.1.3 pkgrel=1 -pkgdesc="PLT Racket (a variant of Scheme) Environment" +pkgdesc="A programming language environment (formerly known as PLT Scheme) suitable for tasks ranging from scripting to application development" arch=('i686' 'x86_64' 'mips64el') url="http://racket-lang.org/" license=('LGPL') depends=('gtk2' 'libffi' 'desktop-file-utils') makedepends=('gsfonts') -provides=('drscheme') -conflicts=('drscheme') -replaces=('drscheme') options=('!strip') install=racket.install source=(http://download.racket-lang.org/installers/${pkgver}/racket/${pkgname}-${pkgver}-src-unix.tgz \ drracket.desktop) -md5sums=('c686e789913c40bfd78505574963c1fe' +md5sums=('6c33caf6ee49a422be053effaf630941' '9223c9736ead677431542b41271c7b3c') -sha1sums=('f1f7e2ee1cd754d65013dab80bc1f9a3be1e3b41' +sha1sums=('7face74729cee8b36ce3df44b36b04ca23b4c986' 'a20808f6b250225704856f82a544681a962a299d') build() { diff --git a/extra/rrdtool/PKGBUILD b/extra/rrdtool/PKGBUILD index 184bb230c..37f8d6e3a 100644 --- a/extra/rrdtool/PKGBUILD +++ b/extra/rrdtool/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 131818 2011-07-15 23:27:54Z dan $ +# $Id: PKGBUILD 135894 2011-08-20 03:53:06Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=rrdtool pkgver=1.4.5 -pkgrel=3 +pkgrel=4 pkgdesc="Data logging and graphing application" arch=('i686' 'x86_64' 'mips64el') url="http://www.rrdtool.org" license=('GPL' 'custom') -depends=('libpng' 'libxml2' 'pango') +depends=('libxml2' 'pango' 'ttf-dejavu') makedepends=('intltool' 'ruby' 'python2' 'tcl' 'lua') optdepends=('tcl: to use corresponding binding' \ 'python2: to use corresponding binding' \ @@ -21,9 +21,8 @@ sha1sums=('56638e8aedd5d5522152e86746e382b75dc48c35') build() { cd "${srcdir}/${pkgname}-${pkgver}" - sed -i 's|-lrrd|-lrrd -L/usr/lib/perl5/core_perl/CORE/ -lperl -Wl,-E -Wl,-rpath,/usr/lib/perl5/core_perl/CORE |' \ - bindings/perl-shared/Makefile.PL - ./configure --prefix=/usr --localstatedir=/var --disable-rpath \ + sed -i 's|-lrrd|-lrrd -L/usr/lib/perl5/core_perl/CORE/ -lperl |' bindings/perl-shared/Makefile.PL + PYTHON=python2 ./configure --prefix=/usr --localstatedir=/var --disable-rpath \ --enable-perl --enable-perl-site-install --with-perl-options='INSTALLDIRS=vendor' \ --enable-ruby --enable-ruby-site-install --enable-python \ --enable-lua --enable-lua-site-install --enable-tcl --disable-libwrap diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD index 6f3420887..d8134cb81 100644 --- a/extra/samba/PKGBUILD +++ b/extra/samba/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 134504 2011-08-04 16:59:32Z tpowa $ +# $Id: PKGBUILD 135597 2011-08-16 14:39:28Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgbase=samba pkgname=('smbclient' 'samba') -pkgver=3.5.11 +pkgver=3.6.0 # We use the 'A' to fake out pacman's version comparators. Samba chooses # to append 'a','b',etc to their subsequent releases, which pamcan # misconstrues as alpha, beta, etc. Bad samba! -_realver=3.5.11 +_realver=3.6.0 pkgrel=1 arch=(i686 x86_64 mips64el) url="http://www.samba.org" @@ -129,7 +129,7 @@ depends=('db' 'popt' 'libcups' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap' 'kr # copy ldap example install -D -m644 ${srcdir}/samba-${_realver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema } -md5sums=('81bbd16048c6ca40baea8c59126ee385' +md5sums=('e297e0ea7923c7de8d7c1d8fd0ec0a05' 'a3da19515a234c703876cf850c44e996' '5697da77590ec092cc8a883bae06093c' 'a4bbfa39fee95bba2e7ad6b535fae7e6' diff --git a/extra/scummvm/PKGBUILD b/extra/scummvm/PKGBUILD index 1fa433641..c3af7e031 100644 --- a/extra/scummvm/PKGBUILD +++ b/extra/scummvm/PKGBUILD @@ -1,22 +1,23 @@ -# $Id: PKGBUILD 135227 2011-08-11 09:16:00Z juergen $ +# $Id: PKGBUILD 135987 2011-08-21 05:01:03Z eric $ # Maintainer: juergen <juergen@hoetzel.info> # Contributor: Manolis Tzanidakis, Petter Gundersen pkgname=scummvm pkgver=1.3.1 -pkgrel=1 +pkgrel=2 pkgdesc="A 'virtual machine' for several classic graphical point-and-click adventure games." arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.scummvm.org/" -depends=('gcc-libs' 'alsa-lib' 'libmad' 'libvorbis' 'zlib' 'flac>=1.1.4' 'sdl' 'fluidsynth') +depends=('libmad' 'sdl' 'fluidsynth') +makedepends=('libmpeg2') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2) md5sums=('87e5076e93bfa762f1c5d7f45b41d4e2') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}"/${pkgname}-${pkgver} ./configure --backend=sdl --disable-debug \ - --with-mpeg2-prefix=/usr \ + --enable-mpeg2 --with-mpeg2-prefix=/usr \ --with-flac-prefix=/usr \ --with-fluidsynth-prefix=/usr \ --prefix=/usr @@ -24,15 +25,14 @@ build() { } package() { - cd ${srcdir}/${pkgname}-${pkgver} - install -Dm755 scummvm ${pkgdir}/usr/bin/scummvm - install -Dm644 dists/scummvm.6 ${pkgdir}/usr/share/man/man6/scummvm.6 + cd "${srcdir}"/${pkgname}-${pkgver} + install -Dm755 scummvm "${pkgdir}"/usr/bin/scummvm + install -Dm644 dists/scummvm.6 "${pkgdir}"/usr/share/man/man6/scummvm.6 # fixes FS#9118 install -Dm644 dists/${pkgname}.desktop \ - ${pkgdir}/usr/share/applications/${pkgname}.desktop + "${pkgdir}"/usr/share/applications/${pkgname}.desktop install -Dm644 icons/scummvm.xpm \ - ${pkgdir}/usr/share/pixmaps/scummvm.xpm - - install -Dm644 gui/themes/scummmodern.zip ${pkgdir}/usr/share/scummvm/scummmodern.zip + "${pkgdir}"/usr/share/pixmaps/scummvm.xpm + install -Dm644 gui/themes/scummmodern.zip "${pkgdir}"/usr/share/scummvm/scummmodern.zip } diff --git a/extra/soundtouch/PKGBUILD b/extra/soundtouch/PKGBUILD index 3de1063b2..02932f3f5 100644 --- a/extra/soundtouch/PKGBUILD +++ b/extra/soundtouch/PKGBUILD @@ -1,10 +1,8 @@ -# $Id: PKGBUILD 67310 2010-02-06 08:17:47Z eric $ -# Maintainer: Eric Belanger <eric@archlinux.org> -# Contributor: Jaroslaw Swierczynski <swiergot@juvepoland.com> -# Contributor: Raymano <re1212122000@yahoo.com> +# $Id: PKGBUILD 136036 2011-08-21 23:32:17Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=soundtouch -pkgver=1.5.0 +pkgver=1.6.0 pkgrel=1 pkgdesc="An audio processing library" arch=('i686' 'x86_64' 'mips64el') @@ -16,24 +14,18 @@ source=(http://www.surina.net/soundtouch/${pkgname}-${pkgver}.tar.gz soundtouch-1.4.0-mmx-sse-compile-fix.patch soundtouch-1.4.0-x86_64-asm-broken.patch disable-mmx.patch) -md5sums=('5456481d8707d2a2c27466ea64a099cb' - 'f0204136c90ce4f6d4761073151eb4dc' - '0d856bb5b519b18c6ba3a2e1770bdfd2' - '3a5097f2a65ec9bd5f733f9935cd498b') -sha1sums=('c3e73419acec242a49a408b78c55883def937fc0' - '39815091c4cb1817f8a56b8fb29fa684984514d1' - '95282cca856b3b8645fadb530ce5eb892074f193' - '92d7851d1992a592dab5490f18c072df943afdda') + soundtouch-1.4.0-x86_64-asm-broken.patch) build() { cd "${srcdir}/${pkgname}" - patch -Np1 -i "${srcdir}/soundtouch-1.4.0-mmx-sse-compile-fix.patch" - patch -Np1 -i "${srcdir}/soundtouch-1.4.0-x86_64-asm-broken.patch" + patch -p1 -i "${srcdir}/soundtouch-1.4.0-mmx-sse-compile-fix.patch" + patch -p1 -i "${srcdir}/soundtouch-1.4.0-x86_64-asm-broken.patch" if [ "${CARCH}" = "mips64el" ]; then patch -Np1 -i "${srcdir}/disable-mmx.patch" fi + ./bootstrap case $CARCH in i686) ./configure --prefix=/usr --enable-shared @@ -46,7 +38,9 @@ build() { ;; esac make +} + +package() { + cd "${srcdir}/${pkgname}" make DESTDIR="${pkgdir}" pkgdocdir=/usr/share/doc/soundtouch install - # Upstream changed pkgconfig filename - ln -sf soundtouch-1.4.pc "${pkgdir}/usr/lib/pkgconfig/soundtouch-1.0.pc" || return 1 } diff --git a/extra/soundtouch/soundtouch-1.4.0-mmx-sse-compile-fix.patch b/extra/soundtouch/soundtouch-1.4.0-mmx-sse-compile-fix.patch index 4369b178b..562e38e97 100644 --- a/extra/soundtouch/soundtouch-1.4.0-mmx-sse-compile-fix.patch +++ b/extra/soundtouch/soundtouch-1.4.0-mmx-sse-compile-fix.patch @@ -1,14 +1,14 @@ -diff -up soundtouch/source/SoundTouch/Makefile.in~ soundtouch/source/SoundTouch/Makefile.in ---- soundtouch/source/SoundTouch/Makefile.in~ 2009-02-15 11:21:36.000000000 +0100 -+++ soundtouch/source/SoundTouch/Makefile.in 2009-02-15 11:23:30.000000000 +0100 -@@ -209,7 +209,9 @@ libSoundTouch_la_SOURCES = AAFilter.cpp - # Note by authore: '-msse2' might not work in non-X86 compilations. If someone can - # fix this script to automatically check for CPU architecture, please submit a patch - # to me. --AM_CXXFLAGS = -O3 -msse2 -fcheck-new -I../../include -+AM_CXXFLAGS = -fcheck-new -I../../include -+mmx_optimized.lo : AM_CXXFLAGS = -mmmx -fcheck-new -I../../include -+sse_optimized.lo : AM_CXXFLAGS = -msse -fcheck-new -I../../include - all: all-am - - .SUFFIXES: +diff -up soundtouch/source/SoundTouch/Makefile.am~ soundtouch/source/SoundTouch/Makefile.am +--- soundtouch/source/SoundTouch/Makefile.am~ 2009-02-15 11:21:36.000000000 +0100 ++++ soundtouch/source/SoundTouch/Makefile.am 2009-02-15 11:23:30.000000000 +0100 +@@ -36,7 +36,9 @@ + # Note by authore: '-msse2' might not work in non-X86 compilations. If someone can
+ # fix this script to automatically check for CPU architecture, please submit a patch
+ # to me.
+-AM_CXXFLAGS=-O3 -msse2 -fcheck-new -I../../include
++AM_CXXFLAGS = -fcheck-new -I../../include
++mmx_optimized.lo : AM_CXXFLAGS = -mmmx -fcheck-new -I../../include
++sse_optimized.lo : AM_CXXFLAGS = -msse -fcheck-new -I../../include
+
+
+ # other linking flags to add
diff --git a/extra/squid/PKGBUILD b/extra/squid/PKGBUILD index a4c2f02dc..7e046a1e9 100644 --- a/extra/squid/PKGBUILD +++ b/extra/squid/PKGBUILD @@ -1,32 +1,35 @@ -# $Id: PKGBUILD 131635 2011-07-13 01:26:21Z kevin $ +# $Id: PKGBUILD 135984 2011-08-21 04:56:14Z eric $ # Maintainer: Kevin Piche <kevin@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=squid pkgver=3.1.14 -pkgrel=1 +pkgrel=2 pkgdesc="A full-featured Web proxy cache server." arch=(i686 x86_64 'mips64el') url="http://www.squid-cache.org" -depends=('openssl' 'pam' 'cron' 'perl') +depends=('openssl' 'pam' 'cron' 'perl' 'libtool') makedepends=('libcap>=2.16') license=('GPL') backup=(etc/squid/squid.conf etc/squid/mime.conf etc/conf.d/squid) install=squid.install source=(http://www.squid-cache.org/Versions/v3/3.1/${pkgname}-${pkgver}.tar.bz2 squid squid.conf.d squid.pam squid.cron squid-3.1.11-unused.patch) -md5sums=('8f82a451b04c3bf3c29202c548d2f2dd' 'd213b0cc1db72b749bb8c88716fdab39' - '2383772ef94efddc7b920628bc7ac5b0' '270977cdd9b47ef44c0c427ab9034777' - '5e17df989e2a74e869790c066f61225b' '8e59089e4a8556fc18df51979f1cfbff') +md5sums=('8f82a451b04c3bf3c29202c548d2f2dd' + 'd213b0cc1db72b749bb8c88716fdab39' + '2383772ef94efddc7b920628bc7ac5b0' + '270977cdd9b47ef44c0c427ab9034777' + '5e17df989e2a74e869790c066f61225b' + '8e59089e4a8556fc18df51979f1cfbff') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}"/${pkgname}-${pkgver} # gcc 4.6 doesn't support -fhuge-objects. sed '/^ HUGE_OBJECT_FLAG=/ s/"-fhuge-objects"//' -i configure # fix compile errors with gcc 4.6 # http://bugs.squid-cache.org/show_bug.cgi?id=3178 - #patch -Np1 -i ${srcdir}/squid-3.1.11-unused.patch + #patch -Np1 -i "${srcdir}"/squid-3.1.11-unused.patch # fix cache_dir, cache_dir size, and effective group. sed '/^DEFAULT_SWAP_DIR/ s@/cache@/cache/squid@' -i src/Makefile.in @@ -55,12 +58,12 @@ build() { } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd "${srcdir}"/${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install - install -D -m755 ${srcdir}/squid ${pkgdir}/etc/rc.d/squid - install -D -m755 ${srcdir}/squid.cron ${pkgdir}/etc/cron.weekly/squid - install -D -m644 ${srcdir}/squid.conf.d ${pkgdir}/etc/conf.d/squid - install -D -m644 ${srcdir}/squid.pam ${pkgdir}/etc/pam.d/squid + install -D -m755 "${srcdir}"/squid "${pkgdir}"/etc/rc.d/squid + install -D -m755 "${srcdir}"/squid.cron "${pkgdir}"/etc/cron.weekly/squid + install -D -m644 "${srcdir}"/squid.conf.d "${pkgdir}"/etc/conf.d/squid + install -D -m644 "${srcdir}"/squid.pam "${pkgdir}"/etc/pam.d/squid } # vim: ts=2 sw=2 et ft=sh diff --git a/extra/telepathy-gabble/PKGBUILD b/extra/telepathy-gabble/PKGBUILD index 9cdf5653b..6065b01ce 100644 --- a/extra/telepathy-gabble/PKGBUILD +++ b/extra/telepathy-gabble/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 135521 2011-08-14 19:04:44Z ibiru $ +# $Id: PKGBUILD 135698 2011-08-17 15:28:40Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Daniel Balieiro <daniel@balieiro.com> # Contributor: Rodrigo L. M. Flores <mail@rodrigoflores.org> pkgname=telepathy-gabble -pkgver=0.12.4 -pkgrel=3 +pkgver=0.12.6 +pkgrel=1 pkgdesc="A Jabber/XMPP connection manager for Telepathy" arch=('i686' 'x86_64' 'mips64el') url="http://telepathy.freedesktop.org" @@ -15,7 +15,7 @@ makedepends=('libxslt' 'python2') options=('!libtool') source=(http://telepathy.freedesktop.org/releases/telepathy-gabble/${pkgname}-${pkgver}.tar.gz) install=telepathy-gabble.install -md5sums=('428962565d568667d3ff1aa7eee3da51') +md5sums=('5524c7b6a29801feedc9ffa82503911a') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/thunar/PKGBUILD b/extra/thunar/PKGBUILD index d8494a12c..a978fa4eb 100644 --- a/extra/thunar/PKGBUILD +++ b/extra/thunar/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 125778 2011-05-29 16:38:52Z andyrtr $ +# $Id: PKGBUILD 135871 2011-08-19 21:48:29Z eric $ # Maintainer: andyrtr <andyrtr funnychar archlinux.org> # Contributor: Andrew Simmons <andrew.simmons@gmail.com> pkgname=thunar pkgver=1.2.2 -pkgrel=1 +pkgrel=2 pkgdesc="modern file manager for Xfce" arch=('i686' 'x86_64' 'mips64el') license=('GPL2' 'LGPL2.1') @@ -23,12 +23,12 @@ options=('!libtool') install=${pkgname}.install backup=('etc/polkit-1/localauthority/50-local.d/org.freedesktop.udisks.pkla') source=(http://archive.xfce.org/src/xfce/${pkgname}/1.2/Thunar-${pkgver}.tar.bz2 - org.freedesktop.udisks.pkla) -md5sums=('a86df0212db71e61f459bda6bc7b7fb6' - 'a7ddb5eec02d9a8e91a2997862e73cd8') + org.freedesktop.udisks.pkla + fix-gvfs.patch) build() { cd ${srcdir}/Thunar-${pkgver} + patch -Np1 -i ../fix-gvfs.patch ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib \ @@ -57,3 +57,9 @@ package() { install -dm755 ${pkgdir}/etc/polkit-1/localauthority/50-local.d install -m644 ${srcdir}/org.freedesktop.udisks.pkla ${pkgdir}/etc/polkit-1/localauthority/50-local.d/ } +md5sums=('a86df0212db71e61f459bda6bc7b7fb6' + 'a7ddb5eec02d9a8e91a2997862e73cd8' + '376c81af1ce5cf8b872d62a878163091') +md5sums=('a86df0212db71e61f459bda6bc7b7fb6' + 'a7ddb5eec02d9a8e91a2997862e73cd8' + '167c79462cddc5aaa1fcdc814041350b') diff --git a/extra/thunar/fix-gvfs.patch b/extra/thunar/fix-gvfs.patch new file mode 100644 index 000000000..71c7dbb57 --- /dev/null +++ b/extra/thunar/fix-gvfs.patch @@ -0,0 +1,148 @@ +--- a/thunar/thunar-shortcuts-model.c ++++ b/thunar/thunar-shortcuts-model.c +@@ -1,25 +1,23 @@ +-/* vi:set et ai sw=2 sts=2 ts=2: */ ++/* $Id$ */ + /*- + * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org> +- * Copyright (c) 2009-2011 Jannis Pohlmann <jannis@xfce.org> ++ * Copyright (c) 2009 Jannis Pohlmann <jannis@xfce.org> + * +- * This program is free software; you can redistribute it and/or +- * modify it under the terms of the GNU General Public License as +- * published by the Free Software Foundation; either version 2 of +- * the License, or (at your option) any later version. ++ * This program is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License as published by the Free ++ * Software Foundation; either version 2 of the License, or (at your option) ++ * any later version. + * +- * This program is distributed in the hope that it will be useful, +- * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- * GNU General Public License for more details. ++ * This program is distributed in the hope that it will be useful, but WITHOUT ++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for ++ * more details. + * +- * You should have received a copy of the GNU General Public +- * License along with this program; if not, write to the Free +- * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +- * Boston, MA 02110-1301, USA. ++ * You should have received a copy of the GNU General Public License along with ++ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple ++ * Place, Suite 330, Boston, MA 02111-1307 USA + */ + +- + #ifdef HAVE_CONFIG_H + #include <config.h> + #endif +@@ -219,84 +217,6 @@ thunar_shortcuts_model_drag_source_init (GtkTreeDragSourceIface *iface) + + + +-static gboolean +-thunar_shortcuts_model_add_network_idle (gpointer user_data) +-{ +- ThunarShortcutsModel *model = THUNAR_SHORTCUTS_MODEL (user_data); +- ThunarShortcut *shortcut = NULL; +- GtkTreePath *path; +- GtkTreeIter iter; +- ThunarFile *file = NULL; +- GVolume *volume = NULL; +- gboolean have_iter = FALSE; +- gboolean is_separator = FALSE; +- gboolean position_found = FALSE; +- GFile *location = NULL; +- +- /* append the network icon if browsing the network is supported */ +- if (thunar_g_vfs_is_uri_scheme_supported ("network")) +- { +- /* load the network root file */ +- location = g_file_new_for_uri ("network://"); +- file = thunar_file_get (location, NULL); +- g_object_unref (location); +- +- /* create the shortcut */ +- shortcut = g_slice_new0 (ThunarShortcut); +- shortcut->type = THUNAR_SHORTCUT_SYSTEM_DEFINED; +- shortcut->file = file; +- +- /* iterate over all rows in the model in order to find the +- * first one with a volume or a separator */ +- have_iter = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (model), &iter); +- while (have_iter && !position_found) +- { +- /* read volume and separator flag from the current row */ +- gtk_tree_model_get (GTK_TREE_MODEL (model), &iter, +- THUNAR_SHORTCUTS_MODEL_COLUMN_VOLUME, &volume, +- THUNAR_SHORTCUTS_MODEL_COLUMN_SEPARATOR, &is_separator, +- -1); +- +- /* check if a volume row was found */ +- if (volume != NULL) +- { +- /* stop searching */ +- position_found = TRUE; +- +- /* release the volume */ +- g_object_unref (volume); +- } +- else if (is_separator) +- { +- /* stop searching */ +- position_found = TRUE; +- } +- else +- { +- /* advance to the next row */ +- have_iter = gtk_tree_model_iter_next (GTK_TREE_MODEL (model), &iter); +- } +- } +- +- /* we always have a volume or separator row */ +- g_assert (position_found); +- +- /* get the path of the iter */ +- path = gtk_tree_model_get_path (GTK_TREE_MODEL (model), &iter); +- +- /* append the shortcut to the list */ +- thunar_shortcuts_model_add_shortcut (model, shortcut, path); +- +- /* release the path */ +- gtk_tree_path_free (path); +- } +- +- /* remove this idle handler */ +- return FALSE; +-} +- +- +- + static void + thunar_shortcuts_model_init (ThunarShortcutsModel *model) + { +@@ -339,6 +259,10 @@ thunar_shortcuts_model_init (ThunarShortcutsModel *model) + /* append the root file system */ + system_paths = g_list_append (system_paths, thunar_g_file_new_for_root ()); + ++ /* append the network icon if browsing the network is supported */ ++ if (thunar_g_vfs_is_uri_scheme_supported ("network")) ++ system_paths = g_list_append (system_paths, g_file_new_for_uri ("network://")); ++ + /* will be used to append the shortcuts to the list */ + path = gtk_tree_path_new_from_indices (0, -1); + +@@ -416,9 +340,6 @@ thunar_shortcuts_model_init (ThunarShortcutsModel *model) + g_object_unref (bookmarks); + g_object_unref (home); + gtk_tree_path_free (path); +- +- /* add the network item (and other slow items) in an idle handler */ +- g_idle_add_full (G_PRIORITY_LOW, thunar_shortcuts_model_add_network_idle, model, NULL); + } + + + diff --git a/extra/vino/PKGBUILD b/extra/vino/PKGBUILD index d3fdb3962..e080471e7 100644 --- a/extra/vino/PKGBUILD +++ b/extra/vino/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 131782 2011-07-15 06:46:07Z ibiru $ +# $Id: PKGBUILD 135808 2011-08-18 15:04:44Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=vino pkgver=3.0.3 -pkgrel=1 +pkgrel=2 pkgdesc="a VNC server for the GNOME desktop" arch=('i686' 'x86_64' 'mips64el') license=('GPL') diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index 16b41643c..9a5f9ee98 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 133933 2011-07-30 16:56:22Z giovanni $ +# $Id: PKGBUILD 135810 2011-08-18 15:04:49Z andyrtr $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Martin Sandsmark <martin.sandsmark@kde.org> pkgname=vlc pkgver=1.1.11 -pkgrel=3 +pkgrel=4 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" arch=('i686' 'x86_64' 'mips64el') url="http://www.videolan.org/vlc/" diff --git a/extra/vpnc/PKGBUILD b/extra/vpnc/PKGBUILD new file mode 100644 index 000000000..28994abc2 --- /dev/null +++ b/extra/vpnc/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 135620 2011-08-16 16:43:05Z dreisner $ +# Maintainer: Dave Reisner <dreisner@archlinux.org> +# Contributor: Thomas Baechler <thomas@archlinux.org> + +pkgname=vpnc +pkgver=0.5.3.svn457 +pkgrel=1 +pkgdesc="VPN client for cisco3000 VPN Concentrators" +url="http://www.unix-ag.uni-kl.de/~massar/vpnc/" +license=('GPL') +depends=('libgcrypt' 'openssl' 'iproute2') +optdepends=('openresolv: Let vpnc manage resolv.conf') +arch=('i686' 'x86_64') +source=("ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz" + 'vpnc.conf') +backup=('etc/vpnc/default.conf') +md5sums=('033e642e17200a0efc0eda1c1c1886a2' + 'a3f4e0cc682f437e310a1c86ae198e45') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + # Build hybrid support + sed -i 's|^#OPENSSL|OPENSSL|g' Makefile + + # fix resolvconf location for community/openresolv + sed -i 's|/sbin/resolvconf|/usr&|g' vpnc-script + + make PREFIX=/usr +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" PREFIX=/usr install + + rm -f "$pkgdir"/etc/vpnc/vpnc.conf + install -D -m644 "$srcdir"/vpnc.conf "$pkgdir"/etc/vpnc/default.conf +} diff --git a/extra/vpnc/vpnc.conf b/extra/vpnc/vpnc.conf new file mode 100644 index 000000000..914f827fd --- /dev/null +++ b/extra/vpnc/vpnc.conf @@ -0,0 +1,17 @@ +# example vpnc configuration file +# see vpnc --long-help for details + +#Interface name tun0 +#IKE DH Group dh2 +#Perfect Forward Secrecy nopfs + +# You may replace this script with something better +#Script /etc/vpnc/vpnc-script +# Enable this option for NAT traversal +#UDP Encapsulate + +#IPSec gateway my.gateway.com +#IPSec ID someid +#IPSec secret somesecret +#Xauth username myusername +#Xauth password mypassword diff --git a/extra/weechat/PKGBUILD b/extra/weechat/PKGBUILD index 09f86fbfd..cc551e671 100644 --- a/extra/weechat/PKGBUILD +++ b/extra/weechat/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 125306 2011-05-25 19:29:12Z foutrelis $ +# $Id: PKGBUILD 135812 2011-08-18 15:04:52Z andyrtr $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: lucke <lucke at o2 dot pl> pkgname=weechat pkgver=0.3.5 -pkgrel=2 +pkgrel=3 pkgdesc="Fast, light and extensible IRC client (curses UI)" arch=('i686' 'x86_64' 'mips64el') url="http://www.weechat.org/" diff --git a/extra/wireshark/PKGBUILD b/extra/wireshark/PKGBUILD index 6f8f1d2c3..a8a54fdb5 100644 --- a/extra/wireshark/PKGBUILD +++ b/extra/wireshark/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 132077 2011-07-19 20:50:29Z guillaume $ +# $Id: PKGBUILD 135814 2011-08-18 15:04:55Z andyrtr $ # Maintainer: Guillaume ALAUX <guillaume at alaux dot net> # Contributor: Florian Pritz <bluewind at jabber dot ccc dot de> pkgname=(wireshark-cli wireshark-gtk) pkgbase=wireshark pkgver=1.6.1 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') license=('GPL2') makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libpcap' 'bash' 'gnutls' 'libcap' 'lua') diff --git a/extra/xf86-input-wacom/70-wacom.rules b/extra/xf86-input-wacom/70-wacom.rules index 67e5580cc..f6aa20835 100644 --- a/extra/xf86-input-wacom/70-wacom.rules +++ b/extra/xf86-input-wacom/70-wacom.rules @@ -1,8 +1,12 @@ ACTION!="add|change", GOTO="wacom_end" -# Match all wacom tablets with a serial ID starting with WACf -ATTRS{id}=="WACf*" ENV{NAME}="Serial Wacom Tablet", ENV{SUBSYSTEM}="input", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1" -ATTRS{id}=="FUJ*" ENV{NAME}="Serial Wacom Tablet", ENV{SUBSYSTEM}="input", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1" +# Match all serial wacom tablets with a serial ID starting with WACf +# Notes: We assign NAME though we shouldn't, but currently the server requires it +# We assign the lot to subsystem pnp too because server reads NAME from +# the parent device. Once all that's fixed, as simple SUBSYSTEM="tty" +# will do and the ENV{NAME} can be removed. +SUBSYSTEM=="tty|pnp", SUBSYSTEMS=="pnp", ATTRS{id}=="WACf*", ENV{ID_MODEL}="Serial Wacom Tablet $attr{id}", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1", ENV{NAME}="Serial Wacom Tablet $attr{id}" +SUBSYSTEM=="tty|pnp", SUBSYSTEMS=="pnp", ATTRS{id}=="FUJ*", ENV{ID_MODEL}="Serial Wacom Tablet $attr{id}", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1", ENV{NAME}="Serial Wacom Tablet $attr{id}" LABEL="wacom_end" diff --git a/extra/xf86-input-wacom/PKGBUILD b/extra/xf86-input-wacom/PKGBUILD index 3a3607553..5c982f730 100644 --- a/extra/xf86-input-wacom/PKGBUILD +++ b/extra/xf86-input-wacom/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 128917 2011-06-25 14:03:51Z heftig $ +# $Id: PKGBUILD 135826 2011-08-19 02:23:54Z heftig $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: M Rawash <mrawash@gmail.com> pkgname=xf86-input-wacom pkgver=0.11.1 -pkgrel=1 +pkgrel=2 pkgdesc="X.Org Wacom tablet driver" arch=('i686' 'x86_64' 'mips64el') url="http://linuxwacom.sourceforge.net/" @@ -18,7 +18,7 @@ options=(!libtool) source=(http://downloads.sourceforge.net/project/linuxwacom/${pkgname}/${pkgname}-${pkgver}.tar.bz2 70-wacom.rules) md5sums=('0aec4a338cc583ed497b6af68d6d80ab' - '4d3665bb2ef8a8190734640dffa4c6f7') + '10db4f8272286690255c1bcc18bfdd92') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xfce4-mailwatch-plugin/PKGBUILD b/extra/xfce4-mailwatch-plugin/PKGBUILD index 58113add0..59daa2395 100644 --- a/extra/xfce4-mailwatch-plugin/PKGBUILD +++ b/extra/xfce4-mailwatch-plugin/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 108113 2011-01-29 14:05:40Z andyrtr $ +# $Id: PKGBUILD 135816 2011-08-18 15:04:58Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Suzy Williams <suzanne.williams3@verizon.net> pkgname=xfce4-mailwatch-plugin pkgver=1.1.0 -pkgrel=3 +pkgrel=4 pkgdesc="A mailbox watch/check plugin for the Xfce4 panel" arch=(i686 x86_64 'mips64el') license=('GPL2') url="http://spurint.org/projects/xfce4-mailwatch-plugin/" groups=('xfce4-goodies') -depends=('xfce4-panel' 'libxfcegui4' 'gnutls>=2.4.1' 'hicolor-icon-theme') +depends=('xfce4-panel' 'libxfcegui4' 'gnutls' 'libgcrypt' 'hicolor-icon-theme') makedepends=('intltool' 'xfce4-dev-tools') options=('!libtool') install=${pkgname}.install diff --git a/extra/xfdesktop/PKGBUILD b/extra/xfdesktop/PKGBUILD index 8c039765c..c0637cda9 100644 --- a/extra/xfdesktop/PKGBUILD +++ b/extra/xfdesktop/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 125789 2011-05-29 16:59:08Z andyrtr $ +# $Id: PKGBUILD 135949 2011-08-20 21:30:39Z eric $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: tobias <tobias funnychar archlinux.org> pkgname=xfdesktop pkgver=4.8.2 -pkgrel=2 +pkgrel=3 pkgdesc="A desktop manager for Xfce" arch=('i686' 'x86_64' 'mips64el') license=('GPL2') @@ -17,11 +17,14 @@ conflicts=('xfce4-menueditor') replaces=('xfce4-menueditor') options=('!libtool') install=xfdesktop.install -source=(http://archive.xfce.org/src/xfce/${pkgname}/4.8/${pkgname}-${pkgver}.tar.bz2) -md5sums=('ed25d59f478afda552d121e96657d16f') +source=(http://archive.xfce.org/src/xfce/${pkgname}/4.8/${pkgname}-${pkgver}.tar.bz2 + fix-desktop-drag-and-drop.patch) +md5sums=('ed25d59f478afda552d121e96657d16f' + '86d464bcd8ffae9f048454f49603658a') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i ../fix-desktop-drag-and-drop.patch ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib \ diff --git a/extra/xfdesktop/fix-desktop-drag-and-drop.patch b/extra/xfdesktop/fix-desktop-drag-and-drop.patch new file mode 100644 index 000000000..8c0c4bcc8 --- /dev/null +++ b/extra/xfdesktop/fix-desktop-drag-and-drop.patch @@ -0,0 +1,57 @@ +diff --git a/src/xfdesktop-file-icon-manager.c b/src/xfdesktop-file-icon-manager.c +index 2711646..d3ca2eb 100644 +--- a/src/xfdesktop-file-icon-manager.c ++++ b/src/xfdesktop-file-icon-manager.c +@@ -2794,7 +2794,7 @@ xfdesktop_file_icon_manager_drag_data_received(XfdesktopIconViewManager *manager + GFile *tfile = NULL; + gboolean copy_only = TRUE, drop_ok = FALSE; + GList *file_list; +- ++ + if(info == TARGET_XDND_DIRECT_SAVE0) { + /* we don't suppose XdndDirectSave stage 3, result F, i.e., the app + * has to save the data itself given the filename we provided in +@@ -2816,7 +2816,7 @@ xfdesktop_file_icon_manager_drag_data_received(XfdesktopIconViewManager *manager + /* data is "URL\nTITLE" */ + GFile *source_file = NULL; + gchar *exo_desktop_item_edit = g_find_program_in_path("exo-desktop-item-edit"); +- ++ + if(drop_icon) { + GFileInfo *finfo = xfdesktop_file_icon_peek_file_info(XFDESKTOP_FILE_ICON(drop_icon)); + if(g_file_info_get_file_type(finfo) == G_FILE_TYPE_DIRECTORY) +@@ -2911,8 +2911,15 @@ xfdesktop_file_icon_manager_drag_data_received(XfdesktopIconViewManager *manager + gchar *dest_basename = g_file_get_basename(l->data); + + if(dest_basename && *dest_basename != '\0') { +- GFile *dest_file = g_file_get_child(base_dest_file, dest_basename); +- dest_file_list = g_list_prepend(dest_file_list, dest_file); ++ /* If we copy a file, we need to use the new absolute filename ++ * as the destination. If we move, we need to use the destination ++ * directory. */ ++ if(copy_only) { ++ GFile *dest_file = g_file_get_child(base_dest_file, dest_basename); ++ dest_file_list = g_list_prepend(dest_file_list, dest_file); ++ } else { ++ dest_file_list = g_list_prepend(dest_file_list, base_dest_file); ++ } + } + + g_free(dest_basename); +@@ -2923,10 +2930,10 @@ xfdesktop_file_icon_manager_drag_data_received(XfdesktopIconViewManager *manager + if(dest_file_list) { + dest_file_list = g_list_reverse(dest_file_list); + +- drop_ok =xfdesktop_file_utils_transfer_files(context->action, +- file_list, +- dest_file_list, +- fmanager->priv->gscreen); ++ drop_ok = xfdesktop_file_utils_transfer_files(context->action, ++ file_list, ++ dest_file_list, ++ fmanager->priv->gscreen); + } + + xfdesktop_file_utils_file_list_free(dest_file_list); + + diff --git a/extra/xmlsec/PKGBUILD b/extra/xmlsec/PKGBUILD index aa48f707b..88df6c5b0 100644 --- a/extra/xmlsec/PKGBUILD +++ b/extra/xmlsec/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 131121 2011-07-10 21:19:59Z andyrtr $ +# $Id: PKGBUILD 135818 2011-08-18 15:05:00Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Hussam Al-Tayeb <ht990332@gmail.com> pkgname=xmlsec pkgver=1.2.18 -pkgrel=1 +pkgrel=2 pkgdesc="XML Security Library is a C library based on LibXML2" license=('custom') arch=(i686 x86_64 'mips64el') url="http://www.aleksey.com/xmlsec/index.html" -depends=('libxslt>=1.1.26' 'openssl>=1.0.0' 'gnutls>=2.12.7' 'nss>=3.12.10' 'libtool') +depends=('libxslt>=1.1.26' 'openssl>=1.0.0' 'gnutls' 'nss>=3.12.10' 'libtool') makedepends=('pkgconfig') options=('!libtool') source=(http://www.aleksey.com/xmlsec/download/${pkgname}1-${pkgver}.tar.gz) diff --git a/extra/xpdf/PKGBUILD b/extra/xpdf/PKGBUILD index f1e05a636..d5034ea67 100644 --- a/extra/xpdf/PKGBUILD +++ b/extra/xpdf/PKGBUILD @@ -1,74 +1,66 @@ -# $Id: PKGBUILD 117882 2011-04-04 21:05:28Z bisson $ +# $Id: PKGBUILD 135889 2011-08-20 02:28:50Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: tobias <tobias@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> pkgname=xpdf -_srcver=3.02 -_patchlevel=pl6 -pkgver=${_srcver}_${_patchlevel} +#pkgver=3.03_pl1 +pkgver=3.03 pkgrel=1 -pkgdesc="A viewer for Portable Document Format (PDF) files" +pkgdesc='Viewer for Portable Document Format (PDF) files' +url='http://www.foolabs.com/xpdf/' +license=('GPL2') arch=('i686' 'x86_64' 'mips64el') -license=('GPL') -depends=('lesstif' 'gsfonts' 'libxt' 'desktop-file-utils') -optdepends=('poppler: pdf tools that used to be included in xpdf') +depends=('lesstif' 'gsfonts' 'libxt') +optdepends=('poppler: tools that used to be included in xpdf' + 'desktop-file-utils: for desktop environments') +# "ftp://ftp.foolabs.com/pub/${pkgname}/${pkgname}-${pkgver%_*}pl1.patch" +source=("ftp://ftp.foolabs.com/pub/${pkgname}/${pkgname}-${pkgver%_*}.tar.gz" + 'char.patch' + 'desktop') +sha1sums=('499423e8a795e0efd76ca798239eb4d0d52fe248' + '5c471944685a6b24a2b0c0e000562d1a3263aeeb' + '3b6fe01636253676ffa0efe1b237a75af4721f6d') + +install=install backup=('etc/xpdfrc') -url="http://www.foolabs.com/xpdf/" -install=${pkgname}.install -source=(ftp://ftp.foolabs.com/pub/${pkgname}/${pkgname}-${_srcver}.tar.gz - ftp://ftp.foolabs.com/pub/${pkgname}/${pkgname}-${_srcver}pl1.patch - ftp://ftp.foolabs.com/pub/${pkgname}/${pkgname}-${_srcver}pl2.patch - ftp://ftp.foolabs.com/pub/${pkgname}/${pkgname}-${_srcver}pl3.patch - ftp://ftp.foolabs.com/pub/${pkgname}/${pkgname}-${_srcver}pl4.patch - ftp://ftp.foolabs.com/pub/${pkgname}/${pkgname}-${_srcver}pl5.patch - xpdf-3.00-xfont.patch - xpdf.desktop) -md5sums=('599dc4cc65a07ee868cf92a667a913d2' - '877118786dfe27d1b7aa5a6759cc6e45' - '3a5cb165ae66781e0b21e6219ae06795' - '581963ede0fb5715e1a69f01b5b8ce63' - '70b752716798dd341a4bf890df5f6fdc' - '504902ca5e9d66c67eed03636ec6b163' - '6490de55687e0d2389212c1b5bbcf916' - '93b9df5ebef3bc56133236ef3f176bb7') build() { - cd "${srcdir}/${pkgname}-${_srcver}" + cd "${srcdir}/${pkgname}-${pkgver%_*}" + +# patch -p1 -i "../${pkgname}-${_srcver}pl1.patch" + patch -p1 -i ../char.patch + + sed -i 's:/usr/share/fonts/type1/gsfonts:/usr/share/fonts/Type1:' xpdf/GlobalParams.cc + sed -i 's:times-medium-r-normal--16:times-medium-r-normal--14:' xpdf/XPDFViewer.cc # FS#14217 - patch -Np1 -i "${srcdir}/${pkgname}-${_srcver}pl1.patch" - patch -Np1 -i "${srcdir}/${pkgname}-${_srcver}pl2.patch" - patch -Np1 -i "${srcdir}/${pkgname}-${_srcver}pl3.patch" - patch -Np1 -i "${srcdir}/${pkgname}-${_srcver}pl4.patch" - patch -Np1 -i "${srcdir}/${pkgname}-${_srcver}pl5.patch" - patch -Np1 -i "${srcdir}/xpdf-3.00-xfont.patch" - sed -i 's:/usr/share/fonts/type1/gsfonts:/usr/share/fonts/Type1:' xpdf/GlobalParams.cc + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --enable-multithreaded \ + --enable-wordlist \ + --with-freetype2-library=/usr/lib \ + --with-freetype2-includes=/usr/include/freetype2 \ + --x-includes=/usr/include \ + --with-Xm-library=/usr/lib \ + --with-Xm-includes=/usr/include \ - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --enable-multithreaded \ - --enable-wordlist \ - --with-freetype2-library=/usr/lib \ - --with-freetype2-includes=/usr/include/freetype2 \ - --x-includes=/usr/include \ - --with-Xm-library=/usr/lib \ - --with-Xm-includes=/usr/include - make + make } package() { - cd "${srcdir}/${pkgname}-${_srcver}" - make DESTDIR="${pkgdir}" install + cd "${srcdir}/${pkgname}-${pkgver%_*}" + + make DESTDIR="${pkgdir}" install + + install -Dm644 ../desktop "${pkgdir}/usr/share/applications/xpdf.desktop" + install -Dm644 xpdf/xpdfIcon.xpm "${pkgdir}/usr/share/pixmaps/xpdf.xpm" - # remove some libs and manpages provided by poppler now - for tool in pdffonts pdfimages pdfinfo pdftoppm pdftops pdftotext ; do - rm -f "${pkgdir}/usr/bin/${tool}" - rm -f "${pkgdir}/usr/share/man/man1/${tool}.1" - done - install -m755 -d ${pkgdir}/usr/share/applications - install -m644 "${srcdir}/xpdf.desktop" "${pkgdir}/usr/share/applications/" - install -m755 -d ${pkgdir}/usr/share/pixmaps - install -m644 xpdf/xpdfIcon.xpm ${pkgdir}/usr/share/pixmaps/xpdf.xpm + # remove libs and manpages provided by poppler + # pdfdetach should go there too once it is in poppler + for tool in pdffonts pdfimages pdfinfo pdftoppm pdftops pdftotext ; do + rm "${pkgdir}/usr/bin/${tool}" + rm "${pkgdir}/usr/share/man/man1/${tool}.1" + done } diff --git a/extra/xpdf/char.patch b/extra/xpdf/char.patch new file mode 100644 index 000000000..8e49393a6 --- /dev/null +++ b/extra/xpdf/char.patch @@ -0,0 +1,12 @@ +diff -aur old/xpdf/XPDFViewer.cc new/xpdf/XPDFViewer.cc +--- old/xpdf/XPDFViewer.cc 2011-08-15 14:08:53.000000000 -0700 ++++ new/xpdf/XPDFViewer.cc 2011-08-17 11:05:55.739431215 -0700 +@@ -1803,7 +1803,7 @@ + menuPane = XmCreatePulldownMenu(toolBar, "zoomMenuPane", args, n); + for (i = 0; i < nZoomMenuItems; ++i) { + n = 0; +- s = XmStringCreateLocalized(zoomMenuInfo[i].label); ++ s = XmStringCreateLocalized((char *)zoomMenuInfo[i].label); + XtSetArg(args[n], XmNlabelString, s); ++n; + XtSetArg(args[n], XmNuserData, (XtPointer)i); ++n; + sprintf(buf, "zoom%d", i); diff --git a/extra/xpdf/desktop b/extra/xpdf/desktop new file mode 100644 index 000000000..06830ecda --- /dev/null +++ b/extra/xpdf/desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Xpdf +Comment=Views Adobe PDF (acrobat) files +Exec=xpdf +Terminal=false +Type=Application +Icon=xpdf +Categories=Office; +MimeType=application/pdf; diff --git a/extra/xpdf/install b/extra/xpdf/install new file mode 100644 index 000000000..c6cf149dd --- /dev/null +++ b/extra/xpdf/install @@ -0,0 +1,11 @@ +post_install() { + [[ -x /usr/bin/update-desktop-database ]] && update-desktop-database -q || true +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/xulrunner/PKGBUILD b/extra/xulrunner/PKGBUILD index 783b9f3e3..f1aa98ef9 100644 --- a/extra/xulrunner/PKGBUILD +++ b/extra/xulrunner/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 131156 2011-07-11 11:19:22Z ibiru $ +# $Id: PKGBUILD 135629 2011-08-16 19:39:58Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=xulrunner -pkgver=5.0 -_ffoxver=5.0 +pkgver=6.0 +_ffoxver=6.0 pkgrel=1 pkgver=2.0 pkgrel=2 # hold ver @@ -31,7 +31,6 @@ build() { patch -Np0 -i "${srcdir}/mips.patch" } - export CXXFLAGS="-fpermissive" export LDFLAGS="-Wl,-rpath,/usr/lib/xulrunner-${pkgver} -Wl,-O1,--sort-common,--hash-style=gnu,--as-needed" make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS" @@ -43,13 +42,13 @@ package() { #Remove included dictionaries, add symlink to system myspell path. #Note: this will cause file conflicts when users have installed dictionaries in the old location - rm -rf "${pkgdir}/usr/lib/xulrunner-5.0/dictionaries" - ln -sf /usr/share/myspell/dicts "${pkgdir}/usr/lib/xulrunner-5.0/dictionaries" + rm -rf "${pkgdir}/usr/lib/xulrunner-$pkgver/dictionaries" + ln -sf /usr/share/myspell/dicts "${pkgdir}/usr/lib/xulrunner-$pkgver/dictionaries" # add xulrunner library path to ld.so.conf install -d ${pkgdir}/etc/ld.so.conf.d echo "/usr/lib/xulrunner-${pkgver}" > ${pkgdir}/etc/ld.so.conf.d/xulrunner.conf } -md5sums=('9f64a01e86a5d424e12a8e3305c5debe' +md5sums=('1840185865a1a8975df4a3db59080ddc' '2358a2ddd35bcdd62ff42442dfe548d9' '639ea80e823543dd415b90c0ee804186') diff --git a/extra/zile/PKGBUILD b/extra/zile/PKGBUILD index 5a8334b7a..98d67ea4d 100644 --- a/extra/zile/PKGBUILD +++ b/extra/zile/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 125598 2011-05-26 20:47:05Z kevin $ +# $Id: PKGBUILD 135981 2011-08-21 03:51:34Z eric $ # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Maintainer: Kevin Piche <kevin@archlinux.org> @@ -9,20 +9,19 @@ pkgdesc="A small, fast, and powerful Emacs clone" arch=(i686 x86_64 'mips64el') url="http://www.gnu.org/software/zile/" # Lua is not required, the author uses it to generate some source files. -makedepends=('help2man') depends=('ncurses') license=('GPL') source=(http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz) md5sums=('fe77d801ba69e0fb9b4914a04b9ff506') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}"/${pkgname}-${pkgver} ./configure --prefix=/usr make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd "${srcdir}"/${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install } |