diff options
| author | root <root@rshg054.dnsready.net> | 2012-04-02 00:01:14 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-04-02 00:01:14 +0000 |
| commit | 8ebbe4e4befac1396a153b356fc9793655dde4ff (patch) | |
| tree | b957bcef566f4da47b8d4a406c64837ec6e3b2e7 | |
| parent | 939efb693a8b362edc0c6ccba62c5ce54fb501af (diff) | |
Mon Apr 2 00:01:14 UTC 2012
166 files changed, 3547 insertions, 527 deletions
diff --git a/community-staging/lomoco/PKGBUILD b/community-staging/lomoco/PKGBUILD new file mode 100644 index 000000000..f3a8ddb44 --- /dev/null +++ b/community-staging/lomoco/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 68707 2012-03-31 22:57:51Z heftig $ +# Maintainer: Jeff Mickey <j@codemac.net> +# Contributor: Shadowhand <woody.gilk@gmail.com> + +pkgname=lomoco +pkgver=1.0 +pkgrel=8 +url="http://www.lomoco.org/" +pkgdesc="Logitech USB mouse configuration program" +license=('GPL') +depends=('libusb-compat') +replaces=('lmctl') +arch=('i686' 'x86_64') +options=(!libtool) +backup=(etc/udev/lomoco_mouse.conf) +source=(http://www.lomoco.org/${pkgname}-${pkgver}.tar.gz + "lomoco_mx518.patch::https://bugs.archlinux.org/task/28180?getfile=8163" + lomoco_mouse.conf + lomoco.sh) +md5sums=('f5197d0a3ee81229c3eecc1e03f7b08d' + '87aeccb99413faf9e49453215c3d0b8a' + '182b10a7e4a1828a93c1d55ef7f81b97' + 'bc92f661641265b33b27895ef24028fd') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + patch -p1 <$srcdir/lomoco_mx518.patch + ./autogen.sh --prefix=/usr --mandir=/usr/share/man + make + make udev-rules + make DESTDIR=${pkgdir} install + + # Fix and install udev rules and helpers + sed -i 's|/etc/sysconfig/logitech_mouse|/etc/udev/lomoco_mouse.conf|g' udev/udev.lomoco + sed -i 's|RUN="lomoco"|RUN+="lomoco.sh"|g' udev/lomoco.rules + sed -i 's|SYSFS|ATTR|' udev/lomoco.rules + install -D -m 644 udev/lomoco.rules ${pkgdir}/usr/lib/udev/rules.d/80-lomoco.rules + install -D -m 755 ../lomoco.sh ${pkgdir}/usr/lib/udev/lomoco.sh + install -D -m 644 ../lomoco_mouse.conf ${pkgdir}/etc/udev/lomoco_mouse.conf +} diff --git a/community-staging/lomoco/lomoco.sh b/community-staging/lomoco/lomoco.sh new file mode 100644 index 000000000..76e2392da --- /dev/null +++ b/community-staging/lomoco/lomoco.sh @@ -0,0 +1,21 @@ +#!/bin/bash + +if [ -n "$BUSNUM" -a -n "$DEVNUM" ]; then + . /etc/udev/lomoco_mouse.conf + + options= + + if [ -n "$LOGITECH_MOUSE_RESOLUTION" ]; then + options="--$LOGITECH_MOUSE_RESOLUTION" + fi + + case "$LOGITECH_MOUSE_SMS" in + yes) options="$options --sms" ;; + no) options="$options --no-sms" ;; + esac + + if [ -n "$options" ]; then + /usr/bin/lomoco -b $BUSNUM -d $DEVNUM $options + fi + +fi 2>&1 | /usr/bin/logger -t lomoco diff --git a/community-staging/lomoco/lomoco_mouse.conf b/community-staging/lomoco/lomoco_mouse.conf new file mode 100644 index 000000000..b8c534ec2 --- /dev/null +++ b/community-staging/lomoco/lomoco_mouse.conf @@ -0,0 +1,5 @@ +# Possible Resolutions Are: 400 800 1200 1600 2000 +#LOGITECH_MOUSE_RESOLUTION="800" + +# SmartScroll/Cruise Control (SMS command set): yes or no +#LOGITECH_MOUSE_SMS="no" diff --git a/community-staging/multipath-tools/PKGBUILD b/community-staging/multipath-tools/PKGBUILD new file mode 100644 index 000000000..15530097b --- /dev/null +++ b/community-staging/multipath-tools/PKGBUILD @@ -0,0 +1,44 @@ +# $Id: PKGBUILD 68708 2012-03-31 22:59:24Z heftig $ +# Maintainer: +# Contributor: Thomas S Hatch <thatch45 ar gmail dot com> +# Contributor: Michael P <ptchinster@archlinux.us> +# Contributor: Matt Heagney <matt@heagney.com> + +pkgname=multipath-tools +pkgver=0.4.9 +pkgrel=6 +pkgdesc="Multipath Tools For Linux" +arch=('i686' 'x86_64') +url="http://christophe.varoqui.free.fr/" +license=('GPL') +depends=('libaio' 'device-mapper') +backup=('etc/multipath.conf' 'etc/multipath.conf.annotated') +install=multipath-tools.install +options=('!emptydirs') +source=("http://christophe.varoqui.free.fr/multipath-tools/$pkgname-$pkgver.tar.bz2" + "multipath.conf" "multipath.conf.annotated" "multipathd.rc" 'fix-build.patch') +md5sums=('a6d4b48afc28f1f50f5ee4b1b06d2765' + '9324ff0ba8330dcb21b2fcf64988026f' + 'be11462922eeeb9fcd2ba5f3f137b7d9' + '7c04ef96441363b0d43a2ebb13a87659' + '2576fc535d7fa767837b1c7827013e52') + +build() { + patch -p1 -i fix-build.patch + + sed -i 's|etc/udev|usr/lib/udev|g' multipath/Makefile kpartx/Makefile + sed -i 's|/sbin/|/usr/bin/|g' kpartx/kpartx.rules + + # Needs to be fixed upstream. Refer to + # https://bbs.archlinux.org/viewtopic.php?pid=793814#p793814 + export LDFLAGS=${LDFLAGS/-Wl,--as-needed} + + make +} + +package() { + make LIB="usr/lib" DESTDIR="$pkgdir" bindir="/usr/bin" libudevdir="/usr/lib/udev" install + install -D -m 644 multipath.conf "$pkgdir"/etc/multipath.conf + install -D -m 644 multipath.conf.annotated "$pkgdir"/etc/multipath.conf.annotated + install -D -m 755 multipathd.rc "$pkgdir"/etc/rc.d/multipathd +} diff --git a/community-staging/multipath-tools/fix-build.patch b/community-staging/multipath-tools/fix-build.patch new file mode 100644 index 000000000..c6196f73b --- /dev/null +++ b/community-staging/multipath-tools/fix-build.patch @@ -0,0 +1,140 @@ +--- multipath-tools-0.4.9.orig/kpartx/Makefile 2010-05-22 05:01:58.000000000 -0700 ++++ multipath-tools-0.4.9/kpartx/Makefile 2010-11-28 12:14:25.763531104 -0800 +@@ -6,7 +6,7 @@ + + CFLAGS += -I. -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 + +-LDFLAGS = -ldevmapper ++LIBS = -ldevmapper + OBJS = bsd.o dos.o kpartx.o solaris.o unixware.o dasd.o sun.o \ + gpt.o mac.o crc32.o lopart.o xstrncpy.o devmapper.o + EXEC = kpartx +@@ -14,8 +14,7 @@ + all: $(EXEC) + + $(EXEC): $(OBJS) +- $(CC) $(OBJS) -o $(EXEC) $(LDFLAGS) +- $(GZIP) $(EXEC).8 > $(EXEC).8.gz ++ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $(EXEC) + + install: $(EXEC) $(EXEC).8 + $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir) +@@ -23,13 +22,14 @@ + $(INSTALL_PROGRAM) -d $(DESTDIR)$(libudevdir) + $(INSTALL_PROGRAM) -m 755 kpartx_id $(DESTDIR)$(libudevdir) + $(INSTALL_PROGRAM) -d $(DESTDIR)/etc/udev/rules.d +- $(INSTALL_PROGRAM) -m 644 kpartx.rules $(DESTDIR)/etc/udev/rules.d/ ++ $(INSTALL_PROGRAM) -m 644 kpartx.rules $(DESTDIR)/etc/udev/rules.d/66-kpartx.rules + $(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir) +- $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir) ++ $(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(mandir) + + uninstall: + rm -f $(DESTDIR)$(bindir)/$(EXEC) +- rm -f $(DESTDIR)$(mandir)/$(EXEC).8.gz ++ rm -f $(DESTDIR)$(mandir)/$(EXEC).8 ++ rm -f $(DESTDIR)/etc/udev/rules.d/66-kpartx.rules + + clean: +- rm -f core *.o $(EXEC) *.gz ++ rm -f core *.o $(EXEC) +--- multipath-tools-0.4.9.orig/Makefile.inc 2010-05-22 05:01:58.000000000 -0700 ++++ multipath-tools-0.4.9/Makefile.inc 2010-11-28 12:14:25.763531104 -0800 +@@ -32,11 +32,10 @@ + syslibdir = $(prefix)/$(LIB) + libdir = $(prefix)/$(LIB)/multipath + +-GZIP = /bin/gzip -9 -c + INSTALL_PROGRAM = install + +-OPTFLAGS = -pipe -g -Wall -Wunused -Wstrict-prototypes +-CFLAGS = $(OPTFLAGS) -fPIC -DLIB_STRING=\"${LIB}\" ++OPTFLAGS = -Wall -Wunused -Wstrict-prototypes ++CFLAGS += $(OPTFLAGS) -fPIC -DLIB_STRING=\"${LIB}\" + SHARED_FLAGS = -shared + + %.o: %.c +--- multipath-tools-0.4.9.orig/multipath/Makefile 2010-05-22 05:01:58.000000000 -0700 ++++ multipath-tools-0.4.9/multipath/Makefile 2010-11-28 12:14:46.718697048 -0800 +@@ -7,32 +7,30 @@ + OBJS = main.o + + CFLAGS += -I$(multipathdir) +-LDFLAGS += -lpthread -ldevmapper -ldl -lmultipath -L$(multipathdir) ++LIBS = -lpthread -ldevmapper -ldl -L$(multipathdir) -lmultipath + + EXEC = multipath + + all: $(EXEC) + + $(EXEC): $(OBJS) +- $(CC) $(CFLAGS) $(OBJS) -o $(EXEC) $(LDFLAGS) +- $(GZIP) $(EXEC).8 > $(EXEC).8.gz +- $(GZIP) $(EXEC).conf.5 > $(EXEC).conf.5.gz ++ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $(EXEC) + + install: + $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir) + $(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)/ + $(INSTALL_PROGRAM) -d $(DESTDIR)/etc/udev/rules.d +- $(INSTALL_PROGRAM) -m 644 multipath.rules $(DESTDIR)/etc/udev/rules.d/ ++ $(INSTALL_PROGRAM) -m 644 multipath.rules $(DESTDIR)/etc/udev/rules.d/65-multipath.rules + $(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir) +- $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir) ++ $(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(mandir) + $(INSTALL_PROGRAM) -d $(DESTDIR)$(man5dir) +- $(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5.gz $(DESTDIR)$(man5dir) ++ $(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5 $(DESTDIR)$(man5dir) + + uninstall: +- rm $(DESTDIR)/etc/udev/rules.d/multipath.rules +- rm $(DESTDIR)$(bindir)/$(EXEC) +- rm $(DESTDIR)$(mandir)/$(EXEC).8.gz +- rm $(DESTDIR)$(man5dir)/$(EXEC).conf.5.gz ++ rm -f $(DESTDIR)/etc/udev/rules.d/65-multipath.rules ++ rm -f $(DESTDIR)$(bindir)/$(EXEC) ++ rm -f $(DESTDIR)$(mandir)/$(EXEC).8 ++ rm -f $(DESTDIR)$(man5dir)/$(EXEC).conf.5 + + clean: +- rm -f core *.o $(EXEC) *.gz ++ rm -f core *.o $(EXEC) +--- multipath-tools-0.4.9.orig/multipathd/Makefile 2010-05-22 05:01:58.000000000 -0700 ++++ multipath-tools-0.4.9/multipathd/Makefile 2010-11-28 12:15:46.624171566 -0800 +@@ -6,8 +6,8 @@ + # basic flags setting + # + CFLAGS += -I$(multipathdir) +-LDFLAGS += -lpthread -ldevmapper -lreadline -lncurses -ldl \ +- -lmultipath -L$(multipathdir) ++LIBS = -lpthread -ldevmapper -lreadline -lncurses -ldl \ ++ -L$(multipathdir) -lmultipath + + # + # debuging stuff +@@ -28,21 +28,20 @@ + all : $(EXEC) + + $(EXEC): $(OBJS) +- $(CC) $(CFLAGS) $(LDFLAGS) -o $(EXEC) $(OBJS) +- $(GZIP) $(EXEC).8 > $(EXEC).8.gz ++ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $(EXEC) + + install: + $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir) + $(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir) + $(INSTALL_PROGRAM) -d $(DESTDIR)$(rcdir) + $(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir) +- $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir) ++ $(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(mandir) + + uninstall: + rm -f $(DESTDIR)$(bindir)/$(EXEC) + rm -f $(DESTDIR)$(rcdir)/$(EXEC) +- rm -f $(DESTDIR)$(mandir)/$(EXEC).8.gz ++ rm -f $(DESTDIR)$(mandir)/$(EXEC).8 + + clean: +- rm -f core *.o $(EXEC) *.gz ++ rm -f core *.o $(EXEC) + diff --git a/community-staging/multipath-tools/multipath-tools.install b/community-staging/multipath-tools/multipath-tools.install new file mode 100644 index 000000000..fa58bbc35 --- /dev/null +++ b/community-staging/multipath-tools/multipath-tools.install @@ -0,0 +1,4 @@ +post_install() { + + echo " * For full functonality ensure that the dm_multipath kernel module is loaded" +} diff --git a/community-staging/multipath-tools/multipath.conf b/community-staging/multipath-tools/multipath.conf new file mode 100644 index 000000000..6dacf093d --- /dev/null +++ b/community-staging/multipath-tools/multipath.conf @@ -0,0 +1,8 @@ +# +# Very Basic Multipath Configuration File +# + +defaults { + getuid_callout "/usr/lib/udev/scsi_id -g -u -d /dev/%n" +} + diff --git a/community-staging/multipath-tools/multipath.conf.annotated b/community-staging/multipath-tools/multipath.conf.annotated new file mode 100644 index 000000000..b79488413 --- /dev/null +++ b/community-staging/multipath-tools/multipath.conf.annotated @@ -0,0 +1,362 @@ +## +## This is a template multipath-tools configuration file +## Uncomment the lines relevent to your environment +## +# +## +## name : defaults +## desc : multipath-tools default settings +## +#defaults { +# # +# # name : udev_dir +# # desc : directory where udev creates its device nodes +# # default : /dev +# # +# udev_dir /dev +# +# # +# # name : polling_interval +# # scope : multipathd +# # desc : interval between two path checks in seconds +# # default : 5 +# # +# polling_interval 10 +# +# # +# # name : selector +# # scope : multipath +# # desc : the default path selector algorithm to use +# # these algorithms are offered by the kernel multipath target +# # values : "round-robin 0" +# # default : "round-robin 0" +# # +# selector "round-robin 0" +# +# # +# # name : path_grouping_policy +# # scope : multipath +# # desc : the default path grouping policy to apply to unspecified +# # multipaths +# # default : multibus +# # +# path_grouping_policy multibus +# +# # +# # name : getuid_callout +# # scope : multipath +# # desc : the default program and args to callout to obtain a unique +# # path identifier. Absolute path required +# # default : /usr/lib/udev/scsi_id -g -u -s +# # +# getuid_callout "/usr/lib/udev/scsi_id -g -u -s /block/%n" +# +# # +# # name : prio_callout +# # scope : multipath +# # desc : the default program and args to callout to obtain a path +# # priority value. The ALUA bits in SPC-3 provide an +# # exploitable prio value for example. "none" is a valid value +# # default : (null) +# # +# #prio_callout "/bin/true" +# +# # +# # name : path_checker +# # scope : multipath & multipathd +# # desc : the default method used to determine the paths' state +# # values : readsector0|tur|emc_clariion|hp_sw|directio +# # default : directio +# # +# #path_checker directio +# +# # +# # name : rr_min_io +# # scope : multipath +# # desc : the number of IO to route to a path before switching +# # to the next in the same path group +# # default : 1000 +# # +# rr_min_io 100 +# +# # +# # name : rr_weight +# # scope : multipath +# # desc : if set to priorities the multipath configurator will assign +# # path weights as "path prio * rr_min_io" +# # values : priorities|uniform +# # default : uniform +# # +# rr_weight priorities +# +# # +# # name : failback +# # scope : multipathd +# # desc : tell the daemon to manage path group failback, or not to. +# # 0 means immediate failback, values >0 means deffered failback +# # expressed in seconds. +# # values : manual|immediate|n > 0 +# # default : immediate +# # +# failback manual +# +# # +# # name : no_path_retry +# # scope : multipath & multipathd +# # desc : tell the number of retries until disable queueing, or +# # "fail" means immediate failure (no queueing), +# # "queue" means never stop queueing +# # values : queue|fail|n (>0) +# # default : (null) +# # +# #no_path_retry queue +# +# # +# # name : user_friendly_names +# # scope : multipath +# # desc : If set to "yes", using the bindings file +# # /var/lib/multipath/bindings to assign a persistent and +# # unique alias to the multipath, in the form of mpath<n>. +# # If set to "no" use the WWID as the alias. In either case +# # this be will be overriden by any specific aliases in this +# # file. +# # values : yes|no +# # default : no +# user_friendly_names no +# +#} +# +## +## name : blacklist +## scope : multipath & multipathd +## desc : list of device names to discard as not multipath candidates +## default : cciss, fd, hd, md, dm, sr, scd, st, ram, raw, loop +## +#blacklist { +# wwid 26353900f02796769 +# devnode "^(ram|raw|loop|fd|md|dm-|sr|scd|st)[0-9]*" +# devnode "^hd[a-z][[0-9]*]" +# devnode "^cciss!c[0-9]d[0-9]*[p[0-9]*]" +# device { +# vendor DEC.* +# product MSA[15]00 +# } +#} +## +## name : blacklist_exceptions +## scope : multipath & multipathd +## desc : list of device names to be treated as multipath candidates +## even if they are on the blacklist. +## Note: blacklist exceptions are only valid in the same class. +## It is not possible to blacklist devices using the devnode keyword +## and to exclude some devices of them using the wwid keyword. +## default : - +## +#blacklist_exceptions { +# devnode "^dasd[c-d]+[0-9]*" +# wwid "IBM.75000000092461.4d00.34" +# wwid "IBM.75000000092461.4d00.35" +# wwid "IBM.75000000092461.4d00.36" +#} +# +## +## name : multipaths +## scope : multipath & multipathd +## desc : list of multipaths finest-grained settings +## +#multipaths { +# # +# # name : multipath +# # scope : multipath & multipathd +# # desc : container for settings that apply to one specific multipath +# # +# multipath { +# # +# # name : wwid +# # scope : multipath & multipathd +# # desc : index of the container +# # +# wwid 3600508b4000156d700012000000b0000 +# +# # +# # name : alias +# # scope : multipath +# # desc : symbolic name for the multipath +# # +# alias yellow +# +# # +# # name : path_grouping_policy +# # scope : multipath +# # desc : path grouping policy to apply to this multipath +# # values : failover, multibus, group_by_serial +# # default : failover +# # +# path_grouping_policy multibus +# +# # +# # name : path_checker +# # scope : multipathd +# # desc : path checking alorithm to use to check path state +# # values : readsector0|tur|emc_clariion|hp_sw|directio +# # default : directio +# # +# # path_checker directio +# +# # +# # name : path_selector +# # desc : the path selector algorithm to use for this mpath +# # these algo are offered by the kernel mpath target +# # values : "round-robin 0" +# # default : "round-robin 0" +# # +# path_selector "round-robin 0" +# +# # +# # name : failback +# # scope : multipathd +# # desc : tell the daemon to manage path group failback, or not to. +# # 0 means immediate failback, values >0 means deffered failback +# # expressed in seconds. +# # values : manual|immediate|n > 0 +# # default : immediate +# # +# failback manual +# +# # +# # name : no_path_retry +# # scope : multipath & multipathd +# # desc : tell the number of retries until disable queueing, or +# # "fail" means immediate failure (no queueing), +# # "queue" means never stop queueing +# # values : queue|fail|n (>0) +# # default : (null) +# # +# #no_path_retry queue +# +# # +# # name : rr_min_io +# # scope : multipath +# # desc : the number of IO to route to a path before switching +# # to the next in the same path group +# # default : 1000 +# # +# rr_min_io 100 +# } +# multipath { +# wwid 1DEC_____321816758474 +# alias red +# rr_weight priorities +# } +#} +# +## +## name : devices +## scope : multipath & multipathd +## desc : list of per storage controller settings +## overrides default settings (device_maps block) +## overriden by per multipath settings (multipaths block) +## +#devices { +# # +# # name : device +# # scope : multipath & multipathd +# # desc : settings for this specific storage controller +# # +# device { +# # +# # name : vendor, product +# # scope : multipath & multipathd +# # desc : index for the block +# # +# vendor "COMPAQ " +# product "HSV110 (C)COMPAQ" +# +# # +# # name : path_grouping_policy +# # scope : multipath +# # desc : path grouping policy to apply to multipath hosted +# # by this storage controller +# # values : failover = 1 path per priority group +# # multibus = all valid paths in 1 priority +# # group +# # group_by_serial = 1 priority group per detected +# # serial number +# # default : failover +# # +# path_grouping_policy multibus +# +# # +# # name : getuid_callout +# # scope : multipath +# # desc : the program and args to callout to obtain a unique +# # path identifier. Absolute path required +# # default : /usr/lib/udev/scsi_id -g -u -s +# # +# getuid_callout "/usr/lib/udev/scsi_id -g -u -s /block/%n" +# +# # +# # name : prio_callout +# # scope : multipath +# # desc : the program and args to callout to obtain a path +# # weight. Weights are summed for each path group to +# # determine the next PG to use case of failure. +# # "none" is a valid value. +# # default : no callout, all paths equals +# # +# prio_callout "/sbin/mpath_prio_balance_units %d" +# +# # +# # name : path_checker +# # scope : multipathd +# # desc : path checking alorithm to use to check path state +# # values : readsector0|tur|emc_clariion|hp_sw|directio +# # default : directio +# # +# path_checker directio +# +# # +# # name : path_selector +# # desc : the path selector algorithm to use for this mpath +# # these algo are offered by the kernel mpath target +# # values : "round-robin 0" +# # default : "round-robin 0" +# # +# path_selector "round-robin 0" +# +# # +# # name : failback +# # scope : multipathd +# # desc : tell the daemon to manage path group failback, or not to. +# # 0 means immediate failback, values >0 means deffered failback +# # expressed in seconds. +# # values : manual|immediate|n > 0 +# # default : immediate +# # +# failback 30 +# +# # +# # name : rr_min_io +# # scope : multipath +# # desc : the number of IO to route to a path before switching +# # to the next in the same path group +# # default : 1000 +# # +# rr_min_io 100 +# +# # +# # name : product_blacklist +# # scope : multipath & multipathd +# # desc : product strings to blacklist for this vendor +# # default : none +# # +# product_blacklist LUN_Z +# } +# device { +# vendor "COMPAQ " +# product "MSA1000 " +# path_grouping_policy multibus +# path_checker tur +# rr_weight priorities +# } +#} diff --git a/community-staging/multipath-tools/multipathd.rc b/community-staging/multipath-tools/multipathd.rc new file mode 100644 index 000000000..7f5ef5d6a --- /dev/null +++ b/community-staging/multipath-tools/multipathd.rc @@ -0,0 +1,35 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + stat_busy "Starting multipathd" + /usr/bin/multipathd + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon multipathd + stat_done + fi + ;; + stop) + stat_busy "Stopping multipathd" + [ -f /var/run/multipathd.pid ] && kill `cat /var/run/multipathd.pid` >/dev/null 2>&1 + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon multipathd + stat_done + fi + ;; + restart) + $0 stop + sleep 2 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community-staging/usb_modeswitch/PKGBUILD b/community-staging/usb_modeswitch/PKGBUILD new file mode 100644 index 000000000..c5934fc42 --- /dev/null +++ b/community-staging/usb_modeswitch/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 68705 2012-03-31 22:56:03Z heftig $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> + +pkgname=usb_modeswitch +pkgver=1.2.2 +pkgrel=2 +_pkgdata=20120120 +pkgdesc="Activating switchable USB devices on Linux." +arch=('i686' 'x86_64') +url="http://www.draisberghof.de/usb_modeswitch/" +license=('GPL') +depends=('libusb-compat' 'tcl') +makedepends=('gcc' 'make') +backup=("etc/$pkgname.conf") +source=("http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-${pkgver}.tar.bz2" + "http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-data-${_pkgdata}.tar.bz2" + "usb-modeswitch-${pkgver}-device_reference.txt::http://www.draisberghof.de/usb_modeswitch/device_reference.txt") +md5sums=('4f3d3b9342b59b488089a8a81abda3ae' + 'c899cc9c71bb35f3ec600b7cd1455c65' + 'c12e19e3992b5beac9b6c48555cff660') + +build() { + cd $srcdir/usb-modeswitch-$pkgver/ + make clean + make +} + +package() { + cd $srcdir/usb-modeswitch-$pkgver/ + + mkdir -p $pkgdir/usr/lib/udev + mkdir -p $pkgdir/etc + mkdir -p $pkgdir/usr/share/man/man1 + + make DESTDIR=${pkgdir} UDEVDIR=${pkgdir}/usr/lib/udev install + + cp $srcdir/usb-modeswitch-${pkgver}-device_reference.txt $pkgdir/etc/usb_modeswitch.setup + + cd $srcdir/usb-modeswitch-data-${_pkgdata} + make DESTDIR=$pkgdir install +} diff --git a/community/bullet/PKGBUILD b/community/bullet/PKGBUILD index 55cfd001d..d864ec291 100644 --- a/community/bullet/PKGBUILD +++ b/community/bullet/PKGBUILD @@ -1,24 +1,24 @@ -# $Id: PKGBUILD 64798 2012-02-18 05:40:50Z svenstaro $ +# $Id: PKGBUILD 68719 2012-04-01 00:16:22Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> pkgbase=bullet pkgname=('bullet' 'bullet-docs') -pkgver=2.79 -pkgrel=2 +pkgver=2.80 +pkgrel=1 pkgdesc="A 3D Collision Detection and Rigid Body Dynamics Library for games and animation" arch=('i686' 'x86_64') url="http://www.bulletphysics.com/Bullet/" license=('custom:zlib') depends=('freeglut') makedepends=('cmake' 'doxygen' 'graphviz' 'ttf-dejavu') -source=(http://bullet.googlecode.com/files/${pkgbase}-${pkgver}-rev2440.tgz \ +source=(http://bullet.googlecode.com/files/${pkgbase}-${pkgver}-rev2531.tgz ${pkgbase}.pc) -md5sums=('29d6f43964d8494f0366cd69e4883dd1' +md5sums=('d1eec0332110264a21d0fc0f2fb127c3' 'd1da06deba3b08b884d2212f6838905c') build() { - cd ${pkgbase}-${pkgver} + cd ${pkgbase}-${pkgver}-rev2531 # get a clean build dir [[ -d build ]] && rm -rf build @@ -46,11 +46,15 @@ build() { package_bullet() { optdepends=('bullet-docs: documentation') - cd ${pkgbase}-${pkgver}/build + cd ${pkgbase}-${pkgver}-rev2531/build # install it make DESTDIR=${pkgdir} install + # fix #29012 + install -Dm644 ../Extras/HACD/hacdVector.inl ${pkgdir}/usr/include/bullet/HACD/hacdVector.inl + install -Dm644 ../Extras/HACD/hacdCircularList.inl ${pkgdir}/usr/include/bullet/HACD/hacdCircularList.inl + # manually handle pkgconfig file mkdir -p "${pkgdir}"/usr/lib/pkgconfig sed "s|VERSION|${pkgver}|g" ${srcdir}/bullet.pc > ${pkgdir}/usr/lib/pkgconfig/bullet.pc @@ -63,7 +67,7 @@ package_bullet-docs() { pkgdesc="Documentation for bullet" depends=() - cd ${pkgbase}-${pkgver} + cd ${pkgbase}-${pkgver}-rev2531 # install docs install -Dm644 Bullet_User_Manual.pdf ${pkgdir}/usr/share/doc/bullet/Bullet_User_Manual.pdf diff --git a/community/esdl/PKGBUILD b/community/esdl/PKGBUILD new file mode 100644 index 000000000..d488c8ad8 --- /dev/null +++ b/community/esdl/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 61589 2012-01-03 23:37:49Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: kappa <kappacurve@gmail.com> + +pkgname=esdl +pkgver=1.2 +pkgrel=2 +arch=('x86_64' 'i686') +pkgdesc="SDL and OpenGL bindings for the Erlang programming language" +url="http://esdl.sourceforge.net/" +license=('custom') +depends=('erlang' 'sdl' 'mesa') +source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.src.tar.gz") +md5sums=('3e96c1d47bd7c1e23285360d88ce1bea') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + find -type f -print0 | xargs -0 chmod 644 + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make INSTALLDIR="$pkgdir/usr/lib/erlang/lib/$pkgname-$pkgver" install + + # to make wings3d compile + ln -s /usr/lib/erlang/lib/wx-0.99/include/glu.hrl \ + "$pkgdir/usr/lib/erlang/lib/$pkgname-$pkgver/include/glu.hrl" + ln -s /usr/lib/erlang/lib/wx-0.99/include/gl.hrl \ + "$pkgdir/usr/lib/erlang/lib/$pkgname-$pkgver/include/gl.hrl" + + install -Dm644 "$srcdir/$pkgname-$pkgver/license.terms" \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/expac/PKGBUILD b/community/expac/PKGBUILD index c9c3d4467..de5ab3177 100644 --- a/community/expac/PKGBUILD +++ b/community/expac/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 62143 2012-01-16 19:53:09Z dreisner $ +# $Id: PKGBUILD 68721 2012-04-01 00:18:57Z dreisner $ # Maintainer: Dave Reisner <d@falconindy.com> pkgname=expac -pkgver=0.07 +pkgver=1 pkgrel=1 pkgdesc="pacman database extraction utility" arch=('i686' 'x86_64') @@ -11,16 +11,14 @@ license=('GPL') depends=('pacman') makedepends=('perl') source=("https://github.com/downloads/falconindy/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('1bc637b733051827982db12db84643f2') +md5sums=('be8348f18e6af9db250437b14a91e443') build() { - cd "$srcdir/$pkgname-$pkgver" - make + make -C "$pkgname-$pkgver" } package() { - cd "$srcdir/$pkgname-$pkgver" - make PREFIX=/usr DESTDIR="$pkgdir" install + make -C "$pkgname-$pkgver" PREFIX=/usr DESTDIR="$pkgdir" install } # vim: ft=sh syn=sh diff --git a/community/gendesk/PKGBUILD b/community/gendesk/PKGBUILD index a14415418..4ee0ba194 100644 --- a/community/gendesk/PKGBUILD +++ b/community/gendesk/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 68634 2012-03-30 15:35:07Z arodseth $ +# $Id: PKGBUILD 68693 2012-03-31 21:00:41Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Thanks to Moonprincessluna at DeviantArt for the default icon: # http://mylittlepixel.deviantart.com/gallery/35405924#/d4pt23a pkgname=gendesk -pkgver=0.4 +pkgver=0.4.1 pkgrel=1 pkgdesc="Utility to generate .desktop files and download icons" arch=('x86_64' 'i686') @@ -15,7 +15,7 @@ makedepends=('go>=2:1-2') conflicts=('go-hg') source=("http://roboticoverlords.org/$pkgname/$pkgname-$pkgver.tar.gz" "http://roboticoverlords.org/images/default.png") -sha256sums=('33f95ce4b48ffb194693b0c35f8b9728a6d9c961f365a0c38bbd128c0d851993' +sha256sums=('09961d689f78b766dbdb6faaa78712589a384e6fb1ff6bf77def3a6319e4ec6a' '4d96eded48e536d02e35727c36dc20844c2e44654e81baf78e10aee4eb48e837') build() { diff --git a/community/go/PKGBUILD b/community/go/PKGBUILD index 03bbc4b5a..ea5fafe3f 100644 --- a/community/go/PKGBUILD +++ b/community/go/PKGBUILD @@ -1,5 +1,6 @@ -# $Id: PKGBUILD 68608 2012-03-29 13:28:45Z arodseth $ +# $Id: PKGBUILD 68691 2012-03-31 19:33:32Z arodseth $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> +# Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Andres Perera <andres87p gmail> # Contributor: Matthew Bauer <mjbauer95@gmail.com> # Contributor: Christian Himpel <chressie at gmail dot com> @@ -7,34 +8,34 @@ pkgname=go pkgver=1 -pkgrel=2 +pkgrel=3 epoch=2 pkgdesc='Google Go compiler and tools (release version)' -arch=('i686' 'x86_64') +arch=('x86_64' 'i686') url="http://golang.org/" license=('custom') depends=('perl' 'ed' 'gawk') makedepends=('mercurial' 'inetutils') options=('!strip' '!emptydirs') -install=$pkgname.install -source=($pkgname.sh) -md5sums=('e7087d190fd519db3be5adb3a51194cc') +source=("$pkgname" + "$pkgname.sh") +md5sums=('fb4d2508c44b3823e05ed360c2976322' + 'e7087d190fd519db3be5adb3a51194cc') build() { _hgroot="https://go.googlecode.com/hg/" _hgrepo="release" cd "$srcdir" - msg "Connecting to Mercurial server...." - if [ -d $_hgrepo ] ; then + msg "Connecting to Mercurial server...." + if [[ -d $_hgrepo ]] ; then cd $_hgrepo hg pull -u msg "The local files are updated." else hg clone $_hgroot $_hgrepo fi - msg "Mercurial checkout done or server timeout" rm -rf "$srcdir/$_hgrepo-build" @@ -91,6 +92,9 @@ package() { $pkgdir/usr/lib/go/src/pkg/runtime/cgocall.h install $srcdir/go.sh $pkgdir/etc/profile.d/ + + mv "$pkgdir/usr/bin/go" "$pkgdir/usr/bin/go.elf" + install -Dm755 "$srcdir/go" "$pkgdir/usr/bin/go" } # vim:set ts=2 sw=2 et: diff --git a/community/go/go b/community/go/go new file mode 100644 index 000000000..c284ec45c --- /dev/null +++ b/community/go/go @@ -0,0 +1,5 @@ +#!/bin/sh +if [[ -z $GOROOT ]]; then + export GOROOT=/usr/lib/go +fi +/usr/bin/go.elf "$@" diff --git a/community/hatari/PKGBUILD b/community/hatari/PKGBUILD index 750c9bf10..6c6152e49 100644 --- a/community/hatari/PKGBUILD +++ b/community/hatari/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 63626 2012-02-05 12:01:45Z ibiru $ +# $Id: PKGBUILD 68675 2012-03-31 12:26:15Z lcarlier $ # Maintainer: Shinlun Hsieh <yngwiexx@yahoo.com.tw> pkgname=hatari -pkgver=1.5.0 -pkgrel=2 +pkgver=1.6.1 +pkgrel=1 pkgdesc='An Atari ST and STE emulator' arch=('i686' 'x86_64') url='http://hatari.sourceforge.net/' license=('GPL') depends=('sdl' 'libpng') makedepends=('cmake') -source=("http://download.berlios.de/hatari/${pkgname}-${pkgver}.tar.bz2") -md5sums=('16277cff73ec3a342b87b7b7ea3932f4') +source=("http://download.tuxfamily.org/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2") +md5sums=('14f6af33734c971cb4f349a38c6981a1') build() { cd ${pkgname}-${pkgver} diff --git a/community/libgringotts/PKGBUILD b/community/libgringotts/PKGBUILD index e8665a917..0e2766ace 100644 --- a/community/libgringotts/PKGBUILD +++ b/community/libgringotts/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 67534 2012-03-13 11:05:54Z lcarlier $ +# $Id: PKGBUILD 68667 2012-03-31 08:24:10Z stativ $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> pkgname=libgringotts pkgver=1.2.1 -pkgrel=8 +pkgrel=9 pkgdesc="Encryption backend for Gringotts." arch=('i686' 'x86_64') url="http://developer.berlios.de/projects/gringotts" @@ -21,10 +21,11 @@ build() { ./configure --prefix=/usr make } -pckage() { + +package() { cd ${srcdir}/$pkgname-$pkgver make DESTDIR=${pkgdir} install - rm -fr ${pkgdir}/usr/share || return 1 + rm -fr ${pkgdir}/usr/share } diff --git a/community/me-tv/PKGBUILD b/community/me-tv/PKGBUILD index d269c786b..12bd3392d 100644 --- a/community/me-tv/PKGBUILD +++ b/community/me-tv/PKGBUILD @@ -5,7 +5,7 @@ #Previous Contributor: Jeff Bailes <thepizzaking@gmail.com> pkgname=me-tv -pkgver=1.4.0.7 +pkgver=1.4.0.9 pkgrel=1 epoch=1 pkgdesc="A GTK desktop application for watching digital television services that use the DVB standard" @@ -42,4 +42,4 @@ package() { } -md5sums=('1f7e10b063b869afcb00c6570061c1ef') +md5sums=('4d097d8893bc8c5dec0811e6cdcf4d7b') diff --git a/community/me-tv/me-tv.install b/community/me-tv/me-tv.install index f701b4754..ca1279c14 100644 --- a/community/me-tv/me-tv.install +++ b/community/me-tv/me-tv.install @@ -10,6 +10,7 @@ pre_upgrade() { post_upgrade() { post_install $1 + echo "If you run into errors after upgrading, try deleting ~/.local/share/me-tv/" } pre_remove() { diff --git a/community/osmo/PKGBUILD b/community/osmo/PKGBUILD index 9f84f2a8a..612679b84 100644 --- a/community/osmo/PKGBUILD +++ b/community/osmo/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 67694 2012-03-14 00:29:40Z giovanni $ +# $Id: PKGBUILD 68669 2012-03-31 08:29:38Z stativ $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> # Contributor: Benzo <mb_benzo@yahoo.es> pkgname=osmo pkgver=0.2.10 -pkgrel=6 +pkgrel=7 pkgdesc="A handy personal organizer" arch=('i686' 'x86_64') url="http://clayo.org/osmo/" diff --git a/community/pcsclite/PKGBUILD b/community/pcsclite/PKGBUILD index b58f512a7..b7371be87 100644 --- a/community/pcsclite/PKGBUILD +++ b/community/pcsclite/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 63833 2012-02-06 00:38:50Z giovanni $ +# $Id: PKGBUILD 68679 2012-03-31 14:28:34Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Daniel Plaza <daniel.plaza.espi@gmail.com> pkgname=pcsclite -pkgver=1.8.2 +pkgver=1.8.3 pkgrel=1 pkgdesc="PC/SC Architecture smartcard middleware library" arch=('i686' 'x86_64') url="https://alioth.debian.org/projects/pcsclite/" license=('BSD') -depends=('udev') +depends=('python') makedepends=('pkg-config') options=('!libtool' '!docs') -source=("https://alioth.debian.org/frs/download.php/3695/pcsc-lite-${pkgver}.tar.bz2" +source=("https://alioth.debian.org/frs/download.php/3706/pcsc-lite-${pkgver}.tar.bz2" 'pcscd') -md5sums=('cb7156346e9478c19085c918b605ed43' +md5sums=('7ad8c97c89f77aab7a00317eb7e811e9' 'c97b6bce695222efb0f003d8e8369010') build() { @@ -33,7 +33,7 @@ build() { package() { cd "${srcdir}/pcsc-lite-${pkgver}" - make DESTDIR=${pkgdir} install + make DESTDIR="${pkgdir}" install install -D -m644 ${srcdir}/pcsc-lite-${pkgver}/COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE install -D -m755 ${srcdir}/pcscd ${pkgdir}/etc/rc.d/pcscd diff --git a/community/setconf/PKGBUILD b/community/setconf/PKGBUILD index 6783a0d0f..e6c5c6c84 100644 --- a/community/setconf/PKGBUILD +++ b/community/setconf/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 64357 2012-02-11 23:24:08Z allan $ +# $Id: PKGBUILD 68685 2012-03-31 16:54:07Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> + pkgname=setconf -pkgver=0.3.2 -pkgrel=4 +pkgver=0.4 +pkgrel=1 pkgdesc="Utility to easily change settings in Makefiles and configuration files" arch=('x86_64' 'i686') url="http://setconf.roboticoverlords.org/" license=('GPL') depends=('pcre' 'gc') -makedepends=('shedskin>=0.9.1') +makedepends=('shedskin') source=("http://setconf.roboticoverlords.org/$pkgname-$pkgver.tbz2") -sha256sums=('8b18e11da7adf78f2e21c39cfa949b178fa1b2f85e691b85be123023b7303f03') +sha256sums=('dca9d6e829f3247da8cb78434dd18d96f3439fc83a32626ff83d4a5c16099d31') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/sfml/PKGBUILD b/community/sfml/PKGBUILD index 85308c364..070110d74 100644 --- a/community/sfml/PKGBUILD +++ b/community/sfml/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 67475 2012-03-11 23:32:18Z svenstaro $ +# $Id: PKGBUILD 68697 2012-03-31 21:54:47Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Ondrej Martinak <omartinak@gmail.com> @@ -7,7 +7,7 @@ pkgname=sfml _git=true if [[ "${_git}" = "true" ]]; then - pkgver=1.99.git20120312 + pkgver=1.99.git20120331 fi pkgrel=1 diff --git a/community/smalltalk/PKGBUILD b/community/smalltalk/PKGBUILD index eeacd6d27..fd95362ad 100644 --- a/community/smalltalk/PKGBUILD +++ b/community/smalltalk/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 62241 2012-01-18 17:54:17Z tdziedzic $ +# $Id: PKGBUILD 68673 2012-03-31 10:11:37Z rvanharen $ # Maintainer: Kaiting Chen <kaitocracy@gmail.com> # Contributor: mrshpot <mrshpot at gmail dot com> # Contributor: Michael Fellinger <m.fellinger@gmail.com> pkgname=smalltalk pkgver=3.2.4 -pkgrel=4 +pkgrel=5 pkgdesc='A free implementation of Smalltalk-80 by the GNU project' url='http://smalltalk.gnu.org/' license=('GPL' 'LGPL') @@ -18,7 +18,7 @@ optdepends=('tk: for gst-blox' 'sqlite3' 'sed: for examples' 'gtk2') - +install=smalltalk.install source=("ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz") md5sums=('a36a7c9beddca08dc492b500738efc82') @@ -41,7 +41,7 @@ build() { check() { cd "${srcdir}/${pkgname}-${pkgver}" - make check +# make check } package() { diff --git a/community/smalltalk/smalltalk.install b/community/smalltalk/smalltalk.install new file mode 100644 index 000000000..992e4edfb --- /dev/null +++ b/community/smalltalk/smalltalk.install @@ -0,0 +1,21 @@ +infodir=usr/share/info +filelist=(gst-base.info{,-1,-2,-3,-4,-5}.gz gst-libs.info{,-1,-2,-3}.gz gst.info{,-1,-2}.gz) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file $infodir/dir 2> /dev/null + done +} + diff --git a/community/task/PKGBUILD b/community/task/PKGBUILD index 51fe81b56..27e46c747 100644 --- a/community/task/PKGBUILD +++ b/community/task/PKGBUILD @@ -5,17 +5,17 @@ # Contributor: coolkehon <coolkehon@gmail.com> pkgname=task -pkgver=1.9.4 -pkgrel=3 +pkgver=2.0.0 +pkgrel=1 pkgdesc="A command-line todo list manager" arch=('i686' 'x86_64') url="http://taskwarrior.org/projects/show/taskwarrior/" -license=('GPL') +license=('MIT') depends=() makedepends=('cmake') -optdepends=('bash-completion: for bash completion', 'python: for python export addon', 'ruby: for ruby export addon', 'perl: for perl export addon') +optdepends=('bash-completion: for bash completion', 'python: for python export addon', 'ruby: for ruby export addon', 'perl: for perl export addon', 'lua: for luaexport addon') source=(http://www.taskwarrior.org/download/$pkgname-$pkgver.tar.gz) -sha1sums=('b9bae255f4fa03970eced3ac0876935271d1d7a1') +sha256sums=('78971e366c2395de1cc4b0c4fc41dd950c309d3bc2f6e9594b4c5821ad6775bd') build() { cd "$srcdir/$pkgname-$pkgver" @@ -28,7 +28,7 @@ package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install - install -Dm644 "$pkgdir/usr/share/doc/task/scripts/bash/task_completion.sh" "$pkgdir/etc/bash_completion.d/task_completion.sh" + install -Dm644 "$pkgdir/usr/share/doc/task/scripts/bash/task_completion.sh" "$pkgdir/usr/share/bash_completion/completions/task_completion.sh" install -Dm644 "$pkgdir/usr/share/doc/task/scripts/fish/task.fish" "$pkgdir/usr/share/fish/completions/task.fish" install -Dm644 "$pkgdir/usr/share/doc/task/scripts/zsh/_task" "$pkgdir/usr/share/zsh/site-functions/_task" @@ -36,4 +36,6 @@ package() { install -Dm644 "$pkgdir/usr/share/doc/task/scripts/vim/syntax/taskdata.vim" "$pkgdir/usr/share/vim/vimfiles/syntax/taskdata.vim" install -Dm644 "$pkgdir/usr/share/doc/task/scripts/vim/syntax/taskedit.vim" "$pkgdir/usr/share/vim/vimfiles/syntax/taskedit.vim" install -Dm644 "$pkgdir/usr/share/doc/task/scripts/vim/syntax/taskrc.vim" "$pkgdir/usr/share/vim/vimfiles/syntax/taskrc.vim" + + install -Dm644 "$srcdir/$pkgname-$pkgver/LICENSE" "$pkgdir/usr/share/licenses/task/LICENSE" } diff --git a/core/openssl/PKGBUILD b/core/openssl/PKGBUILD index d64577707..ff9fcc101 100644 --- a/core/openssl/PKGBUILD +++ b/core/openssl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 153962 2012-03-21 06:20:46Z pierre $ +# $Id: PKGBUILD 154941 2012-03-31 12:48:22Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=openssl @@ -6,7 +6,7 @@ _ver=1.0.1 # use a pacman compatible version scheme # pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}} pkgver=$_ver -pkgrel=1 +pkgrel=2 pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer Security' arch=('i686' 'x86_64') url='https://www.openssl.org' @@ -19,12 +19,14 @@ source=("https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz" "https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz.asc" 'fix-manpages.patch' 'no-rpath.patch' - 'ca-dir.patch') + 'ca-dir.patch' + 'disable-tls12-client.patch') md5sums=('134f168bc2a8333f19f81d684841710b' 'efbe93c11747fed52e60567819409d8a' '5bbc0655bda2af95bc8eb568963ce8ba' 'dc78d3d06baffc16217519242ce92478' - '3bf51be3a1bbd262be46dc619f92aa90') + '3bf51be3a1bbd262be46dc619f92aa90' + '26432b9d7af63c63828b6405c9185400') build() { cd $srcdir/$pkgname-$_ver @@ -44,11 +46,14 @@ build() { patch -p0 -i $srcdir/no-rpath.patch # set ca dir to /etc/ssl by default patch -p0 -i $srcdir/ca-dir.patch + # workaround for PR#2771 + patch -p1 -i $srcdir/disable-tls12-client.patch # mark stack as non-executable: http://bugs.archlinux.org/task/12434 ./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib \ shared zlib enable-md2 ${optflags} \ "${openssltarget}" \ - -Wa,--noexecstack "${CFLAGS}" "${LDFLAGS}" + -Wa,--noexecstack "${CFLAGS}" "${LDFLAGS}" \ + -DOPENSSL_NO_TLS1_2_CLIENT make depend make diff --git a/core/openssl/disable-tls12-client.patch b/core/openssl/disable-tls12-client.patch new file mode 100644 index 000000000..edb87e77f --- /dev/null +++ b/core/openssl/disable-tls12-client.patch @@ -0,0 +1,36 @@ +Index: openssl/ssl/t1_lib.c +RCS File: /v/openssl/cvs/openssl/ssl/t1_lib.c,v +rcsdiff -q -kk '-r1.64.2.14.2.31' '-r1.64.2.14.2.32' -u '/v/openssl/cvs/openssl/ssl/t1_lib.c,v' 2>/dev/null +--- t1_lib.c 2012/02/27 16:38:10 1.64.2.14.2.31 ++++ t1_lib.c 2012/03/21 21:32:57 1.64.2.14.2.32 +@@ -544,7 +544,7 @@ + } + skip_ext: + +- if (TLS1_get_version(s) >= TLS1_2_VERSION) ++ if (TLS1_get_client_version(s) >= TLS1_2_VERSION) + { + if ((size_t)(limit - ret) < sizeof(tls12_sigalgs) + 6) + return NULL; +Index: openssl/ssl/s23_clnt.c +RCS File: /v/openssl/cvs/openssl/ssl/s23_clnt.c,v +rcsdiff -q -kk '-r1.43.2.4.2.5' '-r1.43.2.4.2.6' -u '/v/openssl/cvs/openssl/ssl/s23_clnt.c,v' 2>/dev/null +--- s23_clnt.c 2011/05/19 18:22:15 1.43.2.4.2.5 ++++ s23_clnt.c 2012/03/29 19:08:54 1.43.2.4.2.6 +@@ -287,12 +287,14 @@ + + if (ssl2_compat && ssl23_no_ssl2_ciphers(s)) + ssl2_compat = 0; +- ++#ifndef OPENSSL_NO_TLS1_2_CLIENT + if (!(s->options & SSL_OP_NO_TLSv1_2)) + { + version = TLS1_2_VERSION; + } +- else if (!(s->options & SSL_OP_NO_TLSv1_1)) ++ else ++#endif ++ if (!(s->options & SSL_OP_NO_TLSv1_1)) + { + version = TLS1_1_VERSION; + } diff --git a/core/xz/PKGBUILD b/core/xz/PKGBUILD index e2c47b128..f74c8ac58 100644 --- a/core/xz/PKGBUILD +++ b/core/xz/PKGBUILD @@ -1,27 +1,26 @@ -# $Id: PKGBUILD 124452 2011-05-21 17:48:29Z pierre $ +# $Id: PKGBUILD 154939 2012-03-31 12:48:19Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> # Contributor: François Charette <firmicus@gmx.net> pkgname=xz pkgver=5.0.3 -pkgrel=1 +pkgrel=2 pkgdesc='Library and command line tools for XZ and LZMA compressed files' arch=('i686' 'x86_64') url='http://tukaani.org/xz/' license=('GPL' 'LGPL' 'custom') depends=('sh') -provides=('lzma' 'lzma-utils' 'xz-utils') -replaces=('lzma' 'lzma-utils' 'xz-utils') -conflicts=('lzma' 'lzma-utils' 'xz-utils') options=('!libtool') -source=("http://tukaani.org/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('fefe52f9ecd521de2a8ce38c21a27574') - -# keep an upgrade path for older installations -PKGEXT='.pkg.tar.gz' +source=("http://tukaani.org/${pkgname}/${pkgname}-${pkgver}.tar.gz" + "http://tukaani.org/${pkgname}/${pkgname}-${pkgver}.tar.gz.sig" + 'compile-fix.patch') +md5sums=('fefe52f9ecd521de2a8ce38c21a27574' + 'd0725667a6dae0853194dc691e900e26' + 'b74e4f7793848cc5765c848ea30f971f') build() { cd ${srcdir}/${pkgname}-${pkgver} + patch -p1 -i ${srcdir}/compile-fix.patch ./configure --prefix=/usr \ --disable-rpath \ diff --git a/core/xz/compile-fix.patch b/core/xz/compile-fix.patch new file mode 100644 index 000000000..f3b7878d1 --- /dev/null +++ b/core/xz/compile-fix.patch @@ -0,0 +1,28 @@ +From 7db6bdf4abcf524115be2cf5659ed540cef074c5 Mon Sep 17 00:00:00 2001 +From: Lasse Collin <lasse.collin@tukaani.org> +Date: Tue, 10 Jan 2012 17:13:03 +0200 +Subject: [PATCH] Tests: Fix a compiler warning with _FORTIFY_SOURCE. + +Reported here: +http://sourceforge.net/projects/lzmautils/forums/forum/708858/topic/4927385 +--- + tests/create_compress_files.c | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/tests/create_compress_files.c b/tests/create_compress_files.c +index 44367d8..bd5b4ef 100644 +--- a/tests/create_compress_files.c ++++ b/tests/create_compress_files.c +@@ -79,7 +79,8 @@ static void + write_abc(FILE *file) + { + for (size_t i = 0; i < 12345; ++i) +- fwrite("abc\n", 4, 1, file); ++ if (fwrite("abc\n", 4, 1, file) != 1) ++ exit(1); + } + + +-- +1.7.6 + diff --git a/extra/bootchart/PKGBUILD b/extra/bootchart/PKGBUILD index 5eb0b3d28..9a48b1b01 100644 --- a/extra/bootchart/PKGBUILD +++ b/extra/bootchart/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 154392 2012-03-27 12:40:40Z tomegun $ +# $Id: PKGBUILD 154945 2012-03-31 14:17:08Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> pkgname="bootchart" -pkgver=1.15 +pkgver=1.16 pkgrel=1 -pkgdesc="a 'startup' graphing tool" +pkgdesc="A 'startup' graphing tool" url="https://meego.gitorious.org/meego-developer-tools/bootchart" license=('GPL2') arch=(i686 x86_64) @@ -23,5 +23,5 @@ package() { cd "$srcdir/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install } -md5sums=('e24cad9db140521fca5193a88589e669' - '5546709bc77b775290cb54a29affa6ec') +md5sums=('d563854bdbf0f0de821406881164a607' + '381f1375d5563ced806a5bbe7b2efd8e') diff --git a/extra/bootchart/build.patch b/extra/bootchart/build.patch index 82c6e1bfd..91ca34def 100644 --- a/extra/bootchart/build.patch +++ b/extra/bootchart/build.patch @@ -1,15 +1,18 @@ -From 4fe62e6b4c072676d246be02ba92a1df3a9d0feb Mon Sep 17 00:00:00 2001 +From 4d34b379411f781a494b4775260d550ff61e22e4 Mon Sep 17 00:00:00 2001 From: Tom Gundersen <teg@jklm.no> Date: Fri, 16 Mar 2012 01:34:10 +0100 Subject: [PATCH] Makefile: move binary and avoid empty dirs Install to /usr/bin by default, and don't install an empty /etc. + +v2: Adjust README to reflect the change. --- Makefile | 10 ++++------ - 1 file changed, 4 insertions(+), 6 deletions(-) + README | 2 +- + 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile -index 566a848..c017509 100644 +index 2150ed3..ae432fa 100644 --- a/Makefile +++ b/Makefile @@ -6,12 +6,10 @@ CC := gcc @@ -29,6 +32,19 @@ index 566a848..c017509 100644 OBJS := log.o svg.o bootchart.o +diff --git a/README b/README +index fa1d730..1906abb 100644 +--- a/README ++++ b/README +@@ -6,7 +6,7 @@ Bootchart - a 'startup' graphing tool + Bootchart is a tool, usually run at system startup, that collects and graphs + the CPU and disk load of the system as it works. The output of bootchart is + an SVG graph. Normally, bootchart is invoked as `bootchartd` by the kernel +-by passing "init=/sbin/bootchartd" to the kernel. Bootchart will then fork ++by passing "init=/usr/bin/bootchartd" to the kernel. Bootchart will then fork + init off to resume normal system startup, while monitoring and logging + startup information in the background. + -- -1.7.9.4 +1.7.9.5 diff --git a/extra/clisp/PKGBUILD b/extra/clisp/PKGBUILD index eed5c6e36..6e371fce6 100644 --- a/extra/clisp/PKGBUILD +++ b/extra/clisp/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 151174 2012-02-25 06:56:49Z pierre $ +# $Id: PKGBUILD 154935 2012-03-31 09:53:13Z ronald $ # Maintainer: Juergen Hoetzel <juergen@archlinux.org> pkgname=clisp pkgver=2.49 -pkgrel=2 +pkgrel=3 pkgdesc="ANSI Common Lisp interpreter, compiler and debugger" arch=('i686' 'x86_64') license=('GPL') diff --git a/extra/gnuplot/PKGBUILD b/extra/gnuplot/PKGBUILD index 76ba2047d..e383fb0e7 100644 --- a/extra/gnuplot/PKGBUILD +++ b/extra/gnuplot/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 151647 2012-02-29 10:28:02Z ronald $ +# $Id: PKGBUILD 154928 2012-03-31 08:57:52Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: damir <damir@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=gnuplot -pkgver=4.4.4 -pkgrel=2 +pkgver=4.6.0 +pkgrel=1 pkgdesc="Plotting package which outputs to X11, PostScript, PNG, GIF, and others" arch=('i686' 'x86_64') url="http://www.gnuplot.info" @@ -13,17 +13,12 @@ license=('custom') depends=('readline' 'gd' 'wxgtk' 'cairo' 'libjpeg' 'lua') makedepends=('texinfo' 'emacs' 'texlive-core' 'texlive-latexextra') install=gnuplot.install -source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz" - "lua_tikz.patch") -sha1sums=('d4f143eade1f8d8b27be44cbda431d37a71c6a31' - 'd84518c7e46fc0912554c28ba1fc8cdb70d4ee30') +source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz") +sha1sums=('9a43ae13546d97d4b174533ddac31a14e0edc9b2') build() { cd $srcdir/$pkgname-$pkgver - # upstram patch to fix lua/tikz terminal - patch -Np0 -i ${srcdir}/lua_tikz.patch - # fix default source location; use the GDFONTPATH variable to modify at runtime sed -i 's|/usr/X11R6/lib/X11/fonts/truetype|/usr/share/fonts/TTF|' src/variable.c diff --git a/extra/libsigsegv/PKGBUILD b/extra/libsigsegv/PKGBUILD index 43a8267d0..3ca797685 100644 --- a/extra/libsigsegv/PKGBUILD +++ b/extra/libsigsegv/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 137667 2011-09-10 11:21:14Z pierre $ +# $Id: PKGBUILD 154929 2012-03-31 09:05:33Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Johannes Weiner <hannes@saeurebad.de> pkgname=libsigsegv -pkgver=2.6 -pkgrel=2 +pkgver=2.10 +pkgrel=1 arch=('x86_64' 'i686') pkgdesc="Page fault detection library" -url="http://libsigsegv.sourceforge.net/" +url="http://www.gnu.org/software/libsigsegv/" license=('GPL2') depends=('glibc') options=('!libtool') source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('7e24993730649d13c6eabc28bd24de35') +sha1sums=('b75a647a9ebda70e7a3b33583efdd550e0eac094') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/gnome-unstable/gnome-control-center/PKGBUILD b/gnome-unstable/gnome-control-center/PKGBUILD index 805dab1fd..c4a5437d5 100644 --- a/gnome-unstable/gnome-control-center/PKGBUILD +++ b/gnome-unstable/gnome-control-center/PKGBUILD @@ -1,21 +1,20 @@ -# $Id: PKGBUILD 154575 2012-03-30 09:57:19Z heftig $ +# $Id: PKGBUILD 154951 2012-03-31 20:30:25Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-control-center pkgver=3.4.0 -pkgrel=1 +pkgrel=2 pkgdesc="The Control Center for GNOME" arch=('i686' 'x86_64') depends=('accountsservice' 'cups-pk-helper' 'gnome-bluetooth' 'gnome-desktop' 'gnome-menus' 'gnome-online-accounts' 'gnome-settings-daemon' 'gsettings-desktop-schemas' 'gtk3' 'libgtop' 'libsocialweb' 'network-manager-applet' 'sound-theme-freedesktop' 'upower' - 'libsystemd') + 'libsystemd' 'cheese') optdepends=('mesa-demos: provides glxinfo for graphics information' 'apg: adds password generation for user accounts' - 'gnome-color-manager: for color management tasks' - 'cheese: take account photos via webcam') -makedepends=('gnome-doc-utils' 'intltool' 'gnome-common' 'cheese') + 'gnome-color-manager: for color management tasks') +makedepends=('gnome-doc-utils' 'intltool' 'gnome-common') url="http://www.gnome.org" groups=('gnome') install=gnome-control-center.install diff --git a/kernels/xen/PKGBUILD b/kernels/xen/PKGBUILD index 4f4a1218b..c51ffeaa9 100644 --- a/kernels/xen/PKGBUILD +++ b/kernels/xen/PKGBUILD @@ -1,18 +1,18 @@ -# Mantainer M0Rf30 +# Maintainer M0Rf30 # Contributor WaxyMouthfeel -# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy> +# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy> pkgname=xen pkgver=4.1.2 -pkgrel=3 +pkgrel=3.1 pkgdesc="Xen 4 (hypervisor and tools)" arch=(i686 x86_64) url="http://xen.org/" license="GPL" if [[ $CARCH == "x86_64" ]]; then - depends=('xz-utils' 'bzip2' 'iproute' 'net-tools' 'bridge-utils' 'python2' 'sdl' 'zlib' 'e2fsprogs' 'bin86' 'pkgconfig' 'gnutls' 'lzo2' 'lib32-glibc') + depends=('xz' 'bzip2' 'iproute' 'net-tools' 'bridge-utils' 'python2' 'sdl' 'zlib' 'e2fsprogs' 'bin86' 'pkgconfig' 'gnutls' 'lzo2' 'lib32-glibc') else - depends=('xz-utils' 'bzip2' 'iproute' 'net-tools' 'bridge-utils' 'python2' 'sdl' 'zlib' 'e2fsprogs' 'bin86' 'pkgconfig' 'gnutls' 'lzo2' 'glibc') + depends=('xz' 'bzip2' 'iproute' 'net-tools' 'bridge-utils' 'python2' 'sdl' 'zlib' 'e2fsprogs' 'bin86' 'pkgconfig' 'gnutls' 'lzo2' 'glibc') fi optdepends=('xen-docs: Xen Official Documentation') diff --git a/libre/sdl-libre/PKGBUILD b/libre/sdl-libre/PKGBUILD index ffc0ec5f4..3024bd9bf 100644 --- a/libre/sdl-libre/PKGBUILD +++ b/libre/sdl-libre/PKGBUILD @@ -3,10 +3,11 @@ # Contributor: dorphell <dorphell@archlinux.org> # Maintainer (Connochaetos): Henry Jensen <hjensen@connochaetos.org> # Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy> +# Maintainer (Parabola): Márcio Silva <coadde@adinet.com.uy> pkgname=sdl-libre pkgver=1.2.15 -pkgrel=1 +pkgrel=1.1 pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard" arch=('i686' 'x86_64') url="http://www.libsdl.org" @@ -20,16 +21,19 @@ options=('!libtool') source=(http://www.libsdl.org/release/SDL-${pkgver}.tar.gz sdl-1.2.14-fix-mouse-clicking.patch sdl-1.2.14-disable-mmx.patch + riva_mmio.patch no-riva-accel.patch) md5sums=('9d96df8417572a2afb781a7c4c811a85' '04d8c179f125e04bcd4c9d60e013c2d7' 'e5c16b7611f62c7cb25f0534eff68852' + 'f5ab9ba6ba2bb8df74d0f768f9df3ea8' 'eb2f5899db608ad27b379faa5e0beb80') build() { cd ${srcdir}/SDL-${pkgver} patch -Np1 -i $srcdir/sdl-1.2.14-fix-mouse-clicking.patch patch -Np1 -i $srcdir/sdl-1.2.14-disable-mmx.patch + patch -Np0 -i $srcdir/riva_mmio.patch patch -Np0 -i $srcdir/no-riva-accel.patch ./configure --prefix=/usr --disable-nasm --enable-alsa --enable-esd \ --with-x --disable-rpath --disable-static diff --git a/libre/sdl-libre/riva_mmio.patch b/libre/sdl-libre/riva_mmio.patch new file mode 100644 index 000000000..945d9bf9b --- /dev/null +++ b/libre/sdl-libre/riva_mmio.patch @@ -0,0 +1,554 @@ +--- src/video/fbcon/riva_mmio.h 2012-01-19 04:30:06.000000000 -0200 ++++ /dev/null 2012-04-01 13:58:27.776718756 -0300 +@@ -1,449 +0,0 @@ +-/***************************************************************************\ +-|* *| +-|* Copyright 1993-1999 NVIDIA, Corporation. All rights reserved. *| +-|* *| +-|* NOTICE TO USER: The source code is copyrighted under U.S. and *| +-|* international laws. Users and possessors of this source code are *| +-|* hereby granted a nonexclusive, royalty-free copyright license to *| +-|* use this code in individual and commercial software. *| +-|* *| +-|* Any use of this source code must include, in the user documenta- *| +-|* tion and internal comments to the code, notices to the end user *| +-|* as follows: *| +-|* *| +-|* Copyright 1993-1999 NVIDIA, Corporation. All rights reserved. *| +-|* *| +-|* NVIDIA, CORPORATION MAKES NO REPRESENTATION ABOUT THE SUITABILITY *| +-|* OF THIS SOURCE CODE FOR ANY PURPOSE. IT IS PROVIDED "AS IS" *| +-|* WITHOUT EXPRESS OR IMPLIED WARRANTY OF ANY KIND. NVIDIA, CORPOR- *| +-|* ATION DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOURCE CODE, *| +-|* INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY, NONINFRINGE- *| +-|* MENT, AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL *| +-|* NVIDIA, CORPORATION BE LIABLE FOR ANY SPECIAL, INDIRECT, INCI- *| +-|* DENTAL, OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RE- *| +-|* SULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION *| +-|* OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF *| +-|* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOURCE CODE. *| +-|* *| +-|* U.S. Government End Users. This source code is a "commercial *| +-|* item," as that term is defined at 48 C.F.R. 2.101 (OCT 1995), *| +-|* consisting of "commercial computer software" and "commercial *| +-|* computer software documentation," as such terms are used in *| +-|* 48 C.F.R. 12.212 (SEPT 1995) and is provided to the U.S. Govern- *| +-|* ment only as a commercial end item. Consistent with 48 C.F.R. *| +-|* 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (JUNE 1995), *| +-|* all U.S. Government End Users acquire the source code with only *| +-|* those rights set forth herein. *| +-|* *| +-\***************************************************************************/ +- +-#ifndef __RIVA_HW_H__ +-#define __RIVA_HW_H__ +-#define RIVA_SW_VERSION 0x00010003 +- +-/* +- * Typedefs to force certain sized values. +- */ +-typedef Uint8 U008; +-typedef Uint16 U016; +-typedef Uint32 U032; +- +-/* +- * HW access macros. +- */ +-#define NV_WR08(p,i,d) (((U008 *)(p))[i]=(d)) +-#define NV_RD08(p,i) (((U008 *)(p))[i]) +-#define NV_WR16(p,i,d) (((U016 *)(p))[(i)/2]=(d)) +-#define NV_RD16(p,i) (((U016 *)(p))[(i)/2]) +-#define NV_WR32(p,i,d) (((U032 *)(p))[(i)/4]=(d)) +-#define NV_RD32(p,i) (((U032 *)(p))[(i)/4]) +-#define VGA_WR08(p,i,d) NV_WR08(p,i,d) +-#define VGA_RD08(p,i) NV_RD08(p,i) +- +-/* +- * Define supported architectures. +- */ +-#define NV_ARCH_03 0x03 +-#define NV_ARCH_04 0x04 +-#define NV_ARCH_10 0x10 +-/***************************************************************************\ +-* * +-* FIFO registers. * +-* * +-\***************************************************************************/ +- +-/* +- * Raster OPeration. Windows style ROP3. +- */ +-typedef volatile struct +-{ +- U032 reserved00[4]; +- U016 FifoFree; +- U016 Nop; +- U032 reserved01[0x0BB]; +- U032 Rop3; +-} RivaRop; +-/* +- * 8X8 Monochrome pattern. +- */ +-typedef volatile struct +-{ +- U032 reserved00[4]; +- U016 FifoFree; +- U016 Nop; +- U032 reserved01[0x0BD]; +- U032 Shape; +- U032 reserved03[0x001]; +- U032 Color0; +- U032 Color1; +- U032 Monochrome[2]; +-} RivaPattern; +-/* +- * Scissor clip rectangle. +- */ +-typedef volatile struct +-{ +- U032 reserved00[4]; +- U016 FifoFree; +- U016 Nop; +- U032 reserved01[0x0BB]; +- U032 TopLeft; +- U032 WidthHeight; +-} RivaClip; +-/* +- * 2D filled rectangle. +- */ +-typedef volatile struct +-{ +- U032 reserved00[4]; +- U016 FifoFree; +- U016 Nop[1]; +- U032 reserved01[0x0BC]; +- U032 Color; +- U032 reserved03[0x03E]; +- U032 TopLeft; +- U032 WidthHeight; +-} RivaRectangle; +-/* +- * 2D screen-screen BLT. +- */ +-typedef volatile struct +-{ +- U032 reserved00[4]; +- U016 FifoFree; +- U016 Nop; +- U032 reserved01[0x0BB]; +- U032 TopLeftSrc; +- U032 TopLeftDst; +- U032 WidthHeight; +-} RivaScreenBlt; +-/* +- * 2D pixel BLT. +- */ +-typedef volatile struct +-{ +- U032 reserved00[4]; +- U016 FifoFree; +- U016 Nop[1]; +- U032 reserved01[0x0BC]; +- U032 TopLeft; +- U032 WidthHeight; +- U032 WidthHeightIn; +- U032 reserved02[0x03C]; +- U032 Pixels; +-} RivaPixmap; +-/* +- * Filled rectangle combined with monochrome expand. Useful for glyphs. +- */ +-typedef volatile struct +-{ +- U032 reserved00[4]; +- U016 FifoFree; +- U016 Nop; +- U032 reserved01[0x0BB]; +- U032 reserved03[(0x040)-1]; +- U032 Color1A; +- struct +- { +- U032 TopLeft; +- U032 WidthHeight; +- } UnclippedRectangle[64]; +- U032 reserved04[(0x080)-3]; +- struct +- { +- U032 TopLeft; +- U032 BottomRight; +- } ClipB; +- U032 Color1B; +- struct +- { +- U032 TopLeft; +- U032 BottomRight; +- } ClippedRectangle[64]; +- U032 reserved05[(0x080)-5]; +- struct +- { +- U032 TopLeft; +- U032 BottomRight; +- } ClipC; +- U032 Color1C; +- U032 WidthHeightC; +- U032 PointC; +- U032 MonochromeData1C; +- U032 reserved06[(0x080)+121]; +- struct +- { +- U032 TopLeft; +- U032 BottomRight; +- } ClipD; +- U032 Color1D; +- U032 WidthHeightInD; +- U032 WidthHeightOutD; +- U032 PointD; +- U032 MonochromeData1D; +- U032 reserved07[(0x080)+120]; +- struct +- { +- U032 TopLeft; +- U032 BottomRight; +- } ClipE; +- U032 Color0E; +- U032 Color1E; +- U032 WidthHeightInE; +- U032 WidthHeightOutE; +- U032 PointE; +- U032 MonochromeData01E; +-} RivaBitmap; +-/* +- * 3D textured, Z buffered triangle. +- */ +-typedef volatile struct +-{ +- U032 reserved00[4]; +- U016 FifoFree; +- U016 Nop; +- U032 reserved01[0x0BC]; +- U032 TextureOffset; +- U032 TextureFormat; +- U032 TextureFilter; +- U032 FogColor; +-/* This is a problem on LynxOS */ +-#ifdef Control +-#undef Control +-#endif +- U032 Control; +- U032 AlphaTest; +- U032 reserved02[0x339]; +- U032 FogAndIndex; +- U032 Color; +- float ScreenX; +- float ScreenY; +- float ScreenZ; +- float EyeM; +- float TextureS; +- float TextureT; +-} RivaTexturedTriangle03; +-typedef volatile struct +-{ +- U032 reserved00[4]; +- U016 FifoFree; +- U016 Nop; +- U032 reserved01[0x0BB]; +- U032 ColorKey; +- U032 TextureOffset; +- U032 TextureFormat; +- U032 TextureFilter; +- U032 Blend; +-/* This is a problem on LynxOS */ +-#ifdef Control +-#undef Control +-#endif +- U032 Control; +- U032 FogColor; +- U032 reserved02[0x39]; +- struct +- { +- float ScreenX; +- float ScreenY; +- float ScreenZ; +- float EyeM; +- U032 Color; +- U032 Specular; +- float TextureS; +- float TextureT; +- } Vertex[16]; +- U032 DrawTriangle3D; +-} RivaTexturedTriangle05; +-/* +- * 2D line. +- */ +-typedef volatile struct +-{ +- U032 reserved00[4]; +- U016 FifoFree; +- U016 Nop[1]; +- U032 reserved01[0x0BC]; +- U032 Color; /* source color 0304-0307*/ +- U032 Reserved02[0x03e]; +- struct { /* start aliased methods in array 0400- */ +- U032 point0; /* y_x S16_S16 in pixels 0- 3*/ +- U032 point1; /* y_x S16_S16 in pixels 4- 7*/ +- } Lin[16]; /* end of aliased methods in array -047f*/ +- struct { /* start aliased methods in array 0480- */ +- U032 point0X; /* in pixels, 0 at left 0- 3*/ +- U032 point0Y; /* in pixels, 0 at top 4- 7*/ +- U032 point1X; /* in pixels, 0 at left 8- b*/ +- U032 point1Y; /* in pixels, 0 at top c- f*/ +- } Lin32[8]; /* end of aliased methods in array -04ff*/ +- U032 PolyLin[32]; /* y_x S16_S16 in pixels 0500-057f*/ +- struct { /* start aliased methods in array 0580- */ +- U032 x; /* in pixels, 0 at left 0- 3*/ +- U032 y; /* in pixels, 0 at top 4- 7*/ +- } PolyLin32[16]; /* end of aliased methods in array -05ff*/ +- struct { /* start aliased methods in array 0600- */ +- U032 color; /* source color 0- 3*/ +- U032 point; /* y_x S16_S16 in pixels 4- 7*/ +- } ColorPolyLin[16]; /* end of aliased methods in array -067f*/ +-} RivaLine; +-/* +- * 2D/3D surfaces +- */ +-typedef volatile struct +-{ +- U032 reserved00[4]; +- U016 FifoFree; +- U016 Nop; +- U032 reserved01[0x0BE]; +- U032 Offset; +-} RivaSurface; +-typedef volatile struct +-{ +- U032 reserved00[4]; +- U016 FifoFree; +- U016 Nop; +- U032 reserved01[0x0BD]; +- U032 Pitch; +- U032 RenderBufferOffset; +- U032 ZBufferOffset; +-} RivaSurface3D; +- +-/***************************************************************************\ +-* * +-* Virtualized RIVA H/W interface. * +-* * +-\***************************************************************************/ +- +-struct _riva_hw_inst; +-struct _riva_hw_state; +-/* +- * Virtialized chip interface. Makes RIVA 128 and TNT look alike. +- */ +-typedef struct _riva_hw_inst +-{ +- /* +- * Chip specific settings. +- */ +- U032 Architecture; +- U032 Version; +- U032 CrystalFreqKHz; +- U032 RamAmountKBytes; +- U032 MaxVClockFreqKHz; +- U032 RamBandwidthKBytesPerSec; +- U032 EnableIRQ; +- U032 IO; +- U032 VBlankBit; +- U032 FifoFreeCount; +- U032 FifoEmptyCount; +- /* +- * Non-FIFO registers. +- */ +- volatile U032 *PCRTC; +- volatile U032 *PRAMDAC; +- volatile U032 *PFB; +- volatile U032 *PFIFO; +- volatile U032 *PGRAPH; +- volatile U032 *PEXTDEV; +- volatile U032 *PTIMER; +- volatile U032 *PMC; +- volatile U032 *PRAMIN; +- volatile U032 *FIFO; +- volatile U032 *CURSOR; +- volatile U032 *CURSORPOS; +- volatile U032 *VBLANKENABLE; +- volatile U032 *VBLANK; +- volatile U008 *PCIO; +- volatile U008 *PVIO; +- volatile U008 *PDIO; +- /* +- * Common chip functions. +- */ +- int (*Busy)(struct _riva_hw_inst *); +- void (*CalcStateExt)(struct _riva_hw_inst *,struct _riva_hw_state *,int,int,int,int,int,int,int,int,int,int,int,int,int); +- void (*LoadStateExt)(struct _riva_hw_inst *,struct _riva_hw_state *); +- void (*UnloadStateExt)(struct _riva_hw_inst *,struct _riva_hw_state *); +- void (*SetStartAddress)(struct _riva_hw_inst *,U032); +- void (*SetSurfaces2D)(struct _riva_hw_inst *,U032,U032); +- void (*SetSurfaces3D)(struct _riva_hw_inst *,U032,U032); +- int (*ShowHideCursor)(struct _riva_hw_inst *,int); +- void (*LockUnlock)(struct _riva_hw_inst *, int); +- /* +- * Current extended mode settings. +- */ +- struct _riva_hw_state *CurrentState; +- /* +- * FIFO registers. +- */ +- RivaRop *Rop; +- RivaPattern *Patt; +- RivaClip *Clip; +- RivaPixmap *Pixmap; +- RivaScreenBlt *Blt; +- RivaBitmap *Bitmap; +- RivaLine *Line; +- RivaTexturedTriangle03 *Tri03; +- RivaTexturedTriangle05 *Tri05; +-} RIVA_HW_INST; +-/* +- * Extended mode state information. +- */ +-typedef struct _riva_hw_state +-{ +- U032 bpp; +- U032 width; +- U032 height; +- U032 repaint0; +- U032 repaint1; +- U032 screen; +- U032 pixel; +- U032 horiz; +- U032 arbitration0; +- U032 arbitration1; +- U032 vpll; +- U032 pllsel; +- U032 general; +- U032 config; +- U032 cursor0; +- U032 cursor1; +- U032 cursor2; +- U032 offset0; +- U032 offset1; +- U032 offset2; +- U032 offset3; +- U032 pitch0; +- U032 pitch1; +- U032 pitch2; +- U032 pitch3; +-} RIVA_HW_STATE; +- +-/* +- * FIFO Free Count. Should attempt to yield processor if RIVA is busy. +- */ +- +-#define RIVA_FIFO_FREE(hwptr,cnt) \ +-{ \ +- while (FifoFreeCount < (cnt)) \ +- FifoFreeCount = hwptr->FifoFree >> 2; \ +- FifoFreeCount -= (cnt); \ +-} +-#endif /* __RIVA_HW_H__ */ +- +--- src/video/fbcon/SDL_fbriva.c 2012-01-19 04:30:06.000000000 -0200 ++++ src/video/fbcon/SDL_fbriva.c 2012-04-01 15:10:10.108451467 -0300 +@@ -24,12 +24,10 @@ + #include "SDL_video.h" + #include "../SDL_blit.h" + #include "SDL_fbriva.h" +-#include "riva_mmio.h" + #include "riva_regs.h" + + + static int FifoEmptyCount = 0; +-static int FifoFreeCount = 0; + + /* Wait for vertical retrace */ + static void WaitVBL(_THIS) +@@ -41,20 +39,6 @@ + while ( !(*port & 0x08) ) + ; + } +-static void NV3WaitIdle(_THIS) +-{ +- RivaRop *Rop = (RivaRop *)(mapped_io + ROP_OFFSET); +- while ( (Rop->FifoFree < FifoEmptyCount) || +- (*(mapped_io + PGRAPH_OFFSET + 0x000006B0) & 0x01) ) +- ; +-} +-static void NV4WaitIdle(_THIS) +-{ +- RivaRop *Rop = (RivaRop *)(mapped_io + ROP_OFFSET); +- while ( (Rop->FifoFree < FifoEmptyCount) || +- (*(mapped_io + PGRAPH_OFFSET + 0x00000700) & 0x01) ) +- ; +-} + + #if 0 /* Not yet implemented? */ + /* Sets video mem colorkey and accelerated blit function */ +@@ -74,7 +58,6 @@ + { + int dstX, dstY; + int dstW, dstH; +- RivaBitmap *Bitmap = (RivaBitmap *)(mapped_io + BITMAP_OFFSET); + + /* Don't blit to the display surface when switched away */ + if ( switched_away ) { +@@ -93,13 +76,6 @@ + dstX += rect->x; + dstY += rect->y; + +- RIVA_FIFO_FREE(Bitmap, 1); +- Bitmap->Color1A = color; +- +- RIVA_FIFO_FREE(Bitmap, 2); +- Bitmap->UnclippedRectangle[0].TopLeft = (dstX << 16) | dstY; +- Bitmap->UnclippedRectangle[0].WidthHeight = (dstW << 16) | dstH; +- + FB_AddBusySurface(dst); + + if ( dst == this->screen ) { +@@ -115,7 +91,6 @@ + int srcX, srcY; + int dstX, dstY; + int dstW, dstH; +- RivaScreenBlt *Blt = (RivaScreenBlt *)(mapped_io + BLT_OFFSET); + + /* FIXME: For now, only blit to display surface */ + if ( dst->pitch != SDL_VideoSurface->pitch ) { +@@ -142,11 +117,6 @@ + dstX += dstrect->x; + dstY += dstrect->y; + +- RIVA_FIFO_FREE(Blt, 3); +- Blt->TopLeftSrc = (srcY << 16) | srcX; +- Blt->TopLeftDst = (dstY << 16) | dstX; +- Blt->WidthHeight = (dstH << 16) | dstW; +- + FB_AddBusySurface(src); + FB_AddBusySurface(dst); + +@@ -185,23 +155,15 @@ + + void FB_RivaAccel(_THIS, __u32 card) + { +- RivaRop *Rop = (RivaRop *)(mapped_io + ROP_OFFSET); + + /* We have hardware accelerated surface functions */ + this->CheckHWBlit = CheckHWBlit; + wait_vbl = WaitVBL; + switch (card) { +- case FB_ACCEL_NV3: +- wait_idle = NV3WaitIdle; +- break; +- case FB_ACCEL_NV4: +- wait_idle = NV4WaitIdle; +- break; + default: + /* Hmm... FIXME */ + break; + } +- FifoEmptyCount = Rop->FifoFree; + + /* The Riva has an accelerated color fill */ + this->info.blit_fill = 1; diff --git a/libre/sqlite3-libre/PKGBUILD b/libre/sqlite3-libre/PKGBUILD new file mode 100644 index 000000000..569538fbf --- /dev/null +++ b/libre/sqlite3-libre/PKGBUILD @@ -0,0 +1,63 @@ +# $Id: PKGBUILD 154652 2012-03-30 14:26:35Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> + +pkgbase="sqlite3" +pkgname=('sqlite3' 'sqlite3-tcl') +_amalgamationver=3071100 +_amalgamationver2=${_amalgamationver/00/} +#pkgver=${_amalgamationver2//0/.} +pkgver=3.7.11 +pkgrel=1.1 +pkgdesc="A C library that implements an SQL database engine" +arch=('i686' 'x86_64' 'mips64el') +license=('custom') +url="http://www.sqlite.org/" +makedepends=('tcl' 'readline>=6.0.00') +source=( # tarball containing the amalgamation for SQLite 3.7.5 together with a configure script and makefile for building it; includes now also the Tcl Extension Architecture (TEA) + http://www.sqlite.org/sqlite-autoconf-$_amalgamationver.tar.gz + license.txt) +options=('!libtool' '!emptydirs') +md5sums=('0552d71bda98ebdcaea305cd6058221b' + 'c1cdbc5544034d9012e421e75a5e4890') + +build() { + export CFLAGS="$CFLAGS -DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE" + + # build sqlite + cd "$srcdir"/sqlite-autoconf-$_amalgamationver + ./configure --prefix=/usr \ + --disable-static + make + + # build the tcl extension + cd "$srcdir"/sqlite-autoconf-$_amalgamationver/tea + ./configure --prefix=/usr \ + --with-system-sqlite + make + +} + +package_sqlite3() { + + pkgdesc="A C library that implements an SQL database engine" + depends=('readline>=6.0.00') + conflicts=('sqlite' 'sqlite3') + replaces=('sqlite' 'sqlite3') + provides=("sqlite3=$pkgver") + + cd ${srcdir}/sqlite-autoconf-$_amalgamationver + make DESTDIR=${pkgdir} install + + # license + install -D -m644 ${srcdir}/license.txt ${pkgdir}/usr/share/licenses/${pkgname}/license.txt +} + +package_sqlite3-tcl() { + + pkgdesc="sqlite3 Tcl Extension Architecture (TEA)" + depends=('sqlite3>=3.7.5') + + cd ${srcdir}/sqlite-autoconf-$_amalgamationver/tea + make DESTDIR=${pkgdir} install +} diff --git a/libre/sqlite3-libre/license.txt b/libre/sqlite3-libre/license.txt new file mode 100644 index 000000000..118c5d5e6 --- /dev/null +++ b/libre/sqlite3-libre/license.txt @@ -0,0 +1,33 @@ +SQLite Copyright +SQLite is in the +Public Domain + + +All of the deliverable code in SQLite has been dedicated to the public domain by the authors. All code authors, and representatives of the companies they work for, have signed affidavits dedicating their contributions to the public domain and originals of those signed affidavits are stored in a firesafe at the main offices of Hwaci. Anyone is free to copy, modify, publish, use, compile, sell, or distribute the original SQLite code, either in source code form or as a compiled binary, for any purpose, commercial or non-commercial, and by any means. + +The previous paragraph applies to the deliverable code in SQLite - those parts of the SQLite library that you actually bundle and ship with a larger application. Portions of the documentation and some code used as part of the build process might fall under other licenses. The details here are unclear. We do not worry about the licensing of the documentation and build code so much because none of these things are part of the core deliverable SQLite library. + +All of the deliverable code in SQLite has been written from scratch. No code has been taken from other projects or from the open internet. Every line of code can be traced back to its original author, and all of those authors have public domain dedications on file. So the SQLite code base is clean and is uncontaminated with licensed code from other projects. +Obtaining An Explicit License To Use SQLite + +Even though SQLite is in the public domain and does not require a license, some users want to obtain a license anyway. Some reasons for obtaining a license include: +You are using SQLite in a jurisdiction that does not recognize the public domain. +You are using SQLite in a jurisdiction that does not recognize the right of an author to dedicate their work to the public domain. +You want to hold a tangible legal document as evidence that you have the legal right to use and distribute SQLite. +Your legal department tells you that you have to purchase a license. + +If you feel like you really have to purchase a license for SQLite, Hwaci, the company that employs the architect and principal developers of SQLite, will sell you one. +Contributed Code + +In order to keep SQLite completely free and unencumbered by copyright, all new contributors to the SQLite code base are asked to dedicate their contributions to the public domain. If you want to send a patch or enhancement for possible inclusion in the SQLite source tree, please accompany the patch with the following statement: +The author or authors of this code dedicate any and all copyright interest in this code to the public domain. We make this dedication for the benefit of the public at large and to the detriment of our heirs and successors. We intend this dedication to be an overt act of relinquishment in perpetuity of all present and future rights to this code under copyright law. + +We are not able to accept patches or changes to SQLite that are not accompanied by a statement such as the above. In addition, if you make changes or enhancements as an employee, then a simple statement such as the above is insufficient. You must also send by surface mail a copyright release signed by a company officer. A signed original of the copyright release should be mailed to: +Hwaci +6200 Maple Cove Lane +Charlotte, NC 28269 +USA + +A template copyright release is available in PDF or HTML. You can use this release to make future changes. + +see http://www.sqlite.org/copyright.html
\ No newline at end of file diff --git a/staging/bluez/PKGBUILD b/staging/bluez/PKGBUILD new file mode 100644 index 000000000..277b5413d --- /dev/null +++ b/staging/bluez/PKGBUILD @@ -0,0 +1,84 @@ +# $Id: PKGBUILD 154962 2012-03-31 22:36:54Z tomegun $ +# Maintainer: Tom Gundersen <teg@jklm.no> +# Contributor: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Geoffroy Carrier <geoffroy@archlinux.org> + +pkgname=bluez +pkgver=4.99 +pkgrel=2 +pkgdesc="Libraries and tools for the Bluetooth protocol stack" +url="http://www.bluez.org/" +arch=('i686' 'x86_64') +license=('GPL2') +depends=('dbus-core' 'python2' 'udev') +makedepends=('gstreamer0.10-base' 'libusb-compat' 'libsndfile') +optdepends=("gstreamer0.10-base: bluetooth GStreamer support" + "alsa-lib: Audio bluetooth devices support" + "dbus-python: to run bluez-simple-agent" + "pygobject: to run bluez-simple-agent" + "libusb-compat: USB adapters support" + "cups: CUPS backend") +conflicts=('bluez-libs' 'bluez-utils') +provides=('bluez-libs' 'bluez-utils') +replaces=('bluez-libs' 'bluez-utils') +options=('!libtool') +backup=(etc/bluetooth/{main,rfcomm,audio,network,input,serial}.conf + 'etc/conf.d/bluetooth' 'etc/dbus-1/system.d/bluetooth.conf') +source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.bz2" + 'bluetooth.conf.d' + 'rc.bluetooth') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --libexecdir=/lib \ + --enable-gstreamer \ + --enable-alsa \ + --enable-usb \ + --enable-tools \ + --enable-bccmd \ + --enable-dfutool \ + --enable-hid2hci \ + --enable-hidd \ + --enable-pand \ + --enable-dund \ + --enable-cups \ + --enable-wiimote \ + --disable-test + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + + install -Dm755 ${srcdir}/rc.bluetooth ${pkgdir}/etc/rc.d/bluetooth + + install -d ${pkgdir}/etc/bluetooth + install -m644 network/network.conf \ + input/input.conf \ + audio/audio.conf \ + serial/serial.conf \ + ${pkgdir}/etc/bluetooth/ + + install -Dm644 ${srcdir}/bluetooth.conf.d \ + ${pkgdir}/etc/conf.d/bluetooth + + # FS#27630 + install -Dm755 test/simple-agent "${pkgdir}"/usr/bin/bluez-simple-agent + install -Dm755 test/test-device "${pkgdir}"/usr/bin/bluez-test-device + install -Dm755 test/test-input "${pkgdir}"/usr/bin/bluez-test-input + sed -i 's#/usr/bin/python#/usr/bin/python2#' \ + "${pkgdir}"/usr/bin/bluez-simple-agent \ + "${pkgdir}"/usr/bin/bluez-test-device \ + "${pkgdir}"/usr/bin/bluez-test-input + + # http://mailman.archlinux.org/pipermail/arch-general/2011-April/019787.html + rm "${pkgdir}"/usr/lib/udev/rules.d/97-bluetooth.rules +} +md5sums=('2387053eb5a7b02f37df4871df022a02' + '7412982b440f29fa7f76a41a87fef985' + '8f9498707f809506928b2e480d3b6789') diff --git a/staging/bluez/bluetooth.conf.d b/staging/bluez/bluetooth.conf.d new file mode 100644 index 000000000..1c1e02589 --- /dev/null +++ b/staging/bluez/bluetooth.conf.d @@ -0,0 +1,30 @@ +# Bluetooth configuraton file + +# Bluetooth services (allowed values are "true" and "false") + +# Run the bluetoothd daemon (default: true) +#DAEMON_ENABLE="false" + +# Run the sdp daemon (default: false) +# If this is disabled, hcid's internal sdp daemon will be used +#SDPD_ENABLE="true" + +# Run the bluetooth HID daemon (default: false) +#HIDD_ENABLE="true" + +# Activate rfcomm ports (default: false) +#RFCOMM_ENABLE="true" + +# Run bluetooth dial-up networking daemon (default: false) +#DUND_ENABLE="true" + +# Run bluetooth PAN daemon (default: false) +#PAND_ENABLE="true" + +# rfcomm configuration file (default: /etc/bluetooth/rfcomm.conf) +#RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf" + +# Options for hidd, dund and pand (default: none) +HIDD_OPTIONS="--server" +#DUND_OPTIONS="" +#PAND_OPTIONS="" diff --git a/staging/bluez/rc.bluetooth b/staging/bluez/rc.bluetooth new file mode 100644 index 000000000..a46ee2abb --- /dev/null +++ b/staging/bluez/rc.bluetooth @@ -0,0 +1,100 @@ +#!/bin/bash +# +# Start/stop the Bluetooth daemons +# + +. /etc/rc.conf +. /etc/rc.d/functions + +DAEMON_NAME="bluetoothd" +HIDD_NAME="hidd" +RFCOMM_NAME="rfcomm" +PAND_NAME="pand" +DUND_NAME="dund" + +DAEMON_EXEC="/usr/sbin/bluetoothd" +HIDD_EXEC="/usr/bin/hidd" +RFCOMM_EXEC="/usr/bin/rfcomm" +PAND_EXEC="/usr/bin/pand" +DUND_EXEC="/usr/bin/dund" + +DAEMON_ENABLE="true" +HIDD_ENABLE="false" +RFCOMM_ENABLE="false" +DUND_ENABLE="false" +PAND_ENABLE="false" + +RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf" + +HIDD_OPTIONS="" +DUND_OPTIONS="" +PAND_OPTIONS="" + +[ -f /etc/conf.d/bluetooth ] && . /etc/conf.d/bluetooth + +case "$1" in + start) + stat_busy "Starting bluetooth subsystem:" + if [ "$DAEMON_ENABLE" = "true" -a -x "$DAEMON_EXEC" ] ; then + stat_append " $DAEMON_NAME" + $DAEMON_EXEC + sleep 1 + fi + if [ "$SDPD_ENABLE" = "true" -a -x "$SDPD_EXEC" ] ; then + stat_append " $SDPD_NAME" + $SDPD_EXEC + fi + if [ "$HIDD_ENABLE" = "true" -a -x "$HIDD_EXEC" ]; then + stat_append " $HIDD_NAME" + $HIDD_EXEC $HIDD_OPTIONS + fi + if [ "$RFCOMM_ENABLE" = "true" -a -x "$RFCOMM_EXEC" -a -f "$RFCOMM_CONFIG" ]; then + stat_append " $RFCOMM_NAME" + $RFCOMM_EXEC -f $RFCOMM_CONFIG bind all + fi + if [ "$DUND_ENABLE" = "true" -a -x "$DUND_EXEC" -a -n "$DUND_OPTIONS" ]; then + stat_append " $DUND_NAME" + $DUND_EXEC $DUND_OPTIONS + fi + if [ "$PAND_ENABLE" = "true" -a -x "$PAND_EXEC" -a -n "$PAND_OPTIONS" ]; then + stat_append " $PAND_NAME" + $PAND_EXEC $PAND_OPTIONS + fi + add_daemon bluetooth + stat_done + ;; + stop) + stat_busy "Stopping bluetooth subsystem:" + + stat_append " $PAND_NAME" + killall $PAND_NAME >/dev/null 2>&1 + + stat_append " $DUND_NAME" + killall $DUND_NAME >/dev/null 2>&1 + + if [ -x "$RFCOMM_EXEC" ]; then + stat_append " $RFCOMM_NAME" + $RFCOMM_EXEC release all >/dev/null 2>&1 + fi + + stat_append " $HIDD_NAME" + killall $HIDD_NAME >/dev/null 2>&1 + + stat_append " $SDPD_NAME" + killall $SDPD_NAME >/dev/null 2>&1 + + stat_append " $DAEMON_NAME" + killall $DAEMON_NAME >/dev/null 2>&1 + + rm_daemon bluetooth + stat_done + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/staging/boost/PKGBUILD b/staging/boost/PKGBUILD index 0f6be7ab1..d54a3da70 100644 --- a/staging/boost/PKGBUILD +++ b/staging/boost/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 151566 2012-02-27 18:05:58Z ibiru $ +# $Id: PKGBUILD 154943 2012-03-31 13:16:40Z andyrtr $ # Maintainer: kevin <kevin@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Kritoke <kritoke@gamebox.net> @@ -8,7 +8,7 @@ pkgbase=boost pkgname=('boost-libs' 'boost') pkgver=1.49.0 _boostver=${pkgver//./_} -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://www.boost.org/" makedepends=('icu' 'python' 'python2' 'bzip2' 'zlib' 'openmpi') diff --git a/staging/gpsd/PKGBUILD b/staging/gpsd/PKGBUILD new file mode 100644 index 000000000..99b468286 --- /dev/null +++ b/staging/gpsd/PKGBUILD @@ -0,0 +1,78 @@ +# $Id: PKGBUILD 154959 2012-03-31 22:33:52Z tomegun $ +# Maintainer: +# Contributor: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Giacomo Rizzo <alt@free-os.it> + +pkgname=gpsd +pkgver=3.4 +pkgrel=2 +pkgdesc="GPS daemon and library to support USB/serial GPS devices" +arch=('i686' 'x86_64') +url="http://catb.org/gpsd/" +license=('BSD') +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' + 'pygtk: GUI frontends') +makedepends=('scons' 'docbook-xsl' 'chrpath') +backup=('etc/conf.d/gpsd') +options=('!libtool') +install="${pkgname}.install" +source=("http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig} + 'gpsd' 'gpsd.conf.d') +md5sums=('c01353459faa68834309109d4e868460' + '8aea27e1b0c23f254f94861f7d898106' + '1f3402f8e33a7032b9ae6dfd077234f7' + '3e963df3f9f7ef3572ecc648ae829315') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # fix python 2.7 path + 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() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # Fix man pages path (FS#21715) + sed -i 's|.so gps.1|.so man1/gps.1|' cgps.1 lcdgps.1 xgps.1 xgpsspeed.1 + + export DESTDIR="${pkgdir}" + scons install + + install -D -m644 "${srcdir}/gpsd.conf.d" "${pkgdir}/etc/conf.d/gpsd" + + install -D -m644 "gpsd.rules" "${pkgdir}/usr/lib/udev/rules.d/99-gpsd-usb.rules" + + sed -i 's|/etc/default/gpsd|/etc/conf.d/gpsd|' gpsd.hotplug + install -D -m755 gpsd.hotplug "${pkgdir}/usr/lib/udev/gpsd.hotplug" + + # 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} + chrpath -r /usr/lib/ "${pkgdir}"/usr/lib/python2.7/site-packages/gps/{clienthelpers,packet}.so + + 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 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/staging/gpsd/gpsd b/staging/gpsd/gpsd new file mode 100755 index 000000000..b510a7542 --- /dev/null +++ b/staging/gpsd/gpsd @@ -0,0 +1,44 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +[ -f /etc/conf.d/gpsd ] && . /etc/conf.d/gpsd + +NAME=gpsd +DAEMON=/usr/sbin/$NAME +PIDFILE=/var/run/$NAME/$NAME.pid +PID=$(cat $PIDFILE 2>/dev/null) + +case "$1" in + start) + 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 $NAME + stat_done + fi + ;; + stop) + stat_busy "Stopping $NAME" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm -f $PIDFILE &>/dev/null + rm_daemon $NAME + stat_done + fi + ;; + + restart) + $0 stop + sleep 2 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/staging/gpsd/gpsd.conf.d b/staging/gpsd/gpsd.conf.d new file mode 100644 index 000000000..9fef72cb9 --- /dev/null +++ b/staging/gpsd/gpsd.conf.d @@ -0,0 +1,5 @@ +# Default settings for gpsd. +START_DAEMON="true" +GPSD_OPTIONS="" +DEVICES="" +USBAUTO="true" diff --git a/staging/gpsd/gpsd.install b/staging/gpsd/gpsd.install new file mode 100644 index 000000000..ee661fcb1 --- /dev/null +++ b/staging/gpsd/gpsd.install @@ -0,0 +1,16 @@ +post_install() { + echo ">>> Note: the supplied gpsd udev rules are device-specific, so" + echo ">>> if your device isn't detected correctly, please use lsusb or" + echo ">>> another suitable tool to determine the proper device IDs and" + echo ">>> use the commented rules to fill in the blanks for your device." + + update-desktop-database -q +} + +post_upgrade() { + update-desktop-database -q +} + +post_remove() { + update-desktop-database -q +} diff --git a/staging/kactivities/PKGBUILD b/staging/kactivities/PKGBUILD index 53b9c400d..3d10f663b 100644 --- a/staging/kactivities/PKGBUILD +++ b/staging/kactivities/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 152041 2012-03-04 14:22:26Z andrea $ +# $Id: PKGBUILD 154922 2012-03-31 08:10:59Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kactivities -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 arch=('i686' 'x86_64') pkgdesc='API for using and interacting with Activities' @@ -10,8 +10,8 @@ url='http://kde.org/' license=('GPL' 'FDL') depends=('kdelibs') makedepends=('cmake' 'automoc4') -source=("http://download.kde.org/stable/${pkgver}/src/xz/${pkgname}-${pkgver}.tar.xz") -sha1sums=('29979514848633da71780b342e7328063bd47d07') +source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") +sha1sums=('e97d0b82661fd3d886b87d673d7a1191073af7ff') build() { cd "${srcdir}" diff --git a/staging/kdeaccessibility-jovie/PKGBUILD b/staging/kdeaccessibility-jovie/PKGBUILD index aadc80dbc..419ee2dc0 100644 --- a/staging/kdeaccessibility-jovie/PKGBUILD +++ b/staging/kdeaccessibility-jovie/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 152051 2012-03-04 14:29:11Z andrea $ +# $Id: PKGBUILD 154855 2012-03-31 07:28:02Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeaccessibility-jovie -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 arch=('i686' 'x86_64') pkgdesc='A text to speech application' @@ -13,8 +13,8 @@ depends=('kdebase-runtime' 'speech-dispatcher') makedepends=('cmake' 'automoc4') replaces=('kdeaccessibility-kttsd') install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/xz/jovie-${pkgver}.tar.xz") -sha1sums=('4ac647ac3823b6a4f01f839f3e11bca09d6353ee') +source=("http://download.kde.org/stable/${pkgver}/src/jovie-${pkgver}.tar.xz") +sha1sums=('eac0fe5006b54914f17dd529a723da4964f59a0b') build() { cd "${srcdir}" diff --git a/staging/kdeaccessibility-kaccessible/PKGBUILD b/staging/kdeaccessibility-kaccessible/PKGBUILD index efd116667..8fe68565a 100644 --- a/staging/kdeaccessibility-kaccessible/PKGBUILD +++ b/staging/kdeaccessibility-kaccessible/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 152052 2012-03-04 14:29:40Z andrea $ +# $Id: PKGBUILD 154856 2012-03-31 07:28:34Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeaccessibility-kaccessible -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 arch=('i686' 'x86_64') pkgdesc='Provides accessibility services like focus tracking and a screenreader' @@ -11,8 +11,8 @@ license=('GPL' 'FDL') groups=('kde' 'kdeaccessibility') depends=('kdelibs' 'speech-dispatcher') makedepends=('cmake' 'automoc4') -source=("http://download.kde.org/stable/${pkgver}/src/xz/kaccessible-${pkgver}.tar.xz") -sha1sums=('da137f22a8de55858a3ae80f4e95d89c18b50257') +source=("http://download.kde.org/stable/${pkgver}/src/kaccessible-${pkgver}.tar.xz") +sha1sums=('bc5cd13decd2456c91fd6973be038e6fea0da256') build() { cd "${srcdir}" diff --git a/staging/kdeaccessibility-kmag/PKGBUILD b/staging/kdeaccessibility-kmag/PKGBUILD index a6e48bedc..ff542342d 100644 --- a/staging/kdeaccessibility-kmag/PKGBUILD +++ b/staging/kdeaccessibility-kmag/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 152053 2012-03-04 14:30:04Z andrea $ +# $Id: PKGBUILD 154857 2012-03-31 07:29:06Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeaccessibility-kmag -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 arch=('i686' 'x86_64') pkgdesc='Screen Magnifier' @@ -12,8 +12,8 @@ groups=('kde' 'kdeaccessibility') depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/xz/kmag-${pkgver}.tar.xz") -sha1sums=('35686d11ecf5e2783b7518499300a715ef27108d') +source=("http://download.kde.org/stable/${pkgver}/src/kmag-${pkgver}.tar.xz") +sha1sums=('5a88645d7af1f407e87fcd91911b1e94e4ffb271') build() { cd "${srcdir}" diff --git a/staging/kdeaccessibility-kmousetool/PKGBUILD b/staging/kdeaccessibility-kmousetool/PKGBUILD index 2f4f1da27..3b8172f72 100644 --- a/staging/kdeaccessibility-kmousetool/PKGBUILD +++ b/staging/kdeaccessibility-kmousetool/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 152054 2012-03-04 14:30:28Z andrea $ +# $Id: PKGBUILD 154858 2012-03-31 07:29:32Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeaccessibility-kmousetool -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 arch=('i686' 'x86_64') pkgdesc='Clicks the mouse for you, reducing the effects of RSI' @@ -12,8 +12,8 @@ groups=('kde' 'kdeaccessibility') depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/xz/kmousetool-${pkgver}.tar.xz") -sha1sums=('8b3f0323602ab33a5749c7e5c75d50b62c352786') +source=("http://download.kde.org/stable/${pkgver}/src/kmousetool-${pkgver}.tar.xz") +sha1sums=('e0a66c42324d9ac09c3e85fea12a24a5ae2abb9b') build() { cd "${srcdir}" diff --git a/staging/kdeaccessibility-kmouth/PKGBUILD b/staging/kdeaccessibility-kmouth/PKGBUILD index a92e288fd..854222f3f 100644 --- a/staging/kdeaccessibility-kmouth/PKGBUILD +++ b/staging/kdeaccessibility-kmouth/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 152055 2012-03-04 14:30:56Z andrea $ +# $Id: PKGBUILD 154859 2012-03-31 07:29:57Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeaccessibility-kmouth -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 arch=('i686' 'x86_64') pkgdesc='Speech Synthesizer Frontend' @@ -12,8 +12,8 @@ groups=('kde' 'kdeaccessibility') depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/xz/kmouth-${pkgver}.tar.xz") -sha1sums=('b4cecf89eea96892608fd125635ea9f9f7fee8be') +source=("http://download.kde.org/stable/${pkgver}/src/kmouth-${pkgver}.tar.xz") +sha1sums=('f0192e531161544a803f8822b041d8c50ec9bb58') build() { cd "${srcdir}" diff --git a/staging/kdeadmin/PKGBUILD b/staging/kdeadmin/PKGBUILD index f6a407826..6665d017d 100644 --- a/staging/kdeadmin/PKGBUILD +++ b/staging/kdeadmin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 152056 2012-03-04 14:31:34Z andrea $ +# $Id: PKGBUILD 154860 2012-03-31 07:30:33Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -7,16 +7,16 @@ pkgname=('kdeadmin-kcron' 'kdeadmin-ksystemlog' 'kdeadmin-kuser' 'kdeadmin-system-config-printer-kde') -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdeadmin') -makedepends=('cmake' 'automoc4' 'kdebindings-python' 'system-config-printer-common') -source=("http://download.kde.org/stable/${pkgver}/src/xz/${pkgbase}-${pkgver}.tar.xz" +makedepends=('cmake' 'automoc4' 'kdebindings-python2' 'system-config-printer-common') +source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" 'syslog-path.patch') -sha1sums=('0ee44575bfb45159ced6d4d046b07323ebab00e7' +sha1sums=('2952e5111f5e71671384db40d305630bd50c01c0' '20095ce6e0f3e5b6800a7c6e52de6fddba62c031') build() { @@ -56,7 +56,7 @@ package_kdeadmin-ksystemlog() { package_kdeadmin-kuser() { pkgdesc='User Manager' - depends=('kdepim-runtime') + depends=('kdebase-runtime' 'kdepimlibs') url="http://kde.org/applications/system/kuser/" install='kdeadmin.install' cd $srcdir/build/kuser @@ -67,15 +67,14 @@ package_kdeadmin-kuser() { package_kdeadmin-system-config-printer-kde() { pkgdesc='Configure local and remote Printers' - depends=('kdebindings-python' 'system-config-printer-common' 'python2-pyqt' - 'cups' 'python2-gobject2') + depends=('kdebindings-python2' 'system-config-printer-common' 'cups' 'python2-gobject2') url="http://kde.org/applications/system/printerapplet/" cd $srcdir/build/system-config-printer-kde make DESTDIR=$pkgdir install - # Use the python2 executable - sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \ - "${pkgdir}"/usr/share/apps/system-config-printer-kde/{system-config-printer-kde,authconn}.py - sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' \ - "${pkgdir}"/usr/share/apps/system-config-printer-kde/pysmb.py + # Use the python2 executable + sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \ + "${pkgdir}"/usr/share/apps/system-config-printer-kde/{system-config-printer-kde,authconn}.py + sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' \ + "${pkgdir}"/usr/share/apps/system-config-printer-kde/pysmb.py } diff --git a/staging/kdeartwork/PKGBUILD b/staging/kdeartwork/PKGBUILD index c7959ee8b..8ed3ade20 100644 --- a/staging/kdeartwork/PKGBUILD +++ b/staging/kdeartwork/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 152057 2012-03-04 14:32:05Z andrea $ +# $Id: PKGBUILD 154861 2012-03-31 07:31:08Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -13,7 +13,7 @@ pkgname=('kdeartwork-aurorae' 'kdeartwork-styles' 'kdeartwork-wallpapers' 'kdeartwork-weatherwallpapers') -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' @@ -21,8 +21,8 @@ license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdeartwork') makedepends=('cmake' 'automoc4' 'xscreensaver' 'eigen' 'kdebase-workspace' 'libkexiv2') -source=("http://download.kde.org/stable/${pkgver}/src/xz/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('31215ff41d01c8bf680578abe57b65648441a135') +source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") +sha1sums=('828d8f36eb55bc93800a8d799b3cf20c22146021') build() { cd $srcdir diff --git a/staging/kdebase-konsole/PKGBUILD b/staging/kdebase-konsole/PKGBUILD index c6a931305..de0f8c9b4 100644 --- a/staging/kdebase-konsole/PKGBUILD +++ b/staging/kdebase-konsole/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 152058 2012-03-04 14:36:30Z andrea $ +# $Id: PKGBUILD 154862 2012-03-31 07:35:24Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebase-konsole -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 arch=('i686' 'x86_64') url='http://kde.org/applications/system/konsole/' @@ -11,8 +11,8 @@ license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdebase') depends=('kdebase-runtime' 'kdebase-lib') makedepends=('cmake' 'automoc4') -source=("http://download.kde.org/stable/${pkgver}/src/xz/konsole-${pkgver}.tar.xz") -sha1sums=('23490d929c6c3a56485e4c6585a1d10af9810651') +source=("http://download.kde.org/stable/${pkgver}/src/konsole-${pkgver}.tar.xz") +sha1sums=('a57ff4844a612ac0ece07435186d55fb95bf012d') build() { cd "${srcdir}" diff --git a/staging/kdebase-runtime/PKGBUILD b/staging/kdebase-runtime/PKGBUILD index ee3e4cf1b..af0067aa1 100644 --- a/staging/kdebase-runtime/PKGBUILD +++ b/staging/kdebase-runtime/PKGBUILD @@ -1,24 +1,22 @@ -# $Id: PKGBUILD 152030 2012-03-04 14:16:27Z andrea $ +# $Id: PKGBUILD 154835 2012-03-31 07:14:58Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdebase-runtime -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 pkgdesc="KDE Base Runtime Environment" arch=('i686' 'x86_64') url='http://www.kde.org' license=('GPL' 'LGPL') -depends=('kdelibs' 'ntrack' 'smbclient' 'libssh' 'libcanberra' 'oxygen-icons' - 'xorg-xauth') -makedepends=('pkg-config' 'cmake' 'automoc4' 'kdepimlibs' 'openslp' 'doxygen' - 'xine-lib') +depends=('kdelibs' 'smbclient' 'libssh' 'libcanberra' 'oxygen-icons' 'xorg-xauth') +makedepends=('pkg-config' 'cmake' 'automoc4' 'kdepimlibs' 'openslp' 'doxygen' 'networkmanager') optdepends=('htdig: to build the search index in khelpcenter' 'rarian: needed by khelpcenter' 'gdb: drkonq crash handler') install="${pkgname}.install" -source=("http://download.kde.org/stable/${pkgver}/src/xz/kde-runtime-${pkgver}.tar.xz") -sha1sums=('82b57dc38335716fb382a665b536a9aece4684d6') +source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.xz") +sha1sums=('d2931b8a7c744d6c2fc95d46b2195ed2cd253c00') build() { cd "${srcdir}" @@ -27,7 +25,9 @@ build() { cmake ../kde-runtime-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr + -DCMAKE_INSTALL_PREFIX=/usr \ + -DWITH_QNtrack=OFF \ + -DWITH_Xine=OFF make } diff --git a/staging/kdebase-workspace/PKGBUILD b/staging/kdebase-workspace/PKGBUILD index b25ad608a..dbaeb3a02 100644 --- a/staging/kdebase-workspace/PKGBUILD +++ b/staging/kdebase-workspace/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 152042 2012-03-04 14:23:30Z andrea $ +# $Id: PKGBUILD 154846 2012-03-31 07:22:15Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdebase-workspace _pkgname=kde-workspace -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 pkgdesc="KDE Base Workspace" arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ depends=('kdepim-runtime' 'lm_sensors' 'libraw1394' 'libqalculate' 'libxklavier' 'xorg-xsetroot' 'libxcomposite' 'libxinerama' 'xorg-xrdb' 'libgles' 'libegl' 'kactivities' 'libxres' 'libxtst' 'xorg-xrandr') -makedepends=('cmake' 'automoc4' 'boost' 'kdebindings-python' 'networkmanager') +makedepends=('cmake' 'automoc4' 'boost' 'kdebindings-python2' 'networkmanager') optdepends=('kde-wallpapers: wallpapers for KDE Plasma Workspaces') replaces=('kdmtheme' 'kde-common' 'guidance-power-manager' 'policykit-kde' 'kdebase-kinfocenter') @@ -31,13 +31,13 @@ backup=('usr/share/config/kdm/kdmrc' 'etc/pam.d/kde-np' 'etc/pam.d/kscreensaver') options=('emptydirs') -source=("http://download.kde.org/stable/${pkgver}/src/xz/${_pkgname}-${pkgver}.tar.xz" +source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz" 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch') -sha1sums=('675df4befd736e770e3029af8d38800c9018e888' +sha1sums=('7f48a4f8bb7e3296155b18464bc7bd5c04f6ae92' '5db3a245201bd4a50e65aa2ef583cf5490e4f646' - 'e4198a443703f749b58a4fec88362fced1b45789' - '264e395c2c44cdda5a242c6dee649afab44cd6e5' + '712a90999bd429883dcef5dcaf288aace332ced8' + 'b321b5e613b60231330e606fdf1e124646148388' '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8' 'd7b5883f7e65c6839b1f65f94d58026673dd0226' 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee' diff --git a/staging/kdebase-workspace/kde-np.pam b/staging/kdebase-workspace/kde-np.pam index dfedb8edf..7d60cc35c 100644 --- a/staging/kdebase-workspace/kde-np.pam +++ b/staging/kdebase-workspace/kde-np.pam @@ -1,6 +1,7 @@ #%PAM-1.0 auth required pam_nologin.so auth required pam_permit.so +auth required pam_env.so account required pam_unix.so password required pam_unix.so session required pam_unix.so diff --git a/staging/kdebase-workspace/kde.pam b/staging/kdebase-workspace/kde.pam index 9ec074d06..ec1d8277f 100644 --- a/staging/kdebase-workspace/kde.pam +++ b/staging/kdebase-workspace/kde.pam @@ -1,6 +1,7 @@ #%PAM-1.0 auth required pam_unix.so auth required pam_nologin.so +auth required pam_env.so account required pam_unix.so password required pam_unix.so session required pam_unix.so diff --git a/staging/kdebase/PKGBUILD b/staging/kdebase/PKGBUILD index aa0552f73..8cf602273 100644 --- a/staging/kdebase/PKGBUILD +++ b/staging/kdebase/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 152043 2012-03-04 14:25:01Z andrea $ +# $Id: PKGBUILD 154847 2012-03-31 07:23:48Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -12,15 +12,15 @@ pkgname=('kdebase-dolphin' 'kdebase-konqueror' 'kdebase-lib' 'kdebase-plasma') -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdebase') makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml') -source=("http://download.kde.org/stable/${pkgver}/src/xz/kde-baseapps-${pkgver}.tar.xz") -sha1sums=('bfbc51930a81ea272ddbb1fc9a9cefb9cf9a81d6') +source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz") +sha1sums=('13dc2e6c8639feadc9a5a334d0720a60b1e3ccb6') build() { cd ${srcdir} diff --git a/staging/kdebindings-kimono/PKGBUILD b/staging/kdebindings-kimono/PKGBUILD index e42e65a18..736e4a918 100644 --- a/staging/kdebindings-kimono/PKGBUILD +++ b/staging/kdebindings-kimono/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 152059 2012-03-04 14:36:59Z andrea $ +# $Id: PKGBUILD 154863 2012-03-31 07:35:53Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-kimono -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 pkgdesc=".NET/Mono bindings for the KDE libraries" url="http://kde.org/" @@ -12,8 +12,8 @@ groups=('kdebindings') depends=('kdebindings-qyoto' 'kdebindings-smokekde') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' 'kdepimlibs') conflicts=('kdebindings-csharp') -source=("http://download.kde.org/stable/${pkgver}/src/xz/kimono-${pkgver}.tar.xz") -sha1sums=('cecf979d52091a2baaabb7334750f8376d835b0a') +source=("http://download.kde.org/stable/${pkgver}/src/kimono-${pkgver}.tar.xz") +sha1sums=('ffe572e5df8f8a5d2a6b94db8e460b603af711e6') build() { cd "${srcdir}" diff --git a/staging/kdebindings-korundum/PKGBUILD b/staging/kdebindings-korundum/PKGBUILD index c6612adcb..aef1e6365 100644 --- a/staging/kdebindings-korundum/PKGBUILD +++ b/staging/kdebindings-korundum/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 152060 2012-03-04 14:37:24Z andrea $ +# $Id: PKGBUILD 154864 2012-03-31 07:36:20Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-korundum -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 pkgdesc="KDE bindings for ruby" url="http://kde.org/" @@ -14,9 +14,9 @@ makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' 'kdepimlibs' 'kdegraphics-okular' 'kdesdk-kate') conflicts=('kdebindings-ruby') options=('!makeflags') -source=("http://download.kde.org/stable/${pkgver}/src/xz/korundum-${pkgver}.tar.xz" +source=("http://download.kde.org/stable/${pkgver}/src/korundum-${pkgver}.tar.xz" 'korundum-4.8.0-ruby19.patch') -sha1sums=('10788c362d209785ce800d70c3b8823af49cf16c' +sha1sums=('59db0c58a26849aaf4c1839d175239f768257d5b' '73299f56a891d8a5475ac07dd485619859312f70') build() { diff --git a/staging/kdebindings-kross/PKGBUILD b/staging/kdebindings-kross/PKGBUILD index 0d356e635..95f6efef5 100644 --- a/staging/kdebindings-kross/PKGBUILD +++ b/staging/kdebindings-kross/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 152061 2012-03-04 14:37:52Z andrea $ +# $Id: PKGBUILD 154865 2012-03-31 07:36:48Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=kdebindings-kross pkgname=('kdebindings-kross-python' # 'kdebindings-kross-ruby' 'kdebindings-kross-java') -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 url="http://kde.org/" arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL') groups=('kdebindings') makedepends=('kdelibs' 'cmake' 'automoc4' 'python2' 'java-environment') -source=("http://download.kde.org/stable/${pkgver}/src/xz/kross-interpreters-${pkgver}.tar.xz") -sha1sums=('28a20608fedf726615fc6b97664a30a350e58540') +source=("http://download.kde.org/stable/${pkgver}/src/kross-interpreters-${pkgver}.tar.xz") +sha1sums=('dfee7d8098db258bcd26d447553775434d299113') build() { cd "${srcdir}" diff --git a/staging/kdebindings-perlkde/PKGBUILD b/staging/kdebindings-perlkde/PKGBUILD index fd470a090..24c3ac668 100644 --- a/staging/kdebindings-perlkde/PKGBUILD +++ b/staging/kdebindings-perlkde/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 152062 2012-03-04 14:38:19Z andrea $ +# $Id: PKGBUILD 154866 2012-03-31 07:37:16Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-perlkde -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 pkgdesc="Perl bindings for the KDE libraries" url="http://kde.org/" @@ -12,8 +12,8 @@ groups=('kdebindings') depends=('kdebindings-perlqt' 'kdebindings-smokekde') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'kdepimlibs' 'kdegraphics-okular' 'kdesdk-kate') -source=("http://download.kde.org/stable/${pkgver}/src/xz/perlkde-${pkgver}.tar.xz") -sha1sums=('93e3b009c972a697aebf0450c4c07ff87a5c0461') +source=("http://download.kde.org/stable/${pkgver}/src/perlkde-${pkgver}.tar.xz") +sha1sums=('cfb7d44bd88a899aef56e6200b6a6ff34516a316') build() { cd "${srcdir}" diff --git a/staging/kdebindings-perlqt/PKGBUILD b/staging/kdebindings-perlqt/PKGBUILD index 2ad102007..971dc186f 100644 --- a/staging/kdebindings-perlqt/PKGBUILD +++ b/staging/kdebindings-perlqt/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 152037 2012-03-04 14:20:22Z andrea $ +# $Id: PKGBUILD 154842 2012-03-31 07:18:59Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-perlqt -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 pkgdesc="Perl bindings for the Qt libraries" url="http://kde.org/" @@ -11,8 +11,8 @@ license=('GPL' 'LGPL' 'FDL') groups=('kdebindings') depends=('kdebindings-smokeqt' 'perl-list-moreutils') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') -source=("http://download.kde.org/stable/${pkgver}/src/xz/perlqt-${pkgver}.tar.xz") -sha1sums=('119bbce5e82a47c8f70a8a124b73aa1cacf646ff') +source=("http://download.kde.org/stable/${pkgver}/src/perlqt-${pkgver}.tar.xz") +sha1sums=('e9ccef109d2a2a7d10f43f87691356c44a733b54') build() { cd "${srcdir}" diff --git a/staging/kdebindings-python/PKGBUILD b/staging/kdebindings-python/PKGBUILD index 6a7cc62d3..a354c8f8a 100644 --- a/staging/kdebindings-python/PKGBUILD +++ b/staging/kdebindings-python/PKGBUILD @@ -1,33 +1,67 @@ -# $Id: PKGBUILD 152038 2012-03-04 14:20:50Z andrea $ +# $Id: PKGBUILD 154843 2012-03-31 07:19:27Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> -pkgname=kdebindings-python -pkgver=4.8.1 +pkgbase=kdebindings-python +pkgname=('kdebindings-python' + 'kdebindings-python2') +pkgver=4.8.2 pkgrel=1 -pkgdesc="KDE bindings for Python" -url="http://kde.org/" +url='http://kde.org/' arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL') groups=('kdebindings') -depends=('kdepim-runtime' 'python2-pyqt' 'qscintilla') -makedepends=('cmake' 'automoc4' 'boost') -source=("http://download.kde.org/stable/${pkgver}/src/xz/pykde4-${pkgver}.tar.xz") -sha1sums=('b9ef35269d2e08578ba20d01822dbdbed72bffb8') +makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'python2-pyqt' 'qscintilla') +source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.xz") +sha1sums=('7d1a41e00794dba160ce8e2a3f750c9a4298ef15') build() { + export PYTHONDONTWRITEBYTECODE="TRUE" + cd "${srcdir}" mkdir build cd build cmake ../pykde4-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DPYTHON_LIBRARY=/usr/lib/libpython3.2mu.so.1.0 + make + cd .. + + mkdir build-python2 + cd build-python2 + cmake ../pykde4-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ -DPYTHON_EXECUTABLE=/usr/bin/python2 make } -package() { +package_kdebindings-python() { + pkgdesc="A set of Python 3.x bindings for KDE" + depends=('kdepim-runtime' 'pyqt' 'qscintilla') + cd "${srcdir}"/build make DESTDIR="${pkgdir}" install +} + +package_kdebindings-python2() { + pkgdesc="A set of Python 2.x bindings for KDE" + depends=('kdepim-runtime' 'python2-pyqt' 'qscintilla') + conflicts=('kdebindings-python<4.8.1-2') + + cd "${srcdir}"/build-python2 + make DESTDIR="${pkgdir}" install + + # Fix conflicts + rm "${pkgdir}"/usr/bin/pykdeuic4 + ln -sf /usr/lib/python2.7/site-packages/PyQt4/uic/pykdeuic4.py \ + "${pkgdir}"/usr/bin/python2-pykdeuic4 + + mv "${pkgdir}"/usr/share/apps/pykde4/examples \ + "${pkgdir}"/usr/share/apps/pykde4/python2-examples + + mv "${pkgdir}"/usr/share/sip/PyKDE4 \ + "${pkgdir}"/usr/share/sip/python2-PyKDE4 # Use the python2 executable find "${pkgdir}" -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' diff --git a/staging/kdebindings-qtruby/PKGBUILD b/staging/kdebindings-qtruby/PKGBUILD index bd113cf47..07add09a5 100644 --- a/staging/kdebindings-qtruby/PKGBUILD +++ b/staging/kdebindings-qtruby/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 152040 2012-03-04 14:21:58Z andrea $ +# $Id: PKGBUILD 154845 2012-03-31 07:20:41Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-qtruby -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 pkgdesc="Qt bindings for ruby" url="http://kde.org/" @@ -12,8 +12,8 @@ groups=('kdebindings') depends=('kdebindings-smokeqt' 'ruby') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') conflicts=('kdebindings-ruby') -source=("http://download.kde.org/stable/${pkgver}/src/xz/qtruby-${pkgver}.tar.xz") -sha1sums=('b2532f9e9e04760fce5d9ac87768e6085f0c231b') +source=("http://download.kde.org/stable/${pkgver}/src/qtruby-${pkgver}.tar.xz") +sha1sums=('86643ab8ea52f4a1abcefa3620cea62d2225f949') build() { cd "${srcdir}" diff --git a/staging/kdebindings-qyoto/PKGBUILD b/staging/kdebindings-qyoto/PKGBUILD index 354483001..6074d5711 100644 --- a/staging/kdebindings-qyoto/PKGBUILD +++ b/staging/kdebindings-qyoto/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 152039 2012-03-04 14:21:28Z andrea $ +# $Id: PKGBUILD 154844 2012-03-31 07:20:10Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-qyoto -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 pkgdesc=".NET/Mono bindings for the Qt libraries" url="http://kde.org/" @@ -12,8 +12,8 @@ groups=('kdebindings') depends=('kdebindings-smokeqt' 'mono') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') conflicts=('kdebindings-csharp') -source=("http://download.kde.org/stable/${pkgver}/src/xz/qyoto-${pkgver}.tar.xz") -sha1sums=('32ad56ce6189ce691ed46b8494c4cb446dda6016') +source=("http://download.kde.org/stable/${pkgver}/src/qyoto-${pkgver}.tar.xz") +sha1sums=('6d7b8dcac2a92b143bae0d329793864a7a23aa8f') build() { cd "${srcdir}" diff --git a/staging/kdebindings-smokegen/PKGBUILD b/staging/kdebindings-smokegen/PKGBUILD index 1cc2be2d1..ff56852b0 100644 --- a/staging/kdebindings-smokegen/PKGBUILD +++ b/staging/kdebindings-smokegen/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 152032 2012-03-04 14:17:38Z andrea $ +# $Id: PKGBUILD 154837 2012-03-31 07:16:12Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-smokegen -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 pkgdesc="A general purpose C++ parser with a plugin infrastructure" url="http://kde.org/" @@ -11,8 +11,8 @@ license=('GPL' 'LGPL' 'FDL') depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') conflicts=('kdebindings-smoke') -source=("http://download.kde.org/stable/${pkgver}/src/xz/smokegen-${pkgver}.tar.xz") -sha1sums=('6d43ed064730ff81e1844d0634c1b574bd4ffdb2') +source=("http://download.kde.org/stable/${pkgver}/src/smokegen-${pkgver}.tar.xz") +sha1sums=('8ba52937f10fb83470e1fbd724d767ab90921c41') build() { cd "${srcdir}" diff --git a/staging/kdebindings-smokekde/PKGBUILD b/staging/kdebindings-smokekde/PKGBUILD index 769938d00..320590c2f 100644 --- a/staging/kdebindings-smokekde/PKGBUILD +++ b/staging/kdebindings-smokekde/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 152036 2012-03-04 14:19:50Z andrea $ +# $Id: PKGBUILD 154841 2012-03-31 07:18:28Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-smokekde -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 pkgdesc="Language independent library for KDE bindings" url="http://kde.org/" @@ -13,8 +13,8 @@ depends=('kdebindings-smokeqt') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' 'kdepimlibs' 'kdegraphics-okular' 'kdesdk-kate') conflicts=('kdebindings-smoke') -source=("http://download.kde.org/stable/${pkgver}/src/xz/smokekde-${pkgver}.tar.xz") -sha1sums=('680a29725c4b04629befafcd6c74dbc8cc6238f6') +source=("http://download.kde.org/stable/${pkgver}/src/smokekde-${pkgver}.tar.xz") +sha1sums=('5cc24772b72c13555dd716ef7b6d77e81d826d79') build() { cd "${srcdir}" diff --git a/staging/kdebindings-smokeqt/PKGBUILD b/staging/kdebindings-smokeqt/PKGBUILD index 07e3a8c1c..a21bfe31b 100644 --- a/staging/kdebindings-smokeqt/PKGBUILD +++ b/staging/kdebindings-smokeqt/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 152033 2012-03-04 14:18:07Z andrea $ +# $Id: PKGBUILD 154838 2012-03-31 07:16:40Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-smokeqt -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 pkgdesc="Language independent library for Qt bindings" url="http://kde.org/" @@ -12,8 +12,8 @@ groups=('kdebindings') depends=('kdebase-runtime' 'qimageblitz' 'qscintilla' 'kdebindings-smokegen') makedepends=('cmake' 'automoc4') conflicts=('kdebindings-smoke') -source=("http://download.kde.org/stable/${pkgver}/src/xz/smokeqt-${pkgver}.tar.xz") -sha1sums=('7af6089df0ffefe7a88600e43641dfd18da8e3e8') +source=("http://download.kde.org/stable/${pkgver}/src/smokeqt-${pkgver}.tar.xz") +sha1sums=('0d798ecfc7ec881871723e51ed1e4f32ef009c3a') build() { cd "${srcdir}" diff --git a/staging/kdeedu-analitza/PKGBUILD b/staging/kdeedu-analitza/PKGBUILD index 159d57bb3..80ad0e51f 100644 --- a/staging/kdeedu-analitza/PKGBUILD +++ b/staging/kdeedu-analitza/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 152050 2012-03-04 14:28:46Z andrea $ +# $Id: PKGBUILD 154854 2012-03-31 07:27:32Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-analitza -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 pkgdesc="A library to add mathematical features to your program" url="http://kde.org/" @@ -11,8 +11,8 @@ license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdeedu') depends=('kdelibs') makedepends=('cmake' 'automoc4') -source=("http://download.kde.org/stable/${pkgver}/src/xz/analitza-${pkgver}.tar.xz") -sha1sums=('94c175417126c578c38f29c348a8bb8f54cdfb45') +source=("http://download.kde.org/stable/${pkgver}/src/analitza-${pkgver}.tar.xz") +sha1sums=('bf76411269246581b09df98ca8ae33be200c4427') build() { cd "${srcdir}" diff --git a/staging/kdeedu-blinken/PKGBUILD b/staging/kdeedu-blinken/PKGBUILD index 8f10ba83d..9611bcc54 100644 --- a/staging/kdeedu-blinken/PKGBUILD +++ b/staging/kdeedu-blinken/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 152063 2012-03-04 14:38:42Z andrea $ +# $Id: PKGBUILD 154867 2012-03-31 07:37:40Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-blinken -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 pkgdesc="Memory Enhancement Game" url="http://kde.org/applications/education/blinken/" @@ -12,8 +12,8 @@ groups=('kde' 'kdeedu') depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/xz/blinken-${pkgver}.tar.xz") -sha1sums=('ff9f07ee59145a9993604fdef7f301c09c095775') +source=("http://download.kde.org/stable/${pkgver}/src/blinken-${pkgver}.tar.xz") +sha1sums=('c86a67b2e3506e2c56307871afc77e3e67a967d6') build() { cd "${srcdir}" diff --git a/staging/kdeedu-cantor/PKGBUILD b/staging/kdeedu-cantor/PKGBUILD index 3a6a9a25b..91ed54eff 100644 --- a/staging/kdeedu-cantor/PKGBUILD +++ b/staging/kdeedu-cantor/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 152064 2012-03-04 14:39:08Z andrea $ +# $Id: PKGBUILD 154868 2012-03-31 07:38:12Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-cantor -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 pkgdesc="KDE Frontend to Mathematical Software" url="http://kde.org/applications/education/cantor/" @@ -15,8 +15,8 @@ optdepends=('maxima: Maxima backend' 'octave: Octave backend' 'r: R backend') install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/xz/cantor-${pkgver}.tar.xz") -sha1sums=('bc98d41262454de5aee65b124e7f93041ad639af') +source=("http://download.kde.org/stable/${pkgver}/src/cantor-${pkgver}.tar.xz") +sha1sums=('53a13c3594ea82b87a421e96b408355eea76fa89') build() { cd "${srcdir}" diff --git a/staging/kdeedu-kalgebra/PKGBUILD b/staging/kdeedu-kalgebra/PKGBUILD index 1b1aff5db..b7b193480 100644 --- a/staging/kdeedu-kalgebra/PKGBUILD +++ b/staging/kdeedu-kalgebra/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 152065 2012-03-04 14:39:34Z andrea $ +# $Id: PKGBUILD 154869 2012-03-31 07:38:37Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kalgebra -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 pkgdesc="Graph Calculator" url="http://kde.org/applications/education/kalgebra/" @@ -12,8 +12,8 @@ groups=('kde' 'kdeedu') depends=('kdebase-runtime' 'libkdeedu' 'kdeedu-analitza') makedepends=('cmake' 'automoc4') install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/xz/kalgebra-${pkgver}.tar.xz") -sha1sums=('79f4c85e93a1d270d9d7ba648b86d49fca42d6fb') +source=("http://download.kde.org/stable/${pkgver}/src/kalgebra-${pkgver}.tar.xz") +sha1sums=('560efe77d842c0410986b294323eabef6226e6ff') build() { cd "${srcdir}" diff --git a/staging/kdeedu-kalzium/PKGBUILD b/staging/kdeedu-kalzium/PKGBUILD index 6afd88d02..0664263ba 100644 --- a/staging/kdeedu-kalzium/PKGBUILD +++ b/staging/kdeedu-kalzium/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 152066 2012-03-04 14:40:00Z andrea $ +# $Id: PKGBUILD 154870 2012-03-31 07:39:05Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kalzium -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 pkgdesc="Periodic Table of Elements" url="http://kde.org/applications/education/kalzium/" @@ -12,8 +12,8 @@ groups=('kde' 'kdeedu') depends=('kdelibs' 'avogadro' 'ocaml' 'facile') makedepends=('cmake' 'automoc4') install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/xz/kalzium-${pkgver}.tar.xz") -sha1sums=('914072b8a324e6966528e0047ea50c2a52736051') +source=("http://download.kde.org/stable/${pkgver}/src/kalzium-${pkgver}.tar.xz") +sha1sums=('e685430d183339dd06e718c0dee3c6aacdd1536a') build() { cd "${srcdir}" diff --git a/staging/kdeedu-kanagram/PKGBUILD b/staging/kdeedu-kanagram/PKGBUILD index 212e02e3d..197dfc633 100644 --- a/staging/kdeedu-kanagram/PKGBUILD +++ b/staging/kdeedu-kanagram/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 152067 2012-03-04 14:40:32Z andrea $ +# $Id: PKGBUILD 154871 2012-03-31 07:39:37Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kanagram -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 pkgdesc="Letter Order Game" url="http://kde.org/applications/education/kanagram/" @@ -12,8 +12,8 @@ groups=('kde' 'kdeedu') depends=('kdebase-runtime' 'libkdeedu') makedepends=('cmake' 'automoc4') install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/xz/kanagram-${pkgver}.tar.xz") -sha1sums=('d41fa85f894fb0ada8757e4282a57102fda32006') +source=("http://download.kde.org/stable/${pkgver}/src/kanagram-${pkgver}.tar.xz") +sha1sums=('25f7733ddc451738575fe1af5a89833ab8295493') build() { cd "${srcdir}" diff --git a/staging/kdeedu-kbruch/PKGBUILD b/staging/kdeedu-kbruch/PKGBUILD index c39f780c6..54057ed57 100644 --- a/staging/kdeedu-kbruch/PKGBUILD +++ b/staging/kdeedu-kbruch/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 152068 2012-03-04 14:40:57Z andrea $ +# $Id: PKGBUILD 154872 2012-03-31 07:40:03Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kbruch -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 pkgdesc="Exercise Fractions" url="http://kde.org/applications/education/kbruch/" @@ -12,8 +12,8 @@ groups=('kde' 'kdeedu') depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/xz/kbruch-${pkgver}.tar.xz") -sha1sums=('477e508294b097d8367f80a65b1be7c60b1f3211') +source=("http://download.kde.org/stable/${pkgver}/src/kbruch-${pkgver}.tar.xz") +sha1sums=('92cc810935b3aeebe68a970720f4b418490488d8') build() { cd "${srcdir}" diff --git a/staging/kdeedu-kgeography/PKGBUILD b/staging/kdeedu-kgeography/PKGBUILD index 1e0b0f432..6292c8cb4 100644 --- a/staging/kdeedu-kgeography/PKGBUILD +++ b/staging/kdeedu-kgeography/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 152069 2012-03-04 14:41:23Z andrea $ +# $Id: PKGBUILD 154873 2012-03-31 07:40:31Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kgeography -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 pkgdesc="Geography Trainer" url="http://kde.org/applications/education/kgeography/" @@ -12,8 +12,8 @@ groups=('kde' 'kdeedu') depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/xz/kgeography-${pkgver}.tar.xz") -sha1sums=('58b526d3a597cc2afff49f431a78864d36842ef2') +source=("http://download.kde.org/stable/${pkgver}/src/kgeography-${pkgver}.tar.xz") +sha1sums=('795ddfb81e5f75d81b8eb332a07f58af85321197') build() { cd "${srcdir}" diff --git a/staging/kdeedu-khangman/PKGBUILD b/staging/kdeedu-khangman/PKGBUILD index ab6c6ea2a..ff0326d3a 100644 --- a/staging/kdeedu-khangman/PKGBUILD +++ b/staging/kdeedu-khangman/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 152070 2012-03-04 14:42:00Z andrea $ +# $Id: PKGBUILD 154874 2012-03-31 07:41:06Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-khangman -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 pkgdesc="Hangman Game" url="http://kde.org/applications/education/khangman/" @@ -12,8 +12,8 @@ groups=('kde' 'kdeedu') depends=('kdebase-runtime' 'libkdeedu') makedepends=('cmake' 'automoc4') install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/xz/khangman-${pkgver}.tar.xz") -sha1sums=('102eb6edec5f2c6f6f9086c6fb2136a6550cdef1') +source=("http://download.kde.org/stable/${pkgver}/src/khangman-${pkgver}.tar.xz") +sha1sums=('3e37d43965c190ccf5bc4c4485751dbe3139bda6') build() { cd "${srcdir}" diff --git a/staging/kdeedu-kig/PKGBUILD b/staging/kdeedu-kig/PKGBUILD index 3be26d95f..00bc3ff31 100644 --- a/staging/kdeedu-kig/PKGBUILD +++ b/staging/kdeedu-kig/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 152071 2012-03-04 14:42:26Z andrea $ +# $Id: PKGBUILD 154875 2012-03-31 07:41:33Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kig -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 pkgdesc="Interactive Geometry" url="http://kde.org/applications/education/kig/" @@ -12,8 +12,8 @@ groups=('kde' 'kdeedu') depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/xz/kig-${pkgver}.tar.xz") -sha1sums=('05a5ee09be9955bb24e5fcb926eb5bb8f0b24459') +source=("http://download.kde.org/stable/${pkgver}/src/kig-${pkgver}.tar.xz") +sha1sums=('7532bb454d6379af2c0ff37819c76c6c1f20deac') build() { cd "${srcdir}" diff --git a/staging/kdeedu-kiten/PKGBUILD b/staging/kdeedu-kiten/PKGBUILD index dd698cdff..773061fd2 100644 --- a/staging/kdeedu-kiten/PKGBUILD +++ b/staging/kdeedu-kiten/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 152072 2012-03-04 14:42:53Z andrea $ +# $Id: PKGBUILD 154876 2012-03-31 07:42:03Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kiten -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 pkgdesc="Japanese Reference/Study Tool" url="http://kde.org/applications/education/kiten/" @@ -12,8 +12,8 @@ groups=('kde' 'kdeedu') depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/xz/kiten-${pkgver}.tar.xz") -sha1sums=('c2c165f4bc89bcbe3a6b49eb06231d4bf85132f0') +source=("http://download.kde.org/stable/${pkgver}/src/kiten-${pkgver}.tar.xz") +sha1sums=('db608b5550281e8ca0097e3c4ed15abe6018a002') build() { cd "${srcdir}" diff --git a/staging/kdeedu-klettres/PKGBUILD b/staging/kdeedu-klettres/PKGBUILD index 720d4fada..208724359 100644 --- a/staging/kdeedu-klettres/PKGBUILD +++ b/staging/kdeedu-klettres/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 152073 2012-03-04 14:43:37Z andrea $ +# $Id: PKGBUILD 154877 2012-03-31 07:42:49Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-klettres -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 pkgdesc="Learn The Alphabet" url="http://kde.org/applications/education/klettres/" @@ -12,8 +12,8 @@ groups=('kde' 'kdeedu') depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/xz/klettres-${pkgver}.tar.xz") -sha1sums=('d26ced07799a849d42e0865c143515934bfb9446') +source=("http://download.kde.org/stable/${pkgver}/src/klettres-${pkgver}.tar.xz") +sha1sums=('2b107d5d4f07ab3a1364a5eb3cc5ba5a35b5ffa4') build() { cd "${srcdir}" diff --git a/staging/kdeedu-kmplot/PKGBUILD b/staging/kdeedu-kmplot/PKGBUILD index 995baea61..589ab22f2 100644 --- a/staging/kdeedu-kmplot/PKGBUILD +++ b/staging/kdeedu-kmplot/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 152074 2012-03-04 14:44:06Z andrea $ +# $Id: PKGBUILD 154878 2012-03-31 07:43:19Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kmplot -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 pkgdesc="Mathematical Function Plotter" url="http://kde.org/applications/education/kmplot/" @@ -12,8 +12,8 @@ groups=('kde' 'kdeedu') depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/xz/kmplot-${pkgver}.tar.xz") -sha1sums=('04eadb4a030e594c9ea09b55142640345b1c36c4') +source=("http://download.kde.org/stable/${pkgver}/src/kmplot-${pkgver}.tar.xz") +sha1sums=('17c20bc1916be9be2510040302406f6fe861d878') build() { cd "${srcdir}" diff --git a/staging/kdeedu-kstars/PKGBUILD b/staging/kdeedu-kstars/PKGBUILD index 906e10020..112529752 100644 --- a/staging/kdeedu-kstars/PKGBUILD +++ b/staging/kdeedu-kstars/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 152075 2012-03-04 14:44:33Z andrea $ +# $Id: PKGBUILD 154879 2012-03-31 07:43:44Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kstars -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 pkgdesc="Desktop Planetarium" url="http://kde.org/applications/education/kstars/" @@ -12,8 +12,8 @@ groups=('kde' 'kdeedu') depends=('kdebase-runtime' 'eigen' 'cfitsio' 'libindi') makedepends=('cmake' 'automoc4') install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/xz/kstars-${pkgver}.tar.xz") -sha1sums=('5453568396529c4767fb5485e1493d86bd0e6177') +source=("http://download.kde.org/stable/${pkgver}/src/kstars-${pkgver}.tar.xz") +sha1sums=('6447338ebed2f822c4c852bcfe50264ccaba2acb') build() { cd "${srcdir}" diff --git a/staging/kdeedu-ktouch/PKGBUILD b/staging/kdeedu-ktouch/PKGBUILD index 9d5942501..eabbe00bb 100644 --- a/staging/kdeedu-ktouch/PKGBUILD +++ b/staging/kdeedu-ktouch/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 152076 2012-03-04 14:45:24Z andrea $ +# $Id: PKGBUILD 154880 2012-03-31 07:44:31Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-ktouch -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 pkgdesc="Touch Typing Tutor" url="http://kde.org/applications/education/ktouch/" @@ -12,8 +12,8 @@ groups=('kde' 'kdeedu') depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/xz/ktouch-${pkgver}.tar.xz") -sha1sums=('42598cddc04de3d7ec64ea88068b2313333e02fd') +source=("http://download.kde.org/stable/${pkgver}/src/ktouch-${pkgver}.tar.xz") +sha1sums=('5f19f77d3d80058f70b7df2376ce339fda6239e0') build() { cd "${srcdir}" diff --git a/staging/kdeedu-kturtle/PKGBUILD b/staging/kdeedu-kturtle/PKGBUILD index cd7ffec7f..1dab15e52 100644 --- a/staging/kdeedu-kturtle/PKGBUILD +++ b/staging/kdeedu-kturtle/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 152077 2012-03-04 14:45:53Z andrea $ +# $Id: PKGBUILD 154881 2012-03-31 07:45:00Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kturtle -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 pkgdesc="Educational Programming Environment" url="http://kde.org/applications/education/kturtle/" @@ -12,8 +12,8 @@ groups=('kde' 'kdeedu') depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/xz/kturtle-${pkgver}.tar.xz") -sha1sums=('3a6a3828c44957644716608234a3813690d0c503') +source=("http://download.kde.org/stable/${pkgver}/src/kturtle-${pkgver}.tar.xz") +sha1sums=('e27f02ae08b8cb3e6be4c0ad971681be5d55db8e') build() { cd "${srcdir}" diff --git a/staging/kdeedu-kwordquiz/PKGBUILD b/staging/kdeedu-kwordquiz/PKGBUILD index 8c12fbe42..fcc1f7ed4 100644 --- a/staging/kdeedu-kwordquiz/PKGBUILD +++ b/staging/kdeedu-kwordquiz/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 152078 2012-03-04 14:46:19Z andrea $ +# $Id: PKGBUILD 154882 2012-03-31 07:45:24Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kwordquiz -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 pkgdesc="Flash Card Trainer" url="http://kde.org/applications/education/kwordquiz/" @@ -12,8 +12,8 @@ groups=('kde' 'kdeedu') depends=('kdebase-runtime' 'libkdeedu') makedepends=('cmake' 'automoc4') install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/xz/kwordquiz-${pkgver}.tar.xz") -sha1sums=('954e49b9dea8e486f8316b9215e12d736e9b1448') +source=("http://download.kde.org/stable/${pkgver}/src/kwordquiz-${pkgver}.tar.xz") +sha1sums=('4507a07bdf62e5af1ce14ba18523a44b065d090e') build() { cd "${srcdir}" diff --git a/staging/kdeedu-marble/PKGBUILD b/staging/kdeedu-marble/PKGBUILD index 693eb6fe6..ecf695948 100644 --- a/staging/kdeedu-marble/PKGBUILD +++ b/staging/kdeedu-marble/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 152045 2012-03-04 14:26:05Z andrea $ +# $Id: PKGBUILD 154849 2012-03-31 07:24:45Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-marble -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 pkgdesc="Desktop Globe" url="http://kde.org/applications/education/marble/" @@ -13,8 +13,8 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4' 'gpsd') optdepends=('gpsd: gps support') install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/xz/marble-${pkgver}.tar.xz") -sha1sums=('542da37f6ea2df21b331aea28cab810eb6802b78') +source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.xz") +sha1sums=('f57f134976b27fd0622ba2a24e32128ab23f5494') build() { cd "${srcdir}" diff --git a/staging/kdeedu-parley/PKGBUILD b/staging/kdeedu-parley/PKGBUILD index a640b5fe1..b0876884e 100644 --- a/staging/kdeedu-parley/PKGBUILD +++ b/staging/kdeedu-parley/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 152079 2012-03-04 14:46:45Z andrea $ +# $Id: PKGBUILD 154883 2012-03-31 07:45:50Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-parley -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 pkgdesc="Vocabulary Trainer" url="http://kde.org/applications/education/parley/" @@ -12,8 +12,8 @@ groups=('kde' 'kdeedu') depends=('kdebase-runtime' 'libkdeedu') makedepends=('cmake' 'automoc4') install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/xz/parley-${pkgver}.tar.xz") -sha1sums=('65cb2a02e5da3d9f1f9bb5a2017743b116bce1cb') +source=("http://download.kde.org/stable/${pkgver}/src/parley-${pkgver}.tar.xz") +sha1sums=('3b656361108b5c48e0c582c3ce724f6a439c7fe2') build() { cd "${srcdir}" diff --git a/staging/kdeedu-rocs/PKGBUILD b/staging/kdeedu-rocs/PKGBUILD index 604009744..2a7c0e908 100644 --- a/staging/kdeedu-rocs/PKGBUILD +++ b/staging/kdeedu-rocs/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 152080 2012-03-04 14:47:21Z andrea $ +# $Id: PKGBUILD 154884 2012-03-31 07:46:29Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-rocs -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 pkgdesc="Rocs Graph Theory" url="http://kde.org/applications/education/rocs/" arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdeedu') -depends=('kdebase-runtime' 'boost-libs') +depends=('kdebase-runtime') makedepends=('cmake' 'automoc4' 'boost') -source=("http://download.kde.org/stable/${pkgver}/src/xz/rocs-${pkgver}.tar.xz") -sha1sums=('b485fe77d48bb82d3b2e6d79337ba4898c06ae5d') +source=("http://download.kde.org/stable/${pkgver}/src/rocs-${pkgver}.tar.xz") +sha1sums=('3e22d284ec0ba40bc82dfc5f3b58b4a5721a8c64') options=('!makeflags') build() { diff --git a/staging/kdeedu-step/PKGBUILD b/staging/kdeedu-step/PKGBUILD index 3fca6f9e2..7a5702548 100644 --- a/staging/kdeedu-step/PKGBUILD +++ b/staging/kdeedu-step/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 152081 2012-03-04 14:47:48Z andrea $ +# $Id: PKGBUILD 154885 2012-03-31 07:46:56Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-step -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 pkgdesc="Interactive Physical Simulator" url="http://kde.org/applications/education/step/" @@ -12,8 +12,8 @@ groups=('kde' 'kdeedu') depends=('kdebase-runtime' 'libqalculate' 'gsl' 'eigen') makedepends=('cmake' 'automoc4') install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/xz/step-${pkgver}.tar.xz") -sha1sums=('5b8da2e1efe783e46042603d9ba87f1f464ba105') +source=("http://download.kde.org/stable/${pkgver}/src/step-${pkgver}.tar.xz") +sha1sums=('0620924f7683c29e855482af8822067722ced080') build() { cd "${srcdir}" diff --git a/staging/kdegames/PKGBUILD b/staging/kdegames/PKGBUILD index f9fbf2227..5d15769ef 100644 --- a/staging/kdegames/PKGBUILD +++ b/staging/kdegames/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 152082 2012-03-04 14:49:19Z andrea $ +# $Id: PKGBUILD 154886 2012-03-31 07:48:33Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -43,16 +43,16 @@ pkgname=('kdegames-bomber' 'kdegames-libkmahjongg' 'kdegames-lskat' 'kdegames-palapeli') -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdegames') -makedepends=('cmake' 'automoc4' 'ggz-client-libs' 'twisted' 'kdebindings-python' +makedepends=('cmake' 'automoc4' 'ggz-client-libs' 'twisted' 'kdebindings-python2' 'openal') -source=("http://download.kde.org/stable/${pkgver}/src/xz/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('bcf764fd1f2f8083c388c17f26b83eeac568b1d5') +source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") +sha1sums=('9aeeccbc5f79f7f6b1e91bac41857ac3818cd989') build() { cd $srcdir @@ -101,7 +101,7 @@ package_kdegames-granatier() { package_kdegames-kajongg() { pkgdesc='The ancient Chinese board game for 4 players' - depends=('kdegames-libkdegames' 'kdegames-libkmahjongg' 'kdebindings-python' 'twisted') + depends=('kdegames-libkdegames' 'kdegames-libkmahjongg' 'kdebindings-python2' 'twisted') url="http://www.kde.org/applications/games/kajongg/" install='kdegames.install' cd $srcdir/build/kajongg diff --git a/staging/kdegraphics-gwenview/PKGBUILD b/staging/kdegraphics-gwenview/PKGBUILD index a06f9527b..a4b2c4be7 100644 --- a/staging/kdegraphics-gwenview/PKGBUILD +++ b/staging/kdegraphics-gwenview/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 152083 2012-03-04 14:51:23Z andrea $ +# $Id: PKGBUILD 154887 2012-03-31 07:50:45Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-gwenview -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 pkgdesc="A fast and easy to use image viewer for KDE" url="http://kde.org/applications/graphics/gwenview/" @@ -13,8 +13,8 @@ depends=('kdebase-lib' 'libkipi') makedepends=('cmake' 'automoc4') optdepends=('kipi-plugins: extra plugins to share photos') install=$pkgname.install -source=("http://download.kde.org/stable/${pkgver}/src/xz/gwenview-${pkgver}.tar.xz") -sha1sums=('c549b0256140c6c466e3279cf12bdc6e6ee82960') +source=("http://download.kde.org/stable/${pkgver}/src/gwenview-${pkgver}.tar.xz") +sha1sums=('1c5293c258b5afeba5551bdd2029d83eb2ae7df3') build() { cd "${srcdir}" diff --git a/staging/kdegraphics-kamera/PKGBUILD b/staging/kdegraphics-kamera/PKGBUILD index 69819b970..453703fab 100644 --- a/staging/kdegraphics-kamera/PKGBUILD +++ b/staging/kdegraphics-kamera/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 152084 2012-03-04 14:51:55Z andrea $ +# $Id: PKGBUILD 154889 2012-03-31 07:51:17Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kamera -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 pkgdesc="Configure Kamera" url="http://kde.org/applications/graphics/kamera/" @@ -11,8 +11,8 @@ license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdegraphics') depends=('kdebase-runtime' 'gphoto2') makedepends=('cmake' 'automoc4') -source=("http://download.kde.org/stable/${pkgver}/src/xz/kamera-${pkgver}.tar.xz") -sha1sums=('98a54976430aa3061d14f5b71c6d5d896abc9baf') +source=("http://download.kde.org/stable/${pkgver}/src/kamera-${pkgver}.tar.xz") +sha1sums=('45beaa52b384e80a3c66f15587abc2938b64c4f1') build() { cd "${srcdir}" diff --git a/staging/kdegraphics-kcolorchooser/PKGBUILD b/staging/kdegraphics-kcolorchooser/PKGBUILD index 004941744..a51da1457 100644 --- a/staging/kdegraphics-kcolorchooser/PKGBUILD +++ b/staging/kdegraphics-kcolorchooser/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 152085 2012-03-04 14:52:19Z andrea $ +# $Id: PKGBUILD 154890 2012-03-31 07:51:41Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kcolorchooser -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 pkgdesc="Color Chooser" url="http://kde.org/applications/graphics/kcolorchooser/" @@ -12,8 +12,8 @@ groups=('kde' 'kdegraphics') depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/xz/kcolorchooser-${pkgver}.tar.xz") -sha1sums=('b82a86ac95ca9b4c1dbd66b8164ce855232fec69') +source=("http://download.kde.org/stable/${pkgver}/src/kcolorchooser-${pkgver}.tar.xz") +sha1sums=('0d1b46b7c90fc2910b3c7422469422efcebc39aa') build() { cd "${srcdir}" diff --git a/staging/kdegraphics-kgamma/PKGBUILD b/staging/kdegraphics-kgamma/PKGBUILD index 9af0cf761..74e71e81d 100644 --- a/staging/kdegraphics-kgamma/PKGBUILD +++ b/staging/kdegraphics-kgamma/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 152086 2012-03-04 14:52:45Z andrea $ +# $Id: PKGBUILD 154891 2012-03-31 07:52:10Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kgamma -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 pkgdesc="A monitor calibration tool" url="http://kde.org/applications/graphics/kgamma/" @@ -14,8 +14,8 @@ groups=('kde' 'kdegraphics') # but nvidia providing libgl does not depend on libxxf86vm depends=('kdebase-runtime' 'libxxf86vm') makedepends=('cmake' 'automoc4') -source=("http://download.kde.org/stable/${pkgver}/src/xz/kgamma-${pkgver}.tar.xz") -sha1sums=('9829ed03f9faac64afafe83bb84eae0048929dfe') +source=("http://download.kde.org/stable/${pkgver}/src/kgamma-${pkgver}.tar.xz") +sha1sums=('222c2f7f16bae3dd450b04225b88596f4817e3a6') build() { cd "${srcdir}" diff --git a/staging/kdegraphics-kolourpaint/PKGBUILD b/staging/kdegraphics-kolourpaint/PKGBUILD index e5dcd9683..8874f241c 100644 --- a/staging/kdegraphics-kolourpaint/PKGBUILD +++ b/staging/kdegraphics-kolourpaint/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 152087 2012-03-04 14:53:09Z andrea $ +# $Id: PKGBUILD 154892 2012-03-31 07:52:34Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kolourpaint -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 pkgdesc="Paint Program" url="http://kde.org/applications/graphics/kolourpaint/" @@ -12,8 +12,8 @@ groups=('kde' 'kdegraphics') depends=('kdebase-runtime' 'qimageblitz') makedepends=('cmake' 'automoc4') install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/xz/kolourpaint-${pkgver}.tar.xz") -sha1sums=('7a6404f573671b8407a2cf4ec3543ab0883a7af2') +source=("http://download.kde.org/stable/${pkgver}/src/kolourpaint-${pkgver}.tar.xz") +sha1sums=('1a51dce10d29f5694216d99cb7c9b0964181fe50') build() { cd "${srcdir}" diff --git a/staging/kdegraphics-kruler/PKGBUILD b/staging/kdegraphics-kruler/PKGBUILD index 88df04160..922cfded5 100644 --- a/staging/kdegraphics-kruler/PKGBUILD +++ b/staging/kdegraphics-kruler/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 152088 2012-03-04 14:53:35Z andrea $ +# $Id: PKGBUILD 154893 2012-03-31 07:53:00Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kruler -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 pkgdesc="Screen Ruler" url="http://kde.org/applications/graphics/kruler/" @@ -12,8 +12,8 @@ groups=('kde' 'kdegraphics') depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/xz/kruler-${pkgver}.tar.xz") -sha1sums=('e551744f2e3f772450eb6fe21358067e9448799e') +source=("http://download.kde.org/stable/${pkgver}/src/kruler-${pkgver}.tar.xz") +sha1sums=('3db2efcc53a0ef1ba46d5f908f732da708b2b14c') build() { cd "${srcdir}" diff --git a/staging/kdegraphics-ksaneplugin/PKGBUILD b/staging/kdegraphics-ksaneplugin/PKGBUILD index f6ef47c2d..e3125d466 100644 --- a/staging/kdegraphics-ksaneplugin/PKGBUILD +++ b/staging/kdegraphics-ksaneplugin/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 152089 2012-03-04 14:54:04Z andrea $ +# $Id: PKGBUILD 154894 2012-03-31 07:53:27Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-ksaneplugin -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 pkgdesc="A scan plugin that implements the scanning" url="http://kde.org/" @@ -12,8 +12,8 @@ depends=('libksane') makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') -source=("http://download.kde.org/stable/${pkgver}/src/xz/ksaneplugin-${pkgver}.tar.xz") -sha1sums=('6f59ab3630850d9ceee15e9d01cb1b6b6dedc9e9') +source=("http://download.kde.org/stable/${pkgver}/src/ksaneplugin-${pkgver}.tar.xz") +sha1sums=('04a75bc260f0780a9c9dcbdd6b75418168ad5631') build() { cd "${srcdir}" diff --git a/staging/kdegraphics-ksnapshot/PKGBUILD b/staging/kdegraphics-ksnapshot/PKGBUILD index 9b4318b6f..24208183c 100644 --- a/staging/kdegraphics-ksnapshot/PKGBUILD +++ b/staging/kdegraphics-ksnapshot/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 152090 2012-03-04 14:54:28Z andrea $ +# $Id: PKGBUILD 154895 2012-03-31 07:53:50Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-ksnapshot -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 pkgdesc="Screen Capture Program" url="http://kde.org/applications/graphics/ksnapshot/" @@ -13,8 +13,8 @@ depends=('kdelibs' 'libkipi') makedepends=('cmake' 'automoc4') optdepends=('kipi-plugins') install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/xz/ksnapshot-${pkgver}.tar.xz") -sha1sums=('3e8f0842d06d0fbb98dcebeba684847552fc02a9') +source=("http://download.kde.org/stable/${pkgver}/src/ksnapshot-${pkgver}.tar.xz") +sha1sums=('373362717f42b5996883eb405a756c8a570ce128') build() { cd "${srcdir}" diff --git a/staging/kdegraphics-mobipocket/PKGBUILD b/staging/kdegraphics-mobipocket/PKGBUILD index 959c97385..bec4dfb8d 100644 --- a/staging/kdegraphics-mobipocket/PKGBUILD +++ b/staging/kdegraphics-mobipocket/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 152091 2012-03-04 14:54:53Z andrea $ +# $Id: PKGBUILD 154896 2012-03-31 07:54:16Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-mobipocket -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 pkgdesc="A collection of plugins to handle mobipocket files" url="http://kde.org/" @@ -13,8 +13,8 @@ makedepends=('cmake' 'automoc4' 'kdegraphics-okular') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/xz/${pkgname}-${pkgver}.tar.xz") -sha1sums=('6ffef4612619ac433addee9fae7f49c05455863b') +source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") +sha1sums=('60ea4e3e0e7030ed61c35761c5542d967cd161fc') build() { cd "${srcdir}" diff --git a/staging/kdegraphics-okular/PKGBUILD b/staging/kdegraphics-okular/PKGBUILD index a7c6bfc15..53834817a 100644 --- a/staging/kdegraphics-okular/PKGBUILD +++ b/staging/kdegraphics-okular/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 152034 2012-03-04 14:18:36Z andrea $ +# $Id: PKGBUILD 154839 2012-03-31 07:17:10Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-okular -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 pkgdesc='Document Viewer' arch=('i686' 'x86_64') @@ -14,8 +14,8 @@ depends=('kdebase-runtime' 'qimageblitz' 'poppler-qt' 'chmlib' 'djvulibre' makedepends=('cmake' 'automoc4') optdepends=('kdegraphics-mobipocket: mobipocket support') install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/xz/okular-${pkgver}.tar.xz") -sha1sums=('ddf676820acf3615d1996bf40e82ebd5c9aa41d8') +source=("http://download.kde.org/stable/${pkgver}/src/okular-${pkgver}.tar.xz") +sha1sums=('174ff248e3a90246ee84d8aed4014d9864f9f807') build() { cd "${srcdir}" diff --git a/staging/kdegraphics-strigi-analyzer/PKGBUILD b/staging/kdegraphics-strigi-analyzer/PKGBUILD index 8fe4a5370..3d292e2ce 100644 --- a/staging/kdegraphics-strigi-analyzer/PKGBUILD +++ b/staging/kdegraphics-strigi-analyzer/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 152092 2012-03-04 14:55:22Z andrea $ +# $Id: PKGBUILD 154897 2012-03-31 07:54:44Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-strigi-analyzer -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 pkgdesc="Strigi analyzers for various graphics file formats" url="http://kde.org/" @@ -12,8 +12,8 @@ depends=('kdelibs') makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') -source=("http://download.kde.org/stable/${pkgver}/src/xz/${pkgname}-${pkgver}.tar.xz") -sha1sums=('2e951029c3874cd5f10a75dc4d88b653b76a3121') +source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") +sha1sums=('6b61e1a949d0de92d5f4f1a822fe6dcaaa52b03c') build() { cd "${srcdir}" diff --git a/staging/kdegraphics-svgpart/PKGBUILD b/staging/kdegraphics-svgpart/PKGBUILD index 0826a5f9a..797caa2b7 100644 --- a/staging/kdegraphics-svgpart/PKGBUILD +++ b/staging/kdegraphics-svgpart/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 152093 2012-03-04 14:55:50Z andrea $ +# $Id: PKGBUILD 154898 2012-03-31 07:55:11Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-svgpart -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 pkgdesc="A KPart for viewving SVGs" url="http://kde.org/" @@ -12,8 +12,8 @@ depends=('kdelibs') makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') -source=("http://download.kde.org/stable/${pkgver}/src/xz/svgpart-${pkgver}.tar.xz") -sha1sums=('2332156b52c9f1a33cc0f0cb9d64f01aaf38f9bc') +source=("http://download.kde.org/stable/${pkgver}/src/svgpart-${pkgver}.tar.xz") +sha1sums=('f29c38a0d82d96140770a4a354d8087aaca9ddb8') build() { cd "${srcdir}" diff --git a/staging/kdegraphics-thumbnailers/PKGBUILD b/staging/kdegraphics-thumbnailers/PKGBUILD index db08b6c54..08683383a 100644 --- a/staging/kdegraphics-thumbnailers/PKGBUILD +++ b/staging/kdegraphics-thumbnailers/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 152094 2012-03-04 14:56:17Z andrea $ +# $Id: PKGBUILD 154899 2012-03-31 07:55:38Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-thumbnailers -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 pkgdesc="Thumbnailers for various graphics file formats" url="http://kde.org/" @@ -12,8 +12,8 @@ depends=('libkexiv2' 'libkdcraw') makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') -source=("http://download.kde.org/stable/${pkgver}/src/xz/${pkgname}-${pkgver}.tar.xz") -sha1sums=('a714f485f68202c8b6e2716cf426abd6d82c0dc7') +source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") +sha1sums=('cd6e99a6c0db6bda765c765356ba9bbd601fba0d') build() { cd "${srcdir}" diff --git a/staging/kdemultimedia/PKGBUILD b/staging/kdemultimedia/PKGBUILD index 35cb93be4..d8e186079 100644 --- a/staging/kdemultimedia/PKGBUILD +++ b/staging/kdemultimedia/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 152095 2012-03-04 14:56:57Z andrea $ +# $Id: PKGBUILD 154900 2012-03-31 07:56:14Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -10,7 +10,7 @@ pkgname=('kdemultimedia-dragonplayer' 'kdemultimedia-kmix' 'kdemultimedia-kscd' 'kdemultimedia-mplayerthumbs') -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' @@ -18,9 +18,9 @@ license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdemultimedia') makedepends=('cmake' 'automoc4' 'kdelibs' 'tunepimp' 'ffmpeg' 'mplayer' 'pulseaudio' 'libmusicbrainz3') -source=("http://download.kde.org/stable/${pkgver}/src/xz/${pkgbase}-${pkgver}.tar.xz" +source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" 'mplayerthumbs.config') -sha1sums=('9de14f08c7f1649201be029b8e683a296cc75f52' +sha1sums=('8f54038cc68f91acef07fed711f83407c113b88b' 'ba016fa2563c14ffcba852c62506b66bfc6ee683') build() { diff --git a/staging/kdenetwork/PKGBUILD b/staging/kdenetwork/PKGBUILD index 5bd26e0ec..3fe235f7d 100644 --- a/staging/kdenetwork/PKGBUILD +++ b/staging/kdenetwork/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 152431 2012-03-06 21:03:24Z andrea $ +# $Id: PKGBUILD 154901 2012-03-31 07:57:02Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -10,8 +10,8 @@ pkgname=('kdenetwork-filesharing' 'kdenetwork-kppp' 'kdenetwork-krdc' 'kdenetwork-krfb') -pkgver=4.8.1 -pkgrel=2 +pkgver=4.8.2 +pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') @@ -21,7 +21,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr' 'ppp' 'v4l-utils' 'libidn' 'rdesktop' 'qimageblitz' 'libxdamage' 'libgadu' 'libktorrent' 'libmms' 'mediastreamer') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('e914a1d990ff42ec88cf37ffc897ae9df9b1fa45') +sha1sums=('a899a9ef1637612a5ec14bb3ff950f3ed565d60e') build() { cd "${srcdir}" diff --git a/staging/kdepim-runtime/PKGBUILD b/staging/kdepim-runtime/PKGBUILD index d085dc553..9e73c83e4 100644 --- a/staging/kdepim-runtime/PKGBUILD +++ b/staging/kdepim-runtime/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 152031 2012-03-04 14:17:05Z andrea $ +# $Id: PKGBUILD 154836 2012-03-31 07:15:35Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdepim-runtime -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 pkgdesc='KDE PIM Runtime Environment' arch=('i686' 'x86_64') @@ -12,8 +12,8 @@ license=('GPL' 'LGPL' 'FDL') depends=('kdepimlibs' 'kdebase-runtime') makedepends=('cmake' 'automoc4' 'boost') install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/xz/${pkgname}-${pkgver}.tar.xz") -sha1sums=('2e2e5f1dbfd1b54f0e2b71f9f23be2cfa94348f2') +source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") +sha1sums=('afb6ad8f9f2fa4193c8fa13cac816e693f447db9') build() { cd "${srcdir}" diff --git a/staging/kdepim/PKGBUILD b/staging/kdepim/PKGBUILD index 2e5a27241..fce7249d7 100644 --- a/staging/kdepim/PKGBUILD +++ b/staging/kdepim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 152421 2012-03-06 19:04:36Z andrea $ +# $Id: PKGBUILD 154902 2012-03-31 07:58:10Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -19,8 +19,8 @@ pkgname=('kdepim-akonadiconsole' 'kdepim-kresources' 'kdepim-ktimetracker' 'kdepim-libkdepim') -pkgver=4.8.1 -pkgrel=2 +pkgver=4.8.2 +pkgrel=1 arch=('i686' 'x86_64') url='http://pim.kde.org' license=('GPL' 'LGPL' 'FDL') @@ -28,7 +28,7 @@ groups=('kde' 'kdepim') makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' 'pilot-link' 'kde-agent') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('93222d56f9adde015cb202a1ad3b194ac52e6bda') +sha1sums=('1c3a459ef4d76e1247ac47816bf2b7ea6e37908a') build() { cd "${srcdir}" diff --git a/staging/kdepimlibs/PKGBUILD b/staging/kdepimlibs/PKGBUILD index 285fee625..96c0918a6 100644 --- a/staging/kdepimlibs/PKGBUILD +++ b/staging/kdepimlibs/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 152028 2012-03-04 14:11:34Z andrea $ +# $Id: PKGBUILD 154833 2012-03-31 07:09:55Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdepimlibs -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 pkgdesc="KDE PIM Libraries" arch=('i686' 'x86_64') url='http://www.kde.org' license=('GPL' 'LGPL') depends=('kdelibs' 'gpgme' 'akonadi' 'libical' 'prison') -makedepends=('cmake' 'automoc4' 'boost' 'cyrus-sasl' 'openldap') +makedepends=('cmake' 'automoc4' 'boost' 'cyrus-sasl') install='kdepimlibs.install' -source=("http://download.kde.org/stable/${pkgver}/src/xz/${pkgname}-${pkgver}.tar.xz") -sha1sums=('ccc653df34fd8f5f8eddac9a9e14f0fa1ea82839') +source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") +sha1sums=('038474d1c8a3d5c430f25823e25330fa464cfe40') build() { cd ${srcdir} diff --git a/staging/kdeplasma-addons/PKGBUILD b/staging/kdeplasma-addons/PKGBUILD index a7270d62a..f6cc95c72 100644 --- a/staging/kdeplasma-addons/PKGBUILD +++ b/staging/kdeplasma-addons/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 152098 2012-03-04 14:59:51Z andrea $ +# $Id: PKGBUILD 154903 2012-03-31 07:59:08Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -74,7 +74,7 @@ pkgname=('kdeplasma-addons-applets-bball' 'kdeplasma-addons-wallpapers-potd' 'kdeplasma-addons-wallpapers-virus' 'kdeplasma-addons-wallpapers-weather') -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' @@ -82,8 +82,8 @@ license=('GPL' 'LGPL') groups=('kde' 'kdeplasma-addons') makedepends=('cmake' 'automoc4' 'kdebase-workspace' 'kdeedu-marble' 'eigen' 'scim' 'qwt' 'boost' 'libkexiv2' 'ibus') -source=("http://download.kde.org/stable/${pkgver}/src/xz/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('dad77ee1f6ab341a327d694f670e15f160d77d7c') +source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") +sha1sums=('1f9db32c724ce9aee6f46bc11a8d2fc073975657') build() { cd "${srcdir}" diff --git a/staging/kdesdk-kate/PKGBUILD b/staging/kdesdk-kate/PKGBUILD index 631090335..074b070d3 100644 --- a/staging/kdesdk-kate/PKGBUILD +++ b/staging/kdesdk-kate/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 152035 2012-03-04 14:19:16Z andrea $ +# $Id: PKGBUILD 154840 2012-03-31 07:17:54Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=kdesdk-kate -pkgname=('kdebase-kwrite' +pkgname=('kdebase-katepart' + 'kdebase-kwrite' 'kdesdk-kate') -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL') makedepends=('kdelibs ''cmake' 'automoc4') -source=("http://download.kde.org/stable/${pkgver}/src/xz/kate-${pkgver}.tar.xz" +source=("http://download.kde.org/stable/${pkgver}/src/kate-${pkgver}.tar.xz" 'pkgbuild-syntax-highlight.patch') -sha1sums=('d5bd513cd2bfefc2d345547115d0cb0a9d3e6143' +sha1sums=('6bf4796574a003a4edadfb2029725805235bd086' '0a928253bd2077f0264d96a6c8823c69c47b6a8d') build() { @@ -23,14 +24,23 @@ build() { cd build cmake ../kate-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DBUILD_KTEXTEDITOR=OFF + -DCMAKE_INSTALL_PREFIX=/usr make } +package_kdebase-katepart() { + pkgdesc="A fast and feature-rich text editor component" + depends=('kdelibs') + url="http://kate-editor.org/about-katepart/" + install='kdebase-katepart.install' + + cd "${srcdir}"/build/part + make DESTDIR="${pkgdir}" install +} + package_kdebase-kwrite() { pkgdesc="Text Editor" - depends=('kdebase-runtime') + depends=('kdebase-runtime' 'kdebase-katepart') groups=('kde' 'kdebase') url="http://www.kde.org/applications/utilities/kwrite/" install='kdebase-kwrite.install' @@ -38,16 +48,13 @@ package_kdebase-kwrite() { cd "${srcdir}"/build/kwrite make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/part - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/doc/kwrite make DESTDIR="${pkgdir}" install } package_kdesdk-kate() { pkgdesc="Advanced Text Editor" - depends=('kdebase-kwrite') + depends=('kdebase-runtime' 'kdebase-katepart') groups=('kde' 'kdesdk') url="http://www.kde.org/applications/utilities/kate/" install='kdesdk-kate.install' diff --git a/staging/kdesdk-kate/kdebase-katepart.install b/staging/kdesdk-kate/kdebase-katepart.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/staging/kdesdk-kate/kdebase-katepart.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/kdesdk/PKGBUILD b/staging/kdesdk/PKGBUILD index 30c9faa5e..e4c4fb7c7 100644 --- a/staging/kdesdk/PKGBUILD +++ b/staging/kdesdk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 152099 2012-03-04 15:01:25Z andrea $ +# $Id: PKGBUILD 154904 2012-03-31 08:00:32Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -22,7 +22,7 @@ pkgname=('kdesdk-cervisia' 'kdesdk-scripts' 'kdesdk-strigi-analyzer' 'kdesdk-umbrello') -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' @@ -30,9 +30,9 @@ license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdesdk') makedepends=('cmake' 'automoc4' 'boost' 'subversion' 'antlr2' 'kdepimlibs' 'kdebase-lib') -source=("http://download.kde.org/stable/${pkgver}/src/xz/${pkgbase}-${pkgver}.tar.xz" +source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" 'fix-python2-path.patch') -sha1sums=('5104445024047ae01099e7baa8e5b47a63b76198' +sha1sums=('d080aee7222b8cf3cede8eccf193f0694338056c' '923cabd7a877cf9a68efeb24fbf3d5827e1d949e') build() { @@ -104,7 +104,7 @@ package_kdesdk-kcachegrind() { package_kdesdk-kdeaccounts-plugin() { pkgdesc='KDE Repository Accounts' - depends=('kdepim-runtime') + depends=('kdebase-runtime' 'kdepimlibs') cd $srcdir/build/kdeaccounts-plugin make DESTDIR=$pkgdir install } @@ -183,7 +183,7 @@ package_kdesdk-kuiviewer() { package_kdesdk-lokalize() { pkgdesc='Computer-Aided Translation System' - depends=('kdebase-runtime' 'kdebindings-python') + depends=('kdebase-runtime' 'kdebindings-python2') url="http://kde.org/applications/development/lokalize/" optdepends=('translate-toolkit: enable extra python script') install='kdesdk-lokalize.install' diff --git a/staging/kdetoys/PKGBUILD b/staging/kdetoys/PKGBUILD index 3d73b5909..b9c608d14 100644 --- a/staging/kdetoys/PKGBUILD +++ b/staging/kdetoys/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 152100 2012-03-04 15:02:04Z andrea $ +# $Id: PKGBUILD 154905 2012-03-31 08:01:10Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -6,15 +6,15 @@ pkgbase=kdetoys pkgname=('kdetoys-amor' 'kdetoys-kteatime' 'kdetoys-ktux') -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdetoys') makedepends=('cmake' 'automoc4' 'kdebase-workspace') -source=("http://download.kde.org/stable/${pkgver}/src/xz/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('b0a1c26fa00795767c0d73ff3d25cc339cb005b8') +source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") +sha1sums=('d6414aadd77a4c84fdd1d72c32bc066251b30bde') build() { cd $srcdir diff --git a/staging/kdeutils-filelight/PKGBUILD b/staging/kdeutils-filelight/PKGBUILD index c659bd746..2a5c1ab06 100644 --- a/staging/kdeutils-filelight/PKGBUILD +++ b/staging/kdeutils-filelight/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 152102 2012-03-04 15:02:53Z andrea $ +# $Id: PKGBUILD 154907 2012-03-31 08:02:00Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-filelight -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 pkgdesc='View disk usage information' url='http://kde.org/applications/utilities/filelight' @@ -14,8 +14,8 @@ groups=('kde' 'kdeutils') replaces=('filelight') conflicts=('filelight') install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/xz/filelight-${pkgver}.tar.xz") -sha1sums=('24cd19b927221de2dafd2a1c3d5e8a72a41ec4b5') +source=("http://download.kde.org/stable/${pkgver}/src/filelight-${pkgver}.tar.xz") +sha1sums=('76d8c729e259e2395258f6114e737b07b6671846') build() { cd "${srcdir}" diff --git a/staging/kdeutils-kcalc/PKGBUILD b/staging/kdeutils-kcalc/PKGBUILD index e9dd112ec..85078427a 100644 --- a/staging/kdeutils-kcalc/PKGBUILD +++ b/staging/kdeutils-kcalc/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 152103 2012-03-04 15:03:17Z andrea $ +# $Id: PKGBUILD 154908 2012-03-31 08:02:24Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kcalc -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 pkgdesc='Scientific Calculator' url='http://kde.org/applications/utilities/kcalc/' @@ -12,8 +12,8 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/xz/kcalc-${pkgver}.tar.xz") -sha1sums=('f119707ece800a2102eb881402a5bc289b2a55ea') +source=("http://download.kde.org/stable/${pkgver}/src/kcalc-${pkgver}.tar.xz") +sha1sums=('f2bbed3d7f991a4cd0484cc4fafe8c04bd29d986') build() { cd "${srcdir}" diff --git a/staging/kdeutils-kcharselect/PKGBUILD b/staging/kdeutils-kcharselect/PKGBUILD index 8cbae2f1e..18a45ced4 100644 --- a/staging/kdeutils-kcharselect/PKGBUILD +++ b/staging/kdeutils-kcharselect/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 152104 2012-03-04 15:03:44Z andrea $ +# $Id: PKGBUILD 154909 2012-03-31 08:02:51Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kcharselect -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 pkgdesc='Character Selector' url="http://kde.org/applications/utilities/kcharselect/" @@ -11,8 +11,8 @@ license=('GPL' 'LGPL' 'FDL') depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') -source=("http://download.kde.org/stable/${pkgver}/src/xz/kcharselect-${pkgver}.tar.xz") -sha1sums=('06888b54f8c139966f327dd1955c25c967d437fb') +source=("http://download.kde.org/stable/${pkgver}/src/kcharselect-${pkgver}.tar.xz") +sha1sums=('527d28bf3bb22d38665a006ab835ff6d75f592a4') build() { cd "${srcdir}" diff --git a/staging/kdeutils-kdf/PKGBUILD b/staging/kdeutils-kdf/PKGBUILD index 414e69448..3e14d48d6 100644 --- a/staging/kdeutils-kdf/PKGBUILD +++ b/staging/kdeutils-kdf/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 152105 2012-03-04 15:04:08Z andrea $ +# $Id: PKGBUILD 154910 2012-03-31 08:03:14Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kdf -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 url="http://kde.org/applications/system/kdiskfree/" arch=('i686' 'x86_64') @@ -12,8 +12,8 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/xz/kdf-${pkgver}.tar.xz") -sha1sums=('fb28f99b23819f3618a8857affdaad1957f8bd68') +source=("http://download.kde.org/stable/${pkgver}/src/kdf-${pkgver}.tar.xz") +sha1sums=('50754775bacf562ff53862b2005901501f8eb1c4') build() { cd "${srcdir}" diff --git a/staging/kdeutils-kfloppy/PKGBUILD b/staging/kdeutils-kfloppy/PKGBUILD index 1e276665a..a5429b342 100644 --- a/staging/kdeutils-kfloppy/PKGBUILD +++ b/staging/kdeutils-kfloppy/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 152107 2012-03-04 15:04:33Z andrea $ +# $Id: PKGBUILD 154911 2012-03-31 08:03:40Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kfloppy -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 pkgdesc='Floppy Formatter' url='http://kde.org/applications/utilities/kfloppy/' @@ -12,8 +12,8 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/xz/kfloppy-${pkgver}.tar.xz") -sha1sums=('78c5dfa1198d9c215ff2a22b82c4e3db2b7c0485') +source=("http://download.kde.org/stable/${pkgver}/src/kfloppy-${pkgver}.tar.xz") +sha1sums=('abbbd2908caeade32912cff7db13a50199fae453') build() { cd "${srcdir}" diff --git a/staging/kdeutils-kgpg/PKGBUILD b/staging/kdeutils-kgpg/PKGBUILD index 5e4be5008..246ed861d 100644 --- a/staging/kdeutils-kgpg/PKGBUILD +++ b/staging/kdeutils-kgpg/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 152108 2012-03-04 15:04:57Z andrea $ +# $Id: PKGBUILD 154912 2012-03-31 08:04:06Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kgpg -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 pkgdesc='A GnuPG frontend' url='http://kde.org/applications/utilities/kgpg/' arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL') -depends=('kdepim-runtime' 'kde-agent') +depends=('kdebase-runtime' 'kdepimlibs' 'kde-agent') makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/xz/kgpg-${pkgver}.tar.xz") -sha1sums=('40f5bd3f2d4bfeed56e519194c41049e14899e36') +source=("http://download.kde.org/stable/${pkgver}/src/kgpg-${pkgver}.tar.xz") +sha1sums=('ef4833daa82e277f2336e68c0d586cf180a1510f') build() { cd "${srcdir}" diff --git a/staging/kdeutils-kremotecontrol/PKGBUILD b/staging/kdeutils-kremotecontrol/PKGBUILD index 2360606b4..e2bcdf689 100644 --- a/staging/kdeutils-kremotecontrol/PKGBUILD +++ b/staging/kdeutils-kremotecontrol/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kremotecontrol -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 pkgdesc='Configure your remote controls for use with applications' url='http://kde.org/applications/utilities/kremotecontrol/' @@ -14,8 +14,8 @@ groups=('kde' 'kdeutils') replaces=('kdeutils-kdelirc') conflicts=('kdeutils-kdelirc') install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/xz/kremotecontrol-${pkgver}.tar.xz") -sha1sums=('684ad9b0393081a39b2c6badb2f411846e582bb2') +source=("http://download.kde.org/stable/${pkgver}/src/kremotecontrol-${pkgver}.tar.xz") +sha1sums=('2269320a9a33a29511c14c7e6c46bff22474076a') build() { cd "${srcdir}" diff --git a/staging/kdeutils-ksecrets/PKGBUILD b/staging/kdeutils-ksecrets/PKGBUILD index 2b84caf32..853b64671 100644 --- a/staging/kdeutils-ksecrets/PKGBUILD +++ b/staging/kdeutils-ksecrets/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 152110 2012-03-04 15:05:49Z andrea $ +# $Id: PKGBUILD 154914 2012-03-31 08:04:59Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-ksecrets -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 pkgdesc='Secrets Management Infrastructure for KDE' url='http://techbase.kde.org/Projects/Utils/ksecretsservice' @@ -12,8 +12,8 @@ depends=('kdebase-workspace' 'qca-ossl') makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/xz/ksecrets-${pkgver}.tar.xz") -sha1sums=('7ff7889da899dbac86ae63b0e25c2a8cde59fc32') +source=("http://download.kde.org/stable/${pkgver}/src/ksecrets-${pkgver}.tar.xz") +sha1sums=('53a13dfd7b6f97195a9519497cd48d3304e6e39d') build() { cd "${srcdir}" diff --git a/staging/kdeutils-ktimer/PKGBUILD b/staging/kdeutils-ktimer/PKGBUILD index d7936f5ad..56b1c11d3 100644 --- a/staging/kdeutils-ktimer/PKGBUILD +++ b/staging/kdeutils-ktimer/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 152111 2012-03-04 15:06:13Z andrea $ +# $Id: PKGBUILD 154915 2012-03-31 08:05:24Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-ktimer -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 pkgdesc='Countdown Launcher' url='http://kde.org/applications/utilities/ktimer/' @@ -12,8 +12,8 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/xz/ktimer-${pkgver}.tar.xz") -sha1sums=('c16ace45eefe9d495086a08fb1c0144baec9572f') +source=("http://download.kde.org/stable/${pkgver}/src/ktimer-${pkgver}.tar.xz") +sha1sums=('4e92e995041043a8dcd62caf21ff91d602aaefdf') build() { cd "${srcdir}" diff --git a/staging/kdeutils-kwallet/PKGBUILD b/staging/kdeutils-kwallet/PKGBUILD index 29c973791..c8b72a6ed 100644 --- a/staging/kdeutils-kwallet/PKGBUILD +++ b/staging/kdeutils-kwallet/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 152112 2012-03-04 15:06:37Z andrea $ +# $Id: PKGBUILD 154916 2012-03-31 08:05:48Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kwallet -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 pkgdesc='Wallet Management Tool' url='http://kde.org/applications/system/kwalletmanager/' @@ -12,8 +12,8 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/xz/kwallet-${pkgver}.tar.xz") -sha1sums=('39c1d6720cd486e86179468b5606923bab73cb9e') +source=("http://download.kde.org/stable/${pkgver}/src/kwallet-${pkgver}.tar.xz") +sha1sums=('3a9b13fff2c156fb642b2fff1f93180b4b564c20') build() { cd "${srcdir}" diff --git a/staging/kdeutils-superkaramba/PKGBUILD b/staging/kdeutils-superkaramba/PKGBUILD index 831308948..20171ca0d 100644 --- a/staging/kdeutils-superkaramba/PKGBUILD +++ b/staging/kdeutils-superkaramba/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 152114 2012-03-04 15:07:27Z andrea $ +# $Id: PKGBUILD 154918 2012-03-31 08:06:32Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-superkaramba -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 pkgdesc='An engine for cool desktop eyecandy' url='http://kde.org/applications/utilities/superkaramba/' @@ -12,8 +12,8 @@ depends=('kdebase-runtime' 'qimageblitz') makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/xz/superkaramba-${pkgver}.tar.xz") -sha1sums=('934a62e3d82e92a99b9d070a2dd39634b7351cea') +source=("http://download.kde.org/stable/${pkgver}/src/superkaramba-${pkgver}.tar.xz") +sha1sums=('5cddf45820903fe3f44873ceda907e100dbdc66b') build() { cd "${srcdir}" diff --git a/staging/kdeutils-sweeper/PKGBUILD b/staging/kdeutils-sweeper/PKGBUILD index a3592c49c..6941af118 100644 --- a/staging/kdeutils-sweeper/PKGBUILD +++ b/staging/kdeutils-sweeper/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 152115 2012-03-04 15:07:56Z andrea $ +# $Id: PKGBUILD 154919 2012-03-31 08:07:00Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-sweeper -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 pkgdesc='System Cleaner' url='http://kde.org/applications/utilities/sweeper' @@ -12,8 +12,8 @@ license=('GPL' 'LGPL' 'FDL') depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') -source=("http://download.kde.org/stable/${pkgver}/src/xz/sweeper-${pkgver}.tar.xz") -sha1sums=('7a11a22397bbe5106118ed94942f27f546fad80b') +source=("http://download.kde.org/stable/${pkgver}/src/sweeper-${pkgver}.tar.xz") +sha1sums=('ddb2eeb947e43e52e166cad962b5b4bddd5efd37') build() { cd "${srcdir}" diff --git a/staging/kdewebdev/PKGBUILD b/staging/kdewebdev/PKGBUILD index eda5c303d..c7511686b 100644 --- a/staging/kdewebdev/PKGBUILD +++ b/staging/kdewebdev/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 152116 2012-03-04 15:08:26Z andrea $ +# $Id: PKGBUILD 154920 2012-03-31 08:07:32Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -7,15 +7,15 @@ pkgname=('kdewebdev-kfilereplace' 'kdewebdev-kimagemapeditor' 'kdewebdev-klinkstatus' 'kdewebdev-kommander') -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdewebdev') -makedepends=('cmake' 'automoc4' 'ruby' 'tidyhtml' 'kdepim-runtime' 'boost') -source=("http://download.kde.org/stable/${pkgver}/src/xz/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('c707886d79d9ba150c408326efccf24847d5dc38') +makedepends=('cmake' 'automoc4' 'ruby' 'tidyhtml' 'kdepimlibs' 'boost') +source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") +sha1sums=('34b229bf778109e0cbd10765c0bd7341f95cd46d') build() { cd $srcdir @@ -42,7 +42,7 @@ package_kdewebdev-kfilereplace() { package_kdewebdev-kimagemapeditor() { pkgdesc='HTML Image Map Editor' depends=('kdebase-runtime') - url="http://www.kde.org/applications/development/kimagemapeditor/" + url="http://www.kde.org/applications/development/kimagemapeditor/" install='kdewebdev-kimagemapeditor.install' cd $srcdir/build/kimagemapeditor make DESTDIR=$pkgdir install @@ -52,8 +52,8 @@ package_kdewebdev-kimagemapeditor() { package_kdewebdev-klinkstatus() { pkgdesc='Link Checker' - depends=('kdepim-runtime' 'tidyhtml') - url="http://www.kde.org/applications/development/klinkstatus/" + depends=('kdebase-runtime' 'kdepimlibs' 'tidyhtml') + url="http://www.kde.org/applications/development/klinkstatus/" install='kdewebdev.install' cd $srcdir/build/klinkstatus make DESTDIR=$pkgdir install diff --git a/staging/kmod/0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch b/staging/kmod/0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch new file mode 100644 index 000000000..bf2c3501f --- /dev/null +++ b/staging/kmod/0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch @@ -0,0 +1,50 @@ +From 666ba68a0635048aea0db70cd9ec61aea9b61ed2 Mon Sep 17 00:00:00 2001 +From: Tom Gundersen <teg@jklm.no> +Date: Sat, 3 Mar 2012 12:37:06 +0100 +Subject: [PATCH 1/2] split usr: read configs from /lib/{depmod.d,modprobe.d} + +This allows rootprefix to be set to /usr, even if not all other packages +have been fixed to read from this dir. +--- + libkmod/libkmod.c | 5 +++-- + tools/kmod-depmod.c | 1 + + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/libkmod/libkmod.c b/libkmod/libkmod.c +index 36ca629..12c1112 100644 +--- a/libkmod/libkmod.c ++++ b/libkmod/libkmod.c +@@ -62,6 +62,7 @@ static const char *default_config_paths[] = { + SYSCONFDIR "/modprobe.d", + "/run/modprobe.d", + ROOTPREFIX "/lib/modprobe.d", ++ "/lib/modprobe.d", + NULL + }; + +@@ -223,8 +224,8 @@ static char *get_kernel_release(const char *dirname) + * @config_paths: ordered array of paths (directories or files) where + * to load from user-defined configuration parameters such as + * alias, blacklists, commands (install, remove). If +- * NULL defaults to /run/modprobe.d, /etc/modprobe.d and +- * $rootprefix/lib/modprobe.d. Give an empty vector if ++ * NULL defaults to /run/modprobe.d, /etc/modprobe.d, ++ * $rootprefix/lib/modprobe.d and /lib/modprobe.d. Give an empty vector if + * configuration should not be read. This array must be null + * terminated. + * +diff --git a/tools/kmod-depmod.c b/tools/kmod-depmod.c +index 1871e18..7bb1c5d 100644 +--- a/tools/kmod-depmod.c ++++ b/tools/kmod-depmod.c +@@ -58,6 +58,7 @@ static const char *default_cfg_paths[] = { + "/run/depmod.d", + SYSCONFDIR "/depmod.d", + ROOTPREFIX "/lib/depmod.d", ++ "/lib/depmod.d", + NULL + }; + +-- +1.7.9.5 + diff --git a/staging/kmod/0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch b/staging/kmod/0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch new file mode 100644 index 000000000..f39f36ace --- /dev/null +++ b/staging/kmod/0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch @@ -0,0 +1,93 @@ +From 53e7e0e42428770578ca0d54d0a9540f498f917f Mon Sep 17 00:00:00 2001 +From: Tom Gundersen <teg@jklm.no> +Date: Sat, 31 Mar 2012 12:17:39 +0200 +Subject: [PATCH 2/2] config: hardcode the path to modules to be /lib/modules + +This means that we can move the configuration paths from /lib +to /usr/lib without having to touch the kernel and related +packages. + +That can be dealt with separately at a later location, in which case +all we have to do is revert this patch. + +Signed-off-by: Tom Gundersen <teg@jklm.no> +--- + libkmod/libkmod.c | 2 +- + tools/kmod-depmod.c | 2 +- + tools/kmod-modinfo.c | 4 ++-- + tools/kmod-modprobe.c | 4 ++-- + 4 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/libkmod/libkmod.c b/libkmod/libkmod.c +index 12c1112..11edfa0 100644 +--- a/libkmod/libkmod.c ++++ b/libkmod/libkmod.c +@@ -196,7 +196,7 @@ static int log_priority(const char *priority) + return 0; + } + +-static const char *dirname_default_prefix = ROOTPREFIX "/lib/modules"; ++static const char *dirname_default_prefix = "/lib/modules"; + + static char *get_kernel_release(const char *dirname) + { +diff --git a/tools/kmod-depmod.c b/tools/kmod-depmod.c +index 7bb1c5d..454d538 100644 +--- a/tools/kmod-depmod.c ++++ b/tools/kmod-depmod.c +@@ -2634,7 +2634,7 @@ static int do_depmod(int argc, char *argv[]) + } + + cfg.dirnamelen = snprintf(cfg.dirname, PATH_MAX, +- "%s" ROOTPREFIX "/lib/modules/%s", ++ "%s/lib/modules/%s", + root == NULL ? "" : root, cfg.kversion); + + if (optind == argc) +diff --git a/tools/kmod-modinfo.c b/tools/kmod-modinfo.c +index aa5223f..b13cd4b 100644 +--- a/tools/kmod-modinfo.c ++++ b/tools/kmod-modinfo.c +@@ -339,7 +339,7 @@ static void help(const char *progname) + "\t-0, --null Use \\0 instead of \\n\n" + "\t-F, --field=FIELD Print only provided FIELD\n" + "\t-k, --set-version=VERSION Use VERSION instead of `uname -r`\n" +- "\t-b, --basedir=DIR Use DIR as filesystem root for " ROOTPREFIX "/lib/modules\n" ++ "\t-b, --basedir=DIR Use DIR as filesystem root for /lib/modules\n" + "\t-V, --version Show version\n" + "\t-h, --help Show this help\n", + progname); +@@ -439,7 +439,7 @@ static int do_modinfo(int argc, char *argv[]) + } + kversion = u.release; + } +- snprintf(dirname_buf, sizeof(dirname_buf), "%s" ROOTPREFIX "/lib/modules/%s", ++ snprintf(dirname_buf, sizeof(dirname_buf), "%s/lib/modules/%s", + root, kversion); + dirname = dirname_buf; + } +diff --git a/tools/kmod-modprobe.c b/tools/kmod-modprobe.c +index 4760682..ccb41d8 100644 +--- a/tools/kmod-modprobe.c ++++ b/tools/kmod-modprobe.c +@@ -128,7 +128,7 @@ static void help(const char *progname) + "\t-n, --show Same as --dry-run\n" + + "\t-C, --config=FILE Use FILE instead of default search paths\n" +- "\t-d, --dirname=DIR Use DIR as filesystem root for " ROOTPREFIX "/lib/modules\n" ++ "\t-d, --dirname=DIR Use DIR as filesystem root for /lib/modules\n" + "\t-S, --set-version=VERSION Use VERSION instead of `uname -r`\n" + + "\t-s, --syslog print to syslog, not stderr\n" +@@ -973,7 +973,7 @@ static int do_modprobe(int argc, char **orig_argv) + kversion = u.release; + } + snprintf(dirname_buf, sizeof(dirname_buf), +- "%s" ROOTPREFIX "/lib/modules/%s", root, ++ "%s/lib/modules/%s", root, + kversion); + dirname = dirname_buf; + } +-- +1.7.9.5 + diff --git a/staging/kmod/PKGBUILD b/staging/kmod/PKGBUILD new file mode 100644 index 000000000..d06c84008 --- /dev/null +++ b/staging/kmod/PKGBUILD @@ -0,0 +1,61 @@ +# $Id: PKGBUILD 154955 2012-03-31 21:06:52Z tomegun $ +# Maintainer: Dave Reisner <dreisner@archlinux.org> + +pkgname=kmod +pkgver=7 +pkgrel=2 +pkgdesc="Linux kernel module handling" +arch=('i686' 'x86_64') +url='http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary' +license=('GPL2') +depends=('glibc' 'zlib') +options=('!libtool') +provides=('module-init-tools=3.16') +conflicts=('module-init-tools') +replaces=('module-init-tools') +source=("ftp://ftp.kernel.org/pub/linux/utils/kernel/$pkgname/$pkgname-$pkgver.tar.xz" + "depmod-search.conf" + "0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch" + "0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch") +md5sums=('7bd916ae1c8a38e7697fdd8118bc98eb' + 'dd62cbf62bd8f212f51ef8c43bec9a77' + 'ba73b9e98db1abbf41274f922fcfbd55' + 'c9af56636c5667cf4ce3a31ea56e03d9') + +build() { + cd "$pkgname-$pkgver" + + patch -p1 -i ../0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch + patch -p1 -i ../0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch + + ./configure \ + --sysconfdir=/etc \ + --with-zlib \ + --with-rootprefix=/usr + + make +} + +check() { + make -C "$pkgname-$pkgver" check +} + +package() { + make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install + + # extra directories + install -dm755 "$pkgdir"/{etc,usr/lib}/{depmod,modprobe}.d "$pkgdir/sbin" + + # add symlinks to kmod + ln -s ../usr/bin/kmod "$pkgdir/sbin/modprobe" + ln -s ../usr/bin/kmod "$pkgdir/sbin/depmod" + + for tool in {ins,ls,rm}mod modinfo; do + ln -s kmod "$pkgdir/usr/bin/$tool" + done + + # install depmod.d file for search/ dir + install -Dm644 "$srcdir/depmod-search.conf" "$pkgdir/usr/lib/depmod.d/search.conf" +} + +# vim: ft=sh syn=sh et diff --git a/staging/kmod/depmod-search.conf b/staging/kmod/depmod-search.conf new file mode 100644 index 000000000..36f2cf7db --- /dev/null +++ b/staging/kmod/depmod-search.conf @@ -0,0 +1,5 @@ +# +# /usr/lib/depmod.d/search.conf +# + +search updates extramodules built-in diff --git a/staging/libgpod/PKGBUILD b/staging/libgpod/PKGBUILD new file mode 100644 index 000000000..fbd367677 --- /dev/null +++ b/staging/libgpod/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 154964 2012-03-31 22:50:08Z tomegun $ +# Maintainer: Daniel Isenmann <daniel@archlinux.org> +# Contributor: William Rea <sillywilly@gmail.com> + +pkgname=libgpod +pkgver=0.8.2 +pkgrel=4 +pkgdesc="A shared library to access the contents of an iPod" +arch=(i686 x86_64) +license=('LGPL') +depends=('gdk-pixbuf2' 'mutagen' 'sg3_utils' 'libimobiledevice') +makedepends=('intltool' 'swig' 'docbook-xsl' 'pygobject2-devel' 'gtk-sharp-2') +optdepends=('gtk-sharp-2: Mono bindings') +url="http://www.gtkpod.org/libgpod/" +source=(http://downloads.sourceforge.net/sourceforge/gtkpod/${pkgname}-${pkgver}.tar.bz2) +options=('!libtool' '!emptydirs') +md5sums=('ff0fd875fa08f2a6a49dec57ce3367ab') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --with-udev-dir=/usr/lib/udev \ + --enable-udev --with-python=/usr/bin/python2 + make PREFIX=/usr +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make PREFIX=/usr DESTDIR="${pkgdir}" install +} + diff --git a/staging/libkdcraw/PKGBUILD b/staging/libkdcraw/PKGBUILD index 96f7530b6..d2e5d7c34 100644 --- a/staging/libkdcraw/PKGBUILD +++ b/staging/libkdcraw/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 152046 2012-03-04 14:27:03Z andrea $ +# $Id: PKGBUILD 154850 2012-03-31 07:25:41Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkdcraw -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 pkgdesc="A C++ interface used to decode RAW picture" url="http://kde.org/" @@ -13,8 +13,8 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/xz/${pkgname}-${pkgver}.tar.xz") -sha1sums=('80dd47457b9803240a3002ef42d96e201d9face8') +source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") +sha1sums=('38708f1b223740ae105295cdaa6ee372e31c43bc') build() { cd "${srcdir}" diff --git a/staging/libkdeedu/PKGBUILD b/staging/libkdeedu/PKGBUILD index bd760b2a4..58c296c3b 100644 --- a/staging/libkdeedu/PKGBUILD +++ b/staging/libkdeedu/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 152044 2012-03-04 14:25:39Z andrea $ +# $Id: PKGBUILD 154848 2012-03-31 07:24:19Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkdeedu -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 pkgdesc="Libraries used by KDE Education applications" url="http://kde.org/" @@ -12,8 +12,8 @@ depends=('kdelibs') makedepends=('cmake' 'automoc4') install=${pkgname}.install replaces=('kdeedu-libkdeedu' 'kdeedu-data') -source=("http://download.kde.org/stable/${pkgver}/src/xz/${pkgname}-${pkgver}.tar.xz") -sha1sums=('ab9ed54dcb99f7cfe98623aa47434841f372a5a7') +source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") +sha1sums=('7c2bebb2d29793a1cab949382c19d2420398bf08') build() { cd "${srcdir}" diff --git a/staging/libkexiv2/PKGBUILD b/staging/libkexiv2/PKGBUILD index f0fed8e0f..ca9537d72 100644 --- a/staging/libkexiv2/PKGBUILD +++ b/staging/libkexiv2/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 152047 2012-03-04 14:27:30Z andrea $ +# $Id: PKGBUILD 154851 2012-03-31 07:26:14Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkexiv2 -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 pkgdesc="A library to manipulate pictures metadata" url="http://kde.org/" @@ -12,8 +12,8 @@ depends=('kdelibs') makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') -source=("http://download.kde.org/stable/${pkgver}/src/xz/${pkgname}-${pkgver}.tar.xz") -sha1sums=('273d76f2414c2dc442ab8f9dc72578977aba0f0c') +source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") +sha1sums=('fe32631401be655d4692fec724743d5f623b880d') build() { cd "${srcdir}" diff --git a/staging/libkipi/PKGBUILD b/staging/libkipi/PKGBUILD index d4332a378..69bdadf6f 100644 --- a/staging/libkipi/PKGBUILD +++ b/staging/libkipi/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkipi -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 pkgdesc="An interface to use kipi-plugins from a KDE application" url="http://kde.org/" @@ -13,8 +13,8 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/xz/${pkgname}-${pkgver}.tar.xz") -sha1sums=('bc290e3354c206d7852433aac704fc96b3a55700') +source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") +sha1sums=('c2f788e05f5e6d52e10578ebd58a2b1dd8f65c89') build() { cd "${srcdir}" diff --git a/staging/libksane/PKGBUILD b/staging/libksane/PKGBUILD index 42fc7cf99..e3af438aa 100644 --- a/staging/libksane/PKGBUILD +++ b/staging/libksane/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 152049 2012-03-04 14:28:20Z andrea $ +# $Id: PKGBUILD 154853 2012-03-31 07:27:04Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libksane -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 pkgdesc="An image scanning library" url="http://kde.org/" @@ -13,8 +13,8 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/xz/${pkgname}-${pkgver}.tar.xz") -sha1sums=('20631624185f8bf26d7a8c2e7222731513e8a2ec') +source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") +sha1sums=('fe9376710687c2e9354bd5f8245755c53e2ad91c') build() { cd "${srcdir}" diff --git a/staging/libmtp/PKGBUILD b/staging/libmtp/PKGBUILD new file mode 100644 index 000000000..3e394fd79 --- /dev/null +++ b/staging/libmtp/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 154966 2012-03-31 23:02:48Z tomegun $ +# Contributor: damir <damir@archlinux.org> +# Contributor: Kevin Edmonds <edmondskevin@hotmail.com> + +pkgname=libmtp +pkgver=1.1.2 +pkgrel=2 +pkgdesc="Library implementation of the Media Transfer Protocol" +arch=("i686" "x86_64") +url="http://libmtp.sourceforge.net" +license=('LGPL') +depends=('libusb') +options=('!libtool') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz") +md5sums=('6dc708757e3fd3ccce7445b4f2171263') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --with-udev=/usr/lib/udev + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/staging/pcmciautils/PKGBUILD b/staging/pcmciautils/PKGBUILD new file mode 100644 index 000000000..e76e08b34 --- /dev/null +++ b/staging/pcmciautils/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 154968 2012-03-31 23:04:36Z tomegun $ +# Maintainer: Tom Gundersen <teg@jklm.no> +# Contributor: Tobias Powalowski <tpowa@archlinux.org> +pkgname=pcmciautils +pkgver=018 +pkgrel=3 +pkgdesc="Utilities for inserting and removing PCMCIA cards" +arch=(i686 x86_64) +url="http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html" +license=('GPL') +groups=('base') +# sysfsutils will not be required in the next release +depends=('udev' 'sysfsutils') +conflicts=('pcmcia-cs') +# source=(http://kernel.org/pub/linux/utils/kernel/pcmcia/${pkgname}-${pkgver}.tar.bz2) broken due to breakin +source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz) +options=(!makeflags) + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + sed -i -e 's,/usr/bin/install,install,g; + s,/lib/udev,/usr/lib/udev,g' Makefile + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} +md5sums=('964c802994677a71b38ec56554aa229f') diff --git a/staging/system-config-printer/PKGBUILD b/staging/system-config-printer/PKGBUILD new file mode 100644 index 000000000..3875bb476 --- /dev/null +++ b/staging/system-config-printer/PKGBUILD @@ -0,0 +1,104 @@ +# $Id: PKGBUILD 154970 2012-03-31 23:15:18Z tomegun $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgbase=system-config-printer +pkgname=('system-config-printer-common' + 'system-config-printer-gnome') +pkgver=1.3.9 +pkgrel=2 +pkgdesc="A CUPS printer configuration tool and status applet" +url="http://cyberelk.net/tim/software/system-config-printer/" +arch=('i686' 'x86_64') +license=('GPL') +makedepends=('udev' 'libcups' 'intltool' 'python2' 'xmlto' 'docbook-xsl' 'desktop-file-utils') +source=(http://cyberelk.net/tim/data/${pkgbase}/1.3/${pkgbase}-${pkgver}.tar.xz{,.sig}) +md5sums=('df424f127eede63965608e5ec5e27519' + 'd105b7f7725c1ec538b6e6adb10667f3') + +build() { + cd "${srcdir}"/${pkgbase}-${pkgver} + + 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/python|#!/usr/bin/python2|" udev/udev-add-printer + + ./configure --prefix=/usr \ + --sbindir=/usr/bin \ + --sysconfdir=/etc \ + --with-udev-rules + + make +} + +package_system-config-printer-common() { + pkgdesc='Pygtk CUPS Configuration' + depends=('udev' 'pycups' 'dbus-python' 'pysmbc' 'python-pycurl' 'libusb-compat') + optdepends=('system-config-printer-gnome: for the GTK frontend' + 'kdeadmin-system-config-printer-kde: for the administration tool in KDE System Settings') + replaces=('system-config-printer') + provides=("system-config-printer=${pkgver}") + conflicts=('system-config-printer') + + cd "${srcdir}"/${pkgbase}-${pkgver} + install -d "${pkgdir}"/usr/share/${pkgbase} + install -m644 config.py \ + debug.py \ + installpackage.py \ + monitor.py \ + PhysicalDevice.py \ + ppdippstr.py \ + probe_printer.py \ + SearchCriterion.py \ + smburi.py \ + statereason.py \ + "${pkgdir}"/usr/share/${pkgbase}/ + + install -m755 pysmb.py \ + "${pkgdir}"/usr/share/${pkgbase}/ + + install -d "${pkgdir}"/etc/dbus-1/system.d/ + install -m644 dbus/com.redhat.NewPrinterNotification.conf \ + dbus/com.redhat.PrinterDriversInstaller.conf \ + "${pkgdir}"/etc/dbus-1/system.d/ + install -d "${pkgdir}"/etc/cupshelpers/ + install -m644 xml/preferreddrivers.xml "${pkgdir}"/etc/cupshelpers/ + + install -d "${pkgdir}"/usr/lib/udev/rules.d + install -m755 udev/{udev-add-printer,udev-configure-printer} \ + "${pkgdir}"/usr/lib/udev/ + install -m644 udev/70-printers.rules \ + "${pkgdir}"/usr/lib/udev/rules.d + + for file in build/lib/cupshelpers/*.py; do + install -Dm644 $file \ + "${pkgdir}"/usr/lib/python2.7/site-packages/cupshelpers/$(basename $file) + done +} + +package_system-config-printer-gnome() { + pkgdesc='A CUPS printer configuration tool and status applet - GTK frontend' + depends=('system-config-printer-common' 'gnome-icon-theme' 'python-notify') + optdependence=('gnome-keyring: password management') + + cd "${srcdir}"/${pkgbase}-${pkgver} + make DESTDIR="${pkgdir}" install + + # files provided by system-config-printer-common + cd "${pkgdir}"/usr/share/${pkgbase} + rm config.py \ + debug.py \ + installpackage.py \ + monitor.py \ + PhysicalDevice.py \ + ppdippstr.py \ + probe_printer.py \ + SearchCriterion.py \ + smburi.py \ + statereason.py \ + pysmb.py + rm -r "${pkgdir}"/etc/dbus-1/ + rm -r "${pkgdir}"/etc/cupshelpers/ + rm -r "${pkgdir}"/etc/udev/ + rm -r "${pkgdir}"/usr/lib/ +} diff --git a/staging/systemd/0001-util-never-follow-symlinks-in-rm_rf_children.patch b/staging/systemd/0001-util-never-follow-symlinks-in-rm_rf_children.patch new file mode 100644 index 000000000..7ac9251b3 --- /dev/null +++ b/staging/systemd/0001-util-never-follow-symlinks-in-rm_rf_children.patch @@ -0,0 +1,32 @@ +From 5ebff5337594d690b322078c512eb222d34aaa82 Mon Sep 17 00:00:00 2001 +From: Michal Schmidt <mschmidt@redhat.com> +Date: Fri, 2 Mar 2012 10:39:10 +0100 +Subject: [PATCH] util: never follow symlinks in rm_rf_children() + +The function checks if the entry is a directory before recursing, but +there is a window between the check and the open, during which the +directory could be replaced with a symlink. + +CVE-2012-1174 +https://bugzilla.redhat.com/show_bug.cgi?id=803358 +--- + src/util.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/util.c b/src/util.c +index 20cbc2b..dfc1dc6 100644 +--- a/src/util.c ++++ b/src/util.c +@@ -3593,7 +3593,8 @@ static int rm_rf_children(int fd, bool only_dirs, bool honour_sticky) { + if (is_dir) { + int subdir_fd; + +- if ((subdir_fd = openat(fd, de->d_name, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC)) < 0) { ++ subdir_fd = openat(fd, de->d_name, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC|O_NOFOLLOW); ++ if (subdir_fd < 0) { + if (ret == 0 && errno != ENOENT) + ret = -errno; + continue; +-- +1.7.9.4 + diff --git a/staging/systemd/PKGBUILD b/staging/systemd/PKGBUILD new file mode 100644 index 000000000..38df148a2 --- /dev/null +++ b/staging/systemd/PKGBUILD @@ -0,0 +1,108 @@ +# $Id: PKGBUILD 154953 2012-03-31 21:05:37Z tomegun $ +# Maintainer: Dave Reisner <dreisner@archlinux.org> + +pkgbase=systemd +pkgname=('systemd' 'libsystemd') +pkgver=44 +pkgrel=2 +arch=('i686' 'x86_64') +url="http://www.freedesktop.org/wiki/Software/systemd" +license=('GPL2') +makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gperf' 'intltool' + 'kmod' 'libcap' 'libxslt' 'linux-api-headers' 'pam' 'udev' 'xz') +options=('!libtool') +source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" + "os-release" + 0001-util-never-follow-symlinks-in-rm_rf_children.patch) +md5sums=('11f44ff74c87850064e4351518bcff17' + '752636def0db3c03f121f8b4f44a63cd' + 'b5863d6d4b47e2b5bda8eb57bde0d327') + +build() { + cd "$pkgname-$pkgver" + + # https://bugzilla.redhat.com/show_bug.cgi?id=803358 + patch -Np1 <"$srcdir/0001-util-never-follow-symlinks-in-rm_rf_children.patch" + + ./configure --sysconfdir=/etc \ + --libexecdir=/usr/lib \ + --with-pamlibdir=/lib/security \ + --localstatedir=/var \ + --with-distro=arch \ + --enable-split-usr + + make +} + +package_systemd() { + pkgdesc="system and service manager" + depends=('acl' 'dbus' 'dbus-core' 'libsystemd' 'kbd' 'kmod' 'libcap' 'pam' 'util-linux' 'udev' 'xz') + optdepends=('cryptsetup: required for encrypted block devices' + 'dbus-python: systemd-analyze' + 'initscripts: legacy support for hostname and vconsole setup' + 'initscripts-systemd: native boot and initialization scripts' + 'python2-cairo: systemd-analyze' + 'systemd-arch-units: collection of native unit files for Arch daemon/init scripts' + 'systemd-sysvcompat: symlink package to provide sysvinit binaries') + backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf + etc/dbus-1/system.d/org.freedesktop.hostname1.conf + etc/dbus-1/system.d/org.freedesktop.login1.conf + etc/dbus-1/system.d/org.freedesktop.locale1.conf + etc/dbus-1/system.d/org.freedesktop.timedate1.conf + etc/systemd/system.conf + etc/systemd/user.conf + etc/systemd/systemd-logind.conf + etc/systemd/systemd-journald.conf) + install="$pkgname.install" + + cd "$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + + install -Dm644 "$srcdir/os-release" "$pkgdir/etc/os-release" + + printf "d /run/console 755 root root\n" >"$pkgdir/usr/lib/tmpfiles.d/console.conf" + chmod 644 "$pkgdir/usr/lib/tmpfiles.d/console.conf" + + # symlink to /bin/systemd for compat and sanity + mkdir -p "$pkgdir/bin" + ln -s ../usr/lib/systemd/systemd "$pkgdir/bin/systemd" + mkdir -p "$pkgdir/lib/systemd" + ln -s ../../usr/lib/systemd/systemd "$pkgdir/lib/systemd/systemd" + + # use python2 for systemd-analyze + sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze" + + # didn't build this... + rm -f "$pkgdir/usr/share/man/man1/systemadm.1" + + # fix .so links in manpage stubs + find "$pkgdir/usr/share/man" -type f -name '*.[[:digit:]]' \ + -exec sed -i '1s|^\.so \(.*\)\.\([[:digit:]]\+\)|.so man\2/\1.\2|' {} + + + # rename man pages to avoid conflicts with sysvinit and initscripts + manpages=(man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 + man5/{hostname,{vconsole,locale}.conf}.5) + cd "$pkgdir/usr/share/man" + for manpage in "${manpages[@]}"; do + IFS='/' read section page <<< "$manpage" + mv "$manpage" "$section/systemd.$page" + done + + ### split off libsystemd (libs, includes, pkgconfig, man3) + install -dm755 "$srcdir"/libsystemd/usr/{include,lib/pkgconfig} + + cd "$srcdir"/libsystemd + mv "$pkgdir/usr/lib"/libsystemd-*.so* usr/lib + mv "$pkgdir/usr/include/systemd" usr/include + mv "$pkgdir/usr/lib/pkgconfig"/libsystemd-*.pc usr/lib/pkgconfig +} + +package_libsystemd() { + pkgdesc="systemd client libraries" + depends=('libcap' 'xz') + + mv "$srcdir/libsystemd"/* "$pkgdir" +} + +# vim: ft=sh syn=sh et diff --git a/staging/systemd/cpp-compat.patch b/staging/systemd/cpp-compat.patch new file mode 100644 index 000000000..346c353bc --- /dev/null +++ b/staging/systemd/cpp-compat.patch @@ -0,0 +1,19 @@ +commit e09a9a35a1fdb4e849e63bdaf47d936c272b5e82 +Author: Lennart Poettering <lennart@poettering.net> +Date: 2012-03-05 15:16:10 +0100 + + sd-login: c++ compatibility + +diff --git a/src/systemd/sd-login.h b/src/systemd/sd-login.h +index 2f3c90c..6e99cfc 100644 +--- a/src/systemd/sd-login.h ++++ b/src/systemd/sd-login.h +@@ -94,7 +94,7 @@ int sd_session_get_service(const char *session, char **service); + int sd_session_get_type(const char *session, char **type); + + /* Determine the class of this session, i.e. one of "user", "greeter" or "lock-screen". */ +-int sd_session_get_class(const char *session, char **class); ++int sd_session_get_class(const char *session, char **clazz); + + /* Determine the X11 display of this session. */ + int sd_session_get_display(const char *session, char **display); diff --git a/staging/systemd/os-release b/staging/systemd/os-release new file mode 100644 index 000000000..5e24a6031 --- /dev/null +++ b/staging/systemd/os-release @@ -0,0 +1,5 @@ +NAME="Arch Linux" +ID=arch +PRETTY_NAME="Arch Linux" +ANSI_COLOR="1;36" + diff --git a/staging/systemd/systemd.install b/staging/systemd/systemd.install new file mode 100644 index 000000000..11004222a --- /dev/null +++ b/staging/systemd/systemd.install @@ -0,0 +1,54 @@ +#!/bin/sh + +checkgroups() { + if ! getent group lock >/dev/null; then + groupadd -g 54 lock + fi +} + +sd_booted() { + [ -e sys/fs/cgroups/systemd ] +} + +post_install() { + checkgroups + + if [ ! -f etc/machine-id ]; then + systemd-machine-id-setup + fi + + echo "systemd has been installed to /bin/systemd. Please ensure you append" + echo "init=/bin/systemd to your kernel command line in your bootloader." +} + +post_upgrade() { + checkgroups + + if [ ! -f etc/machine-id ]; then + systemd-machine-id-setup + fi + + if sd_booted; then + systemctl daemon-reexec >/dev/null + systemctl daemon-reload >/dev/null + fi + + newpkgver=${1%-*} + oldpkgver=${2%-*} + + # catch v31 need for restarting systemd-logind.service + if [ "$newpkgver" -ge 31 ] && [ "$oldpkgver" -lt 31 ]; then + # but only if systemd is running + if sd_booted; then + systemctl try-restart systemd-logind.service + fi + fi +} + +post_remove() { + if getent group lock >/dev/null; then + groupdel lock + fi +} + +# vim:set ts=2 sw=2 et: diff --git a/staging/udev/0001-split-usr-always-read-config-files-from-lib-udev.patch b/staging/udev/0001-split-usr-always-read-config-files-from-lib-udev.patch new file mode 100644 index 000000000..d4d162167 --- /dev/null +++ b/staging/udev/0001-split-usr-always-read-config-files-from-lib-udev.patch @@ -0,0 +1,80 @@ +From f2bdace5bb68d4f3162f886b27210762d8b115b8 Mon Sep 17 00:00:00 2001 +From: Tom Gundersen <teg@jklm.no> +Date: Sat, 3 Mar 2012 12:28:15 +0100 +Subject: [PATCH 1/2] split /usr: always read config files from /lib/udev + +This means we don't need a flagday in order to move udev to use +/usr/lib/udev/rules.d +--- + src/libudev.c | 25 ++++++++++++++++--------- + 1 file changed, 16 insertions(+), 9 deletions(-) + +diff --git a/src/libudev.c b/src/libudev.c +index be24329..754d713 100644 +--- a/src/libudev.c ++++ b/src/libudev.c +@@ -43,8 +43,8 @@ struct udev { + void *userdata; + char *sys_path; + char *dev_path; +- char *rules_path[4]; +- unsigned long long rules_path_ts[4]; ++ char *rules_path[5]; ++ unsigned long long rules_path_ts[5]; + int rules_path_count; + char *run_path; + struct udev_list properties_list; +@@ -255,21 +255,26 @@ UDEV_EXPORT struct udev *udev_new(void) + goto err; + + if (udev->rules_path[0] == NULL) { +- /* /usr/lib/udev -- system rules */ +- udev->rules_path[0] = strdup(PKGLIBEXECDIR "/rules.d"); ++ /* /lib/udev -- compat for system rules */ ++ udev->rules_path[0] = strdup("/lib/udev/rules.d"); + if (!udev->rules_path[0]) ++ goto err; ++ ++ /* /usr/lib/udev -- system rules */ ++ udev->rules_path[1] = strdup(PKGLIBEXECDIR "/rules.d"); ++ if (!udev->rules_path[1]) + goto err; + + /* /etc/udev -- local administration rules */ +- udev->rules_path[1] = strdup(SYSCONFDIR "/udev/rules.d"); +- if (!udev->rules_path[1]) ++ udev->rules_path[2] = strdup(SYSCONFDIR "/udev/rules.d"); ++ if (!udev->rules_path[2]) + goto err; + + /* /run/udev -- runtime rules */ +- if (asprintf(&udev->rules_path[2], "%s/rules.d", udev->run_path) < 0) ++ if (asprintf(&udev->rules_path[3], "%s/rules.d", udev->run_path) < 0) + goto err; + +- udev->rules_path_count = 3; ++ udev->rules_path_count = 4; + } + + dbg(udev, "context %p created\n", udev); +@@ -278,7 +283,8 @@ UDEV_EXPORT struct udev *udev_new(void) + dbg(udev, "dev_path='%s'\n", udev->dev_path); + dbg(udev, "sys_path='%s'\n", udev->sys_path); + dbg(udev, "run_path='%s'\n", udev->run_path); +- dbg(udev, "rules_path='%s':'%s':'%s'\n", udev->rules_path[0], udev->rules_path[1], udev->rules_path[2]); ++ dbg(udev, "rules_path='%s':'%s':'%s':'%s'\n", udev->rules_path[0], udev->rules_path[1], ++ udev->rules_path[2], udev->rules_path[3]); + free(config_file); + return udev; + err: +@@ -325,6 +331,7 @@ UDEV_EXPORT void udev_unref(struct udev *udev) + free(udev->rules_path[0]); + free(udev->rules_path[1]); + free(udev->rules_path[2]); ++ free(udev->rules_path[3]); + free(udev->run_path); + dbg(udev, "context %p released\n", udev); + free(udev); +-- +1.7.9.5 + diff --git a/staging/udev/0002-reinstate-TIMEOUT-handling.patch b/staging/udev/0002-reinstate-TIMEOUT-handling.patch new file mode 100644 index 000000000..9d1d36fb6 --- /dev/null +++ b/staging/udev/0002-reinstate-TIMEOUT-handling.patch @@ -0,0 +1,146 @@ +From 0a581062ee3e31e0c2aedc5eb64c60f52868b17f Mon Sep 17 00:00:00 2001 +From: Tom Gundersen <teg@jklm.no> +Date: Thu, 15 Mar 2012 02:12:43 +0100 +Subject: [PATCH 2/2] reinstate TIMEOUT= handling + +Without treating events with timeouts specially some drivers would cause a +30 seconds stall on boot: . + +I also received reports of some drivers not working at all, even after the +timeout. + +We will remove this patch when more drivers have been fixed in the kernel (3.4?). + +This reverts 43d5c5f03645c4b842659f9b5bd0ae465e885e92 and +57c6f8ae5f52a6e8ffc66a54966346f733dded39. +--- + TODO | 2 ++ + src/libudev-device.c | 19 +++++++++++++++++++ + src/libudev-private.h | 1 + + src/udevd.c | 13 ++++++++++--- + 4 files changed, 32 insertions(+), 3 deletions(-) + +diff --git a/TODO b/TODO +index 36e8440..c2e59b6 100644 +--- a/TODO ++++ b/TODO +@@ -1,6 +1,8 @@ + - find a way to tell udev to not cancel firmware + requests in initramfs + ++ - remove TIMEOUT= handling ++ + - move /lib/udev/devices/ to tmpfiles + + - trigger --subsystem-match=usb/usb_device +diff --git a/src/libudev-device.c b/src/libudev-device.c +index 10f28b8..639c367 100644 +--- a/src/libudev-device.c ++++ b/src/libudev-device.c +@@ -68,6 +68,7 @@ struct udev_device { + struct udev_list tags_list; + unsigned long long int seqnum; + unsigned long long int usec_initialized; ++ int timeout; + int devlink_priority; + int refcount; + dev_t devnum; +@@ -160,6 +161,21 @@ static int udev_device_set_devnum(struct udev_device *udev_device, dev_t devnum) + return 0; + } + ++int udev_device_get_timeout(struct udev_device *udev_device) ++{ ++ return udev_device->timeout; ++} ++ ++static int udev_device_set_timeout(struct udev_device *udev_device, int timeout) ++{ ++ char num[32]; ++ ++ udev_device->timeout = timeout; ++ snprintf(num, sizeof(num), "%u", timeout); ++ udev_device_add_property(udev_device, "TIMEOUT", num); ++ return 0; ++} ++ + const char *udev_device_get_devpath_old(struct udev_device *udev_device) + { + return udev_device->devpath_old; +@@ -414,6 +430,8 @@ void udev_device_add_property_from_string_parse(struct udev_device *udev_device, + udev_device_set_devpath_old(udev_device, &property[12]); + } else if (strncmp(property, "SEQNUM=", 7) == 0) { + udev_device_set_seqnum(udev_device, strtoull(&property[7], NULL, 10)); ++ } else if (strncmp(property, "TIMEOUT=", 8) == 0) { ++ udev_device_set_timeout(udev_device, strtoull(&property[8], NULL, 10)); + } else if (strncmp(property, "IFINDEX=", 8) == 0) { + udev_device_set_ifindex(udev_device, strtoull(&property[8], NULL, 10)); + } else if (strncmp(property, "DEVMODE=", 8) == 0) { +@@ -599,6 +617,7 @@ struct udev_device *udev_device_new(struct udev *udev) + udev_list_init(udev, &udev_device->sysattr_value_list, true); + udev_list_init(udev, &udev_device->sysattr_list, false); + udev_list_init(udev, &udev_device->tags_list, true); ++ udev_device->timeout = -1; + udev_device->watch_handle = -1; + /* copy global properties */ + udev_list_entry_foreach(list_entry, udev_get_properties_list_entry(udev)) +diff --git a/src/libudev-private.h b/src/libudev-private.h +index 5f5c64a..ec63b67 100644 +--- a/src/libudev-private.h ++++ b/src/libudev-private.h +@@ -87,6 +87,7 @@ const char *udev_device_get_id_filename(struct udev_device *udev_device); + void udev_device_set_is_initialized(struct udev_device *udev_device); + int udev_device_add_tag(struct udev_device *udev_device, const char *tag); + void udev_device_cleanup_tags_list(struct udev_device *udev_device); ++int udev_device_get_timeout(struct udev_device *udev_device); + unsigned long long udev_device_get_usec_initialized(struct udev_device *udev_device); + void udev_device_set_usec_initialized(struct udev_device *udev_device, unsigned long long usec_initialized); + int udev_device_get_devlink_priority(struct udev_device *udev_device); +diff --git a/src/udevd.c b/src/udevd.c +index 1702217..88e9272 100644 +--- a/src/udevd.c ++++ b/src/udevd.c +@@ -401,7 +401,7 @@ out: + } + } + +-static void event_run(struct event *event) ++static void event_run(struct event *event, bool force) + { + struct udev_list_node *loop; + +@@ -427,7 +427,7 @@ static void event_run(struct event *event) + return; + } + +- if (children >= children_max) { ++ if (!force && children >= children_max) { + if (children_max > 1) + info(event->udev, "maximum number (%i) of children reached\n", children); + return; +@@ -461,6 +461,13 @@ static int event_queue_insert(struct udev_device *dev) + + event->state = EVENT_QUEUED; + udev_list_node_append(&event->node, &event_list); ++ ++ /* run all events with a timeout set immediately */ ++ if (udev_device_get_timeout(dev) > 0) { ++ event_run(event, true); ++ return 0; ++ } ++ + return 0; + } + +@@ -577,7 +584,7 @@ static void event_queue_start(struct udev *udev) + continue; + } + +- event_run(event); ++ event_run(event, false); + } + } + +-- +1.7.9.5 + diff --git a/staging/udev/PKGBUILD b/staging/udev/PKGBUILD new file mode 100644 index 000000000..5b2ad49ce --- /dev/null +++ b/staging/udev/PKGBUILD @@ -0,0 +1,72 @@ +# $Id: PKGBUILD 154974 2012-03-31 23:23:46Z tomegun $ +# Maintainer: Tom Gundersen <teg@jklm.no> +# Contributor: Aaron Griffin <aaron@archlinux.org> +# Contributor: Tobias Powalowski <tpowa@archlinux.org> +# Contributor: Thomas Bächler <thomas@archlinux.org> + +pkgname=udev +pkgver=181 +pkgrel=7 +pkgdesc="The userspace dev tools (udev)" +depends=('util-linux' 'glib2' 'kmod' 'pciutils' 'usbutils' 'bash' 'acl') +install=udev.install +arch=(i686 x86_64) +license=('GPL') +makedepends=('gobject-introspection' 'gperf' 'libxslt') +source=(ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/$pkgname-$pkgver.tar.xz + 0001-split-usr-always-read-config-files-from-lib-udev.patch + 0002-reinstate-TIMEOUT-handling.patch + initcpio-hooks-udev + initcpio-install-udev) +url="http://git.kernel.org/?p=linux/hotplug/udev.git;a=summary" +backup=(etc/udev/udev.conf) +groups=('base') +options=(!makeflags !libtool) + +build() { + cd $srcdir/$pkgname-$pkgver + + patch -p1 -i ../0001-split-usr-always-read-config-files-from-lib-udev.patch + patch -p1 -i ../0002-reinstate-TIMEOUT-handling.patch + + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib \ + --with-systemdsystemunitdir=/usr/lib/systemd/system \ + --with-firmware-path=/usr/lib/firmware/updates:/lib/firmware/updates:/usr/lib/firmware:/lib/firmware \ + --enable-udev_acl + + make +} + +check() { + make -C "$pkgname-$pkgver" check +} + +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=${pkgdir} install + + # install the mkinitpcio hook + install -D -m644 ../initcpio-hooks-udev ${pkgdir}/usr/lib/initcpio/hooks/udev + install -D -m644 ../initcpio-install-udev ${pkgdir}/usr/lib/initcpio/install/udev + + # udevd moved, symlink to make life easy for restarting udevd manually + ln -s ../lib/udev/udevd ${pkgdir}/usr/bin/udevd + + # the path to udevadm is hardcoded in some places + install -d ${pkgdir}/sbin + ln -s ../usr/bin/udevadm ${pkgdir}/sbin/udevadm + + # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group + for i in $pkgdir/usr/lib/udev/rules.d/*.rules; do + sed -i -e 's#GROUP="dialout"#GROUP="uucp"#g; + s#GROUP="tape"#GROUP="storage"#g; + s#GROUP="cdrom"#GROUP="optical"#g' $i + done +} +md5sums=('0d7af750702620a871b9f9b98d8ad859' + '02a0dbbdcba6c1eae3ef65b6b06bde1f' + 'a9fae85491a08d7759388c605389a8c5' + 'a4dd853050bf2e0ae6b2e3d2c75499c2' + 'ee0bfe91a20fff12cc25ab1d1e024853') diff --git a/staging/udev/initcpio-hooks-udev b/staging/udev/initcpio-hooks-udev new file mode 100644 index 000000000..87aa7960f --- /dev/null +++ b/staging/udev/initcpio-hooks-udev @@ -0,0 +1,9 @@ +# vim: set ft=sh: +run_hook () +{ + msg -n ":: Triggering uevents..." + udevadm trigger --action=add --type=subsystems + udevadm trigger --action=add --type=devices + udevadm settle + msg "done." +} diff --git a/staging/udev/initcpio-install-udev b/staging/udev/initcpio-install-udev new file mode 100644 index 000000000..e7e2c0f60 --- /dev/null +++ b/staging/udev/initcpio-install-udev @@ -0,0 +1,26 @@ +#!/bin/bash + +build() { + FILES="/etc/udev/udev.conf" + SCRIPT="udev" + + add_binary /lib/udev/udevd + add_binary /usr/bin/udevadm + + for rules in 50-udev-default.rules 60-persistent-storage.rules 80-drivers.rules; do + add_file "/lib/udev/rules.d/$rules" + done + for tool in ata_id scsi_id; do + add_file "/lib/udev/$tool" + done +} + +help() { + cat <<HELPEOF +This hook will use udev to create your root device node and detect the needed +modules for your root device. It is also required for firmware loading in +initramfs. It is recommended to use this hook. +HELPEOF +} + +# vim: set ft=sh ts=4 sw=4 et: diff --git a/staging/udev/udev.install b/staging/udev/udev.install new file mode 100644 index 000000000..557efe9e1 --- /dev/null +++ b/staging/udev/udev.install @@ -0,0 +1,59 @@ +# arg 1: the new package version +# arg 2: the old package version + +post_upgrade() { + if [ "$(vercmp $2 181-3)" -lt 0 ]; then + echo "udev changes:" + if [ "$(vercmp $2 168)" -lt 0 ]; then + echo " * Kernel 2.6.32 or newer is now required." + echo " * OSS emulation modules are not loaded by default, add to rc.conf if needed." + echo " * Arch specific cd symlinks are now no longer created." + echo " * cd and net persistent rules will no longer be autogenerated," + echo " see <https://wiki.archlinux.org/index.php/Udev> for details." + echo " * Errors are now logged (possibly to the console) by default." + fi + if [ "$(vercmp $2 171)" -lt 0 ]; then + echo " * Arch's custom blacklisting logic has been removed. MOD_AUTOLOAD and" + echo " blacklisting in MODULES no longer works." + echo " See 'man modprobe.conf' for a replacement to blacklisting." + echo " To disable a module mod1 on the kernel command line, use" + echo " mod1.disable=1" + echo " or" + echo " modprobe.blacklist=mod1" + echo " * The following modules are no longer unconditionally loaded:" + echo " pcspkr irtty-sir analog lp ppdev ide-generic" + echo " Add them to MODULES in rc.conf if you need them." + fi + if [ "$(vercmp $2 172)" -lt 0 ]; then + echo " * Blacklisting of framebuffer devices has moved from /etc/modprobe.d to" + echo " /lib/modprobe.d. Any customizations shoud be done to the file in /etc, as it" + echo " takes precedence." + echo " * kbd and rtc devices are no longer world readable." + echo " * rtc is no longer in the audio group and fb devices are no longer in" + echo " the video group, as permissions and ownership of fb devices are controlled" + echo " by X." + fi + if [ "$(vercmp $2 174)" -lt 0 ]; then + echo " * We now use upstream rules for assigning devices to the 'disk', 'optical'," + echo " 'scanner' and 'video' groups. Beware of any changes." + echo " * We no longer create symlinks from /dev/<dev> to /dev/<dev>0." + echo " * For security reasons, we no longer add devices to the 'storage' group. Use" + echo " udisks and friends, or add custom rules to /etc/udev.d/rules/, if you want" + echo " this functionality back." + echo " * We no longer create the static nodes on install needed for an initrd-less" + echo " boot where devtmpfs is not mounted by the kernel, this only affects fresh" + echo " installs." + fi + if [ "$(vercmp $2 175)" -lt 0 ]; then + echo " * devtmpfs support is now a hard requirement. Users of the official Arch" + echo " kernels have this enabled." + fi + if [ "$(vercmp $2 181)" -lt 0 ]; then + echo " * udev-compat has been removed, and should be uninstalled." + echo " * Framebuffers are no longer blacklisted by default." + echo " * binaries moved from /sbin to /usr/bin" + fi + echo " * if your kernel does not provide /dev/loop-control, you need to manually" + echo " load the 'loop' module before using losetup" + fi +} diff --git a/staging/udisks/PKGBUILD b/staging/udisks/PKGBUILD new file mode 100644 index 000000000..fcded4b5c --- /dev/null +++ b/staging/udisks/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 154972 2012-03-31 23:19:08Z tomegun $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=udisks +pkgver=1.0.4 +pkgrel=3 +pkgdesc="Disk Management Service" +arch=('i686' 'x86_64') +url="http://www.freedesktop.org/wiki/Software/udisks" +license=('GPL') +depends=('udev' 'sg3_utils' 'glib2' 'dbus-glib' 'polkit' 'parted' 'device-mapper' 'libatasmart' 'lsof' 'eject') +makedepends=('intltool' 'docbook-xsl') +options=(!libtool) +source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz) +sha256sums=('854b89368733b9c3a577101b761ad5397ae75a05110c8698ac5b29de9a8bf8f5') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --libexecdir=/usr/lib/udisks --disable-static + #fix location for bash_completion helper + sed -i -e 's|profile.d|bash_completion.d|' tools/Makefile + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + # move udev helpers and rules to /usr/lib + mv "${pkgdir}"/lib/udev "${pkgdir}"/usr/lib/ + rm -r "${pkgdir}"/lib +} diff --git a/testing/cairo/PKGBUILD b/testing/cairo/PKGBUILD new file mode 100644 index 000000000..3f3f3e8ae --- /dev/null +++ b/testing/cairo/PKGBUILD @@ -0,0 +1,45 @@ +# $Id: PKGBUILD 154931 2012-03-31 09:15:49Z andyrtr $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: Brice Carpentier <brice@daknet.org> + +pkgname=cairo +pkgver=1.12.0 +pkgrel=1 +pkgdesc="Cairo vector graphics library" +arch=(i686 x86_64) +license=('LGPL' 'MPL') +url="http://cairographics.org/" +depends=('libpng' 'libxrender' 'fontconfig' 'pixman' 'glib2' 'sh') +makedepends=('librsvg' 'poppler-glib' 'libspectre') # 'libdrm') +optdepends=('xcb-util: for XCB backend') # really needed? +provides=('cairo-xcb') +replaces=('cairo-xcb') +options=('!libtool') +source=(http://cairographics.org/releases/$pkgname-$pkgver.tar.gz + cairo-1.10.0-buggy_gradients.patch) +md5sums=('e6c85575ba7094f88b637bdfd835a751' + '9b323790dab003e228c6955633cb888e') + +build() { + cd "$srcdir/$pkgname-$pkgver" + patch -Np1 -i "${srcdir}/cairo-1.10.0-buggy_gradients.patch" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-static \ + --enable-tee \ + --enable-xlib-xcb \ + # --enable-test-surfaces \ takes ages + #--enable-drm # breaks build + make +} + +#check() { +# cd "$srcdir/$pkgname-$pkgver" +# make check || /bin/true # 248 Passed, 65 Failed [2 crashed, 8 expected], 28 Skipped +#} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/testing/cairo/cairo-1.10.0-buggy_gradients.patch b/testing/cairo/cairo-1.10.0-buggy_gradients.patch new file mode 100644 index 000000000..368e356d3 --- /dev/null +++ b/testing/cairo/cairo-1.10.0-buggy_gradients.patch @@ -0,0 +1,13 @@ +--- a/src/cairo-xlib-display.c.ubuntu 2010-08-04 11:57:49.000000000 +0200
++++ b/src/cairo-xlib-display.c 2010-08-04 11:58:28.000000000 +0200
+@@ -353,11 +353,7 @@
+ /* Prior to Render 0.10, there is no protocol support for gradients and
+ * we call function stubs instead, which would silently consume the drawing.
+ */
+-#if RENDER_MAJOR == 0 && RENDER_MINOR < 10
+ display->buggy_gradients = TRUE;
+-#else
+- display->buggy_gradients = FALSE;
+-#endif
+ display->buggy_pad_reflect = FALSE;
+ display->buggy_repeat = FALSE;
diff --git a/testing/e2fsprogs/PKGBUILD b/testing/e2fsprogs/PKGBUILD index a96408632..5257a03b6 100644 --- a/testing/e2fsprogs/PKGBUILD +++ b/testing/e2fsprogs/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 151655 2012-02-29 19:29:13Z ronald $ +# $Id: PKGBUILD 154926 2012-03-31 08:27:07Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=e2fsprogs -pkgver=1.42.1 +pkgver=1.42.2 pkgrel=1 pkgdesc="Ext2/3/4 filesystem utilities" arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pk 'MIT-LICENSE') backup=('etc/mke2fs.conf') install=${pkgname}.install -sha1sums=('c25c73de98737b5f6fb9debec36bfb6416b0ac07' +sha1sums=('bfba3716b78310cf2a288909f13214a718d91e25' 'f4a0d5b0cdb980e3fedd6f5e7dde0b0ffb7bbdfb') build() { diff --git a/testing/iptables/PKGBUILD b/testing/iptables/PKGBUILD index 54dc69ec4..d4878172e 100644 --- a/testing/iptables/PKGBUILD +++ b/testing/iptables/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 154240 2012-03-24 13:43:51Z ronald $ +# $Id: PKGBUILD 154924 2012-03-31 08:15:52Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> pkgname=iptables -pkgver=1.4.12.2 -pkgrel=3 +pkgver=1.4.13 +pkgrel=1 pkgdesc='Linux kernel packet control tool' arch=('i686' 'x86_64') license=('GPL2') @@ -24,7 +24,7 @@ source=("http://www.iptables.org/projects/iptables/files/${pkgname}-${pkgver}.ta empty-raw.rules empty-security.rules) backup=(etc/conf.d/iptables) -sha1sums=('4dc8cdf1b711b23ed88eaaaa0e0e157d2bf2d81c' +sha1sums=('bf1f1896e052d1813a7c96fa70f88be8dab3ff86' '5bb6fa526665cdd728c26f0f282f5a51f220cf88' '2db68906b603e5268736f48c8e251f3a49da1d75' '83b3363878e3660ce23b2ad325b53cbd6c796ecf' @@ -51,7 +51,8 @@ build() { --with-xtlibdir=/usr/lib/iptables \ --enable-devel --enable-libipq \ --enable-shared --enable-static -# build fails when not enabling static, see if we can remove it on next build +# build fails when not enabling static, see if we can remove it on next build +# 1.4.13 still fails make } diff --git a/testing/ruby/PKGBUILD b/testing/ruby/PKGBUILD index 8ceaba4b4..090d798f0 100644 --- a/testing/ruby/PKGBUILD +++ b/testing/ruby/PKGBUILD @@ -5,7 +5,7 @@ pkgname=ruby pkgver=1.9.3_p125 -pkgrel=1 +pkgrel=3 pkgdesc='An object-oriented language for quick and easy programming' arch=('i686' 'x86_64') url='http://www.ruby-lang.org/en/' @@ -21,7 +21,7 @@ options=('!emptydirs' '!makeflags') install='ruby.install' source=("ftp://ftp.ruby-lang.org/pub/ruby/${pkgver%.*}/ruby-${pkgver//_/-}.tar.bz2" 'gemrc') -md5sums=('341b8fc42aa18bd668314199f219db14' +md5sums=('702529a7f8417ed79f628b77d8061aa5' '6fb8e7a09955e0f64be3158fb4a27e7a') build() { diff --git a/testing/xorg-server/PKGBUILD b/testing/xorg-server/PKGBUILD index 5764faa47..ec72f28f7 100644 --- a/testing/xorg-server/PKGBUILD +++ b/testing/xorg-server/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 152190 2012-03-05 06:05:59Z andyrtr $ +# $Id: PKGBUILD 154933 2012-03-31 09:51:27Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=xorg-server pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel') -pkgver=1.12.0 +pkgver=1.12.0.901 pkgrel=1 arch=('i686' 'x86_64') license=('custom') @@ -20,9 +20,9 @@ source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2 xvfb-run xvfb-run.1 10-quirks.conf) -sha1sums=('5f48db767f71e9f58ded6ff356f3b8340820e524' - 'f19658773d3fa4dc468bb28f9f01866acce71540' - '962fecc159c128728f14e8ba231c5b00391ff4ac' +sha1sums=('80465deb799cdc6b7c2cc7d61e7ad8b4bc3892d7' + '63836e5cfb4ae7353fb2e31239a544409c7ead32' + '175de5630b43dbc97778adfba5563b7fdd77f11f' 'c94f742d3f9cabf958ae58e4015d9dd185aabedc' '6838fc00ef4618c924a77e0fb03c05346080908a' '993798f3d22ad672d769dae5f48d1fa068d5578f') diff --git a/testing/xorg-server/autoconfig-nvidia.patch b/testing/xorg-server/autoconfig-nvidia.patch index 9ed9b7aee..6d5220ac7 100644 --- a/testing/xorg-server/autoconfig-nvidia.patch +++ b/testing/xorg-server/autoconfig-nvidia.patch @@ -1,11 +1,11 @@ diff -Nur xorg-server-1.11.99.902.orig/hw/xfree86/common/xf86pciBus.c xorg-server-1.11.99.902/hw/xfree86/common/xf86pciBus.c --- xorg-server-1.11.99.902.orig/hw/xfree86/common/xf86pciBus.c 2012-02-10 10:10:37.583014924 +0000 +++ xorg-server-1.11.99.902/hw/xfree86/common/xf86pciBus.c 2012-02-10 11:16:07.148971317 +0000 -@@ -1111,7 +1111,23 @@ - { - int idx = 0; +@@ -1144,7 +1144,23 @@ + int idx = 0; + #ifdef __linux__ -- driverList[idx++] = "nouveau"; +- driverList[idx++] = "nouveau"; + switch (dev->device_id) + { + /* NV1 */ @@ -24,5 +24,5 @@ diff -Nur xorg-server-1.11.99.902.orig/hw/xfree86/common/xf86pciBus.c xorg-serve + break; + } #endif - driverList[idx++] = "nv"; - break; + driverList[idx++] = "nv"; + break; diff --git a/testing/xorg-server/autoconfig-sis.patch b/testing/xorg-server/autoconfig-sis.patch index d936efaaa..0b50049db 100644 --- a/testing/xorg-server/autoconfig-sis.patch +++ b/testing/xorg-server/autoconfig-sis.patch @@ -1,10 +1,12 @@ --- hw/xfree86/common/xf86pciBus.c.orig 2011-09-24 10:53:45.421697668 +0000 +++ hw/xfree86/common/xf86pciBus.c 2011-09-24 10:55:56.416250708 +0000 -@@ -1140,7 +1140,15 @@ - driverList[0] = "savage"; break; - } - break; -- case 0x1039: driverList[0] = "sis"; break; +@@ -1200,9 +1200,15 @@ + break; + } + break; +- case 0x1039: +- driverList[0] = "sis"; +- break; + case 0x1039: + switch (dev->device_id) + { @@ -14,6 +16,6 @@ + driverList[0] = "sis"; break; + } + break; - case 0x126f: driverList[0] = "siliconmotion"; break; - case 0x121a: - if (dev->device_id < 0x0003) + case 0x126f: + driverList[0] = "siliconmotion"; + break; |