diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-05-05 12:44:44 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-05-05 12:44:44 +0200 |
| commit | 75a1ddbacab1769054ce5040d97360666c34a9c0 (patch) | |
| tree | 9286328a7e1b91adfb3e5c367598529a33ab13c3 | |
| parent | ca998b4c054452abed4e01be1d2b28fee0ca904f (diff) | |
| parent | 5801c5acd80d30d17aaef76b8bc401c61b3ef3c9 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/camlp5/PKGBUILD
community/coq/PKGBUILD
community/ldns/PKGBUILD
community/luxrays/PKGBUILD
community/luxrender/PKGBUILD
community/nut/PKGBUILD
community/root/PKGBUILD
community/swi-prolog/PKGBUILD
community/vtk/PKGBUILD
community/wings3d/wings3d.sh
core/sqlite3/PKGBUILD
core/tzdata/PKGBUILD
extra/cmus/PKGBUILD
extra/dcron/PKGBUILD
extra/farsight2/PKGBUILD
extra/foomatic/PKGBUILD
extra/fwbuilder/PKGBUILD
extra/gnome-utils/PKGBUILD
extra/ivtv-utils/PKGBUILD
extra/kdebase-konsole/PKGBUILD
extra/kdenetwork/PKGBUILD
extra/kdesdk/PKGBUILD
extra/koffice/PKGBUILD
extra/libxfce4menu/PKGBUILD
extra/openmpi/PKGBUILD
extra/telepathy-butterfly/PKGBUILD
extra/telepathy-farsight/PKGBUILD
extra/telepathy-kde-presence-dataengine/PKGBUILD
extra/telepathy-qt4/PKGBUILD
extra/xfce-utils/PKGBUILD
extra/xulrunner/PKGBUILD
multilib/lib32-zlib/PKGBUILD
staging/gimp-devel/gimp-devel.install
testing/gtk3/PKGBUILD
testing/php/PKGBUILD
~xihh/couchdb-git/couchdb.install
~xihh/couchdb-git/rc-script.patch
~xihh/gmime24/PKGBUILD
279 files changed, 500 insertions, 14995 deletions
diff --git a/community/armagetronad/armagetronad.desktop b/community/armagetronad/armagetronad.desktop deleted file mode 100644 index 125b4261d..000000000 --- a/community/armagetronad/armagetronad.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Name=Armagetronad -GenericName=3D Tron clone -GenericName[pl]=Klon gry Tron w 3D -Exec=armagetronad -Icon=/usr/share/armagetronad/desktop/icons/small/armagetronad.png -Categories=Game; -Terminal=false -Type=Application -Encoding=UTF-8 -StartupNotify=false diff --git a/community/armagetronad/gcc43.patch b/community/armagetronad/gcc43.patch deleted file mode 100644 index 358f48221..000000000 --- a/community/armagetronad/gcc43.patch +++ /dev/null @@ -1,210 +0,0 @@ -diff -ur a/src/network/md5.cpp b/src/network/md5.cpp ---- a/src/network/md5.cpp 2009-08-24 20:08:14.000000000 +0200 -+++ b/src/network/md5.cpp 2009-08-24 20:21:51.000000000 +0200 -@@ -75,7 +75,7 @@ - */ - - #include "md5.h" -- -+#include<cstring> - #include <string> - #include <memory> - -Tylko w b/src/network: md5.cpp~ -diff -ur a/src/network/nNetwork.cpp b/src/network/nNetwork.cpp ---- a/src/network/nNetwork.cpp 2009-08-24 20:08:14.000000000 +0200 -+++ b/src/network/nNetwork.cpp 2009-08-24 20:20:40.000000000 +0200 -@@ -24,7 +24,7 @@ - *************************************************************************** - - */ -- -+#include<cstring> - #include "tMemManager.h" - #include "tInitExit.h" - #include "nSimulatePing.h" -Tylko w b/src/network: nNetwork.cpp~ -diff -ur a/src/network/nNetwork.h b/src/network/nNetwork.h ---- a/src/network/nNetwork.h 2009-08-24 20:08:14.000000000 +0200 -+++ b/src/network/nNetwork.h 2009-08-24 20:21:18.000000000 +0200 -@@ -27,7 +27,7 @@ - - #ifndef ArmageTron_NET_H - #define ArmageTron_NET_H -- -+#include<cstring> - #include "tError.h" - #include "tString.h" - #include "tHeap.h" -Tylko w b/src/network: nNetwork.h~ -diff -ur a/src/network/nSocket.h b/src/network/nSocket.h ---- a/src/network/nSocket.h 2009-08-24 20:08:14.000000000 +0200 -+++ b/src/network/nSocket.h 2009-08-24 20:22:09.000000000 +0200 -@@ -33,7 +33,7 @@ - - #ifndef NET_SOCKET_H - #define NET_SOCKET_H -- -+#include<cstring> - #include <iostream> - #include "tConsole.h" - #include "tException.h" -Tylko w b/src/network: nSocket.h~ -diff -ur a/src/render/rModel.h b/src/render/rModel.h ---- a/src/render/rModel.h 2009-08-24 20:08:14.000000000 +0200 -+++ b/src/render/rModel.h 2009-08-24 20:20:57.000000000 +0200 -@@ -27,7 +27,7 @@ - - #ifndef ArmageTron_MODEL_H - #define ArmageTron_MODEL_H -- -+#include<cstring> - #include "defs.h" - #include "tArray.h" - #include "tLinkedList.h" -Tylko w b/src/render: rModel.h~ -diff -ur a/src/tools/tArray.cpp b/src/tools/tArray.cpp ---- a/src/tools/tArray.cpp 2009-08-24 20:08:14.000000000 +0200 -+++ b/src/tools/tArray.cpp 2009-08-24 20:22:25.000000000 +0200 -@@ -27,7 +27,7 @@ - */ - - #define NO_MALLOC_REPLACEMENT -- -+#include<cstring> - #include "tMemManager.h" - #include <iostream> - #include <stdlib.h> -Tylko w b/src/tools: tArray.cpp~ -diff -ur a/src/tools/tCommandLine.cpp b/src/tools/tCommandLine.cpp ---- a/src/tools/tCommandLine.cpp 2009-08-24 20:08:14.000000000 +0200 -+++ b/src/tools/tCommandLine.cpp 2009-08-24 20:24:19.000000000 +0200 -@@ -30,7 +30,7 @@ - #ifndef TCOMMANDLINE_H_INCLUDED - #include "tCommandLine.h" - #endif -- -+#include<cstring> - #include "tLocale.h" - #include "tConfiguration.h" - #include "tException.h" -Tylko w b/src/tools: tCommandLine.cpp~ -diff -ur a/src/tools/tConfiguration.cpp b/src/tools/tConfiguration.cpp ---- a/src/tools/tConfiguration.cpp 2009-08-24 20:08:14.000000000 +0200 -+++ b/src/tools/tConfiguration.cpp 2009-08-24 20:22:42.000000000 +0200 -@@ -24,7 +24,7 @@ - *************************************************************************** - - */ -- -+#include<cstring> - #include "config.h" - #include <fstream> - #include <iomanip> -Tylko w b/src/tools: tConfiguration.cpp~ -diff -ur a/src/tools/tCrypt.cpp b/src/tools/tCrypt.cpp ---- a/src/tools/tCrypt.cpp 2009-08-24 20:08:14.000000000 +0200 -+++ b/src/tools/tCrypt.cpp 2009-08-24 20:22:54.000000000 +0200 -@@ -24,7 +24,7 @@ - *************************************************************************** - - */ -- -+#include<cstring> - #include "tCrypt.h" - #include "tMemManager.h" - -Tylko w b/src/tools: tCrypt.cpp~ -diff -ur a/src/tools/tDirectories.cpp b/src/tools/tDirectories.cpp ---- a/src/tools/tDirectories.cpp 2009-08-24 20:08:14.000000000 +0200 -+++ b/src/tools/tDirectories.cpp 2009-08-24 20:23:06.000000000 +0200 -@@ -27,7 +27,7 @@ - */ - - #include "config.h" -- -+#include<cstring> - #include <errno.h> - #include <sys/types.h> - #include <stdio.h> -Tylko w b/src/tools: tDirectories.cpp~ -diff -ur a/src/tools/tError.cpp b/src/tools/tError.cpp ---- a/src/tools/tError.cpp 2009-08-24 20:08:14.000000000 +0200 -+++ b/src/tools/tError.cpp 2009-08-24 20:28:01.000000000 +0200 -@@ -24,8 +24,9 @@ - *************************************************************************** - - */ -- -+#include<cstring> - #include "config.h" -+#include<cstdlib> - #include <iostream> - #if HAVE_UNISTD_H - #include <unistd.h> -Tylko w b/src/tools: tError.cpp~ -diff -ur a/src/tools/tLocale.cpp b/src/tools/tLocale.cpp ---- a/src/tools/tLocale.cpp 2009-08-24 20:08:14.000000000 +0200 -+++ b/src/tools/tLocale.cpp 2009-08-24 20:23:49.000000000 +0200 -@@ -30,7 +30,7 @@ - #include "tConsole.h" - #include "tDirectories.h" - #include "tSafePTR.h" -- -+#include<cstring> - #include <fstream> - #include <string> - #include <map> -Tylko w b/src/tools: tLocale.cpp~ -diff -ur a/src/tools/tMemManager.cpp b/src/tools/tMemManager.cpp ---- a/src/tools/tMemManager.cpp 2009-08-24 20:08:14.000000000 +0200 -+++ b/src/tools/tMemManager.cpp 2009-08-24 20:24:42.000000000 +0200 -@@ -29,7 +29,7 @@ - #define NO_MALLOC_REPLACEMENT - - #include "defs.h" -- -+#include<cstring> - #include <iostream> - #include <sstream> - #include <stdio.h> // need basic C IO since STL IO does memory management -Tylko w b/src/tools: tMemManager.cpp~ -diff -ur a/src/tools/tRandom.cpp b/src/tools/tRandom.cpp ---- a/src/tools/tRandom.cpp 2009-08-24 20:08:14.000000000 +0200 -+++ b/src/tools/tRandom.cpp 2009-08-24 20:24:31.000000000 +0200 -@@ -29,7 +29,7 @@ - #ifndef TRANDOM_H_INCLUDED - #include "tRandom.h" - #endif -- -+#include<cstdlib> - #ifdef HAVE_STDLIB - #include <stdlib.h> - #endif -Tylko w b/src/tools: tRandom.cpp~ -diff -ur a/src/tools/tString.cpp b/src/tools/tString.cpp ---- a/src/tools/tString.cpp 2009-08-24 20:08:14.000000000 +0200 -+++ b/src/tools/tString.cpp 2009-08-24 20:24:03.000000000 +0200 -@@ -24,7 +24,7 @@ - *************************************************************************** - - */ -- -+#include<cstring> - #include "tMemManager.h" - #include "tString.h" - #include "tLocale.h" -Tylko w b/src/tools: tString.cpp~ -diff -ur a/src/tron/gAIBase.h b/src/tron/gAIBase.h ---- a/src/tron/gAIBase.h 2009-08-24 20:08:14.000000000 +0200 -+++ b/src/tron/gAIBase.h 2009-08-24 20:21:33.000000000 +0200 -@@ -29,7 +29,7 @@ - #define ArmageTron_AIBASE_H - - #include "rSDL.h" -- -+#include<memory> - #include "eTimer.h" - #include "ePath.h" - #include "ePlayer.h" -Tylko w b/src/tron: gAIBase.h~ diff --git a/community/camlp5/PKGBUILD b/community/camlp5/PKGBUILD deleted file mode 100644 index e4577bd84..000000000 --- a/community/camlp5/PKGBUILD +++ /dev/null @@ -1,75 +0,0 @@ -# Maintainer: Thomas Dziedzic < gostrc at gmail > -# Contributor: Nathan Owe <ndowens.aur at gmail dot com> -# Contributor: George Giorgidze <giorgidze@gmail.com> -# Contributor: Massimiliano Brocchini <brocchini@netseven.it> - -pkgname=('camlp5' 'camlp5-transitional') -_baseversion=6.05 -_patchlevel=0 -#pkgver=${_baseversion}.${_patchlevel} -pkgver=${_baseversion} -pkgrel=1 -arch=('i686' 'x86_64' 'mips64el') -url='http://pauillac.inria.fr/~ddr/camlp5/' -license=('BSD') -depends=('ocaml') -source=("http://pauillac.inria.fr/~ddr/camlp5/distrib/src/camlp5-${_baseversion}.tgz") -# upstream likes to release occasional patches instead of releasing new versions -for i in $(seq ${_patchlevel}); do - source+=("http://pauillac.inria.fr/~ddr/camlp5/distrib/src/patch-${_baseversion}-${i}") -done -md5sums=('51e333f027ead70aa1b0cd7993320e24') - -build() { - cd camlp5-${_baseversion} - - for i in $(seq ${_patchlevel}); do - patch -Np0 -i ${srcdir}/patch-${_baseversion}-${i} - done - - cd ${srcdir} - - cp -r camlp5-${_baseversion} camlp5-transitional-${_baseversion} - - cd ${srcdir}/camlp5-${_baseversion} - - ./configure \ - -prefix '/usr' \ - -mandir '/usr/share/man' \ - -strict - - make world.opt - - cd ${srcdir}/camlp5-transitional-${_baseversion} - - ./configure \ - -prefix '/usr' \ - -mandir '/usr/share/man' \ - -transitional - - make world.opt -} - -package_camlp5() { - pkgdesc='A preprocessor-pretty-printer of OCaml.' - conflicts=('camlp5-transitional') - - cd camlp5-${_baseversion} - - make DESTDIR=${pkgdir} install - - install -D -m644 LICENSE \ - ${pkgdir}/usr/share/licenses/camlp5/LICENSE -} - -package_camlp5-transitional() { - pkgdesc='A preprocessor-pretty-printer of OCaml. (transitional)' - conflicts=('camlp5') - - cd camlp5-transitional-${_baseversion} - - make DESTDIR=${pkgdir} install - - install -D -m644 LICENSE \ - ${pkgdir}/usr/share/licenses/camlp5-transitional/LICENSE -} diff --git a/community/cl/PKGBUILD b/community/cl/PKGBUILD new file mode 100644 index 000000000..714f8dd28 --- /dev/null +++ b/community/cl/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 61589 2012-01-03 23:37:49Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: kappa <kappacurve@gmail.com> + +pkgname=cl +pkgver=1.0 +pkgrel=1 +arch=('x86_64' 'i686') +pkgdesc="OpenCL binding for the Erlang programming language" +url="http://github.com/tonyrog/cl" +license=('custom:unknown') +depends=('erlang' 'libcl' 'bash') +makedepends=('opencl-headers') +source=("$pkgname-$pkgver.tar.gz::https://nodeload.github.com/tonyrog/cl/tarball/master") +md5sums=('62960d4b8ce47be7d2e3898b99a30fd1') +_dirname='tonyrog-cl-bba7b77' + +build() { + cd "$srcdir/$_dirname" + + make + + cd c_src + rm config.* +} + +package() { + cd "$srcdir/$_dirname" + + mkdir -p "$pkgdir/usr/lib/erlang/lib/$pkgname-$pkgver" + cp -r * "$pkgdir/usr/lib/erlang/lib/$pkgname-$pkgver" + + #install -Dm644 license.terms "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/coq/PKGBUILD b/community/coq/PKGBUILD deleted file mode 100644 index fa18fdb02..000000000 --- a/community/coq/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# Maintainer: Thomas Dziedzic < gostrc at gmail > -# Contributor: George Giorgidze <giorgidze@gmail.com> - -pkgname=coq -pkgver=8.3pl4 -pkgrel=1 -pkgdesc='Formal proof management system.' -arch=('i686' 'x86_64' 'mips64el') -url='http://coq.inria.fr/' -license=('GPL') -options=('!emptydirs') -depends=('gtk2' 'lablgtk2' 'ocaml') -makedepends=('camlp5-transitional' 'netpbm' 'hevea') -source=("http://coq.inria.fr/distrib/V${pkgver}/files/coq-${pkgver}.tar.gz") -md5sums=('88e2ce021b09eca207e3119d5202a695') - -build() { - cd coq-${pkgver} - - ./configure \ - -prefix '/usr' \ - -mandir '/usr/share/man' \ - -opt \ - -with-doc yes - - make world - - make doc-html -} - -package() { - cd coq-${pkgver} - - make COQINSTALLPREFIX=${pkgdir} install - - make COQINSTALLPREFIX=${pkgdir} install-doc-html -} diff --git a/community/coq/camlp5-latest-fix.diff b/community/coq/camlp5-latest-fix.diff deleted file mode 100644 index 80af1c924..000000000 --- a/community/coq/camlp5-latest-fix.diff +++ /dev/null @@ -1,354 +0,0 @@ -Index: checker/checker.ml -=================================================================== ---- checker/checker.ml (revision 15024) -+++ checker/checker.ml (revision 15025) -@@ -274,7 +274,7 @@ - (* let ctx = Check.get_env() in - hov 0 - (str "Error:" ++ spc () ++ Himsg.explain_inductive_error ctx e)*) -- | Stdpp.Exc_located (loc,exc) -> -+ | Compat.Exc_located (loc,exc) -> - hov 0 ((if loc = dummy_loc then (mt ()) - else (str"At location " ++ print_loc loc ++ str":" ++ fnl ())) - ++ explain_exn exc) -Index: lib/compat.ml4 -=================================================================== ---- lib/compat.ml4 (revision 15024) -+++ lib/compat.ml4 (revision 15025) -@@ -15,6 +15,7 @@ - IFDEF CAMLP5 THEN - module M = struct - type loc = Stdpp.location -+exception Exc_located = Ploc.Exc - let dummy_loc = Stdpp.dummy_loc - let make_loc = Stdpp.make_loc - let unloc loc = Stdpp.first_pos loc, Stdpp.last_pos loc -@@ -26,6 +27,7 @@ - end - ELSE IFDEF OCAML308 THEN - module M = struct -+exception Exc_located = Stdpp.Exc_located - type loc = Token.flocation - let dummy_loc = Token.dummy_loc - let make_loc loc = Token.make_loc loc -@@ -45,6 +47,7 @@ - end - ELSE - module M = struct -+exception Exc_located = Stdpp.Exc_located - type loc = int * int - let dummy_loc = (0,0) - let make_loc x = x -@@ -59,6 +62,7 @@ - END - - type loc = M.loc -+exception Exc_located = M.Exc_located - let dummy_loc = M.dummy_loc - let make_loc = M.make_loc - let unloc = M.unloc -Index: pretyping/pretype_errors.ml -=================================================================== ---- pretyping/pretype_errors.ml (revision 15024) -+++ pretyping/pretype_errors.ml (revision 15025) -@@ -45,7 +45,7 @@ - - let precatchable_exception = function - | Util.UserError _ | TypeError _ | PretypeError _ -- | Stdpp.Exc_located(_,(Util.UserError _ | TypeError _ | -+ | Compat.Exc_located(_,(Util.UserError _ | TypeError _ | - Nametab.GlobalizationError _ | PretypeError _)) -> true - | _ -> false - -Index: pretyping/cases.ml -=================================================================== ---- pretyping/cases.ml (revision 15024) -+++ pretyping/cases.ml (revision 15025) -@@ -100,7 +100,7 @@ - | h::t -> - try f h - with UserError _ | TypeError _ | PretypeError _ -- | Stdpp.Exc_located (_,(UserError _ | TypeError _ | PretypeError _)) -> -+ | Compat.Exc_located (_,(UserError _ | TypeError _ | PretypeError _)) -> - list_try_compile f t - - let force_name = -Index: pretyping/typeclasses_errors.ml -=================================================================== ---- pretyping/typeclasses_errors.ml (revision 15024) -+++ pretyping/typeclasses_errors.ml (revision 15025) -@@ -47,7 +47,7 @@ - raise (TypeClassError (env, UnsatisfiableConstraints (evd, None))) - | Some ev -> - let loc, kind = Evd.evar_source ev evd in -- raise (Stdpp.Exc_located (loc, TypeClassError -+ raise (Compat.Exc_located (loc, TypeClassError - (env, UnsatisfiableConstraints (evd, Some (ev, kind))))) - - let mismatched_ctx_inst env c n m = typeclass_error env (MismatchedContextInstance (c, n, m)) -@@ -55,5 +55,5 @@ - let rec unsatisfiable_exception exn = - match exn with - | TypeClassError (_, UnsatisfiableConstraints _) -> true -- | Stdpp.Exc_located(_, e) -> unsatisfiable_exception e -+ | Compat.Exc_located(_, e) -> unsatisfiable_exception e - | _ -> false -Index: plugins/subtac/subtac_obligations.ml -=================================================================== ---- plugins/subtac/subtac_obligations.ml (revision 15024) -+++ plugins/subtac/subtac_obligations.ml (revision 15025) -@@ -485,8 +485,8 @@ - true - else false - with -- | Stdpp.Exc_located(_, Proof_type.LtacLocated (_, Refiner.FailError (_, s))) -- | Stdpp.Exc_located(_, Refiner.FailError (_, s)) -+ | Compat.Exc_located(_, Proof_type.LtacLocated (_, Refiner.FailError (_, s))) -+ | Compat.Exc_located(_, Refiner.FailError (_, s)) - | Refiner.FailError (_, s) -> - user_err_loc (fst obl.obl_source, "solve_obligation", Lazy.force s) - | e -> false -Index: toplevel/cerrors.ml -=================================================================== ---- toplevel/cerrors.ml (revision 15024) -+++ toplevel/cerrors.ml (revision 15025) -@@ -81,7 +81,7 @@ - hov 0 (str "Syntax error: Undefined token.") - | Lexer.Error (Bad_token s) -> - hov 0 (str "Syntax error: Bad token" ++ spc () ++ str s ++ str ".") -- | Stdpp.Exc_located (loc,exc) -> -+ | Compat.Exc_located (loc,exc) -> - hov 0 ((if loc = dummy_loc then (mt ()) - else (str"At location " ++ print_loc loc ++ str":" ++ fnl ())) - ++ explain_exn_default_aux anomaly_string report_fn exc) -@@ -156,8 +156,8 @@ - | Proof_type.LtacLocated (s,exc) -> - EvaluatedError (hov 0 (Himsg.explain_ltac_call_trace s ++ fnl()), - Some (process_vernac_interp_error exc)) -- | Stdpp.Exc_located (loc,exc) -> -- Stdpp.Exc_located (loc,process_vernac_interp_error exc) -+ | Compat.Exc_located (loc,exc) -> -+ Compat.Exc_located (loc,process_vernac_interp_error exc) - | exc -> - exc - -Index: toplevel/vernac.ml -=================================================================== ---- toplevel/vernac.ml (revision 15024) -+++ toplevel/vernac.ml (revision 15025) -@@ -41,14 +41,14 @@ - match re with - | Error_in_file (_, (b,f,loc), e) when loc <> dummy_loc -> - ((b, f, loc), e) -- | Stdpp.Exc_located (loc, e) when loc <> dummy_loc -> -+ | Compat.Exc_located (loc, e) when loc <> dummy_loc -> - ((false,file, loc), e) -- | Stdpp.Exc_located (_, e) | e -> ((false,file,cmdloc), e) -+ | Compat.Exc_located (_, e) | e -> ((false,file,cmdloc), e) - in - raise (Error_in_file (file, inner, disable_drop inex)) - - let real_error = function -- | Stdpp.Exc_located (_, e) -> e -+ | Compat.Exc_located (_, e) -> e - | Error_in_file (_, _, e) -> e - | e -> e - -Index: toplevel/toplevel.ml -=================================================================== ---- toplevel/toplevel.ml (revision 15024) -+++ toplevel/toplevel.ml (revision 15025) -@@ -274,7 +274,7 @@ - let rec is_pervasive_exn = function - | Out_of_memory | Stack_overflow | Sys.Break -> true - | Error_in_file (_,_,e) -> is_pervasive_exn e -- | Stdpp.Exc_located (_,e) -> is_pervasive_exn e -+ | Compat.Exc_located (_,e) -> is_pervasive_exn e - | DuringCommandInterp (_,e) -> is_pervasive_exn e - | _ -> false - -@@ -290,7 +290,7 @@ - in - let (locstrm,exc) = - match exc with -- | Stdpp.Exc_located (loc, ie) -> -+ | Compat.Exc_located (loc, ie) -> - if valid_buffer_loc top_buffer dloc loc then - (print_highlight_location top_buffer loc, ie) - else -@@ -325,7 +325,7 @@ - let rec discard_to_dot () = - try - Gram.Entry.parse parse_to_dot top_buffer.tokens -- with Stdpp.Exc_located(_,(Token.Error _|Lexer.Error _)) -> -+ with Compat.Exc_located(_,(Token.Error _|Lexer.Error _)) -> - discard_to_dot() - - -Index: tactics/extratactics.ml4 -=================================================================== ---- tactics/extratactics.ml4 (revision 15024) -+++ tactics/extratactics.ml4 (revision 15025) -@@ -580,7 +580,7 @@ - try - Pretyping.Default.understand sigma env t_hole - with -- | Stdpp.Exc_located (loc,Pretype_errors.PretypeError (_, Pretype_errors.UnsolvableImplicit _)) -> -+ | Compat.Exc_located (loc,Pretype_errors.PretypeError (_, Pretype_errors.UnsolvableImplicit _)) -> - resolve_hole (subst_hole_with_term (fst (unloc loc)) c_raw t_hole) - in - let t_constr = resolve_hole (subst_var_with_hole occ id t_raw) in -Index: tactics/class_tactics.ml4 -=================================================================== ---- tactics/class_tactics.ml4 (revision 15024) -+++ tactics/class_tactics.ml4 (revision 15025) -@@ -219,7 +219,7 @@ - - let rec catchable = function - | Refiner.FailError _ -> true -- | Stdpp.Exc_located (_, e) -> catchable e -+ | Compat.Exc_located (_, e) -> catchable e - | e -> Logic.catchable_exception e - - let is_dep gl gls = -Index: tactics/rewrite.ml4 -=================================================================== ---- tactics/rewrite.ml4 (revision 15024) -+++ tactics/rewrite.ml4 (revision 15025) -@@ -1057,7 +1057,7 @@ - else tclIDTAC - in tclTHENLIST [evartac; rewtac] gl - with -- | Stdpp.Exc_located (_, TypeClassError (env, (UnsatisfiableConstraints _ as e))) -+ | Compat.Exc_located (_, TypeClassError (env, (UnsatisfiableConstraints _ as e))) - | TypeClassError (env, (UnsatisfiableConstraints _ as e)) -> - Refiner.tclFAIL_lazy 0 - (lazy (str"setoid rewrite failed: unable to satisfy the rewriting constraints." -Index: tactics/tacinterp.ml -=================================================================== ---- tactics/tacinterp.ml (revision 15024) -+++ tactics/tacinterp.ml (revision 15025) -@@ -93,15 +93,15 @@ - let catch_error call_trace tac g = - if call_trace = [] then tac g else try tac g with - | LtacLocated _ as e -> raise e -- | Stdpp.Exc_located (_,LtacLocated _) as e -> raise e -+ | Compat.Exc_located (_,LtacLocated _) as e -> raise e - | e -> - let (nrep,loc',c),tail = list_sep_last call_trace in -- let loc,e' = match e with Stdpp.Exc_located(loc,e) -> loc,e | _ ->dloc,e in -+ let loc,e' = match e with Compat.Exc_located(loc,e) -> loc,e | _ ->dloc,e in - if tail = [] then - let loc = if loc = dloc then loc' else loc in -- raise (Stdpp.Exc_located(loc,e')) -+ raise (Compat.Exc_located(loc,e')) - else -- raise (Stdpp.Exc_located(loc',LtacLocated((nrep,c,tail,loc),e'))) -+ raise (Compat.Exc_located(loc',LtacLocated((nrep,c,tail,loc),e'))) - - (* Signature for interpretation: val_interp and interpretation functions *) - type interp_sign = -@@ -1979,14 +1979,14 @@ - VRTactic (catch_error trace tac goal) - | a -> a) - with -- | FailError (0,s) | Stdpp.Exc_located(_, FailError (0,s)) -- | Stdpp.Exc_located(_,LtacLocated (_,FailError (0,s))) -> -+ | FailError (0,s) | Compat.Exc_located(_, FailError (0,s)) -+ | Compat.Exc_located(_,LtacLocated (_,FailError (0,s))) -> - raise (Eval_fail (Lazy.force s)) - | FailError (lvl,s) -> raise (FailError (lvl - 1, s)) -- | Stdpp.Exc_located(s,FailError (lvl,s')) -> -- raise (Stdpp.Exc_located(s,FailError (lvl - 1, s'))) -- | Stdpp.Exc_located(s,LtacLocated (s'',FailError (lvl,s'))) -> -- raise (Stdpp.Exc_located(s,LtacLocated (s'',FailError (lvl - 1, s')))) -+ | Compat.Exc_located(s,FailError (lvl,s')) -> -+ raise (Compat.Exc_located(s,FailError (lvl - 1, s'))) -+ | Compat.Exc_located(s,LtacLocated (s'',FailError (lvl,s'))) -> -+ raise (Compat.Exc_located(s,LtacLocated (s'',FailError (lvl - 1, s')))) - - (* Interprets the clauses of a recursive LetIn *) - and interp_letrec ist gl llc u = -Index: ide/coq.ml -=================================================================== ---- ide/coq.ml (revision 15024) -+++ ide/coq.ml (revision 15025) -@@ -112,7 +112,7 @@ - | _ -> true - - let user_error_loc l s = -- raise (Stdpp.Exc_located (l, Util.UserError ("CoqIde", s))) -+ raise (Compat.Exc_located (l, Util.UserError ("CoqIde", s))) - - type printing_state = { - mutable printing_implicit : bool; -@@ -443,7 +443,7 @@ - let rec is_pervasive_exn = function - | Out_of_memory | Stack_overflow | Sys.Break -> true - | Error_in_file (_,_,e) -> is_pervasive_exn e -- | Stdpp.Exc_located (_,e) -> is_pervasive_exn e -+ | Compat.Exc_located (_,e) -> is_pervasive_exn e - | DuringCommandInterp (_,e) -> is_pervasive_exn e - | _ -> false - -@@ -456,7 +456,7 @@ - in - let (loc,exc) = - match exc with -- | Stdpp.Exc_located (loc, ie) -> (Some loc),ie -+ | Compat.Exc_located (loc, ie) -> (Some loc),ie - | Error_in_file (s, (_,fname, loc), ie) -> None, ie - | _ -> dloc,exc - in -Index: parsing/ppvernac.ml -=================================================================== ---- parsing/ppvernac.ml (revision 15024) -+++ parsing/ppvernac.ml (revision 15025) -@@ -781,7 +781,7 @@ - (if i = 1 then mt() else int i ++ str ": ") ++ - pr_raw_tactic tac - ++ (try if deftac & Pfedit.get_end_tac() <> None then str ".." else mt () -- with UserError _|Stdpp.Exc_located _ -> mt()) -+ with UserError _|Compat.Exc_located _ -> mt()) - - | VernacSolveExistential (i,c) -> - str"Existential " ++ int i ++ pr_lconstrarg c -Index: proofs/refiner.ml -=================================================================== ---- proofs/refiner.ml (revision 15024) -+++ proofs/refiner.ml (revision 15025) -@@ -494,15 +494,15 @@ - let catch_failerror e = - if catchable_exception e then check_for_interrupt () - else match e with -- | FailError (0,_) | Stdpp.Exc_located(_, FailError (0,_)) -- | Stdpp.Exc_located(_, LtacLocated (_,FailError (0,_))) -> -+ | FailError (0,_) | Compat.Exc_located(_, FailError (0,_)) -+ | Compat.Exc_located(_, LtacLocated (_,FailError (0,_))) -> - check_for_interrupt () - | FailError (lvl,s) -> raise (FailError (lvl - 1, s)) -- | Stdpp.Exc_located(s,FailError (lvl,s')) -> -- raise (Stdpp.Exc_located(s,FailError (lvl - 1, s'))) -- | Stdpp.Exc_located(s,LtacLocated (s'',FailError (lvl,s'))) -> -+ | Compat.Exc_located(s,FailError (lvl,s')) -> -+ raise (Compat.Exc_located(s,FailError (lvl - 1, s'))) -+ | Compat.Exc_located(s,LtacLocated (s'',FailError (lvl,s'))) -> - raise -- (Stdpp.Exc_located(s,LtacLocated (s'',FailError (lvl - 1,s')))) -+ (Compat.Exc_located(s,LtacLocated (s'',FailError (lvl - 1,s')))) - | e -> raise e - - (* ORELSE0 t1 t2 tries to apply t1 and if it fails, applies t2 *) -Index: proofs/logic.ml -=================================================================== ---- proofs/logic.ml (revision 15024) -+++ proofs/logic.ml (revision 15025) -@@ -48,7 +48,7 @@ - open Pretype_errors - - let rec catchable_exception = function -- | Stdpp.Exc_located(_,e) -> catchable_exception e -+ | Compat.Exc_located(_,e) -> catchable_exception e - | LtacLocated(_,e) -> catchable_exception e - | Util.UserError _ | TypeError _ - | RefinerError _ | Indrec.RecursionSchemeError _ diff --git a/community/csfml/PKGBUILD b/community/csfml/PKGBUILD index 866931159..0a28d763e 100644 --- a/community/csfml/PKGBUILD +++ b/community/csfml/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 64966 2012-02-19 01:53:06Z svenstaro $ +# $Id: PKGBUILD 70299 2012-05-04 03:01:09Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> pkgname=csfml @@ -6,7 +6,7 @@ pkgname=csfml _git=true if [[ "${_git}" = "true" ]]; then - pkgver=1.99.git20120219 + pkgver=1.99.git20120504 fi pkgrel=1 diff --git a/community/desmume/desmume-0.9.7-zlib.1.2.6-fix.patch b/community/desmume/desmume-0.9.7-zlib.1.2.6-fix.patch deleted file mode 100644 index 8cac7cb67..000000000 --- a/community/desmume/desmume-0.9.7-zlib.1.2.6-fix.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- a/src/ROMReader.cpp 2012/02/09 21:33:57 4177 -+++ b/src/ROMReader.cpp 2012/02/10 19:58:06 4178 -@@ -140,7 +140,7 @@ - - void GZIPROMReaderDeInit(void * file) - { -- gzclose(file); -+ gzclose((gzFile)file); - } - - u32 GZIPROMReaderSize(void * file) -@@ -150,22 +150,22 @@ - - /* FIXME this function should first save the current - * position and restore it after size calculation */ -- gzrewind(file); -- while (gzeof (file) == 0) -- size += gzread(file, useless, 1024); -- gzrewind(file); -+ gzrewind((gzFile)file); -+ while (gzeof ((gzFile)file) == 0) -+ size += gzread((gzFile)file, useless, 1024); -+ gzrewind((gzFile)file); - - return size; - } - - int GZIPROMReaderSeek(void * file, int offset, int whence) - { -- return gzseek(file, offset, whence); -+ return gzseek((gzFile)file, offset, whence); - } - - int GZIPROMReaderRead(void * file, void * buffer, u32 size) - { -- return gzread(file, buffer, size); -+ return gzread((gzFile)file, buffer, size); - } - #endif - diff --git a/community/esdl/PKGBUILD b/community/esdl/PKGBUILD index e7b9bc920..76b5be9d6 100644 --- a/community/esdl/PKGBUILD +++ b/community/esdl/PKGBUILD @@ -3,37 +3,37 @@ # Contributor: kappa <kappacurve@gmail.com> pkgname=esdl -pkgver=1.0.1 -pkgrel=3 +pkgver=1.2 +pkgrel=1 epoch=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=('50230ea81418cb029281a70627a5dd8e') +source=("$pkgname-$pkgver.tar.gz::https://nodeload.github.com/dgud/esdl/tarball/master") +md5sums=('d51f8e2fe07b9e82ff9c2e06af35e3eb') +_dirname='dgud-esdl-4139134' build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$_dirname" find -type f -print0 | xargs -0 chmod 644 make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$_dirname" make INSTALLDIR="$pkgdir/usr/lib/erlang/lib/$pkgname-$pkgver" install - ## To make wings3d compile with esdl 1.2 + ## An attempt to make wings3d compile with esdl 1.2 #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" + install -Dm644 license.terms "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } # vim:set ts=2 sw=2 et: diff --git a/community/fox/PKGBUILD b/community/fox/PKGBUILD index 88509597f..c3139a5d3 100644 --- a/community/fox/PKGBUILD +++ b/community/fox/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 63562 2012-02-05 11:56:09Z ibiru $ +# $Id: PKGBUILD 70277 2012-05-03 15:59:36Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Ben <ben@benmazer.net> pkgname=fox -pkgver=1.6.44 -pkgrel=2 +pkgver=1.6.45 +pkgrel=1 pkgdesc="Free Objects for X: GUI Toolkit for C++" arch=('i686' 'x86_64' 'mips64el') url="http://www.fox-toolkit.org/" @@ -13,7 +13,7 @@ depends=('bzip2' 'libxcursor' 'libxft' 'libxrandr' 'mesa' 'libxi' 'libpng' 'libt optdepends=('perl') options=('!libtool') source=(http://ftp.fox-toolkit.org/pub/fox-$pkgver.tar.gz) -md5sums=('6ccc8cbcfa6e4c8b6e4deeeb39c36434') +md5sums=('57bef430c3d01463508d76a88f61d763') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/community/gnome-packagekit/arch.patch b/community/gnome-packagekit/arch.patch deleted file mode 100644 index bf4cd91c4..000000000 --- a/community/gnome-packagekit/arch.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -Nru a/data/gpk-install-local-file.desktop.in b/data/gpk-install-local-file.desktop.in ---- a/data/gpk-install-local-file.desktop.in 2011-03-23 23:15:41.000000000 +1300 -+++ b/data/gpk-install-local-file.desktop.in 2011-04-10 01:04:51.606666671 +1200 -@@ -8,5 +8,5 @@ - Icon=system-software-install - StartupNotify=true - NoDisplay=true --MimeType=application/x-rpm;application/x-redhat-package-manager;application/x-servicepack;application/x-deb; -+MimeType=application/x-xz-compressed-tar;application/x-servicepack; - -diff -Nru a/data/org.gnome.packagekit.gschema.xml b/data/org.gnome.packagekit.gschema.xml ---- a/data/org.gnome.packagekit.gschema.xml 2011-03-28 21:49:37.000000000 +1300 -+++ b/data/org.gnome.packagekit.gschema.xml 2011-04-10 02:37:29.433333340 +1200 -@@ -104,14 +104,4 @@ - <description>When displaying UI from a session DBus request, force these options to be turned on.</description> - </key> - </schema> -- <schema id="org.gnome.settings-daemon" path="/org/gnome/settings-daemon/"> -- <child name="gtk-modules" schema="gnome-settings-daemon.gtk-modules"/> -- </schema> -- <schema id="gnome-settings-daemon.gtk-modules" path="/org/gnome/settings-daemon/gtk-modules/"> -- <key name="pk-gtk-module" type="b"> -- <default>true</default> -- <summary>GTK+ module for font installation</summary> -- <description>This key determines if applications should be able to prompt for fonts.</description> -- </key> -- </schema> - </schemalist> diff --git a/community/ldns/Makefile.patch b/community/ldns/Makefile.patch deleted file mode 100644 index d98291ac9..000000000 --- a/community/ldns/Makefile.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- old/Makefile.in 2012-01-12 00:11:36.000000000 +1100 -+++ new/Makefile.in 2012-01-27 11:36:16.110154453 +1100 -@@ -130,7 +130,7 @@ - exit -1 ; \ - fi - drill/drill: $(DRILL_LOBJS) $(LIB) -- $(LINK_EXE) $(DRILL_LOBJS) $(LIBS) -lldns -o drill/drill -+ $(LINK_EXE) $(DRILL_LOBJS) $(LIBS) $(LIBSSL_LIBS) -lldns -o drill/drill - - install-drill: drill/drill - $(INSTALL) -m 755 -d $(DESTDIR)$(bindir) -@@ -157,7 +157,7 @@ - exit -1 ; \ - fi - $(EXAMPLE_PROGS): $(EXAMPLE_LOBJS) $(LIB) -- $(LINK_EXE) $@.lo $(LIBS) -lldns -o $@ -+ $(LINK_EXE) $@.lo $(LIBS) $(LIBSSL_LIBS) -lldns -o $@ - - $(TESTNS): $(TESTNS_LOBJS) $(LIB) - $(LINK_EXE) $(TESTNS_LOBJS) $(LIBS) -lldns -o $(TESTNS) diff --git a/community/ldns/PKGBUILD b/community/ldns/PKGBUILD deleted file mode 100644 index 46d7e1f5f..000000000 --- a/community/ldns/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# $Id: PKGBUILD 62792 2012-01-27 01:01:36Z bisson $ -# Maintainer: Gaetan Bisson <bisson@archlinux.org> -# Contributor: mathieui <mathieui@mathieui.net> -# Contributor: jiribb <jiribb@gmail.com> - -pkgname=ldns -pkgver=1.6.12 -pkgrel=1 -pkgdesc='Fast DNS library supporting recent RFCs, including Drill and other tools' -url='http://www.nlnetlabs.nl/projects/ldns/' -license=('custom:BSD') -arch=('i686' 'x86_64' 'mips64el') -options=('!libtool') -depends=('openssl') -makedepends=('libpcap') -optdepends=('libpcap: ldns-dpa tool') -source=("http://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 'Makefile.patch') -sha1sums=('1d61df0f666908551d5a62768f77d63e727810aa' - '01bce260e9639d9cd26109a689dddf2498e5026a') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - patch -p1 -i ../Makefile.patch - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --enable-static=no \ - --disable-rpath \ - --with-drill \ - --with-examples \ - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install - - install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/community/luxrays/PKGBUILD b/community/luxrays/PKGBUILD deleted file mode 100644 index 59844fd42..000000000 --- a/community/luxrays/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# $Id: PKGBUILD 59944 2011-12-02 20:59:16Z ibiru $ -# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> -pkgname=luxrays -pkgver=0.8 -_pkgver=ed424ec77571 -pkgrel=7 -epoch=0 -pkgdesc="Accelerate the ray intersection process by using GPUs" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.luxrender.net/" -license=('GPL') -depends=('freeimage' 'freeglut' 'glew' 'libcl') -makedepends=('cmake' 'boost' 'opencl-headers') -source=(https://bitbucket.org/luxrender/luxrays/get/$_pkgver.tar.bz2 \ - luxrays_opencl1.2_use_deprecated.diff) -md5sums=('2ac9c588675c5971c57f473ef10ac67d' - '27b3eb7c6332aa7f040cc4ca94dc3df6') - -build() { - cd "$srcdir/luxrender-$pkgname-$_pkgver" - - # fix the build with opencl-headers 1.2 - # they doesn't support OpenCL 1.1, so we have to use this ugly hack of using deprecated API - patch -Np1 < "$srcdir/luxrays_opencl1.2_use_deprecated.diff" - # fix the break caused by the change of the name of the namespace 'detail' to 'ipcdetail' - sed -i 's|::detail|::ipcdetail|' include/luxrays/utils/core/atomic.h - - export CXXFLAGS="$CXXFLAGS -lpthread" - cmake -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_SKIP_RPATH=ON \ - -DLUXRAYS_DISABLE_OPENCL=OFF \ - . - make -} - -package() { - cd "$srcdir/luxrender-$pkgname-$_pkgver" - - install -d -m755 "$pkgdir"/usr/{bin,include,lib} - install -m755 bin/* "$pkgdir"/usr/bin - install -m644 lib/* "$pkgdir"/usr/lib - cp -a include/luxrays "$pkgdir"/usr/include -} - -# vim:set ts=2 sw=2 et: diff --git a/community/luxrays/luxrays_opencl1.2_use_deprecated.diff b/community/luxrays/luxrays_opencl1.2_use_deprecated.diff deleted file mode 100644 index 0876628d7..000000000 --- a/community/luxrays/luxrays_opencl1.2_use_deprecated.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -rup luxrender-luxrays-ed424ec77571.orig/include/luxrays/luxrays.h luxrender-luxrays-ed424ec77571/include/luxrays/luxrays.h ---- luxrender-luxrays-ed424ec77571.orig/include/luxrays/luxrays.h 2011-04-24 17:43:08.000000000 +0200 -+++ luxrender-luxrays-ed424ec77571/include/luxrays/luxrays.h 2011-11-26 11:38:00.336459874 +0100 -@@ -30,6 +30,8 @@ - - #define __CL_ENABLE_EXCEPTIONS - -+#define CL_USE_DEPRECATED_OPENCL_1_1_APIS -+ - #if defined(__APPLE__) - #include <OpenCL/cl.hpp> - #else diff --git a/community/luxrender/PKGBUILD b/community/luxrender/PKGBUILD deleted file mode 100644 index 9e72f4ab2..000000000 --- a/community/luxrender/PKGBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# $Id: PKGBUILD 67190 2012-03-05 08:57:43Z ibiru $ -# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> -# Initial contributor: flixie <69one@gmx.net> -# Contributor: Imanol Celaya <ornitorrincos@archlinux-es.org> -pkgname=luxrender -pkgver=0.8 -_pkgver=45d3e13eb94c -pkgrel=13 -pkgdesc="Rendering system for physically correct, unbiased image synthesis" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.luxrender.net/" -license=('GPL') -depends=('boost-libs' 'freeimage' 'openexr' 'libcl') -optdepends=('luxblend25: Blender exporter' 'qt: Qt GUI' \ - 'python: Python interface (pylux)' - 'nvidia-utils: OpenCL support for nVidia GPUs' \ - 'amdstream: OpenCL support for AMD GPUs' \ - 'intel-opencl-sdk: OpenCL support for Intel CPUs') -makedepends=('cmake' 'boost' 'qt' 'luxrays' 'python' 'opencl-headers') -source=(ftp://ftp.archlinux.org/other/community/luxrender/lux-"$pkgver".tar.bz2) -md5sums=('0f2d856385db72131f51e44a7ee527fa') - -build() { - cd "$srcdir"/luxrender-lux-$_pkgver - - sed -i 's/FIND_PACKAGE(Boost 1.43 COMPONENTS python REQUIRED)/FIND_PACKAGE(Boost 1.43 COMPONENTS python3 REQUIRED)/' CMakeLists.txt - - export CXXFLAGS="$CXXFLAGS -lpthread" - cmake -DCMAKE_INSTALL_PREFIX=/usr \ - -DLUXRAYS_DISABLE_OPENCL=OFF \ - -DPYTHON_CUSTOM=ON \ - -DPYTHON_LIBRARIES=/usr/lib/libpython3.2mu.so \ - -DPYTHON_INCLUDE_PATH=/usr/include/python3.2mu/ \ - . - make -} - -package() { - cd "$srcdir"/luxrender-lux-$_pkgver - make DESTDIR="$pkgdir" install - - # fix library path on x86_64 - [ "$CARCH" = "x86_64" ] && mv "$pkgdir"/usr/lib64 "$pkgdir"/usr/lib - - #install pylux - install -D -m644 pylux.so "$pkgdir"/usr/lib/python3.2/pylux.so -} - -# vim:set ts=2 sw=2 et: diff --git a/community/lxpanel/battery.patch b/community/lxpanel/battery.patch deleted file mode 100644 index 5d701ea6d..000000000 --- a/community/lxpanel/battery.patch +++ /dev/null @@ -1,72 +0,0 @@ -diff --git plugins/batt/batt_sys.c plugins/batt/batt_sys.c -index 54ff678..1eebab5 100644 ---- a/src/plugins/batt/batt_sys.c -+++ b/src/plugins/batt/batt_sys.c -@@ -35,15 +35,6 @@ - #include <stdlib.h> - #include <string.h> - --battery* battery_new() { -- static int battery_num = 1; -- battery * b = g_new0 ( battery, 1 ); -- battery_reset(b); -- b->battery_num = battery_num; -- battery_num++; -- return b; --} -- - void battery_reset( battery * b) { - b->type_battery = TRUE; - b->capacity_unit = "mAh"; -@@ -58,6 +49,15 @@ void battery_reset( battery * b) { - b->state = NULL; - } - -+battery* battery_new() { -+ static int battery_num = 1; -+ battery * b = g_new0 ( battery, 1 ); -+ battery_reset(b); -+ b->battery_num = battery_num; -+ battery_num++; -+ return b; -+} -+ - static gchar* parse_info_file(char *filename) - { - char *buf = NULL; -@@ -194,7 +194,7 @@ void battery_update( battery *b ) { - - /* convert energy values (in mWh) to charge values (in mAh) if needed and possible */ - if (b->last_capacity_unit != -1 && b->last_capacity == -1) { -- if (b->voltage != -1) { -+ if (b->voltage > 0) { - b->last_capacity = b->last_capacity_unit * 1000 / b->voltage; - } else { - b->last_capacity = b->last_capacity_unit; -@@ -202,7 +202,7 @@ void battery_update( battery *b ) { - } - } - if (b->design_capacity_unit != -1 && b->design_capacity == -1) { -- if (b->voltage != -1) { -+ if (b->voltage > 0) { - b->design_capacity = b->design_capacity_unit * 1000 / b->voltage; - } else { - b->design_capacity = b->design_capacity_unit; -@@ -210,7 +210,7 @@ void battery_update( battery *b ) { - } - } - if (b->remaining_energy != -1 && b->remaining_capacity == -1) { -- if (b->voltage != -1) { -+ if (b->voltage > 0) { - b->remaining_capacity = b->remaining_energy * 1000 / b->voltage; - b->present_rate = b->present_rate * 1000 / b->voltage; - } else { -@@ -220,7 +220,7 @@ void battery_update( battery *b ) { - if (b->last_capacity < MIN_CAPACITY) - b->percentage = 0; - else -- b->percentage = ((float) b->remaining_energy * 100.0) / (float) b->last_capacity_unit; -+ b->percentage = (float) b->remaining_capacity * 100 / b->last_capacity; - - if (b->percentage > 100) - b->percentage = 100; diff --git a/community/minidlna/PKGBUILD b/community/minidlna/PKGBUILD index 45a86fc1a..2114d29e5 100644 --- a/community/minidlna/PKGBUILD +++ b/community/minidlna/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 65511 2012-02-21 07:16:38Z spupykin $ +# $Id: PKGBUILD 70262 2012-05-03 10:11:50Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer:Biginoz < biginoz AT free point fr> # Contributor: Ignacio Galmarino <igalmarino@gmail.com> @@ -7,20 +7,24 @@ pkgname=minidlna pkgver=1.0.24 -pkgrel=2 +pkgrel=3 pkgdesc="A DLNA/UPnP-AV Media server (aka ReadyDLNA)" arch=('i686' 'x86_64' 'mips64el') url="http://sourceforge.net/projects/minidlna/" license=('GPL') -depends=('libexif' 'libjpeg' 'libid3tag' 'flac' 'libvorbis' 'ffmpeg' 'sqlite3') +depends=('libexif' 'libjpeg' 'libid3tag' 'flac' 'libvorbis' 'ffmpeg' 'sqlite') conflicts=('minidlna-cvs') backup=('etc/minidlna.conf' 'etc/conf.d/minidlna') changelog=changelog source=(http://downloads.sourceforge.net/minidlna/minidlna_${pkgver}_src.tar.gz - minidlna.rc) + minidlna.rc + minidlna.conf + minidlna.service) md5sums=('be9b4c91e3fcde592dc3f9828098ca0f' - 'c9863d5703e0a8469cc200f2739567e7') + 'c9863d5703e0a8469cc200f2739567e7' + 'af1b8c0fef9902f797b0324c255da5a1' + '1903ed9ceee43b8bb86146b9ad8eb50c') build() { cd "$srcdir/$pkgname-$pkgver" @@ -36,4 +40,8 @@ package() { mkdir -p $pkgdir/etc/conf.d echo 'MINIDLNA_USER=nobody' >$pkgdir/etc/conf.d/minidlna echo 'MINIDLNA_OPTS=""' >>$pkgdir/etc/conf.d/minidlna + + # systemd files + install -Dm0644 $srcdir/minidlna.conf $pkgdir/usr/lib/tmpfiles.d/minidlna.conf + install -Dm0644 $srcdir/minidlna.service $pkgdir/usr/lib/systemd/system/minidlna.service } diff --git a/community/minidlna/minidlna.conf b/community/minidlna/minidlna.conf new file mode 100644 index 000000000..98be33c0d --- /dev/null +++ b/community/minidlna/minidlna.conf @@ -0,0 +1,4 @@ +# systemd tmpfile settings for minidlna +# See tmpfiles.d(5) for details + +d /var/run/minidlna 0755 nobody nobody - diff --git a/community/minidlna/minidlna.service b/community/minidlna/minidlna.service new file mode 100644 index 000000000..6c9a40152 --- /dev/null +++ b/community/minidlna/minidlna.service @@ -0,0 +1,12 @@ +[Unit] +Description=minidlna server +After=network.target + +[Service] +Type=forking +User=nobody +ExecStart=/usr/sbin/minidlna -P /var/run/minidlna/minidlna.pid +PIDFile=/var/run/minidlna/minidlna.pid + +[Install] +WantedBy=multi-user.target diff --git a/community/mldonkey/mldonkey.desktop b/community/mldonkey/mldonkey.desktop deleted file mode 100644 index b307261e1..000000000 --- a/community/mldonkey/mldonkey.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Name=MLDonkey GUI -Comment=multi-protocol P2P program -Exec=mldonkey_gui -Icon=mldonkey -Terminal=false -Type=Application -Categories=Network;P2P; diff --git a/community/notion/PKGBUILD b/community/notion/PKGBUILD index 5c6b7b0d6..c29a0054a 100644 --- a/community/notion/PKGBUILD +++ b/community/notion/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 57592 2011-10-31 08:12:46Z spupykin $ +# $Id: PKGBUILD 70297 2012-05-03 22:44:04Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Eugen Zagorodniy e dot zagorodniy at gmail dot com # Contributor: aunoor pkgname=notion -pkgver=20111031 +pkgver=20120504 pkgrel=1 pkgdesc="Tabbed tiling, window manager. Fork of Ion3" url="http://sourceforge.net/projects/notion/" @@ -25,6 +25,7 @@ _gitroots=("git://notion.git.sourceforge.net/gitroot/notion/notion" "git://notion.git.sourceforge.net/gitroot/notion/mod_xrandr" "git://notion.git.sourceforge.net/gitroot/notion/contrib") #source=(https://downloads.sourceforge.net/project/notion/notion-3-2011102900-src.tar.bz2) +md5sums=() build() { cd ${srcdir} @@ -66,9 +67,15 @@ build() { done # build doc and modules - for i in mod_xinerama mod_xkbevents mod_xrandr notion-doc; do + for i in mod_xinerama mod_xkbevents mod_xrandr; do (cd $i && make -j1 TOPDIR=.. all) done + + mkdir notion-doc/notionconf-onepage + mkdir notion-doc/notionnotes-onepage + (cd notion-doc && make -j1 TOPDIR=.. all) || true + sed -i 's|mod_query.exec_on_merr|mod\\_query.exec\\_on\\_merr|g' notion-doc/ioncore.exports + (cd notion-doc && make -j1 TOPDIR=.. all) } package() { diff --git a/community/nut/PKGBUILD b/community/nut/PKGBUILD deleted file mode 100644 index efe7ae2d5..000000000 --- a/community/nut/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# Maintainer: Thomas Dziedzic < gostrc at gmail > -# Contributor: Slash <demodevil5 [at] yahoo [dot] com> - -pkgname=nut -pkgver=17.5 -pkgrel=1 -pkgdesc='Records what you eat and analyzes your meals for nutrient levels in terms of the Daily Value or DV which is the standard for food labeling in the US.' -url='http://nut.sourceforge.net/' -license=('GPL') -arch=('i686' 'x86_64' 'mips64el') -source=("http://downloads.sourceforge.net/project/nut/nut/${pkgver}/nut-${pkgver}.tar.gz") -md5sums=('1b18b9fab54a778f21ee4cd95fca5c63') - -build() { - cd ${pkgname}-${pkgver} - - # change install path to /usr instead of /usr/local - sed \ - -e 's#/local##' \ - -i Makefile - - make -} - -package() { - cd ${pkgname}-${pkgver} - - # Install Data - install -d ${pkgdir}/usr/lib/${pkgname} - install -m644 raw.data/* \ - ${pkgdir}/usr/lib/${pkgname}/ - - # Install Binary - install -D ${pkgname} \ - ${pkgdir}/usr/bin/${pkgname} - - # Install Man Page - install -D -m644 ${pkgname}.1 \ - ${pkgdir}/usr/share/man/man1/${pkgname}.1 -} diff --git a/community/packagekit/alpm.patch b/community/packagekit/alpm.patch deleted file mode 100644 index 904cb11d1..000000000 --- a/community/packagekit/alpm.patch +++ /dev/null @@ -1,3320 +0,0 @@ -diff --git a/backends/alpm/Makefile.am b/backends/alpm/Makefile.am -index 5a5468a..d8c3dfc 100644 ---- a/backends/alpm/Makefile.am -+++ b/backends/alpm/Makefile.am -@@ -5,6 +5,7 @@ PK_BACKEND_REPO_FILE = $(confdir)/repos.list - PK_BACKEND_DEFAULT_PATH = "/bin:/usr/bin:/sbin:/usr/sbin" - PK_BACKEND_DEFAULT_ROOT = "/" - PK_BACKEND_DEFAULT_DBPATH = $(localstatedir)/lib/pacman/ -+PK_BACKEND_DEFAULT_GPGDIR = $(sysconfdir)/pacman.d/gnupg/ - PK_BACKEND_DEFAULT_CACHEDIR = $(localstatedir)/cache/pacman/pkg/ - PK_BACKEND_DEFAULT_LOGFILE = $(localstatedir)/log/pacman.log - -@@ -17,6 +18,7 @@ DEFS = -DPK_BACKEND_CONFIG_FILE=\"$(PK_BACKEND_CONFIG_FILE)\" \ - -DPK_BACKEND_DEFAULT_PATH=\"$(PK_BACKEND_DEFAULT_PATH)\" \ - -DPK_BACKEND_DEFAULT_ROOT=\"$(PK_BACKEND_DEFAULT_ROOT)\" \ - -DPK_BACKEND_DEFAULT_DBPATH=\"$(PK_BACKEND_DEFAULT_DBPATH)\" \ -+ -DPK_BACKEND_DEFAULT_GPGDIR=\"$(PK_BACKEND_DEFAULT_GPGDIR)\" \ - -DPK_BACKEND_DEFAULT_CACHEDIR=\"$(PK_BACKEND_DEFAULT_CACHEDIR)\" \ - -DPK_BACKEND_DEFAULT_LOGFILE=\"$(PK_BACKEND_DEFAULT_LOGFILE)\" \ - -DALPM_CACHE_PATH=\"$(ALPM_CACHE_PATH)\" \ -diff --git a/backends/alpm/pk-backend-alpm.c b/backends/alpm/pk-backend-alpm.c -index ba993f0..5c6b629 100644 ---- a/backends/alpm/pk-backend-alpm.c -+++ b/backends/alpm/pk-backend-alpm.c -@@ -22,10 +22,13 @@ - */ - - #include <config.h> -+#include <locale.h> - #include <glib/gstdio.h> - #include <sys/utsname.h> -+#include <pk-backend-spawn.h> - - #include "pk-backend-alpm.h" -+#include "pk-backend-config.h" - #include "pk-backend-databases.h" - #include "pk-backend-error.h" - #include "pk-backend-groups.h" -@@ -35,7 +38,8 @@ PkBackend *backend = NULL; - GCancellable *cancellable = NULL; - static GStaticMutex mutex = G_STATIC_MUTEX_INIT; - --pmdb_t *localdb = NULL; -+alpm_handle_t *alpm = NULL; -+alpm_db_t *localdb = NULL; - - gchar *xfercmd = NULL; - alpm_list_t *holdpkgs = NULL; -@@ -162,7 +166,7 @@ out: - } - - static void --pk_backend_logcb (pmloglevel_t level, const gchar *format, va_list args) -+pk_backend_logcb (alpm_loglevel_t level, const gchar *format, va_list args) - { - gchar *output; - -@@ -176,12 +180,12 @@ pk_backend_logcb (pmloglevel_t level, const gchar *format, va_list args) - - /* report important output to PackageKit */ - switch (level) { -- case PM_LOG_DEBUG: -- case PM_LOG_FUNCTION: -+ case ALPM_LOG_DEBUG: -+ case ALPM_LOG_FUNCTION: - g_debug ("%s", output); - break; - -- case PM_LOG_WARNING: -+ case ALPM_LOG_WARNING: - g_warning ("%s", output); - pk_backend_output (backend, output); - break; -@@ -194,44 +198,99 @@ pk_backend_logcb (pmloglevel_t level, const gchar *format, va_list args) - g_free (output); - } - --static gboolean --pk_backend_initialize_alpm (PkBackend *self, GError **error) -+static void -+pk_backend_configure_environment (PkBackend *self) - { - struct utsname un; -- gchar *user_agent; -+ gchar *value; - -- g_return_val_if_fail (self != NULL, FALSE); -+ g_return_if_fail (self != NULL); - - /* PATH might have been nuked by D-Bus */ - g_setenv ("PATH", PK_BACKEND_DEFAULT_PATH, FALSE); - - uname (&un); -- user_agent = g_strdup_printf ("%s/%s (%s %s) libalpm/%s", -- PACKAGE_TARNAME, PACKAGE_VERSION, -- un.sysname, un.machine, alpm_version ()); -- g_setenv ("HTTP_USER_AGENT", user_agent, FALSE); -- g_free (user_agent); -- -- g_debug ("initializing"); -- if (alpm_initialize () < 0) { -- g_set_error_literal (error, ALPM_ERROR, pm_errno, -- alpm_strerrorlast ()); -+ value = g_strdup_printf ("%s/%s (%s %s) libalpm/%s", PACKAGE_TARNAME, -+ PACKAGE_VERSION, un.sysname, un.machine, -+ alpm_version ()); -+ g_setenv ("HTTP_USER_AGENT", value, FALSE); -+ g_free (value); -+ -+ value = pk_backend_get_locale (self); -+ if (value != NULL) { -+ setlocale (LC_ALL, value); -+ g_free (value); -+ } -+ -+ value = pk_backend_get_proxy_http (self); -+ if (value != NULL) { -+ gchar *uri = pk_backend_spawn_convert_uri (value); -+ g_setenv ("http_proxy", uri, TRUE); -+ g_free (uri); -+ g_free (value); -+ } -+ -+ value = pk_backend_get_proxy_https (self); -+ if (value != NULL) { -+ gchar *uri = pk_backend_spawn_convert_uri (value); -+ g_setenv ("https_proxy", uri, TRUE); -+ g_free (uri); -+ g_free (value); -+ } -+ -+ value = pk_backend_get_proxy_ftp (self); -+ if (value != NULL) { -+ gchar *uri = pk_backend_spawn_convert_uri (value); -+ g_setenv ("ftp_proxy", uri, TRUE); -+ g_free (uri); -+ g_free (value); -+ } -+ -+ value = pk_backend_get_proxy_socks (self); -+ if (value != NULL) { -+ gchar *uri = pk_backend_spawn_convert_uri (value); -+ g_setenv ("socks_proxy", uri, TRUE); -+ g_free (uri); -+ g_free (value); -+ } -+ -+ value = pk_backend_get_no_proxy (self); -+ if (value != NULL) { -+ g_setenv ("no_proxy", value, TRUE); -+ g_free (value); -+ } -+ -+ value = pk_backend_get_pac (self); -+ if (value != NULL) { -+ gchar *uri = pk_backend_spawn_convert_uri (value); -+ g_setenv ("pac", uri, TRUE); -+ g_free (uri); -+ g_free (value); -+ } -+} -+ -+static gboolean -+pk_backend_initialize_alpm (PkBackend *self, GError **error) -+{ -+ g_return_val_if_fail (self != NULL, FALSE); -+ -+ pk_backend_configure_environment (self); -+ -+ alpm = pk_backend_configure (PK_BACKEND_CONFIG_FILE, error); -+ if (alpm == NULL) { - return FALSE; - } - - backend = self; -- localdb = alpm_option_get_localdb (); -+ alpm_option_set_logcb (alpm, pk_backend_logcb); -+ -+ localdb = alpm_option_get_localdb (alpm); - if (localdb == NULL) { -- g_set_error (error, ALPM_ERROR, pm_errno, "[%s]: %s", "local", -- alpm_strerrorlast ()); -+ enum _alpm_errno_t errno = alpm_errno (alpm); -+ g_set_error (error, ALPM_ERROR, errno, "[%s]: %s", "local", -+ alpm_strerror (errno)); - } - -- /* set some sane defaults */ -- alpm_option_set_logcb (pk_backend_logcb); -- alpm_option_set_root (PK_BACKEND_DEFAULT_ROOT); -- alpm_option_set_dbpath (PK_BACKEND_DEFAULT_DBPATH); -- alpm_option_set_logfile (PK_BACKEND_DEFAULT_LOGFILE); -- - return TRUE; - } - -@@ -240,17 +299,20 @@ pk_backend_destroy_alpm (PkBackend *self) - { - g_return_if_fail (self != NULL); - -- if (backend != NULL) { -- if (alpm_trans_get_flags () != -1) { -- alpm_trans_release (); -+ if (alpm != NULL) { -+ if (alpm_trans_get_flags (alpm) < 0) { -+ alpm_trans_release (alpm); - } -- alpm_release (); -+ alpm_release (alpm); -+ -+ alpm = NULL; - backend = NULL; - } - - FREELIST (syncfirsts); - FREELIST (holdpkgs); - g_free (xfercmd); -+ xfercmd = NULL; - } - - void -@@ -380,3 +442,11 @@ pk_backend_finish (PkBackend *self, GError *error) - pk_backend_thread_finished (self); - return (error == NULL); - } -+ -+void -+pk_backend_transaction_start (PkBackend *self) -+{ -+ g_return_if_fail (self != NULL); -+ -+ pk_backend_configure_environment (self); -+} -diff --git a/backends/alpm/pk-backend-alpm.h b/backends/alpm/pk-backend-alpm.h -index 23a2724..ecd6d0f 100644 ---- a/backends/alpm/pk-backend-alpm.h -+++ b/backends/alpm/pk-backend-alpm.h -@@ -28,7 +28,8 @@ - extern PkBackend *backend; - extern GCancellable *cancellable; - --extern pmdb_t *localdb; -+extern alpm_handle_t *alpm; -+extern alpm_db_t *localdb; - - extern gchar *xfercmd; - extern alpm_list_t *holdpkgs; -diff --git a/backends/alpm/pk-backend-config.c b/backends/alpm/pk-backend-config.c -index 21a4c54..c8fd13b 100644 ---- a/backends/alpm/pk-backend-config.c -+++ b/backends/alpm/pk-backend-config.c -@@ -28,29 +28,44 @@ - - #include "pk-backend-alpm.h" - #include "pk-backend-config.h" -+#include "pk-backend-databases.h" - #include "pk-backend-error.h" - --typedef struct { -- gboolean checkspace, ilovecandy, showsize, totaldl, usedelta, usesyslog; -+typedef struct -+{ -+ gboolean checkspace, ilovecandy, totaldl, usedelta, usesyslog, -+ verbosepkglists; - -- gchar *arch, *cleanmethod, *dbpath, *logfile, *root, *xfercmd; -+ gchar *arch, *cleanmethod, *dbpath, *gpgdir, *logfile, *root, -+ *xfercmd; - -- alpm_list_t *cachedirs, *holdpkgs, *ignoregrps, *ignorepkgs, -- *noextracts, *noupgrades, *syncfirsts; -+ alpm_list_t *cachedirs, *holdpkgs, *ignoregroups, *ignorepkgs, -+ *noextracts, *noupgrades, *syncfirsts; - -- alpm_list_t *repos; -- GHashTable *servers; -- GRegex *xrepo, *xarch; -+ alpm_list_t *repos; -+ GHashTable *servers; -+ GHashTable *levels; -+ GRegex *xrepo, *xarch; - } PkBackendConfig; - - static PkBackendConfig * - pk_backend_config_new (void) - { - PkBackendConfig *config = g_new0 (PkBackendConfig, 1); -+ alpm_siglevel_t *level = g_new0 (alpm_siglevel_t, 1); -+ - config->servers = g_hash_table_new_full (g_str_hash, g_str_equal, - g_free, NULL); -+ config->levels = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, -+ g_free); -+ -+ *level |= ALPM_SIG_PACKAGE | ALPM_SIG_PACKAGE_OPTIONAL; -+ *level |= ALPM_SIG_DATABASE | ALPM_SIG_DATABASE_OPTIONAL; -+ g_hash_table_insert (config->levels, g_strdup ("options"), level); -+ - config->xrepo = g_regex_new ("\\$repo", 0, 0, NULL); - config->xarch = g_regex_new ("\\$arch", 0, 0, NULL); -+ - return config; - } - -@@ -76,13 +91,14 @@ pk_backend_config_free (PkBackendConfig *config) - g_free (config->arch); - g_free (config->cleanmethod); - g_free (config->dbpath); -+ g_free (config->gpgdir); - g_free (config->logfile); - g_free (config->root); - g_free (config->xfercmd); - - FREELIST (config->cachedirs); - FREELIST (config->holdpkgs); -- FREELIST (config->ignoregrps); -+ FREELIST (config->ignoregroups); - FREELIST (config->ignorepkgs); - FREELIST (config->noextracts); - FREELIST (config->noupgrades); -@@ -92,6 +108,8 @@ pk_backend_config_free (PkBackendConfig *config) - g_hash_table_foreach_remove (config->servers, - pk_backend_config_servers_free, NULL); - g_hash_table_unref (config->servers); -+ g_hash_table_unref (config->levels); -+ - g_regex_unref (config->xrepo); - g_regex_unref (config->xarch); - } -@@ -113,14 +131,6 @@ pk_backend_config_set_ilovecandy (PkBackendConfig *config) - } - - static void --pk_backend_config_set_showsize (PkBackendConfig *config) --{ -- g_return_if_fail (config != NULL); -- -- config->showsize = TRUE; --} -- --static void - pk_backend_config_set_totaldl (PkBackendConfig *config) - { - g_return_if_fail (config != NULL); -@@ -144,19 +154,28 @@ pk_backend_config_set_usesyslog (PkBackendConfig *config) - config->usesyslog = TRUE; - } - --typedef struct { -- const gchar *name; -- void (*func) (PkBackendConfig *config); -+static void -+pk_backend_config_set_verbosepkglists (PkBackendConfig *config) -+{ -+ g_return_if_fail (config != NULL); -+ -+ config->verbosepkglists = TRUE; -+} -+ -+typedef struct -+{ -+ const gchar *name; -+ void (*func) (PkBackendConfig *config); - } PkBackendConfigBoolean; - - /* keep this in alphabetical order */ - static const PkBackendConfigBoolean pk_backend_config_boolean_options[] = { - { "CheckSpace", pk_backend_config_set_checkspace }, - { "ILoveCandy", pk_backend_config_set_ilovecandy }, -- { "ShowSize", pk_backend_config_set_showsize }, - { "TotalDownload", pk_backend_config_set_totaldl }, - { "UseDelta", pk_backend_config_set_usedelta }, - { "UseSyslog", pk_backend_config_set_usesyslog }, -+ { "VerbosePkgLists", pk_backend_config_set_verbosepkglists }, - { NULL, NULL } - }; - -@@ -234,6 +253,17 @@ pk_backend_config_set_dbpath (PkBackendConfig *config, const gchar *path) - } - - static void -+pk_backend_config_set_gpgdir (PkBackendConfig *config, const gchar *path) -+{ -+ g_return_if_fail (config != NULL); -+ g_return_if_fail (path != NULL); -+ -+ g_free (config->gpgdir); -+ config->gpgdir = g_strdup (path); -+} -+ -+ -+static void - pk_backend_config_set_logfile (PkBackendConfig *config, const gchar *filename) - { - g_return_if_fail (config != NULL); -@@ -263,9 +293,10 @@ pk_backend_config_set_xfercmd (PkBackendConfig *config, const gchar *command) - config->xfercmd = g_strdup (command); - } - --typedef struct { -- const gchar *name; -- void (*func) (PkBackendConfig *config, const gchar *s); -+typedef struct -+{ -+ const gchar *name; -+ void (*func) (PkBackendConfig *config, const gchar *s); - } PkBackendConfigString; - - /* keep this in alphabetical order */ -@@ -274,6 +305,7 @@ static const PkBackendConfigString pk_backend_config_string_options[] = { - { "CacheDir", pk_backend_config_add_cachedir }, - { "CleanMethod", pk_backend_config_set_cleanmethod }, - { "DBPath", pk_backend_config_set_dbpath }, -+ { "GPGDir", pk_backend_config_set_gpgdir }, - { "LogFile", pk_backend_config_set_logfile }, - { "RootDir", pk_backend_config_set_root }, - { "XferCommand", pk_backend_config_set_xfercmd }, -@@ -313,12 +345,12 @@ pk_backend_config_add_holdpkg (PkBackendConfig *config, gchar *package) - } - - static void --pk_backend_config_add_ignoregrp (PkBackendConfig *config, gchar *group) -+pk_backend_config_add_ignoregroup (PkBackendConfig *config, gchar *group) - { - g_return_if_fail (config != NULL); - g_return_if_fail (group != NULL); - -- config->ignoregrps = alpm_list_add (config->ignoregrps, group); -+ config->ignoregroups = alpm_list_add (config->ignoregroups, group); - } - - static void -@@ -357,15 +389,16 @@ pk_backend_config_add_syncfirst (PkBackendConfig *config, gchar *package) - config->syncfirsts = alpm_list_add (config->syncfirsts, package); - } - --typedef struct { -- const gchar *name; -- void (*func) (PkBackendConfig *config, gchar *value); -+typedef struct -+{ -+ const gchar *name; -+ void (*func) (PkBackendConfig *config, gchar *value); - } PkBackendConfigList; - - /* keep this in alphabetical order */ - static const PkBackendConfigList pk_backend_config_list_options[] = { - { "HoldPkg", pk_backend_config_add_holdpkg }, -- { "IgnoreGroup", pk_backend_config_add_ignoregrp }, -+ { "IgnoreGroup", pk_backend_config_add_ignoregroup }, - { "IgnorePkg", pk_backend_config_add_ignorepkg }, - { "NoExtract", pk_backend_config_add_noextract }, - { "NoUpgrade", pk_backend_config_add_noupgrade }, -@@ -451,7 +484,7 @@ pk_backend_config_repo_add_server (PkBackendConfig *config, const gchar *repo, - return FALSE; - } - } else if (strstr (url, "$arch") != NULL) { -- g_set_error (e, ALPM_ERROR, PM_ERR_CONFIG_INVALID, -+ g_set_error (e, ALPM_ERROR, ALPM_ERR_CONFIG_INVALID, - "url contained $arch, which is not set"); - } - -@@ -463,6 +496,95 @@ pk_backend_config_repo_add_server (PkBackendConfig *config, const gchar *repo, - } - - static gboolean -+pk_backend_config_set_siglevel (PkBackendConfig *config, const gchar *section, -+ const gchar *list, GError **error) -+{ -+ alpm_siglevel_t *level; -+ -+ g_return_val_if_fail (config != NULL, FALSE); -+ g_return_val_if_fail (section != NULL, FALSE); -+ g_return_val_if_fail (list != NULL, FALSE); -+ -+ level = g_hash_table_lookup (config->levels, section); -+ if (level == NULL) { -+ level = g_hash_table_lookup (config->levels, "options"); -+ level = g_memdup (level, sizeof (alpm_siglevel_t)); -+ g_hash_table_insert (config->levels, g_strdup (section), level); -+ } -+ -+ while (TRUE) { -+ gboolean package = TRUE, database = TRUE; -+ -+ if (g_str_has_prefix (list, "Package")) { -+ database = FALSE; -+ list += 7; -+ } else if (g_str_has_prefix (list, "Database")) { -+ package = FALSE; -+ list += 8; -+ } -+ -+ /* this also allows e.g. NeverEver, so put prefixes last */ -+ if (g_str_has_prefix (list, "Never")) { -+ if (package) { -+ *level &= ~ALPM_SIG_PACKAGE; -+ } -+ if (database) { -+ *level &= ~ALPM_SIG_DATABASE; -+ } -+ } else if (g_str_has_prefix (list, "Optional")) { -+ if (package) { -+ *level |= ALPM_SIG_PACKAGE; -+ *level |= ALPM_SIG_PACKAGE_OPTIONAL; -+ } -+ if (database) { -+ *level |= ALPM_SIG_DATABASE; -+ *level |= ALPM_SIG_DATABASE_OPTIONAL; -+ } -+ } else if (g_str_has_prefix (list, "Required")) { -+ if (package) { -+ *level |= ALPM_SIG_PACKAGE; -+ *level &= ~ALPM_SIG_PACKAGE_OPTIONAL; -+ } -+ if (database) { -+ *level |= ALPM_SIG_DATABASE; -+ *level &= ~ALPM_SIG_DATABASE_OPTIONAL; -+ } -+ } else if (g_str_has_prefix (list, "TrustedOnly")) { -+ if (package) { -+ *level &= ~ALPM_SIG_PACKAGE_MARGINAL_OK; -+ *level &= ~ALPM_SIG_PACKAGE_UNKNOWN_OK; -+ } -+ if (database) { -+ *level &= ~ALPM_SIG_DATABASE_MARGINAL_OK; -+ *level &= ~ALPM_SIG_DATABASE_UNKNOWN_OK; -+ } -+ } else if (g_str_has_prefix (list, "TrustAll")) { -+ if (package) { -+ *level |= ALPM_SIG_PACKAGE_MARGINAL_OK; -+ *level |= ALPM_SIG_PACKAGE_UNKNOWN_OK; -+ } -+ if (database) { -+ *level |= ALPM_SIG_DATABASE_MARGINAL_OK; -+ *level |= ALPM_SIG_DATABASE_UNKNOWN_OK; -+ } -+ } else { -+ g_set_error (error, ALPM_ERROR, ALPM_ERR_CONFIG_INVALID, -+ "invalid SigLevel value: %s", list); -+ return FALSE; -+ } -+ -+ list = strchr (list, ' '); -+ if (list == NULL) { -+ break; -+ } else { -+ ++list; -+ } -+ } -+ -+ return TRUE; -+} -+ -+static gboolean - pk_backend_config_parse (PkBackendConfig *config, const gchar *filename, - gchar *section, GError **error) - { -@@ -515,7 +637,7 @@ pk_backend_config_parse (PkBackendConfig *config, const gchar *filename, - - if (*str == '\0') { - g_set_error (&e, ALPM_ERROR, -- PM_ERR_CONFIG_INVALID, -+ ALPM_ERR_CONFIG_INVALID, - "empty section name"); - break; - } -@@ -532,7 +654,7 @@ pk_backend_config_parse (PkBackendConfig *config, const gchar *filename, - - /* parse a directive */ - if (section == NULL) { -- g_set_error (&e, ALPM_ERROR, PM_ERR_CONFIG_INVALID, -+ g_set_error (&e, ALPM_ERROR, ALPM_ERR_CONFIG_INVALID, - "directive must belong to a section"); - break; - } -@@ -590,9 +712,18 @@ pk_backend_config_parse (PkBackendConfig *config, const gchar *filename, - continue; - } - } -+ -+ if (g_strcmp0 (key, "SigLevel") == 0 && str != NULL) { -+ if (!pk_backend_config_set_siglevel (config, section, -+ str, &e)) { -+ break; -+ } else { -+ continue; -+ } -+ } - - /* report errors from above */ -- g_set_error (&e, ALPM_ERROR, PM_ERR_CONFIG_INVALID, -+ g_set_error (&e, ALPM_ERROR, ALPM_ERR_CONFIG_INVALID, - "unrecognised directive '%s'", key); - break; - } -@@ -611,107 +742,101 @@ pk_backend_config_parse (PkBackendConfig *config, const gchar *filename, - } - } - --static gboolean --pk_backend_config_configure_paths (PkBackendConfig *config, GError **error) -+static alpm_handle_t * -+pk_backend_config_initialize_alpm (PkBackendConfig *config, GError **error) - { -+ alpm_handle_t *handle; -+ enum _alpm_errno_t errno; -+ gsize dir = 1; -+ - g_return_val_if_fail (config != NULL, FALSE); - -- if (config->root == NULL) { -+ if (config->root == NULL || *config->root == '\0') { -+ g_free (config->root); - config->root = g_strdup (PK_BACKEND_DEFAULT_ROOT); -+ } else if (!g_str_has_suffix (config->root, G_DIR_SEPARATOR_S)) { -+ dir = 0; - } - -- if (alpm_option_set_root (config->root) < 0) { -- g_set_error (error, ALPM_ERROR, pm_errno, "RootDir: %s", -- alpm_strerrorlast ()); -- return FALSE; -+ if (config->dbpath == NULL) { -+ config->dbpath = g_strconcat (config->root, -+ PK_BACKEND_DEFAULT_DBPATH + dir, -+ NULL); - } - -- if (config->dbpath == NULL) { -- config->dbpath = g_strconcat (alpm_option_get_root (), -- PK_BACKEND_DEFAULT_DBPATH + 1, -+ g_debug ("initializing alpm"); -+ handle = alpm_initialize (config->root, config->dbpath, &errno); -+ if (handle == NULL) { -+ g_set_error_literal (error, ALPM_ERROR, errno, -+ alpm_strerror (errno)); -+ return handle; -+ } -+ -+ if (config->gpgdir == NULL) { -+ config->gpgdir = g_strconcat (config->root, -+ PK_BACKEND_DEFAULT_GPGDIR + dir, - NULL); - } - -- if (alpm_option_set_dbpath (config->dbpath) < 0) { -- g_set_error (error, ALPM_ERROR, pm_errno, "DBPath: %s", -- alpm_strerrorlast ()); -- return FALSE; -+ if (alpm_option_set_gpgdir (handle, config->gpgdir) < 0) { -+ errno = alpm_errno (handle); -+ g_set_error (error, ALPM_ERROR, errno, "GPGDir: %s", -+ alpm_strerror (errno)); -+ return handle; - } - - if (config->logfile == NULL) { -- config->logfile = g_strconcat (alpm_option_get_root (), -- PK_BACKEND_DEFAULT_LOGFILE + 1, -+ config->logfile = g_strconcat (config->root, -+ PK_BACKEND_DEFAULT_LOGFILE + dir, - NULL); - } - -- alpm_option_set_logfile (config->logfile); -+ if (alpm_option_set_logfile (handle, config->logfile) < 0) { -+ errno = alpm_errno (handle); -+ g_set_error (error, ALPM_ERROR, errno, "LogFile: %s", -+ alpm_strerror (errno)); -+ return handle; -+ } - - if (config->cachedirs == NULL) { -- gchar *path = g_strconcat (alpm_option_get_root (), -- PK_BACKEND_DEFAULT_CACHEDIR + 1, -+ gchar *path = g_strconcat (config->root, -+ PK_BACKEND_DEFAULT_CACHEDIR + dir, - NULL); - config->cachedirs = alpm_list_add (NULL, path); - } - - /* alpm takes ownership */ -- alpm_option_set_cachedirs (config->cachedirs); -+ if (alpm_option_set_cachedirs (handle, config->cachedirs) < 0) { -+ errno = alpm_errno (handle); -+ g_set_error (error, ALPM_ERROR, errno, "CacheDir: %s", -+ alpm_strerror (errno)); -+ return handle; -+ } - config->cachedirs = NULL; - -- return TRUE; -+ return handle; - } - --static gboolean --pk_backend_config_configure_repos (PkBackendConfig *config, GError **error) -+static alpm_handle_t * -+pk_backend_config_configure_alpm (PkBackendConfig *config, GError **error) - { -- const alpm_list_t *i; -+ alpm_handle_t *handle; -+ alpm_siglevel_t *level; - - g_return_val_if_fail (config != NULL, FALSE); - -- for (i = alpm_option_get_syncdbs (); i != NULL; i = i->next) { -- if (alpm_db_unregister (i->data) < 0) { -- g_set_error_literal (error, ALPM_ERROR, pm_errno, -- alpm_strerrorlast ()); -- return FALSE; -- } -- } -- -- for (i = config->repos; i != NULL; i = i->next) { -- const gchar *key; -- gpointer value; -- pmdb_t *db; -- alpm_list_t *j; -- -- key = (const gchar *) i->data; -- value = g_hash_table_lookup (config->servers, key); -- -- db = alpm_db_register_sync (key); -- if (db == NULL) { -- g_set_error (error, ALPM_ERROR, pm_errno, "[%s]: %s", -- key, alpm_strerrorlast ()); -- return FALSE; -- } -- -- for (j = (alpm_list_t *) value; j != NULL; j = j->next) { -- alpm_db_setserver (db, (const gchar *) j->data); -- } -+ handle = pk_backend_config_initialize_alpm (config, error); -+ if (handle == NULL) { -+ return NULL; - } - -- return TRUE; --} -- --static gboolean --pk_backend_config_configure_alpm (PkBackendConfig *config, GError **error) --{ -- g_return_val_if_fail (config != NULL, FALSE); -- -- if (!pk_backend_config_configure_paths (config, error)) { -- return FALSE; -- } -+ alpm_option_set_checkspace (handle, config->checkspace); -+ alpm_option_set_usedelta (handle, config->usedelta); -+ alpm_option_set_usesyslog (handle, config->usesyslog); -+ alpm_option_set_arch (handle, config->arch); - -- alpm_option_set_checkspace (config->checkspace); -- alpm_option_set_usedelta (config->usedelta); -- alpm_option_set_usesyslog (config->usesyslog); -- alpm_option_set_arch (config->arch); -+ level = g_hash_table_lookup (config->levels, "options"); -+ alpm_option_set_default_siglevel (handle, *level); - - /* backend takes ownership */ - g_free (xfercmd); -@@ -719,9 +844,9 @@ pk_backend_config_configure_alpm (PkBackendConfig *config, GError **error) - config->xfercmd = NULL; - - if (xfercmd != NULL) { -- alpm_option_set_fetchcb (pk_backend_fetchcb); -+ alpm_option_set_fetchcb (handle, pk_backend_fetchcb); - } else { -- alpm_option_set_fetchcb (NULL); -+ alpm_option_set_fetchcb (handle, NULL); - } - - /* backend takes ownership */ -@@ -735,41 +860,53 @@ pk_backend_config_configure_alpm (PkBackendConfig *config, GError **error) - config->syncfirsts = NULL; - - /* alpm takes ownership */ -- alpm_option_set_ignoregrps (config->ignoregrps); -- config->ignoregrps = NULL; -+ alpm_option_set_ignoregroups (handle, config->ignoregroups); -+ config->ignoregroups = NULL; - - /* alpm takes ownership */ -- alpm_option_set_ignorepkgs (config->ignorepkgs); -+ alpm_option_set_ignorepkgs (handle, config->ignorepkgs); - config->ignorepkgs = NULL; - - /* alpm takes ownership */ -- alpm_option_set_noextracts (config->noextracts); -+ alpm_option_set_noextracts (handle, config->noextracts); - config->noextracts = NULL; - - /* alpm takes ownership */ -- alpm_option_set_noupgrades (config->noupgrades); -+ alpm_option_set_noupgrades (handle, config->noupgrades); - config->noupgrades = NULL; - -- if (!pk_backend_config_configure_repos (config, error)) { -- return FALSE; -- } -+ pk_backend_configure_repos (config->repos, config->servers, -+ config->levels); - -- return TRUE; -+ return handle; - } - --gboolean -+alpm_handle_t * - pk_backend_configure (const gchar *filename, GError **error) - { - PkBackendConfig *config; -- gboolean result; -+ alpm_handle_t *handle; -+ GError *e = NULL; - - g_return_val_if_fail (filename != NULL, FALSE); - -+ g_debug ("reading config from %s", filename); - config = pk_backend_config_new (); - -- result = pk_backend_config_parse (config, filename, NULL, error) && -- pk_backend_config_configure_alpm (config, error); -+ if (pk_backend_config_parse (config, filename, NULL, &e)) { -+ handle = pk_backend_config_configure_alpm (config, &e); -+ } else { -+ handle = NULL; -+ } - - pk_backend_config_free (config); -- return result; -+ if (e != NULL) { -+ g_propagate_error (error, e); -+ if (handle != NULL) { -+ alpm_release (handle); -+ } -+ return NULL; -+ } else { -+ return handle; -+ } - } -diff --git a/backends/alpm/pk-backend-config.h b/backends/alpm/pk-backend-config.h -index cb8b8dc..412f59c 100644 ---- a/backends/alpm/pk-backend-config.h -+++ b/backends/alpm/pk-backend-config.h -@@ -21,6 +21,7 @@ - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -+#include <alpm.h> - #include <glib.h> - --gboolean pk_backend_configure (const gchar *filename, GError **error); -+alpm_handle_t *pk_backend_configure (const gchar *filename, GError **error); -diff --git a/backends/alpm/pk-backend-databases.c b/backends/alpm/pk-backend-databases.c -index f6ab06e..a123297 100644 ---- a/backends/alpm/pk-backend-databases.c -+++ b/backends/alpm/pk-backend-databases.c -@@ -26,7 +26,15 @@ - #include "pk-backend-databases.h" - #include "pk-backend-error.h" - -+typedef struct -+{ -+ gchar *name; -+ alpm_list_t *servers; -+ alpm_siglevel_t level; -+} PkBackendRepo; -+ - static GHashTable *disabled = NULL; -+static alpm_list_t *configured = NULL; - - static GHashTable * - disabled_repos_new (GError **error) -@@ -113,8 +121,8 @@ disabled_repos_free (GHashTable *table) - - /* write all disabled repos line by line */ - while (g_hash_table_iter_next (&iter, (gpointer *) &line, NULL) && -- g_data_output_stream_put_string (output, line, NULL, NULL) && -- g_data_output_stream_put_byte (output, '\n', NULL, NULL)); -+ g_data_output_stream_put_string (output, line, NULL, NULL) && -+ g_data_output_stream_put_byte (output, '\n', NULL, NULL)); - - g_object_unref (output); - g_object_unref (os); -@@ -124,41 +132,91 @@ disabled_repos_free (GHashTable *table) - } - - static gboolean --disabled_repos_configure (GHashTable *table, GError **error) -+disabled_repos_configure (GHashTable *table, gboolean only_trusted, -+ GError **error) - { - const alpm_list_t *i; - -- g_debug ("reading config from %s", PK_BACKEND_CONFIG_FILE); -+ g_return_val_if_fail (table != NULL, FALSE); -+ g_return_val_if_fail (alpm != NULL, FALSE); - -- /* read configuration from pacman.conf file */ -- if (!pk_backend_configure (PK_BACKEND_CONFIG_FILE, error)) { -+ if (alpm_db_unregister_all (alpm) < 0) { -+ enum _alpm_errno_t errno = alpm_errno (alpm); -+ g_set_error_literal (error, ALPM_ERROR, errno, -+ alpm_strerror (errno)); - return FALSE; - } - -- /* disable disabled repos */ -- for (i = alpm_option_get_syncdbs (); i != NULL;) { -- pmdb_t *db = (pmdb_t *) i->data; -- const gchar *repo = alpm_db_get_name (db); -+ for (i = configured; i != NULL; i = i->next) { -+ PkBackendRepo *repo = (PkBackendRepo *) i->data; -+ alpm_siglevel_t level = repo->level; -+ alpm_db_t *db; - -- if (g_hash_table_lookup (table, repo) == NULL) { -- /* repo is not disabled */ -- i = i->next; -+ if (g_hash_table_lookup (table, repo->name) != NULL) { -+ /* repo is disabled */ - continue; -+ } else if (!only_trusted) { -+ level &= ~ALPM_SIG_PACKAGE; -+ level &= ~ALPM_SIG_DATABASE; -+ level &= ~ALPM_SIG_USE_DEFAULT; - } - -- if (alpm_db_unregister (db) < 0) { -- g_set_error (error, ALPM_ERROR, pm_errno, "[%s]: %s", -- repo, alpm_strerrorlast ()); -+ db = alpm_db_register_sync (alpm, repo->name, level); -+ if (db == NULL) { -+ enum _alpm_errno_t errno = alpm_errno (alpm); -+ g_set_error (error, ALPM_ERROR, errno, "[%s]: %s", -+ repo->name, alpm_strerror (errno)); - return FALSE; - } - -- /* start again because the list gets invalidated */ -- i = alpm_option_get_syncdbs (); -+ alpm_db_set_servers (db, alpm_list_strdup (repo->servers)); - } - - return TRUE; - } - -+void -+pk_backend_configure_repos (alpm_list_t *repos, GHashTable *servers, -+ GHashTable *levels) -+{ -+ alpm_list_t *i; -+ -+ g_return_if_fail (servers != NULL); -+ -+ for (i = repos; i != NULL; i = i->next) { -+ PkBackendRepo *repo = g_new (PkBackendRepo, 1); -+ gpointer value = g_hash_table_lookup (servers, i->data); -+ -+ repo->name = g_strdup ((const gchar *) i->data); -+ repo->servers = alpm_list_strdup ((alpm_list_t *) value); -+ -+ value = g_hash_table_lookup (levels, i->data); -+ if (value != NULL) { -+ repo->level = *(alpm_siglevel_t *) value; -+ } else { -+ repo->level = ALPM_SIG_USE_DEFAULT; -+ } -+ -+ configured = alpm_list_add (configured, repo); -+ } -+} -+ -+gboolean -+pk_backend_disable_signatures (PkBackend *self, GError **error) -+{ -+ g_return_val_if_fail (self != NULL, FALSE); -+ -+ return disabled_repos_configure (disabled, FALSE, error); -+} -+ -+gboolean -+pk_backend_enable_signatures (PkBackend *self, GError **error) -+{ -+ g_return_val_if_fail (self != NULL, FALSE); -+ -+ return disabled_repos_configure (disabled, TRUE, error); -+} -+ - gboolean - pk_backend_initialize_databases (PkBackend *self, GError **error) - { -@@ -169,7 +227,7 @@ pk_backend_initialize_databases (PkBackend *self, GError **error) - return FALSE; - } - -- if (!disabled_repos_configure (disabled, error)) { -+ if (!disabled_repos_configure (disabled, TRUE, error)) { - return FALSE; - } - -@@ -179,11 +237,21 @@ pk_backend_initialize_databases (PkBackend *self, GError **error) - void - pk_backend_destroy_databases (PkBackend *self) - { -+ alpm_list_t *i; -+ - g_return_if_fail (self != NULL); - - if (disabled != NULL) { - disabled_repos_free (disabled); - } -+ -+ for (i = configured; i != NULL; i = i->next) { -+ PkBackendRepo *repo = (PkBackendRepo *) i->data; -+ g_free (repo->name); -+ FREELIST (repo->servers); -+ g_free (repo); -+ } -+ alpm_list_free (configured); - } - - static gboolean -@@ -210,11 +278,12 @@ pk_backend_get_repo_list_thread (PkBackend *self) - gpointer key, value; - - g_return_val_if_fail (self != NULL, FALSE); -+ g_return_val_if_fail (alpm != NULL, FALSE); - g_return_val_if_fail (disabled != NULL, FALSE); - - /* emit enabled repos */ -- for (i = alpm_option_get_syncdbs (); i != NULL; i = i->next) { -- pmdb_t *db = (pmdb_t *) i->data; -+ for (i = alpm_option_get_syncdbs (alpm); i != NULL; i = i->next) { -+ alpm_db_t *db = (alpm_db_t *) i->data; - const gchar *repo = alpm_db_get_name (db); - - if (pk_backend_cancelled (self)) { -@@ -265,11 +334,11 @@ pk_backend_repo_enable_thread (PkBackend *self) - - if (g_hash_table_remove (disabled, repo)) { - /* reload configuration to preserve ordering */ -- if (disabled_repos_configure (disabled, &error)) { -+ if (disabled_repos_configure (disabled, TRUE, &error)) { - pk_backend_repo_list_changed (self); - } - } else { -- int code = PM_ERR_DB_NOT_NULL; -+ int code = ALPM_ERR_DB_NOT_NULL; - g_set_error (&error, ALPM_ERROR, code, "[%s]: %s", - repo, alpm_strerror (code)); - } -@@ -292,21 +361,23 @@ pk_backend_repo_disable_thread (PkBackend *self) - GError *error = NULL; - - g_return_val_if_fail (self != NULL, FALSE); -+ g_return_val_if_fail (alpm != NULL, FALSE); - g_return_val_if_fail (disabled != NULL, FALSE); - - repo = pk_backend_get_string (self, "repo_id"); - - g_return_val_if_fail (repo != NULL, FALSE); - -- for (i = alpm_option_get_syncdbs (); i != NULL; i = i->next) { -- pmdb_t *db = (pmdb_t *) i->data; -+ for (i = alpm_option_get_syncdbs (alpm); i != NULL; i = i->next) { -+ alpm_db_t *db = (alpm_db_t *) i->data; - const gchar *name = alpm_db_get_name (db); - - if (g_strcmp0 (repo, name) == 0) { - if (alpm_db_unregister (db) < 0) { -- g_set_error (&error, ALPM_ERROR, pm_errno, -+ enum _alpm_errno_t errno = alpm_errno (alpm); -+ g_set_error (&error, ALPM_ERROR, errno, - "[%s]: %s", repo, -- alpm_strerrorlast ()); -+ alpm_strerror (errno)); - } else { - g_hash_table_insert (disabled, g_strdup (repo), - GINT_TO_POINTER (1)); -@@ -316,7 +387,7 @@ pk_backend_repo_disable_thread (PkBackend *self) - } - - if (i == NULL) { -- int code = PM_ERR_DB_NULL; -+ int code = ALPM_ERR_DB_NULL; - g_set_error (&error, ALPM_ERROR, code, "[%s]: %s", repo, - alpm_strerror (code)); - } -diff --git a/backends/alpm/pk-backend-databases.h b/backends/alpm/pk-backend-databases.h -index f9eb2f9..d9b9e78 100644 ---- a/backends/alpm/pk-backend-databases.h -+++ b/backends/alpm/pk-backend-databases.h -@@ -24,6 +24,16 @@ - #include <alpm.h> - #include <pk-backend.h> - -+void pk_backend_configure_repos (alpm_list_t *repos, -+ GHashTable *servers, -+ GHashTable *levels); -+ -+gboolean pk_backend_disable_signatures (PkBackend *self, -+ GError **error); -+ -+gboolean pk_backend_enable_signatures (PkBackend *self, -+ GError **error); -+ - gboolean pk_backend_initialize_databases (PkBackend *self, - GError **error); - -diff --git a/backends/alpm/pk-backend-depends.c b/backends/alpm/pk-backend-depends.c -index 8bb8567..7c7b45a 100644 ---- a/backends/alpm/pk-backend-depends.c -+++ b/backends/alpm/pk-backend-depends.c -@@ -29,7 +29,7 @@ - #include "pk-backend-error.h" - #include "pk-backend-packages.h" - --static pmpkg_t * -+static alpm_pkg_t * - alpm_list_find_pkg (const alpm_list_t *pkgs, const gchar *name) - { - g_return_val_if_fail (name != NULL, NULL); -@@ -50,11 +50,12 @@ pk_backend_find_provider (PkBackend *self, alpm_list_t *pkgs, - PkBitfield filters; - gboolean recursive, skip_local, skip_remote; - -- pmpkg_t *provider; -+ alpm_pkg_t *provider; - alpm_list_t *pkgcache, *syncdbs; - - g_return_val_if_fail (self != NULL, pkgs); - g_return_val_if_fail (depend != NULL, pkgs); -+ g_return_val_if_fail (alpm != NULL, pkgs); - g_return_val_if_fail (localdb != NULL, pkgs); - - recursive = pk_backend_get_bool (self, "recursive"); -@@ -84,8 +85,8 @@ pk_backend_find_provider (PkBackend *self, alpm_list_t *pkgs, - } - - /* look for remote dependencies */ -- syncdbs = alpm_option_get_syncdbs (); -- provider = alpm_find_dbs_satisfier (syncdbs, depend); -+ syncdbs = alpm_option_get_syncdbs (alpm); -+ provider = alpm_find_dbs_satisfier (alpm, syncdbs, depend); - - if (provider != NULL) { - if (!skip_remote) { -@@ -96,7 +97,7 @@ pk_backend_find_provider (PkBackend *self, alpm_list_t *pkgs, - pkgs = alpm_list_add (pkgs, provider); - } - } else { -- int code = PM_ERR_UNSATISFIED_DEPS; -+ int code = ALPM_ERR_UNSATISFIED_DEPS; - g_set_error (error, ALPM_ERROR, code, "%s: %s", depend, - alpm_strerror (code)); - } -@@ -108,7 +109,7 @@ static alpm_list_t * - pk_backend_find_requirer (PkBackend *self, alpm_list_t *pkgs, const gchar *name, - GError **error) - { -- pmpkg_t *requirer; -+ alpm_pkg_t *requirer; - - g_return_val_if_fail (self != NULL, pkgs); - g_return_val_if_fail (name != NULL, pkgs); -@@ -127,7 +128,7 @@ pk_backend_find_requirer (PkBackend *self, alpm_list_t *pkgs, const gchar *name, - pkgs = alpm_list_add (pkgs, requirer); - } - } else { -- int code = PM_ERR_PKG_NOT_FOUND; -+ int code = ALPM_ERR_PKG_NOT_FOUND; - g_set_error (error, ALPM_ERROR, code, "%s: %s", name, - alpm_strerror (code)); - } -@@ -150,7 +151,7 @@ pk_backend_get_depends_thread (PkBackend *self) - - /* construct an initial package list */ - for (; *packages != NULL; ++packages) { -- pmpkg_t *pkg; -+ alpm_pkg_t *pkg; - - if (pk_backend_cancelled (self)) { - break; -@@ -206,7 +207,7 @@ pk_backend_get_requires_thread (PkBackend *self) - - /* construct an initial package list */ - for (; *packages != NULL; ++packages) { -- pmpkg_t *pkg; -+ alpm_pkg_t *pkg; - - if (pk_backend_cancelled (self)) { - break; -diff --git a/backends/alpm/pk-backend-error.c b/backends/alpm/pk-backend-error.c -index 255f1fb..57c4b4b 100644 ---- a/backends/alpm/pk-backend-error.c -+++ b/backends/alpm/pk-backend-error.c -@@ -33,140 +33,159 @@ pk_backend_error (PkBackend *self, GError *error) - g_return_if_fail (self != NULL); - g_return_if_fail (error != NULL); - -- if (error->domain == ALPM_ERROR) { -- switch (error->code) { -- case PM_ERR_MEMORY: -- case PM_ERR_SYSTEM: -- code = PK_ERROR_ENUM_OOM; -- break; -- -- case PM_ERR_BADPERMS: -- code = PK_ERROR_ENUM_NOT_AUTHORIZED; -- break; -- -- case PM_ERR_NOT_A_FILE: -- case PM_ERR_NOT_A_DIR: -- code = PK_ERROR_ENUM_FILE_NOT_FOUND; -- break; -- -- case PM_ERR_WRONG_ARGS: -- case PM_ERR_HANDLE_NULL: -- case PM_ERR_DB_NULL: -- case PM_ERR_TRANS_NULL: -- case PM_ERR_TRANS_NOT_INITIALIZED: -- case PM_ERR_TRANS_NOT_PREPARED: -- case PM_ERR_TRANS_NOT_LOCKED: -- case PM_ERR_INVALID_REGEX: -- code = PK_ERROR_ENUM_INTERNAL_ERROR; -- break; -- -- case PM_ERR_DISK_SPACE: -- code = PK_ERROR_ENUM_NO_SPACE_ON_DEVICE; -- break; -- -- case PM_ERR_HANDLE_NOT_NULL: -- case PM_ERR_DB_NOT_NULL: -- case PM_ERR_TRANS_NOT_NULL: -- code = PK_ERROR_ENUM_FAILED_INITIALIZATION; -- break; -- -- case PM_ERR_HANDLE_LOCK: -- code = PK_ERROR_ENUM_CANNOT_GET_LOCK; -- break; -- -- case PM_ERR_DB_OPEN: -- case PM_ERR_DB_NOT_FOUND: -- case PM_ERR_PKG_REPO_NOT_FOUND: -- code = PK_ERROR_ENUM_REPO_NOT_FOUND; -- break; -- -- case PM_ERR_DB_CREATE: -- code = PK_ERROR_ENUM_CANNOT_WRITE_REPO_CONFIG; -- break; -- -- case PM_ERR_DB_VERSION: -- case PM_ERR_DB_REMOVE: -- code = PK_ERROR_ENUM_REPO_CONFIGURATION_ERROR; -- break; -- -- case PM_ERR_DB_WRITE: -- code = PK_ERROR_ENUM_REPO_NOT_AVAILABLE; -- break; -- -- case PM_ERR_SERVER_BAD_URL: -- code = PK_ERROR_ENUM_REPO_CONFIGURATION_ERROR; -- break; -- -- case PM_ERR_SERVER_NONE: -- code = PK_ERROR_ENUM_NO_MORE_MIRRORS_TO_TRY; -- break; -- -- case PM_ERR_TRANS_DUP_TARGET: -- case PM_ERR_TRANS_ABORT: -- code = PK_ERROR_ENUM_TRANSACTION_ERROR; -- break; -- -- case PM_ERR_TRANS_TYPE: -- code = PK_ERROR_ENUM_CANNOT_CANCEL; -- break; -- -- case PM_ERR_PKG_NOT_FOUND: -- code = PK_ERROR_ENUM_PACKAGE_NOT_FOUND; -- break; -- -- case PM_ERR_PKG_IGNORED: -- code = PK_ERROR_ENUM_PACKAGE_INSTALL_BLOCKED; -- break; -- -- case PM_ERR_PKG_INVALID: -- case PM_ERR_PKG_OPEN: -- case PM_ERR_PKG_INVALID_NAME: -- case PM_ERR_DLT_INVALID: -- code = PK_ERROR_ENUM_INVALID_PACKAGE_FILE; -- break; -- -- case PM_ERR_PKG_CANT_REMOVE: -- code = PK_ERROR_ENUM_PACKAGE_FAILED_TO_REMOVE; -- break; -- -- case PM_ERR_PKG_INVALID_ARCH: -- code = PK_ERROR_ENUM_INCOMPATIBLE_ARCHITECTURE; -- break; -- -- case PM_ERR_DLT_PATCHFAILED: -- code = PK_ERROR_ENUM_PACKAGE_FAILED_TO_BUILD; -- break; -- -- case PM_ERR_UNSATISFIED_DEPS: -- code = PK_ERROR_ENUM_DEP_RESOLUTION_FAILED; -- break; -- -- case PM_ERR_CONFLICTING_DEPS: -- code = PK_ERROR_ENUM_PACKAGE_CONFLICTS; -- break; -- -- case PM_ERR_FILE_CONFLICTS: -- code = PK_ERROR_ENUM_FILE_CONFLICTS; -- break; -- -- case PM_ERR_RETRIEVE: -- case PM_ERR_LIBFETCH: -- case PM_ERR_EXTERNAL_DOWNLOAD: -- code = PK_ERROR_ENUM_PACKAGE_DOWNLOAD_FAILED; -- break; -- -- case PM_ERR_LIBARCHIVE: -- code = PK_ERROR_ENUM_LOCAL_INSTALL_FAILED; -- break; -- -- case PM_ERR_CONFIG_INVALID: -- code = PK_ERROR_ENUM_CANNOT_REMOVE_SYSTEM_PACKAGE; -- break; -- -- case PM_ERR_PKG_HELD: -- code = PK_ERROR_ENUM_CANNOT_REMOVE_SYSTEM_PACKAGE; -- break; -- } -+ if (error->domain != ALPM_ERROR) { -+ pk_backend_error_code (self, code, "%s", error->message); -+ return; -+ } -+ -+ switch (error->code) { -+ case ALPM_ERR_MEMORY: -+ case ALPM_ERR_SYSTEM: -+ code = PK_ERROR_ENUM_OOM; -+ break; -+ -+ case ALPM_ERR_BADPERMS: -+ code = PK_ERROR_ENUM_NOT_AUTHORIZED; -+ break; -+ -+ case ALPM_ERR_NOT_A_FILE: -+ case ALPM_ERR_NOT_A_DIR: -+ code = PK_ERROR_ENUM_FILE_NOT_FOUND; -+ break; -+ -+ case ALPM_ERR_WRONG_ARGS: -+ case ALPM_ERR_HANDLE_NULL: -+ case ALPM_ERR_DB_NULL: -+ case ALPM_ERR_TRANS_NULL: -+ case ALPM_ERR_TRANS_NOT_INITIALIZED: -+ case ALPM_ERR_TRANS_NOT_PREPARED: -+ case ALPM_ERR_TRANS_NOT_LOCKED: -+ case ALPM_ERR_INVALID_REGEX: -+ code = PK_ERROR_ENUM_INTERNAL_ERROR; -+ break; -+ -+ case ALPM_ERR_DISK_SPACE: -+ code = PK_ERROR_ENUM_NO_SPACE_ON_DEVICE; -+ break; -+ -+ case ALPM_ERR_HANDLE_NOT_NULL: -+ case ALPM_ERR_DB_NOT_NULL: -+ case ALPM_ERR_TRANS_NOT_NULL: -+ code = PK_ERROR_ENUM_FAILED_INITIALIZATION; -+ break; -+ -+ case ALPM_ERR_HANDLE_LOCK: -+ code = PK_ERROR_ENUM_CANNOT_GET_LOCK; -+ break; -+ -+ case ALPM_ERR_DB_OPEN: -+ case ALPM_ERR_DB_NOT_FOUND: -+ case ALPM_ERR_PKG_REPO_NOT_FOUND: -+ code = PK_ERROR_ENUM_REPO_NOT_FOUND; -+ break; -+ -+ case ALPM_ERR_DB_CREATE: -+ code = PK_ERROR_ENUM_CANNOT_WRITE_REPO_CONFIG; -+ break; -+ -+ case ALPM_ERR_DB_INVALID: -+ case ALPM_ERR_DB_VERSION: -+ case ALPM_ERR_DB_REMOVE: -+ case ALPM_ERR_SERVER_BAD_URL: -+ code = PK_ERROR_ENUM_REPO_CONFIGURATION_ERROR; -+ break; -+ -+ case ALPM_ERR_DB_INVALID_SIG: -+ case ALPM_ERR_PKG_INVALID_SIG: -+ case ALPM_ERR_SIG_INVALID: -+ code = PK_ERROR_ENUM_BAD_GPG_SIGNATURE; -+ break; -+ -+ case ALPM_ERR_DB_WRITE: -+ code = PK_ERROR_ENUM_REPO_NOT_AVAILABLE; -+ break; -+ -+ case ALPM_ERR_SERVER_NONE: -+ code = PK_ERROR_ENUM_NO_MORE_MIRRORS_TO_TRY; -+ break; -+ -+ case ALPM_ERR_TRANS_DUP_TARGET: -+ case ALPM_ERR_TRANS_ABORT: -+ code = PK_ERROR_ENUM_TRANSACTION_ERROR; -+ break; -+ -+ case ALPM_ERR_TRANS_TYPE: -+ code = PK_ERROR_ENUM_CANNOT_CANCEL; -+ break; -+ -+ case ALPM_ERR_PKG_NOT_FOUND: -+ code = PK_ERROR_ENUM_PACKAGE_NOT_FOUND; -+ break; -+ -+ case ALPM_ERR_PKG_IGNORED: -+ code = PK_ERROR_ENUM_PACKAGE_INSTALL_BLOCKED; -+ break; -+ -+ case ALPM_ERR_PKG_INVALID: -+ case ALPM_ERR_PKG_OPEN: -+ case ALPM_ERR_PKG_INVALID_NAME: -+ case ALPM_ERR_DLT_INVALID: -+ code = PK_ERROR_ENUM_INVALID_PACKAGE_FILE; -+ break; -+ -+ case ALPM_ERR_PKG_INVALID_CHECKSUM: -+ code = PK_ERROR_ENUM_PACKAGE_CORRUPT; -+ break; -+ -+ case ALPM_ERR_PKG_CANT_REMOVE: -+ code = PK_ERROR_ENUM_PACKAGE_FAILED_TO_REMOVE; -+ break; -+ -+ case ALPM_ERR_PKG_INVALID_ARCH: -+ code = PK_ERROR_ENUM_INCOMPATIBLE_ARCHITECTURE; -+ break; -+ -+ case ALPM_ERR_SIG_MISSING: -+ code = PK_ERROR_ENUM_MISSING_GPG_SIGNATURE; -+ break; -+ -+ case ALPM_ERR_DLT_PATCHFAILED: -+ code = PK_ERROR_ENUM_PACKAGE_FAILED_TO_BUILD; -+ break; -+ -+ case ALPM_ERR_UNSATISFIED_DEPS: -+ code = PK_ERROR_ENUM_DEP_RESOLUTION_FAILED; -+ break; -+ -+ case ALPM_ERR_CONFLICTING_DEPS: -+ code = PK_ERROR_ENUM_PACKAGE_CONFLICTS; -+ break; -+ -+ case ALPM_ERR_FILE_CONFLICTS: -+ code = PK_ERROR_ENUM_FILE_CONFLICTS; -+ break; -+ -+ case ALPM_ERR_RETRIEVE: -+ case ALPM_ERR_LIBCURL: -+ case ALPM_ERR_EXTERNAL_DOWNLOAD: -+ code = PK_ERROR_ENUM_PACKAGE_DOWNLOAD_FAILED; -+ break; -+ -+ case ALPM_ERR_LIBARCHIVE: -+ code = PK_ERROR_ENUM_LOCAL_INSTALL_FAILED; -+ break; -+ -+ case ALPM_ERR_GPGME: -+ code = PK_ERROR_ENUM_GPG_FAILURE; -+ break; -+ -+ case ALPM_ERR_CONFIG_INVALID: -+ code = PK_ERROR_ENUM_FAILED_CONFIG_PARSING; -+ break; -+ -+ case ALPM_ERR_PKG_HELD: -+ code = PK_ERROR_ENUM_CANNOT_REMOVE_SYSTEM_PACKAGE; -+ break; - } - - pk_backend_error_code (self, code, "%s", error->message); -diff --git a/backends/alpm/pk-backend-error.h b/backends/alpm/pk-backend-error.h -index 83fe4a5..0a029e4 100644 ---- a/backends/alpm/pk-backend-error.h -+++ b/backends/alpm/pk-backend-error.h -@@ -26,8 +26,8 @@ - #define ALPM_ERROR (alpm_error_quark ()) - - enum { -- PM_ERR_CONFIG_INVALID = 0x10000, -- PM_ERR_PKG_HELD -+ ALPM_ERR_CONFIG_INVALID = 0x10000, -+ ALPM_ERR_PKG_HELD - }; - - void pk_backend_error (PkBackend *self, GError *error); -diff --git a/backends/alpm/pk-backend-groups.c b/backends/alpm/pk-backend-groups.c -index 59e304d..6056c54 100644 ---- a/backends/alpm/pk-backend-groups.c -+++ b/backends/alpm/pk-backend-groups.c -@@ -125,7 +125,7 @@ pk_backend_destroy_groups (PkBackend *self) - } - - const gchar * --alpm_pkg_get_group (pmpkg_t *pkg) -+alpm_pkg_get_group (alpm_pkg_t *pkg) - { - const alpm_list_t *i; - -diff --git a/backends/alpm/pk-backend-groups.h b/backends/alpm/pk-backend-groups.h -index 28dcf65..d736e37 100644 ---- a/backends/alpm/pk-backend-groups.h -+++ b/backends/alpm/pk-backend-groups.h -@@ -29,4 +29,4 @@ gboolean pk_backend_initialize_groups (PkBackend *self, - - void pk_backend_destroy_groups (PkBackend *self); - --const gchar *alpm_pkg_get_group (pmpkg_t *pkg); -+const gchar *alpm_pkg_get_group (alpm_pkg_t *pkg); -diff --git a/backends/alpm/pk-backend-install.c b/backends/alpm/pk-backend-install.c -index 65a6c11..d0cbca2 100644 ---- a/backends/alpm/pk-backend-install.c -+++ b/backends/alpm/pk-backend-install.c -@@ -25,6 +25,7 @@ - #include <pk-backend.h> - - #include "pk-backend-alpm.h" -+#include "pk-backend-databases.h" - #include "pk-backend-error.h" - #include "pk-backend-install.h" - #include "pk-backend-transaction.h" -@@ -32,15 +33,19 @@ - static gint - alpm_add_file (const gchar *filename) - { -- pmpkg_t *pkg; -+ alpm_pkg_t *pkg; -+ alpm_siglevel_t level; - - g_return_val_if_fail (filename != NULL, -1); -+ g_return_val_if_fail (alpm != NULL, -1); - -- if (alpm_pkg_load (filename, 1, &pkg) < 0) { -+ level = alpm_option_get_default_siglevel (alpm); -+ -+ if (alpm_pkg_load (alpm, filename, 1, level, &pkg) < 0) { - return -1; - } - -- if (alpm_add_pkg (pkg) < 0) { -+ if (alpm_add_pkg (alpm, pkg) < 0) { - alpm_pkg_free (pkg); - return -1; - } -@@ -61,8 +66,9 @@ pk_backend_transaction_add_targets (PkBackend *self, GError **error) - - for (; *paths != NULL; ++paths) { - if (alpm_add_file (*paths) < 0) { -- g_set_error (error, ALPM_ERROR, pm_errno, "%s: %s", -- *paths, alpm_strerrorlast ()); -+ enum _alpm_errno_t errno = alpm_errno (alpm); -+ g_set_error (error, ALPM_ERROR, errno, "%s: %s", -+ *paths, alpm_strerror (errno)); - return FALSE; - } - } -@@ -89,17 +95,32 @@ pk_backend_simulate_install_files_thread (PkBackend *self) - static gboolean - pk_backend_install_files_thread (PkBackend *self) - { -+ gboolean only_trusted; - GError *error = NULL; - - g_return_val_if_fail (self != NULL, FALSE); - -+ only_trusted = pk_backend_get_bool (self, "only_trusted"); -+ -+ if (!only_trusted && !pk_backend_disable_signatures (self, &error)) { -+ goto out; -+ } -+ - if (pk_backend_transaction_initialize (self, 0, &error) && - pk_backend_transaction_add_targets (self, &error) && - pk_backend_transaction_simulate (self, &error)) { - pk_backend_transaction_commit (self, &error); - } - -- return pk_backend_transaction_finish (self, error); -+out: -+ pk_backend_transaction_end (self, (error == NULL) ? &error : NULL); -+ -+ if (!only_trusted) { -+ GError **e = (error == NULL) ? &error : NULL; -+ pk_backend_enable_signatures (self, e); -+ } -+ -+ return pk_backend_finish (self, error); - } - - void -diff --git a/backends/alpm/pk-backend-packages.c b/backends/alpm/pk-backend-packages.c -index e9a7c94..c90cd7d 100644 ---- a/backends/alpm/pk-backend-packages.c -+++ b/backends/alpm/pk-backend-packages.c -@@ -27,13 +27,11 @@ - #include "pk-backend-packages.h" - - gchar * --alpm_pkg_build_id (pmpkg_t *pkg) -+alpm_pkg_build_id (alpm_pkg_t *pkg) - { - const gchar *name, *version, *arch, *repo; -- pmdb_t *db; - - g_return_val_if_fail (pkg != NULL, NULL); -- g_return_val_if_fail (localdb != NULL, NULL); - - name = alpm_pkg_get_name (pkg); - version = alpm_pkg_get_version (pkg); -@@ -43,19 +41,18 @@ alpm_pkg_build_id (pmpkg_t *pkg) - arch = "any"; - } - -- db = alpm_pkg_get_db (pkg); -- /* TODO: check */ -- if (db == NULL || db == localdb) { -- repo = "installed"; -+ /* TODO: check correctness */ -+ if (alpm_pkg_get_origin (pkg) == PKG_FROM_SYNCDB) { -+ repo = alpm_db_get_name (alpm_pkg_get_db (pkg)); - } else { -- repo = alpm_db_get_name (db); -+ repo = "installed"; - } - - return pk_package_id_build (name, version, arch, repo); - } - - void --pk_backend_pkg (PkBackend *self, pmpkg_t *pkg, PkInfoEnum info) -+pk_backend_pkg (PkBackend *self, alpm_pkg_t *pkg, PkInfoEnum info) - { - gchar *package; - -@@ -67,16 +64,17 @@ pk_backend_pkg (PkBackend *self, pmpkg_t *pkg, PkInfoEnum info) - g_free (package); - } - --pmpkg_t * -+alpm_pkg_t * - pk_backend_find_pkg (PkBackend *self, const gchar *package_id, GError **error) - { - gchar **package; - const gchar *repo_id; -- pmdb_t *db = NULL; -- pmpkg_t *pkg; -+ alpm_db_t *db = NULL; -+ alpm_pkg_t *pkg; - - g_return_val_if_fail (self != NULL, NULL); - g_return_val_if_fail (package_id != NULL, NULL); -+ g_return_val_if_fail (alpm != NULL, NULL); - g_return_val_if_fail (localdb != NULL, NULL); - - package = pk_package_id_split (package_id); -@@ -86,8 +84,8 @@ pk_backend_find_pkg (PkBackend *self, const gchar *package_id, GError **error) - if (g_strcmp0 (repo_id, "installed") == 0) { - db = localdb; - } else { -- const alpm_list_t *i; -- for (i = alpm_option_get_syncdbs (); i != NULL; i = i->next) { -+ const alpm_list_t *i = alpm_option_get_syncdbs (alpm); -+ for (; i != NULL; i = i->next) { - const gchar *repo = alpm_db_get_name (i->data); - - if (g_strcmp0 (repo, repo_id) == 0) { -@@ -111,7 +109,7 @@ pk_backend_find_pkg (PkBackend *self, const gchar *package_id, GError **error) - } - - if (pkg == NULL) { -- int code = PM_ERR_PKG_NOT_FOUND; -+ int code = ALPM_ERR_PKG_NOT_FOUND; - g_set_error (error, ALPM_ERROR, code, "%s: %s", package_id, - alpm_strerror (code)); - } -@@ -123,7 +121,7 @@ static gboolean - pk_backend_resolve_package (PkBackend *self, const gchar *package, - GError **error) - { -- pmpkg_t *pkg; -+ alpm_pkg_t *pkg; - - PkBitfield filters; - gboolean skip_local, skip_remote; -@@ -142,7 +140,7 @@ pk_backend_resolve_package (PkBackend *self, const gchar *package, - PK_FILTER_ENUM_NOT_INSTALLED); - skip_remote = pk_bitfield_contain (filters, PK_FILTER_ENUM_INSTALLED); - -- if (alpm_pkg_get_db (pkg) == localdb) { -+ if (alpm_pkg_get_origin (pkg) == PKG_FROM_LOCALDB) { - if (!skip_local) { - pk_backend_pkg (self, pkg, PK_INFO_ENUM_INSTALLED); - } -@@ -158,7 +156,7 @@ pk_backend_resolve_package (PkBackend *self, const gchar *package, - static gboolean - pk_backend_resolve_name (PkBackend *self, const gchar *name, GError **error) - { -- pmpkg_t *pkg; -+ alpm_pkg_t *pkg; - int code; - - PkBitfield filters; -@@ -166,6 +164,7 @@ pk_backend_resolve_name (PkBackend *self, const gchar *name, GError **error) - - g_return_val_if_fail (self != NULL, FALSE); - g_return_val_if_fail (name != NULL, FALSE); -+ g_return_val_if_fail (alpm != NULL, FALSE); - g_return_val_if_fail (localdb != NULL, FALSE); - - filters = pk_backend_get_uint (self, "filters"); -@@ -180,8 +179,8 @@ pk_backend_resolve_name (PkBackend *self, const gchar *name, GError **error) - return TRUE; - } - } else if (!skip_remote) { -- const alpm_list_t *i; -- for (i = alpm_option_get_syncdbs (); i != NULL; i = i->next) { -+ const alpm_list_t *i = alpm_option_get_syncdbs (alpm); -+ for (; i != NULL; i = i->next) { - pkg = alpm_db_get_pkg (i->data, name); - if (pkg != NULL) { - pk_backend_pkg (self, pkg, -@@ -191,7 +190,7 @@ pk_backend_resolve_name (PkBackend *self, const gchar *name, GError **error) - } - } - -- code = PM_ERR_PKG_NOT_FOUND; -+ code = ALPM_ERR_PKG_NOT_FOUND; - g_set_error (error, ALPM_ERROR, code, "%s: %s", name, - alpm_strerror (code)); - return FALSE; -@@ -254,7 +253,7 @@ pk_backend_get_details_thread (PkBackend *self) - g_return_val_if_fail (packages != NULL, FALSE); - - for (; *packages != NULL; ++packages) { -- pmpkg_t *pkg; -+ alpm_pkg_t *pkg; - const alpm_list_t *i; - - GString *licenses; -@@ -271,28 +270,30 @@ pk_backend_get_details_thread (PkBackend *self) - break; - } - -- licenses = g_string_new (""); - i = alpm_pkg_get_licenses (pkg); -- for (; i != NULL; i = i->next) { -- /* assume OR although it may not be correct */ -- g_string_append_printf (licenses, " or %s", -- (const gchar *) i->data); -- } -- if (licenses->len == 0) { -- g_string_append (licenses, " or Unknown"); -+ if (i == NULL) { -+ licenses = g_string_new ("Unknown"); -+ } else { -+ licenses = g_string_new ((const gchar *) i->data); -+ while ((i = i->next) != NULL) { -+ const gchar *license = (const gchar *) i->data; -+ /* assume OR although it may not be correct */ -+ g_string_append_printf (licenses, " or %s", -+ license); -+ } - } - - group = pk_group_enum_from_string (alpm_pkg_get_group (pkg)); - desc = alpm_pkg_get_desc (pkg); - url = alpm_pkg_get_url (pkg); - -- if (alpm_pkg_get_db (pkg) == localdb) { -+ if (alpm_pkg_get_origin (pkg) == PKG_FROM_LOCALDB) { - size = alpm_pkg_get_isize (pkg); - } else { - size = alpm_pkg_download_size (pkg); - } - -- pk_backend_details (self, *packages, licenses->str + 4, group, -+ pk_backend_details (self, *packages, licenses->str, group, - desc, url, size); - g_string_free (licenses, TRUE); - } -@@ -317,17 +318,19 @@ pk_backend_get_files_thread (PkBackend *self) - GError *error = NULL; - - g_return_val_if_fail (self != NULL, FALSE); -+ g_return_val_if_fail (alpm != NULL, FALSE); - - packages = pk_backend_get_strv (self, "package_ids"); - - g_return_val_if_fail (packages != NULL, FALSE); - - for (; *packages != NULL; ++packages) { -- pmpkg_t *pkg; -- const alpm_list_t *i; -+ alpm_pkg_t *pkg; -+ const gchar *root; - - GString *files; -- const gchar *root; -+ alpm_filelist_t *filelist; -+ gsize i; - - if (pk_backend_cancelled (self)) { - break; -@@ -338,14 +341,17 @@ pk_backend_get_files_thread (PkBackend *self) - break; - } - -+ root = alpm_option_get_root (alpm); - files = g_string_new (""); -- root = alpm_option_get_root (); -- for (i = alpm_pkg_get_files (pkg); i != NULL; i = i->next) { -- g_string_append_printf (files, ";%s%s", root, -- (const gchar *) i->data); -+ -+ filelist = alpm_pkg_get_files (pkg); -+ for (i = 0; i < filelist->count; ++i) { -+ const gchar *file = filelist->files[i].name; -+ g_string_append_printf (files, "%s%s;", root, file); - } - -- pk_backend_files (self, *packages, files->str + 1); -+ g_string_truncate (files, MAX (files->len, 1) - 1); -+ pk_backend_files (self, *packages, files->str); - g_string_free (files, TRUE); - } - -diff --git a/backends/alpm/pk-backend-packages.h b/backends/alpm/pk-backend-packages.h -index 4b2d7f8..2d54684 100644 ---- a/backends/alpm/pk-backend-packages.h -+++ b/backends/alpm/pk-backend-packages.h -@@ -24,10 +24,11 @@ - #include <alpm.h> - #include <pk-backend.h> - --gchar *alpm_pkg_build_id (pmpkg_t *pkg); -+gchar *alpm_pkg_build_id (alpm_pkg_t *pkg); - --void pk_backend_pkg (PkBackend *self, pmpkg_t *pkg, -- PkInfoEnum info); -+void pk_backend_pkg (PkBackend *self, alpm_pkg_t *pkg, -+ PkInfoEnum info); - --pmpkg_t *pk_backend_find_pkg (PkBackend *self, const gchar *package_id, -- GError **error); -+alpm_pkg_t *pk_backend_find_pkg (PkBackend *self, -+ const gchar *package_id, -+ GError **error); -diff --git a/backends/alpm/pk-backend-remove.c b/backends/alpm/pk-backend-remove.c -index 03329b1..1993061 100644 ---- a/backends/alpm/pk-backend-remove.c -+++ b/backends/alpm/pk-backend-remove.c -@@ -29,29 +29,14 @@ - #include "pk-backend-remove.h" - #include "pk-backend-transaction.h" - --static gint --alpm_remove_local (const gchar *name) --{ -- pmpkg_t *pkg; -- -- g_return_val_if_fail (name != NULL, -1); -- g_return_val_if_fail (localdb != NULL, -1); -- -- pkg = alpm_db_get_pkg (localdb, name); -- if (pkg == NULL) { -- pm_errno = PM_ERR_PKG_NOT_FOUND; -- return -1; -- } -- -- return alpm_remove_pkg (pkg); --} -- - static gboolean - pk_backend_transaction_remove_targets (PkBackend *self, GError **error) - { - gchar **packages; - - g_return_val_if_fail (self != NULL, FALSE); -+ g_return_val_if_fail (alpm != NULL, FALSE); -+ g_return_val_if_fail (localdb != NULL, FALSE); - - packages = pk_backend_get_strv (self, "package_ids"); - -@@ -61,9 +46,11 @@ pk_backend_transaction_remove_targets (PkBackend *self, GError **error) - gchar **package = pk_package_id_split (*packages); - gchar *name = package[PK_PACKAGE_ID_NAME]; - -- if (alpm_remove_local (name) < 0) { -- g_set_error (error, ALPM_ERROR, pm_errno, "%s: %s", -- name, alpm_strerrorlast ()); -+ alpm_pkg_t *pkg = alpm_db_get_pkg (localdb, name); -+ if (pkg == NULL || alpm_remove_pkg (alpm, pkg) < 0) { -+ enum _alpm_errno_t errno = alpm_errno (alpm); -+ g_set_error (error, ALPM_ERROR, errno, "%s: %s", name, -+ alpm_strerror (errno)); - g_strfreev (package); - return FALSE; - } -@@ -79,14 +66,17 @@ pk_backend_transaction_remove_simulate (PkBackend *self, GError **error) - { - const alpm_list_t *i; - -+ g_return_val_if_fail (self != NULL, FALSE); -+ g_return_val_if_fail (alpm != NULL, FALSE); -+ - if (!pk_backend_transaction_simulate (self, error)) { - return FALSE; - } - -- for (i = alpm_trans_get_remove (); i != NULL; i = i->next) { -+ for (i = alpm_trans_get_remove (alpm); i != NULL; i = i->next) { - const gchar *name = alpm_pkg_get_name (i->data); - if (alpm_list_find_str (holdpkgs, name)) { -- g_set_error (error, ALPM_ERROR, PM_ERR_PKG_HELD, -+ g_set_error (error, ALPM_ERROR, ALPM_ERR_PKG_HELD, - "%s: %s", name, - "could not remove HoldPkg"); - return FALSE; -@@ -99,14 +89,14 @@ pk_backend_transaction_remove_simulate (PkBackend *self, GError **error) - static gboolean - pk_backend_simulate_remove_packages_thread (PkBackend *self) - { -- pmtransflag_t flags = PM_TRANS_FLAG_CASCADE; -+ alpm_transflag_t flags = ALPM_TRANS_FLAG_CASCADE; - GError *error = NULL; - - g_return_val_if_fail (self != NULL, FALSE); - - /* remove unneeded packages that were required by those to be removed */ - if (pk_backend_get_bool (self, "autoremove")) { -- flags |= PM_TRANS_FLAG_RECURSE; -+ flags |= ALPM_TRANS_FLAG_RECURSE; - } - - if (pk_backend_transaction_initialize (self, flags, &error) && -@@ -121,18 +111,18 @@ pk_backend_simulate_remove_packages_thread (PkBackend *self) - static gboolean - pk_backend_remove_packages_thread (PkBackend *self) - { -- pmtransflag_t flags = 0; -+ alpm_transflag_t flags = 0; - GError *error = NULL; - - g_return_val_if_fail (self != NULL, FALSE); - - /* remove packages that depend on those to be removed */ - if (pk_backend_get_bool (self, "allow_deps")) { -- flags |= PM_TRANS_FLAG_CASCADE; -+ flags |= ALPM_TRANS_FLAG_CASCADE; - } - /* remove unneeded packages that were required by those to be removed */ - if (pk_backend_get_bool (self, "autoremove")) { -- flags |= PM_TRANS_FLAG_RECURSE; -+ flags |= ALPM_TRANS_FLAG_RECURSE; - } - - if (pk_backend_transaction_initialize (self, flags, &error) && -diff --git a/backends/alpm/pk-backend-search.c b/backends/alpm/pk-backend-search.c -index 592472d..c4e80ae 100644 ---- a/backends/alpm/pk-backend-search.c -+++ b/backends/alpm/pk-backend-search.c -@@ -55,9 +55,10 @@ static gpointer - pk_backend_pattern_chroot (const gchar *needle, GError **error) - { - g_return_val_if_fail (needle != NULL, NULL); -+ g_return_val_if_fail (alpm != NULL, NULL); - - if (G_IS_DIR_SEPARATOR (*needle)) { -- const gchar *file = needle, *root = alpm_option_get_root (); -+ const gchar *file = needle, *root = alpm_option_get_root (alpm); - - /* adjust needle to the correct prefix */ - for (; *file == *root; ++file, ++root) { -@@ -74,7 +75,7 @@ pk_backend_pattern_chroot (const gchar *needle, GError **error) - } - - static gboolean --pk_backend_match_all (pmpkg_t *pkg, gpointer pattern) -+pk_backend_match_all (alpm_pkg_t *pkg, gpointer pattern) - { - g_return_val_if_fail (pkg != NULL, FALSE); - g_return_val_if_fail (pattern != NULL, FALSE); -@@ -84,10 +85,10 @@ pk_backend_match_all (pmpkg_t *pkg, gpointer pattern) - } - - static gboolean --pk_backend_match_details (pmpkg_t *pkg, GRegex *regex) -+pk_backend_match_details (alpm_pkg_t *pkg, GRegex *regex) - { - const gchar *desc; -- pmdb_t *db; -+ alpm_db_t *db; - const alpm_list_t *i; - - g_return_val_if_fail (pkg != NULL, FALSE); -@@ -123,32 +124,38 @@ pk_backend_match_details (pmpkg_t *pkg, GRegex *regex) - } - - static gboolean --pk_backend_match_file (pmpkg_t *pkg, const gchar *needle) -+pk_backend_match_file (alpm_pkg_t *pkg, const gchar *needle) - { -- const alpm_list_t *i; -+ alpm_filelist_t *files; -+ gsize i; - - g_return_val_if_fail (pkg != NULL, FALSE); - g_return_val_if_fail (needle != NULL, FALSE); - -+ files = alpm_pkg_get_files (pkg); -+ - /* match any file the package contains */ - if (G_IS_DIR_SEPARATOR (*needle)) { -- for (i = alpm_pkg_get_files (pkg); i != NULL; i = i->next) { -+ for (i = 0; i < files->count; ++i) { -+ const gchar *file = files->files[i].name; - /* match the full path of file */ -- if (g_strcmp0 (i->data, needle + 1) == 0) { -+ if (g_strcmp0 (file, needle + 1) == 0) { - return TRUE; - } - } - } else { -- for (i = alpm_pkg_get_files (pkg); i != NULL; i = i->next) { -- const gchar *file = strrchr (i->data, G_DIR_SEPARATOR); -- if (file == NULL) { -- file = i->data; -+ for (i = 0; i < files->count; ++i) { -+ const gchar *file = files->files[i].name; -+ const gchar *name = strrchr (file, G_DIR_SEPARATOR); -+ -+ if (name == NULL) { -+ name = file; - } else { -- ++file; -+ ++name; - } - - /* match the basename of file */ -- if (g_strcmp0 (file, needle) == 0) { -+ if (g_strcmp0 (name, needle) == 0) { - return TRUE; - } - } -@@ -158,7 +165,7 @@ pk_backend_match_file (pmpkg_t *pkg, const gchar *needle) - } - - static gboolean --pk_backend_match_group (pmpkg_t *pkg, const gchar *needle) -+pk_backend_match_group (alpm_pkg_t *pkg, const gchar *needle) - { - g_return_val_if_fail (pkg != NULL, FALSE); - g_return_val_if_fail (needle != NULL, FALSE); -@@ -168,7 +175,7 @@ pk_backend_match_group (pmpkg_t *pkg, const gchar *needle) - } - - static gboolean --pk_backend_match_name (pmpkg_t *pkg, GRegex *regex) -+pk_backend_match_name (alpm_pkg_t *pkg, GRegex *regex) - { - g_return_val_if_fail (pkg != NULL, FALSE); - g_return_val_if_fail (regex != NULL, FALSE); -@@ -178,7 +185,7 @@ pk_backend_match_name (pmpkg_t *pkg, GRegex *regex) - } - - static gboolean --pk_backend_match_provides (pmpkg_t *pkg, gpointer pattern) -+pk_backend_match_provides (alpm_pkg_t *pkg, gpointer pattern) - { - /* TODO: implement GStreamer codecs, Pango fonts, etc. */ - const alpm_list_t *i; -@@ -215,7 +222,7 @@ typedef enum { - } SearchType; - - typedef gpointer (*PatternFunc) (const gchar *needle, GError **error); --typedef gboolean (*MatchFunc) (pmpkg_t *pkg, gpointer pattern); -+typedef gboolean (*MatchFunc) (alpm_pkg_t *pkg, gpointer pattern); - - static PatternFunc pattern_funcs[] = { - pk_backend_pattern_needle, -@@ -245,9 +252,9 @@ static MatchFunc match_funcs[] = { - }; - - static gboolean --alpm_pkg_is_local (pmpkg_t *pkg) -+alpm_pkg_is_local (alpm_pkg_t *pkg) - { -- pmpkg_t *local; -+ alpm_pkg_t *local; - - g_return_val_if_fail (pkg != NULL, FALSE); - g_return_val_if_fail (localdb != NULL, FALSE); -@@ -274,7 +281,7 @@ alpm_pkg_is_local (pmpkg_t *pkg) - } - - static void --pk_backend_search_db (PkBackend *self, pmdb_t *db, MatchFunc match, -+pk_backend_search_db (PkBackend *self, alpm_db_t *db, MatchFunc match, - const alpm_list_t *patterns) - { - const alpm_list_t *i, *j; -@@ -326,6 +333,7 @@ pk_backend_search_thread (PkBackend *self) - GError *error = NULL; - - g_return_val_if_fail (self != NULL, FALSE); -+ g_return_val_if_fail (alpm != NULL, FALSE); - g_return_val_if_fail (localdb != NULL, FALSE); - - needles = pk_backend_get_strv (self, "search"); -@@ -366,7 +374,7 @@ pk_backend_search_thread (PkBackend *self) - goto out; - } - -- for (i = alpm_option_get_syncdbs (); i != NULL; i = i->next) { -+ for (i = alpm_option_get_syncdbs (alpm); i != NULL; i = i->next) { - if (pk_backend_cancelled (self)) { - break; - } -diff --git a/backends/alpm/pk-backend-sync.c b/backends/alpm/pk-backend-sync.c -index 9e1e02b..d2f363b 100644 ---- a/backends/alpm/pk-backend-sync.c -+++ b/backends/alpm/pk-backend-sync.c -@@ -26,45 +26,18 @@ - #include <string.h> - - #include "pk-backend-alpm.h" -+#include "pk-backend-databases.h" - #include "pk-backend-error.h" - #include "pk-backend-sync.h" - #include "pk-backend-transaction.h" - --static gint --alpm_add_dbtarget (const gchar *repo, const gchar *name) --{ -- const alpm_list_t *i; -- pmpkg_t *pkg; -- -- g_return_val_if_fail (repo != NULL, -1); -- g_return_val_if_fail (name != NULL, -1); -- -- for (i = alpm_option_get_syncdbs (); i != NULL; i = i->next) { -- if (g_strcmp0 (alpm_db_get_name (i->data), repo) == 0) { -- break; -- } -- } -- -- if (i == NULL) { -- pm_errno = PM_ERR_DB_NOT_FOUND; -- return -1; -- } -- -- pkg = alpm_db_get_pkg (i->data, name); -- if (pkg == NULL) { -- pm_errno = PM_ERR_PKG_NOT_FOUND; -- return -1; -- } -- -- return alpm_add_pkg (pkg); --} -- - static gboolean - pk_backend_transaction_sync_targets (PkBackend *self, GError **error) - { - gchar **packages; - - g_return_val_if_fail (self != NULL, FALSE); -+ g_return_val_if_fail (alpm != NULL, FALSE); - - packages = pk_backend_get_strv (self, "package_ids"); - -@@ -75,9 +48,28 @@ pk_backend_transaction_sync_targets (PkBackend *self, GError **error) - gchar *repo = package[PK_PACKAGE_ID_DATA]; - gchar *name = package[PK_PACKAGE_ID_NAME]; - -- if (alpm_add_dbtarget (repo, name) < 0) { -- g_set_error (error, ALPM_ERROR, pm_errno, "%s/%s: %s", -- repo, name, alpm_strerrorlast ()); -+ const alpm_list_t *i = alpm_option_get_syncdbs (alpm); -+ alpm_pkg_t *pkg; -+ -+ for (; i != NULL; i = i->next) { -+ if (g_strcmp0 (alpm_db_get_name (i->data), repo) == 0) { -+ break; -+ } -+ } -+ -+ if (i == NULL) { -+ enum _alpm_errno_t errno = ALPM_ERR_DB_NOT_FOUND; -+ g_set_error (error, ALPM_ERROR, errno, "%s/%s: %s", -+ repo, name, alpm_strerror (errno)); -+ g_strfreev (package); -+ return FALSE; -+ } -+ -+ pkg = alpm_db_get_pkg (i->data, name); -+ if (pkg == NULL || alpm_add_pkg (alpm, pkg) < 0) { -+ enum _alpm_errno_t errno = alpm_errno (alpm); -+ g_set_error (error, ALPM_ERROR, errno, "%s/%s: %s", -+ repo, name, alpm_strerror (errno)); - g_strfreev (package); - return FALSE; - } -@@ -93,23 +85,27 @@ pk_backend_download_packages_thread (PkBackend *self) - { - alpm_list_t *cachedirs; - const gchar *directory; -- pmtransflag_t flags = 0; -+ alpm_transflag_t flags = 0; - GError *error = NULL; - - g_return_val_if_fail (self != NULL, FALSE); -+ g_return_val_if_fail (alpm != NULL, FALSE); - - directory = pk_backend_get_string (self, "directory"); - - if (directory != NULL) { - /* download files to a PackageKit directory */ - gchar *cachedir = strdup (directory); -- cachedirs = alpm_list_strdup (alpm_option_get_cachedirs ()); -- alpm_option_set_cachedirs (alpm_list_add (NULL, cachedir)); -+ const alpm_list_t *old = alpm_option_get_cachedirs (alpm); -+ alpm_list_t *new = alpm_list_add (NULL, cachedir); -+ -+ cachedirs = alpm_list_strdup (old); -+ alpm_option_set_cachedirs (alpm, new); - } - -- flags |= PM_TRANS_FLAG_NODEPS; -- flags |= PM_TRANS_FLAG_NOCONFLICTS; -- flags |= PM_TRANS_FLAG_DOWNLOADONLY; -+ flags |= ALPM_TRANS_FLAG_NODEPS; -+ flags |= ALPM_TRANS_FLAG_NOCONFLICTS; -+ flags |= ALPM_TRANS_FLAG_DOWNLOADONLY; - - if (pk_backend_transaction_initialize (self, flags, &error) && - pk_backend_transaction_sync_targets (self, &error) && -@@ -118,7 +114,7 @@ pk_backend_download_packages_thread (PkBackend *self) - } - - if (directory != NULL) { -- alpm_option_set_cachedirs (cachedirs); -+ alpm_option_set_cachedirs (alpm, cachedirs); - } - - return pk_backend_transaction_finish (self, error); -@@ -155,17 +151,31 @@ pk_backend_simulate_install_packages_thread (PkBackend *self) - static gboolean - pk_backend_install_packages_thread (PkBackend *self) - { -+ gboolean only_trusted; - GError *error = NULL; - - g_return_val_if_fail (self != NULL, FALSE); - -+ only_trusted = pk_backend_get_bool (self, "only_trusted"); -+ -+ if (!only_trusted && !pk_backend_disable_signatures (self, &error)) { -+ goto out; -+ } -+ - if (pk_backend_transaction_initialize (self, 0, &error) && - pk_backend_transaction_sync_targets (self, &error) && - pk_backend_transaction_simulate (self, &error)) { - pk_backend_transaction_commit (self, &error); - } - -- return pk_backend_transaction_finish (self, error); -+ pk_backend_transaction_end (self, (error == NULL) ? &error : NULL); -+out: -+ if (!only_trusted) { -+ GError **e = (error == NULL) ? &error : NULL; -+ pk_backend_enable_signatures (self, e); -+ } -+ -+ return pk_backend_finish (self, error); - } - - void -@@ -190,16 +200,17 @@ pk_backend_install_packages (PkBackend *self, gboolean only_trusted, - } - - static gboolean --pk_backend_replaces_dependencies (PkBackend *self, pmpkg_t *pkg) -+pk_backend_replaces_dependencies (PkBackend *self, alpm_pkg_t *pkg) - { - const alpm_list_t *i, *replaces; - - g_return_val_if_fail (self != NULL, FALSE); - g_return_val_if_fail (pkg != NULL, FALSE); -+ g_return_val_if_fail (alpm != NULL, FALSE); - - replaces = alpm_pkg_get_replaces (pkg); -- for (i = alpm_trans_get_remove (); i != NULL; i = i->next) { -- pmpkg_t *rpkg = (pmpkg_t *) i->data; -+ for (i = alpm_trans_get_remove (alpm); i != NULL; i = i->next) { -+ alpm_pkg_t *rpkg = (alpm_pkg_t *) i->data; - const gchar *rname = alpm_pkg_get_name (rpkg); - - if (pk_backend_cancelled (self)) { -@@ -208,7 +219,7 @@ pk_backend_replaces_dependencies (PkBackend *self, pmpkg_t *pkg) - continue; - } - -- if (alpm_pkg_get_reason (rpkg) == PM_PKG_REASON_EXPLICIT) { -+ if (alpm_pkg_get_reason (rpkg) == ALPM_PKG_REASON_EXPLICIT) { - return FALSE; - } - } -@@ -219,13 +230,21 @@ pk_backend_replaces_dependencies (PkBackend *self, pmpkg_t *pkg) - static gboolean - pk_backend_update_packages_thread (PkBackend *self) - { -+ gboolean only_trusted; - const alpm_list_t *i; - alpm_list_t *asdeps = NULL; - GError *error = NULL; - - g_return_val_if_fail (self != NULL, FALSE); -+ g_return_val_if_fail (alpm != NULL, FALSE); - g_return_val_if_fail (localdb != NULL, FALSE); - -+ only_trusted = pk_backend_get_bool (self, "only_trusted"); -+ -+ if (!only_trusted && !pk_backend_disable_signatures (self, &error)) { -+ goto out; -+ } -+ - if (!pk_backend_transaction_initialize (self, 0, &error) || - !pk_backend_transaction_sync_targets (self, &error) || - !pk_backend_transaction_simulate (self, &error)) { -@@ -233,8 +252,8 @@ pk_backend_update_packages_thread (PkBackend *self) - } - - /* change the install reason of packages that replace dependencies */ -- for (i = alpm_trans_get_add (); i != NULL; i = i->next) { -- pmpkg_t *pkg = (pmpkg_t *) i->data; -+ for (i = alpm_trans_get_add (alpm); i != NULL; i = i->next) { -+ alpm_pkg_t *pkg = (alpm_pkg_t *) i->data; - const gchar *name = alpm_pkg_get_name (pkg); - - if (pk_backend_cancelled (self)) { -@@ -254,14 +273,22 @@ pk_backend_update_packages_thread (PkBackend *self) - - for (i = asdeps; i != NULL; i = i->next) { - const gchar *name = (const gchar *) i->data; -- alpm_db_set_pkgreason (localdb, name, PM_PKG_REASON_DEPEND); -+ alpm_pkg_t *pkg = alpm_db_get_pkg (localdb, name); -+ alpm_db_set_pkgreason (alpm, pkg, ALPM_PKG_REASON_DEPEND); - } - - out: -+ pk_backend_transaction_end (self, (error == NULL) ? &error : NULL); -+ -+ if (!only_trusted) { -+ GError **e = (error == NULL) ? &error : NULL; -+ pk_backend_enable_signatures (self, e); -+ } -+ - alpm_list_free_inner (asdeps, g_free); - alpm_list_free (asdeps); - -- return pk_backend_transaction_finish (self, error); -+ return pk_backend_finish (self, error); - } - - void -diff --git a/backends/alpm/pk-backend-transaction.c b/backends/alpm/pk-backend-transaction.c -index fdb840e..76402f0 100644 ---- a/backends/alpm/pk-backend-transaction.c -+++ b/backends/alpm/pk-backend-transaction.c -@@ -29,10 +29,10 @@ - static off_t dcomplete = 0; - static off_t dtotal = 0; - --static pmpkg_t *dpkg = NULL; -+static alpm_pkg_t *dpkg = NULL; - static GString *dfiles = NULL; - --static pmpkg_t *tpkg = NULL; -+static alpm_pkg_t *tpkg = NULL; - static GString *toutput = NULL; - - static gchar * -@@ -51,25 +51,26 @@ pk_backend_resolve_path (PkBackend *self, const gchar *basename) - } - - static gboolean --alpm_pkg_has_basename (pmpkg_t *pkg, const gchar *basename) -+alpm_pkg_has_basename (alpm_pkg_t *pkg, const gchar *basename) - { - const alpm_list_t *i; - - g_return_val_if_fail (pkg != NULL, FALSE); - g_return_val_if_fail (basename != NULL, FALSE); -+ g_return_val_if_fail (alpm != NULL, FALSE); - - if (g_strcmp0 (alpm_pkg_get_filename (pkg), basename) == 0) { - return TRUE; - } - -- if (alpm_option_get_usedelta () == 0) { -+ if (alpm_option_get_usedelta (alpm) == 0) { - return FALSE; - } - - for (i = alpm_pkg_get_deltas (pkg); i != NULL; i = i->next) { -- const gchar *patch = alpm_delta_get_filename (i->data); -+ alpm_delta_t *delta = (alpm_delta_t *) i->data; - -- if (g_strcmp0 (patch, basename) == 0) { -+ if (g_strcmp0 (delta->delta, basename) == 0) { - return TRUE; - } - } -@@ -109,6 +110,7 @@ pk_backend_transaction_download_start (PkBackend *self, const gchar *basename) - - g_return_if_fail (self != NULL); - g_return_if_fail (basename != NULL); -+ g_return_if_fail (alpm != NULL); - - /* continue or finish downloading the current package */ - if (dpkg != NULL) { -@@ -127,8 +129,8 @@ pk_backend_transaction_download_start (PkBackend *self, const gchar *basename) - } - - /* figure out what the next package is */ -- for (i = alpm_trans_get_add (); i != NULL; i = i->next) { -- pmpkg_t *pkg = (pmpkg_t *) i->data; -+ for (i = alpm_trans_get_add (alpm); i != NULL; i = i->next) { -+ alpm_pkg_t *pkg = (alpm_pkg_t *) i->data; - - if (alpm_pkg_has_basename (pkg, basename)) { - dpkg = pkg; -@@ -202,16 +204,17 @@ pk_backend_transaction_dlcb (const gchar *basename, off_t complete, off_t total) - } - - static void --pk_backend_transaction_progress_cb (pmtransprog_t type, const gchar *target, -+pk_backend_transaction_progress_cb (alpm_progress_t type, const gchar *target, - gint percent, gsize targets, gsize current) - { - static gint recent = 101; - gsize overall = percent + (current - 1) * 100; - - /* TODO: revert when fixed upstream */ -- if (type == PM_TRANS_PROGRESS_CONFLICTS_START || -- type == PM_TRANS_PROGRESS_DISKSPACE_START || -- type == PM_TRANS_PROGRESS_INTEGRITY_START) { -+ if (type == ALPM_PROGRESS_CONFLICTS_START || -+ type == ALPM_PROGRESS_DISKSPACE_START || -+ type == ALPM_PROGRESS_INTEGRITY_START || -+ type == ALPM_PROGRESS_LOAD_START) { - if (current < targets) { - overall = percent + current++ * 100; - } -@@ -228,12 +231,13 @@ pk_backend_transaction_progress_cb (pmtransprog_t type, const gchar *target, - - /* update transaction progress */ - switch (type) { -- case PM_TRANS_PROGRESS_ADD_START: -- case PM_TRANS_PROGRESS_UPGRADE_START: -- case PM_TRANS_PROGRESS_REMOVE_START: -- case PM_TRANS_PROGRESS_CONFLICTS_START: -- case PM_TRANS_PROGRESS_DISKSPACE_START: -- case PM_TRANS_PROGRESS_INTEGRITY_START: -+ case ALPM_PROGRESS_ADD_START: -+ case ALPM_PROGRESS_UPGRADE_START: -+ case ALPM_PROGRESS_REMOVE_START: -+ case ALPM_PROGRESS_CONFLICTS_START: -+ case ALPM_PROGRESS_DISKSPACE_START: -+ case ALPM_PROGRESS_INTEGRITY_START: -+ case ALPM_PROGRESS_LOAD_START: - if (percent == recent) { - break; - } -@@ -253,7 +257,7 @@ pk_backend_transaction_progress_cb (pmtransprog_t type, const gchar *target, - } - - static void --pk_backend_install_ignorepkg (PkBackend *self, pmpkg_t *pkg, gint *result) -+pk_backend_install_ignorepkg (PkBackend *self, alpm_pkg_t *pkg, gint *result) - { - gchar *output; - -@@ -280,50 +284,52 @@ pk_backend_install_ignorepkg (PkBackend *self, pmpkg_t *pkg, gint *result) - } - - static void --pk_backend_select_provider (PkBackend *self, pmdepend_t *dep, -- const alpm_list_t *providers) -+pk_backend_select_provider (PkBackend *self, const alpm_list_t *providers, -+ alpm_depend_t *depend) - { - gchar *output; - - g_return_if_fail (self != NULL); -- g_return_if_fail (dep != NULL); -+ g_return_if_fail (depend != NULL); - g_return_if_fail (providers != NULL); - - output = g_strdup_printf ("provider package was selected " - "(%s provides %s)\n", - alpm_pkg_get_name (providers->data), -- alpm_dep_get_name (dep)); -+ depend->name); - pk_backend_output (self, output); - g_free (output); - } - - static void --pk_backend_transaction_conv_cb (pmtransconv_t question, gpointer data1, -+pk_backend_transaction_conv_cb (alpm_question_t question, gpointer data1, - gpointer data2, gpointer data3, gint *result) - { - g_return_if_fail (result != NULL); - g_return_if_fail (backend != NULL); - - switch (question) { -- case PM_TRANS_CONV_INSTALL_IGNOREPKG: -+ case ALPM_QUESTION_INSTALL_IGNOREPKG: - pk_backend_install_ignorepkg (backend, data1, result); - break; - -- case PM_TRANS_CONV_REPLACE_PKG: -- case PM_TRANS_CONV_CONFLICT_PKG: -- case PM_TRANS_CONV_CORRUPTED_PKG: -- case PM_TRANS_CONV_LOCAL_NEWER: -+ case ALPM_QUESTION_REPLACE_PKG: -+ case ALPM_QUESTION_CONFLICT_PKG: -+ case ALPM_QUESTION_CORRUPTED_PKG: -+ case ALPM_QUESTION_LOCAL_NEWER: - /* these actions are mostly harmless */ - g_debug ("safe question %d", question); - *result = 1; - break; - -- case PM_TRANS_CONV_REMOVE_PKGS: -+ case ALPM_QUESTION_REMOVE_PKGS: -+ /* TODO: handle keys better */ -+ case ALPM_QUESTION_IMPORT_KEY: - g_debug ("unsafe question %d", question); - *result = 0; - break; - -- case PM_TRANS_CONV_SELECT_PROVIDER: -+ case ALPM_QUESTION_SELECT_PROVIDER: - pk_backend_select_provider (backend, data1, data2); - *result = 0; - break; -@@ -349,7 +355,7 @@ pk_backend_output_end (PkBackend *self) - } - - static void --pk_backend_output_start (PkBackend *self, pmpkg_t *pkg) -+pk_backend_output_start (PkBackend *self, alpm_pkg_t *pkg) - { - g_return_if_fail (self != NULL); - g_return_if_fail (pkg != NULL); -@@ -398,7 +404,7 @@ pk_backend_transaction_test_commit (PkBackend *self) - } - - static void --pk_backend_transaction_add_start (PkBackend *self, pmpkg_t *pkg) -+pk_backend_transaction_add_start (PkBackend *self, alpm_pkg_t *pkg) - { - g_return_if_fail (self != NULL); - g_return_if_fail (pkg != NULL); -@@ -409,18 +415,19 @@ pk_backend_transaction_add_start (PkBackend *self, pmpkg_t *pkg) - } - - static void --pk_backend_transaction_add_done (PkBackend *self, pmpkg_t *pkg) -+pk_backend_transaction_add_done (PkBackend *self, alpm_pkg_t *pkg) - { - const gchar *name, *version; - const alpm_list_t *i, *optdepends; - - g_return_if_fail (self != NULL); - g_return_if_fail (pkg != NULL); -+ g_return_if_fail (alpm != NULL); - - name = alpm_pkg_get_name (pkg); - version = alpm_pkg_get_version (pkg); - -- alpm_logaction ("installed %s (%s)\n", name, version); -+ alpm_logaction (alpm, "installed %s (%s)\n", name, version); - pk_backend_pkg (self, pkg, PK_INFO_ENUM_FINISHED); - - optdepends = alpm_pkg_get_optdepends (pkg); -@@ -438,7 +445,7 @@ pk_backend_transaction_add_done (PkBackend *self, pmpkg_t *pkg) - } - - static void --pk_backend_transaction_remove_start (PkBackend *self, pmpkg_t *pkg) -+pk_backend_transaction_remove_start (PkBackend *self, alpm_pkg_t *pkg) - { - g_return_if_fail (self != NULL); - g_return_if_fail (pkg != NULL); -@@ -449,24 +456,25 @@ pk_backend_transaction_remove_start (PkBackend *self, pmpkg_t *pkg) - } - - static void --pk_backend_transaction_remove_done (PkBackend *self, pmpkg_t *pkg) -+pk_backend_transaction_remove_done (PkBackend *self, alpm_pkg_t *pkg) - { - const gchar *name, *version; - - g_return_if_fail (self != NULL); - g_return_if_fail (pkg != NULL); -+ g_return_if_fail (alpm != NULL); - - name = alpm_pkg_get_name (pkg); - version = alpm_pkg_get_version (pkg); - -- alpm_logaction ("removed %s (%s)\n", name, version); -+ alpm_logaction (alpm, "removed %s (%s)\n", name, version); - pk_backend_pkg (self, pkg, PK_INFO_ENUM_FINISHED); - pk_backend_output_end (self); - } - - static void --pk_backend_transaction_upgrade_start (PkBackend *self, pmpkg_t *pkg, -- pmpkg_t *old) -+pk_backend_transaction_upgrade_start (PkBackend *self, alpm_pkg_t *pkg, -+ alpm_pkg_t *old) - { - PkRoleEnum role; - PkStatusEnum state; -@@ -491,8 +499,8 @@ pk_backend_transaction_upgrade_start (PkBackend *self, pmpkg_t *pkg, - } - - static void --pk_backend_transaction_upgrade_done (PkBackend *self, pmpkg_t *pkg, -- pmpkg_t *old) -+pk_backend_transaction_upgrade_done (PkBackend *self, alpm_pkg_t *pkg, -+ alpm_pkg_t *old) - { - const gchar *name, *pre, *post; - const alpm_list_t *i; -@@ -501,12 +509,13 @@ pk_backend_transaction_upgrade_done (PkBackend *self, pmpkg_t *pkg, - g_return_if_fail (self != NULL); - g_return_if_fail (pkg != NULL); - g_return_if_fail (old != NULL); -+ g_return_if_fail (alpm != NULL); - - name = alpm_pkg_get_name (pkg); - pre = alpm_pkg_get_version (old); - post = alpm_pkg_get_version (pkg); - -- alpm_logaction ("upgraded %s (%s -> %s)\n", name, pre, post); -+ alpm_logaction (alpm, "upgraded %s (%s -> %s)\n", name, pre, post); - pk_backend_pkg (self, pkg, PK_INFO_ENUM_FINISHED); - - optdepends = alpm_list_diff (alpm_pkg_get_optdepends (pkg), -@@ -528,53 +537,65 @@ pk_backend_transaction_upgrade_done (PkBackend *self, pmpkg_t *pkg, - } - - static void --pk_backend_transaction_event_cb (pmtransevt_t event, gpointer data, -+pk_backend_transaction_setup (PkBackend *self) -+{ -+ g_return_if_fail (self != NULL); -+ -+ pk_backend_set_status (self, PK_STATUS_ENUM_SETUP); -+} -+ -+static void -+pk_backend_transaction_event_cb (alpm_event_t event, gpointer data, - gpointer old) - { - g_return_if_fail (backend != NULL); - - /* figure out the backend status and package info */ - switch (event) { -- case PM_TRANS_EVT_CHECKDEPS_START: -- case PM_TRANS_EVT_RESOLVEDEPS_START: -+ case ALPM_EVENT_CHECKDEPS_START: -+ case ALPM_EVENT_RESOLVEDEPS_START: - pk_backend_transaction_dep_resolve (backend); - break; - -- case PM_TRANS_EVT_FILECONFLICTS_START: -- case PM_TRANS_EVT_INTERCONFLICTS_START: -- case PM_TRANS_EVT_INTEGRITY_START: -- case PM_TRANS_EVT_DELTA_INTEGRITY_START: -- case PM_TRANS_EVT_DISKSPACE_START: -+ case ALPM_EVENT_FILECONFLICTS_START: -+ case ALPM_EVENT_INTERCONFLICTS_START: -+ case ALPM_EVENT_INTEGRITY_START: -+ case ALPM_EVENT_DELTA_INTEGRITY_START: -+ case ALPM_EVENT_DISKSPACE_START: - pk_backend_transaction_test_commit (backend); - break; - -- case PM_TRANS_EVT_ADD_START: -+ case ALPM_EVENT_ADD_START: - pk_backend_transaction_add_start (backend, data); - break; - -- case PM_TRANS_EVT_ADD_DONE: -+ case ALPM_EVENT_ADD_DONE: - pk_backend_transaction_add_done (backend, data); - break; - -- case PM_TRANS_EVT_REMOVE_START: -+ case ALPM_EVENT_REMOVE_START: - pk_backend_transaction_remove_start (backend, data); - break; - -- case PM_TRANS_EVT_REMOVE_DONE: -+ case ALPM_EVENT_REMOVE_DONE: - pk_backend_transaction_remove_done (backend, data); - break; - -- case PM_TRANS_EVT_UPGRADE_START: -+ case ALPM_EVENT_UPGRADE_START: - pk_backend_transaction_upgrade_start (backend, data, - old); - break; - -- case PM_TRANS_EVT_UPGRADE_DONE: -+ case ALPM_EVENT_UPGRADE_DONE: - pk_backend_transaction_upgrade_done (backend, data, - old); - break; - -- case PM_TRANS_EVT_SCRIPTLET_INFO: -+ case ALPM_EVENT_LOAD_START: -+ pk_backend_transaction_setup (backend); -+ break; -+ -+ case ALPM_EVENT_SCRIPTLET_INFO: - pk_backend_output (backend, data); - break; - -@@ -588,27 +609,32 @@ static void - transaction_cancelled_cb (GCancellable *object, gpointer data) - { - g_return_if_fail (data != NULL); -+ g_return_if_fail (alpm != NULL); - -- alpm_trans_interrupt (); -+ alpm_trans_interrupt (alpm); - } - - gboolean --pk_backend_transaction_initialize (PkBackend *self, pmtransflag_t flags, -+pk_backend_transaction_initialize (PkBackend *self, alpm_transflag_t flags, - GError **error) - { - g_return_val_if_fail (self != NULL, FALSE); -+ g_return_val_if_fail (alpm != NULL, FALSE); - g_return_val_if_fail (cancellable != NULL, FALSE); - -- if (alpm_trans_init (flags, pk_backend_transaction_event_cb, -- pk_backend_transaction_conv_cb, -- pk_backend_transaction_progress_cb) < 0) { -- g_set_error_literal (error, ALPM_ERROR, pm_errno, -- alpm_strerrorlast ()); -+ if (alpm_trans_init (alpm, flags) < 0) { -+ enum _alpm_errno_t errno = alpm_errno (alpm); -+ g_set_error_literal (error, ALPM_ERROR, errno, -+ alpm_strerror (errno)); - return FALSE; - } - -- alpm_option_set_dlcb (pk_backend_transaction_dlcb); -- alpm_option_set_totaldlcb (pk_backend_transaction_totaldlcb); -+ alpm_option_set_eventcb (alpm, pk_backend_transaction_event_cb); -+ alpm_option_set_questioncb (alpm, pk_backend_transaction_conv_cb); -+ alpm_option_set_progresscb (alpm, pk_backend_transaction_progress_cb); -+ -+ alpm_option_set_dlcb (alpm, pk_backend_transaction_dlcb); -+ alpm_option_set_totaldlcb (alpm, pk_backend_transaction_totaldlcb); - - g_cancellable_connect (cancellable, - G_CALLBACK (transaction_cancelled_cb), -@@ -649,10 +675,11 @@ alpm_miss_build_list (const alpm_list_t *i) - } - - for (; i != NULL; i = i->next) { -- pmdepend_t *dep = alpm_miss_get_dep (i->data); -- gchar *depend = alpm_dep_compute_string (dep); -+ alpm_depmissing_t *miss = (alpm_depmissing_t *) i->data; -+ gchar *depend = alpm_dep_compute_string (miss->depend); -+ - g_string_append_printf (list, "%s <- %s, ", depend, -- alpm_miss_get_target (i->data)); -+ miss->target); - free (depend); - } - -@@ -661,25 +688,21 @@ alpm_miss_build_list (const alpm_list_t *i) - } - - static void --alpm_dep_free (gpointer dep) -+alpm_depend_free (alpm_depend_t *depend) - { -- /* TODO: remove when implemented in libalpm */ -- free ((gpointer) alpm_dep_get_name (dep)); -- free ((gpointer) alpm_dep_get_version (dep)); -- free (dep); -+ free (depend->name); -+ free (depend->version); -+ free (depend); - } - - static void --alpm_miss_free (gpointer miss) -+alpm_depmissing_free (gpointer miss) - { -- /* TODO: remove when implemented in libalpm */ -- const gchar *temp = alpm_miss_get_causingpkg (miss); -- if (temp != NULL) { -- free ((gpointer) temp); -- } -+ alpm_depmissing_t *self = (alpm_depmissing_t *) miss; - -- free ((gpointer) alpm_miss_get_target (miss)); -- alpm_dep_free (alpm_miss_get_dep (miss)); -+ free (self->target); -+ alpm_depend_free (self->depend); -+ free (self->causingpkg); - free (miss); - } - -@@ -695,17 +718,20 @@ alpm_conflict_build_list (const alpm_list_t *i) - } - - for (; i != NULL; i = i->next) { -- const gchar *first = alpm_conflict_get_package1 (i->data); -- const gchar *second = alpm_conflict_get_package2 (i->data); -- const gchar *reason = alpm_conflict_get_reason (i->data); -- -- if (g_strcmp0 (first, reason) == 0 || -- g_strcmp0 (second, reason) == 0) { -- g_string_append_printf (list, "%s <-> %s, ", first, -- second); -+ alpm_conflict_t *conflict = (alpm_conflict_t *) i->data; -+ alpm_depend_t *depend = conflict->reason; -+ -+ if (g_strcmp0 (conflict->package1, depend->name) == 0 || -+ g_strcmp0 (conflict->package2, depend->name) == 0) { -+ g_string_append_printf (list, "%s <-> %s, ", -+ conflict->package1, -+ conflict->package2); - } else { -- g_string_append_printf (list, "%s <-> %s (%s), ", first, -- second, reason); -+ gchar *reason = alpm_dep_compute_string (depend); -+ g_string_append_printf (list, "%s <-> %s (%s), ", -+ conflict->package1, -+ conflict->package2, reason); -+ g_free (reason); - } - } - -@@ -716,10 +742,10 @@ alpm_conflict_build_list (const alpm_list_t *i) - static void - alpm_conflict_free (gpointer conflict) - { -- /* TODO: remove when implemented in libalpm */ -- free ((gpointer) alpm_conflict_get_package1 (conflict)); -- free ((gpointer) alpm_conflict_get_package2 (conflict)); -- free ((gpointer) alpm_conflict_get_reason (conflict)); -+ alpm_conflict_t *self = (alpm_conflict_t *) conflict; -+ -+ free (self->package1); -+ free (self->package2); - free (conflict); - } - -@@ -735,15 +761,17 @@ alpm_fileconflict_build_list (const alpm_list_t *i) - } - - for (; i != NULL; i = i->next) { -- const gchar *target = alpm_fileconflict_get_target (i->data); -- const gchar *file = alpm_fileconflict_get_file (i->data); -- const gchar *ctarget = alpm_fileconflict_get_ctarget (i->data); -- if (*ctarget != '\0') { -+ alpm_fileconflict_t *conflict = (alpm_fileconflict_t *) i->data; -+ -+ if (*conflict->ctarget != '\0') { - g_string_append_printf (list, "%s <-> %s (%s), ", -- target, ctarget, file); -+ conflict->target, -+ conflict->ctarget, -+ conflict->file); - } else { -- g_string_append_printf (list, "%s (%s), ", target, -- file); -+ g_string_append_printf (list, "%s (%s), ", -+ conflict->target, -+ conflict->file); - } - } - -@@ -754,14 +782,11 @@ alpm_fileconflict_build_list (const alpm_list_t *i) - static void - alpm_fileconflict_free (gpointer conflict) - { -- /* TODO: remove when implemented in libalpm */ -- const gchar *temp = alpm_fileconflict_get_ctarget (conflict); -- if (*temp != '\0') { -- free ((gpointer) temp); -- } -+ alpm_fileconflict_t *self = (alpm_fileconflict_t *) conflict; - -- free ((gpointer) alpm_fileconflict_get_target (conflict)); -- free ((gpointer) alpm_fileconflict_get_file (conflict)); -+ free (self->target); -+ free (self->file); -+ free (self->ctarget); - free (conflict); - } - -@@ -771,29 +796,32 @@ pk_backend_transaction_simulate (PkBackend *self, GError **error) - alpm_list_t *data = NULL; - gchar *prefix; - -- if (alpm_trans_prepare (&data) >= 0) { -+ g_return_val_if_fail (self != NULL, FALSE); -+ g_return_val_if_fail (alpm != NULL, FALSE); -+ -+ if (alpm_trans_prepare (alpm, &data) >= 0) { - return TRUE; - } - -- switch (pm_errno) { -- case PM_ERR_PKG_INVALID_ARCH: -+ switch (alpm_errno (alpm)) { -+ case ALPM_ERR_PKG_INVALID_ARCH: - prefix = alpm_pkg_build_list (data); - alpm_list_free (data); - break; - -- case PM_ERR_UNSATISFIED_DEPS: -+ case ALPM_ERR_UNSATISFIED_DEPS: - prefix = alpm_miss_build_list (data); -- alpm_list_free_inner (data, alpm_miss_free); -+ alpm_list_free_inner (data, alpm_depmissing_free); - alpm_list_free (data); - break; - -- case PM_ERR_CONFLICTING_DEPS: -+ case ALPM_ERR_CONFLICTING_DEPS: - prefix = alpm_conflict_build_list (data); - alpm_list_free_inner (data, alpm_conflict_free); - alpm_list_free (data); - break; - -- case PM_ERR_FILE_CONFLICTS: -+ case ALPM_ERR_FILE_CONFLICTS: - prefix = alpm_fileconflict_build_list (data); - alpm_list_free_inner (data, alpm_fileconflict_free); - alpm_list_free (data); -@@ -802,18 +830,21 @@ pk_backend_transaction_simulate (PkBackend *self, GError **error) - default: - prefix = NULL; - if (data != NULL) { -- g_warning ("unhandled error %d", pm_errno); -+ g_warning ("unhandled error %d", -+ alpm_errno (alpm)); - } - break; - } - - if (prefix != NULL) { -- g_set_error (error, ALPM_ERROR, pm_errno, "%s: %s", prefix, -- alpm_strerrorlast ()); -+ enum _alpm_errno_t errno = alpm_errno (alpm); -+ g_set_error (error, ALPM_ERROR, errno, "%s: %s", prefix, -+ alpm_strerror (errno)); - g_free (prefix); - } else { -- g_set_error_literal (error, ALPM_ERROR, pm_errno, -- alpm_strerrorlast ()); -+ enum _alpm_errno_t errno = alpm_errno (alpm); -+ g_set_error_literal (error, ALPM_ERROR, errno, -+ alpm_strerror (errno)); - } - - return FALSE; -@@ -826,10 +857,11 @@ pk_backend_transaction_packages (PkBackend *self) - PkInfoEnum info; - - g_return_if_fail (self != NULL); -+ g_return_if_fail (alpm != NULL); - g_return_if_fail (localdb != NULL); - - /* emit packages that would have been installed */ -- for (i = alpm_trans_get_add (); i != NULL; i = i->next) { -+ for (i = alpm_trans_get_add (alpm); i != NULL; i = i->next) { - if (pk_backend_cancelled (self)) { - break; - } else { -@@ -856,7 +888,7 @@ pk_backend_transaction_packages (PkBackend *self) - } - - /* emit packages that would have been removed */ -- for (i = alpm_trans_get_remove (); i != NULL; i = i->next) { -+ for (i = alpm_trans_get_remove (alpm); i != NULL; i = i->next) { - if (pk_backend_cancelled (self)) { - break; - } else { -@@ -890,6 +922,9 @@ pk_backend_transaction_commit (PkBackend *self, GError **error) - alpm_list_t *data = NULL; - gchar *prefix; - -+ g_return_val_if_fail (self != NULL, FALSE); -+ g_return_val_if_fail (alpm != NULL, FALSE); -+ - if (pk_backend_cancelled (self)) { - return TRUE; - } -@@ -897,19 +932,19 @@ pk_backend_transaction_commit (PkBackend *self, GError **error) - pk_backend_set_allow_cancel (self, FALSE); - pk_backend_set_status (self, PK_STATUS_ENUM_RUNNING); - -- if (alpm_trans_commit (&data) >= 0) { -+ if (alpm_trans_commit (alpm, &data) >= 0) { - return TRUE; - } - -- switch (pm_errno) { -- case PM_ERR_FILE_CONFLICTS: -+ switch (alpm_errno (alpm)) { -+ case ALPM_ERR_FILE_CONFLICTS: - prefix = alpm_fileconflict_build_list (data); - alpm_list_free_inner (data, alpm_fileconflict_free); - alpm_list_free (data); - break; - -- case PM_ERR_PKG_INVALID: -- case PM_ERR_DLT_INVALID: -+ case ALPM_ERR_PKG_INVALID: -+ case ALPM_ERR_DLT_INVALID: - prefix = alpm_string_build_list (data); - alpm_list_free (data); - break; -@@ -917,18 +952,21 @@ pk_backend_transaction_commit (PkBackend *self, GError **error) - default: - prefix = NULL; - if (data != NULL) { -- g_warning ("unhandled error %d", pm_errno); -+ g_warning ("unhandled error %d", -+ alpm_errno (alpm)); - } - break; - } - - if (prefix != NULL) { -- g_set_error (error, ALPM_ERROR, pm_errno, "%s: %s", prefix, -- alpm_strerrorlast ()); -+ enum _alpm_errno_t errno = alpm_errno (alpm); -+ g_set_error (error, ALPM_ERROR, errno, "%s: %s", prefix, -+ alpm_strerror (errno)); - g_free (prefix); - } else { -- g_set_error_literal (error, ALPM_ERROR, pm_errno, -- alpm_strerrorlast ()); -+ enum _alpm_errno_t errno = alpm_errno (alpm); -+ g_set_error_literal (error, ALPM_ERROR, errno, -+ alpm_strerror (errno)); - } - - return FALSE; -@@ -938,9 +976,14 @@ gboolean - pk_backend_transaction_end (PkBackend *self, GError **error) - { - g_return_val_if_fail (self != NULL, FALSE); -+ g_return_val_if_fail (alpm != NULL, FALSE); -+ -+ alpm_option_set_eventcb (alpm, NULL); -+ alpm_option_set_questioncb (alpm, NULL); -+ alpm_option_set_progresscb (alpm, NULL); - -- alpm_option_set_dlcb (NULL); -- alpm_option_set_totaldlcb (NULL); -+ alpm_option_set_dlcb (alpm, NULL); -+ alpm_option_set_totaldlcb (alpm, NULL); - - if (dpkg != NULL) { - pk_backend_transaction_download_end (self); -@@ -949,9 +992,10 @@ pk_backend_transaction_end (PkBackend *self, GError **error) - pk_backend_output_end (self); - } - -- if (alpm_trans_release () < 0) { -- g_set_error_literal (error, ALPM_ERROR, pm_errno, -- alpm_strerrorlast ()); -+ if (alpm_trans_release (alpm) < 0) { -+ enum _alpm_errno_t errno = alpm_errno (alpm); -+ g_set_error_literal (error, ALPM_ERROR, errno, -+ alpm_strerror (errno)); - return FALSE; - } - -diff --git a/backends/alpm/pk-backend-transaction.h b/backends/alpm/pk-backend-transaction.h -index 6bb1d69..e3733d6 100644 ---- a/backends/alpm/pk-backend-transaction.h -+++ b/backends/alpm/pk-backend-transaction.h -@@ -25,7 +25,7 @@ - #include <pk-backend.h> - - gboolean pk_backend_transaction_initialize (PkBackend *self, -- pmtransflag_t flags, -+ alpm_transflag_t flags, - GError **error); - - gboolean pk_backend_transaction_simulate (PkBackend *self, -diff --git a/backends/alpm/pk-backend-update.c b/backends/alpm/pk-backend-update.c -index a281953..37ade1e 100644 ---- a/backends/alpm/pk-backend-update.c -+++ b/backends/alpm/pk-backend-update.c -@@ -34,7 +34,7 @@ - #include "pk-backend-update.h" - - static gchar * --alpm_pkg_build_replaces (pmpkg_t *pkg) -+alpm_pkg_build_replaces (alpm_pkg_t *pkg) - { - const alpm_list_t *i; - GString *string = NULL; -@@ -44,7 +44,7 @@ alpm_pkg_build_replaces (pmpkg_t *pkg) - - /* make a list of the packages that package replaces */ - for (i = alpm_pkg_get_replaces (pkg); i != NULL; i = i->next) { -- pmpkg_t *replaces = alpm_db_get_pkg (localdb, i->data); -+ alpm_pkg_t *replaces = alpm_db_get_pkg (localdb, i->data); - - if (replaces != NULL) { - gchar *package = alpm_pkg_build_id (replaces); -@@ -65,7 +65,7 @@ alpm_pkg_build_replaces (pmpkg_t *pkg) - } - - static gchar * --alpm_pkg_build_urls (pmpkg_t *pkg) -+alpm_pkg_build_urls (alpm_pkg_t *pkg) - { - GString *string = g_string_new (""); - #ifdef ALPM_PACKAGE_URL -@@ -97,7 +97,7 @@ alpm_pkg_build_urls (pmpkg_t *pkg) - } - - static gboolean --alpm_pkg_same_pkgver (pmpkg_t *a, pmpkg_t *b) -+alpm_pkg_same_pkgver (alpm_pkg_t *a, alpm_pkg_t *b) - { - const gchar *version_a, *version_b, *last_a, *last_b; - gsize length_a, length_b; -@@ -145,8 +145,8 @@ pk_backend_get_update_detail_thread (PkBackend *self) - - /* collect details about updates */ - for (; *packages != NULL; ++packages) { -- pmpkg_t *pkg, *old; -- pmdb_t *db; -+ alpm_pkg_t *pkg, *old; -+ alpm_db_t *db; - - gchar *upgrades, *replaces, *urls; - const gchar *reason; -@@ -245,18 +245,19 @@ pk_backend_update_databases (PkBackend *self, gint force, GError **error) { - const alpm_list_t *i; - - g_return_val_if_fail (self != NULL, FALSE); -+ g_return_val_if_fail (alpm != NULL, FALSE); - - if (!pk_backend_transaction_initialize (self, 0, error)) { - return FALSE; - } - -- alpm_logaction ("synchronizing package lists\n"); -+ alpm_logaction (alpm, "synchronizing package lists\n"); - -- dlcb = alpm_option_get_dlcb (); -- totaldlcb = alpm_option_get_totaldlcb (); -+ dlcb = alpm_option_get_dlcb (alpm); -+ totaldlcb = alpm_option_get_totaldlcb (alpm); - - /* set total size to minus the number of databases */ -- i = alpm_option_get_syncdbs (); -+ i = alpm_option_get_syncdbs (alpm); - totaldlcb (-alpm_list_count (i)); - - for (; i != NULL; i = i->next) { -@@ -274,9 +275,10 @@ pk_backend_update_databases (PkBackend *self, gint force, GError **error) { - /* fake the download when already up to date */ - dlcb ("", 1, 1); - } else if (result < 0) { -- g_set_error (error, ALPM_ERROR, pm_errno, "[%s]: %s", -+ enum _alpm_errno_t errno = alpm_errno (alpm); -+ g_set_error (error, ALPM_ERROR, errno, "[%s]: %s", - alpm_db_get_name (i->data), -- alpm_strerrorlast ()); -+ alpm_strerror (errno)); - break; - } - } -@@ -292,20 +294,21 @@ pk_backend_update_databases (PkBackend *self, gint force, GError **error) { - } - - static gboolean --alpm_pkg_is_ignorepkg (pmpkg_t *pkg) -+alpm_pkg_is_ignorepkg (alpm_pkg_t *pkg) - { -- const alpm_list_t *ignorepkgs, *ignoregrps, *i; -+ const alpm_list_t *ignorepkgs, *ignoregroups, *i; - - g_return_val_if_fail (pkg != NULL, TRUE); -+ g_return_val_if_fail (alpm != NULL, TRUE); - -- ignorepkgs = alpm_option_get_ignorepkgs (); -+ ignorepkgs = alpm_option_get_ignorepkgs (alpm); - if (alpm_list_find_str (ignorepkgs, alpm_pkg_get_name (pkg)) != NULL) { - return TRUE; - } - -- ignoregrps = alpm_option_get_ignoregrps (); -+ ignoregroups = alpm_option_get_ignoregroups (alpm); - for (i = alpm_pkg_get_groups (pkg); i != NULL; i = i->next) { -- if (alpm_list_find_str (ignoregrps, i->data) != NULL) { -+ if (alpm_list_find_str (ignoregroups, i->data) != NULL) { - return TRUE; - } - } -@@ -314,7 +317,7 @@ alpm_pkg_is_ignorepkg (pmpkg_t *pkg) - } - - static gboolean --alpm_pkg_is_syncfirst (pmpkg_t *pkg) -+alpm_pkg_is_syncfirst (alpm_pkg_t *pkg) - { - g_return_val_if_fail (pkg != NULL, FALSE); - -@@ -325,8 +328,18 @@ alpm_pkg_is_syncfirst (pmpkg_t *pkg) - return FALSE; - } - --static pmpkg_t * --alpm_pkg_find_update (pmpkg_t *pkg, const alpm_list_t *dbs) -+static gboolean -+alpm_pkg_replaces (alpm_pkg_t *pkg, const gchar *name) -+{ -+ g_return_val_if_fail (pkg != NULL, FALSE); -+ g_return_val_if_fail (name != NULL, FALSE); -+ -+ return alpm_list_find_str (alpm_pkg_get_replaces (pkg), name) != NULL; -+} -+ -+ -+static alpm_pkg_t * -+alpm_pkg_find_update (alpm_pkg_t *pkg, const alpm_list_t *dbs) - { - const gchar *name; - const alpm_list_t *i; -@@ -336,7 +349,7 @@ alpm_pkg_find_update (pmpkg_t *pkg, const alpm_list_t *dbs) - name = alpm_pkg_get_name (pkg); - - for (; dbs != NULL; dbs = dbs->next) { -- pmpkg_t *update = alpm_db_get_pkg (dbs->data, name); -+ alpm_pkg_t *update = alpm_db_get_pkg (dbs->data, name); - - if (update != NULL) { - if (alpm_pkg_vercmp (alpm_pkg_get_version (update), -@@ -349,8 +362,7 @@ alpm_pkg_find_update (pmpkg_t *pkg, const alpm_list_t *dbs) - - i = alpm_db_get_pkgcache (dbs->data); - for (; i != NULL; i = i->next) { -- if (alpm_list_find_str (alpm_pkg_get_replaces (i->data), -- name) != NULL) { -+ if (alpm_pkg_replaces (i->data, name)) { - return i->data; - } - } -@@ -367,6 +379,7 @@ pk_backend_get_updates_thread (PkBackend *self) - const alpm_list_t *i, *syncdbs; - - g_return_val_if_fail (self != NULL, FALSE); -+ g_return_val_if_fail (alpm != NULL, FALSE); - g_return_val_if_fail (localdb != NULL, FALSE); - - time (&one_hour_ago); -@@ -385,9 +398,9 @@ pk_backend_get_updates_thread (PkBackend *self) - } - - /* find outdated and replacement packages */ -- syncdbs = alpm_option_get_syncdbs (); -+ syncdbs = alpm_option_get_syncdbs (alpm); - for (i = alpm_db_get_pkgcache (localdb); i != NULL; i = i->next) { -- pmpkg_t *upgrade = alpm_pkg_find_update (i->data, syncdbs); -+ alpm_pkg_t *upgrade = alpm_pkg_find_update (i->data, syncdbs); - - if (pk_backend_cancelled (self)) { - break; diff --git a/community/parrot/ChangeLog b/community/parrot/ChangeLog deleted file mode 100644 index 725287638..000000000 --- a/community/parrot/ChangeLog +++ /dev/null @@ -1,5 +0,0 @@ - -2008-01-06 Douglas Soares de Andrade <dsa@aur.archlinux.org> - - * Added for x86_64 - diff --git a/community/pgadmin3/pgadmin3.desktop b/community/pgadmin3/pgadmin3.desktop deleted file mode 100644 index 2e0864f60..000000000 --- a/community/pgadmin3/pgadmin3.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=pgadmin3 -Comment=A comprehensive design and management interface for PostgreSQL database -Exec=pgadmin3 -Terminal=false -Type=Application -StartupNotify=true -Icon=/usr/share/pgadmin3/pixmaps/pgAdmin3.ico -Categories=Application;Development; diff --git a/community/pion-net/pion-net-4.0.5-build.patch b/community/pion-net/pion-net-4.0.5-build.patch deleted file mode 100644 index 25fdca20b..000000000 --- a/community/pion-net/pion-net-4.0.5-build.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru pion-net-4.0.5/net/include/pion/net/TCPConnection.hpp pion-net-4.0.5.fixed/net/include/pion/net/TCPConnection.hpp ---- pion-net-4.0.5/net/include/pion/net/TCPConnection.hpp 2010-12-21 03:07:13.000000000 +0100 -+++ pion-net-4.0.5.fixed/net/include/pion/net/TCPConnection.hpp 2011-07-31 09:01:38.445559768 +0200 -@@ -639,7 +639,7 @@ - - /// returns reference to the io_service used for async operations - inline boost::asio::io_service& getIOService(void) { -- return m_ssl_socket.lowest_layer().io_service(); -+ return m_ssl_socket.lowest_layer().get_io_service(); - } - - /// returns non-const reference to underlying TCP socket object diff --git a/community/pound/pound-2.5-openssl.patch b/community/pound/pound-2.5-openssl.patch deleted file mode 100644 index efefd5487..000000000 --- a/community/pound/pound-2.5-openssl.patch +++ /dev/null @@ -1,290 +0,0 @@ -diff -up Pound-2.5/config.c.openssl Pound-2.5/config.c ---- Pound-2.5/config.c.openssl 2010-02-10 12:23:09.000000000 +0100 -+++ Pound-2.5/config.c 2010-02-10 12:23:07.000000000 +0100 -@@ -431,14 +431,22 @@ t_hash(const TABNODE *e) - res = (res ^ *k++) * 16777619; - return res; - } -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+static IMPLEMENT_LHASH_HASH_FN(t, TABNODE) -+#else - static IMPLEMENT_LHASH_HASH_FN(t_hash, const TABNODE *) -+#endif - - static int - t_cmp(const TABNODE *d1, const TABNODE *d2) - { - return strcmp(d1->key, d2->key); - } -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+static IMPLEMENT_LHASH_COMP_FN(t, TABNODE) -+#else - static IMPLEMENT_LHASH_COMP_FN(t_cmp, const TABNODE *) -+#endif - - /* - * parse a service -@@ -460,7 +468,11 @@ parse_service(const char *svc_name) - pthread_mutex_init(&res->mut, NULL); - if(svc_name) - strncpy(res->name, svc_name, KEY_SIZE); -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+ if((res->sessions = LHM_lh_new(TABNODE, t)) == NULL) -+#else - if((res->sessions = lh_new(LHASH_HASH_FN(t_hash), LHASH_COMP_FN(t_cmp))) == NULL) -+#endif - conf_err("lh_new failed - aborted"); - ign_case = ignore_case; - while(conf_fgets(lin, MAXBUF)) { -diff -up Pound-2.5/pound.h.openssl Pound-2.5/pound.h ---- Pound-2.5/pound.h.openssl 2010-02-02 12:49:02.000000000 +0100 -+++ Pound-2.5/pound.h 2010-02-10 12:15:18.000000000 +0100 -@@ -322,6 +322,10 @@ typedef struct _tn { - /* maximal session key size */ - #define KEY_SIZE 127 - -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+DECLARE_LHASH_OF(TABNODE); -+#endif -+ - /* service definition */ - typedef struct _service { - char name[KEY_SIZE + 1]; /* symbolic name */ -@@ -337,7 +341,11 @@ typedef struct _service { - int sess_ttl; /* session time-to-live */ - regex_t sess_start; /* pattern to identify the session data */ - regex_t sess_pat; /* pattern to match the session data */ -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+ LHASH_OF(TABNODE) *sessions; /* currently active sessions */ -+#else - LHASH *sessions; /* currently active sessions */ -+#endif - int dynscale; /* true if the back-ends should be dynamically rescaled */ - int disabled; /* true if the service is disabled */ - struct _service *next; -diff -up Pound-2.5/svc.c.openssl Pound-2.5/svc.c ---- Pound-2.5/svc.c.openssl 2010-02-02 12:49:02.000000000 +0100 -+++ Pound-2.5/svc.c 2010-02-10 12:13:29.000000000 +0100 -@@ -27,12 +27,17 @@ - - #include "pound.h" - -+#ifndef LHASH_OF -+#define LHASH_OF(x) LHASH -+#define CHECKED_LHASH_OF(type, h) h -+#endif -+ - /* - * Add a new key/content pair to a hash table - * the table should be already locked - */ - static void --t_add(LHASH *const tab, const char *key, const void *content, const size_t cont_len) -+t_add(LHASH_OF(TABNODE) *const tab, const char *key, const void *content, const size_t cont_len) - { - TABNODE *t, *old; - -@@ -53,7 +58,11 @@ t_add(LHASH *const tab, const char *key, - } - memcpy(t->content, content, cont_len); - t->last_acc = time(NULL); -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+ if((old = LHM_lh_insert(TABNODE, tab, t)) != NULL) { -+#else - if((old = (TABNODE *)lh_insert(tab, t)) != NULL) { -+#endif - free(old->key); - free(old->content); - free(old); -@@ -68,12 +77,16 @@ t_add(LHASH *const tab, const char *key, - * side-effect: update the time of last access - */ - static void * --t_find(LHASH *const tab, char *const key) -+t_find(LHASH_OF(TABNODE) *const tab, char *const key) - { - TABNODE t, *res; - - t.key = key; -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+ if((res = LHM_lh_retrieve(TABNODE, tab, &t)) != NULL) { -+#else - if((res = (TABNODE *)lh_retrieve(tab, &t)) != NULL) { -+#endif - res->last_acc = time(NULL); - return res->content; - } -@@ -84,12 +97,16 @@ t_find(LHASH *const tab, char *const key - * Delete a key - */ - static void --t_remove(LHASH *const tab, char *const key) -+t_remove(LHASH_OF(TABNODE) *const tab, char *const key) - { - TABNODE t, *res; - - t.key = key; -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+ if((res = LHM_lh_delete(TABNODE, tab, &t)) != NULL) { -+#else - if((res = (TABNODE *)lh_delete(tab, &t)) != NULL) { -+#endif - free(res->key); - free(res->content); - free(res); -@@ -98,59 +115,75 @@ t_remove(LHASH *const tab, char *const k - } - - typedef struct { -- LHASH *tab; -+ LHASH_OF(TABNODE) *tab; - time_t lim; - void *content; - int cont_len; - } ALL_ARG; - - static void --t_old(TABNODE *t, void *arg) -+t_old_doall_arg(TABNODE *t, ALL_ARG *a) - { -- ALL_ARG *a; -- -- a = (ALL_ARG *)arg; - if(t->last_acc < a->lim) -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+ LHM_lh_delete(TABNODE, a->tab, t); -+#else - lh_delete(a->tab, t); -+#endif - return; - } --IMPLEMENT_LHASH_DOALL_ARG_FN(t_old, TABNODE *, void *) -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+IMPLEMENT_LHASH_DOALL_ARG_FN(t_old, TABNODE, ALL_ARG) -+#else -+#define t_old t_old_doall_arg -+IMPLEMENT_LHASH_DOALL_ARG_FN(t_old, TABNODE *, ALL_ARG *) -+#endif - - /* - * Expire all old nodes - */ - static void --t_expire(LHASH *const tab, const time_t lim) -+t_expire(LHASH_OF(TABNODE) *const tab, const time_t lim) - { - ALL_ARG a; - int down_load; - - a.tab = tab; - a.lim = lim; -- down_load = tab->down_load; -- tab->down_load = 0; -+ down_load = CHECKED_LHASH_OF(TABNODE, tab)->down_load; -+ CHECKED_LHASH_OF(TABNODE, tab)->down_load = 0; -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+ LHM_lh_doall_arg(TABNODE, tab, LHASH_DOALL_ARG_FN(t_old), ALL_ARG, &a); -+#else - lh_doall_arg(tab, LHASH_DOALL_ARG_FN(t_old), &a); -- tab->down_load = down_load; -+#endif -+ CHECKED_LHASH_OF(TABNODE, tab)->down_load = down_load; - return; - } - - static void --t_cont(TABNODE *t, void *arg) -+t_cont_doall_arg(TABNODE *t, ALL_ARG *a) - { -- ALL_ARG *a; -- -- a = (ALL_ARG *)arg; - if(memcmp(t->content, a->content, a->cont_len) == 0) -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+ LHM_lh_delete(TABNODE, a->tab, t); -+#else - lh_delete(a->tab, t); -+#endif - return; - } --IMPLEMENT_LHASH_DOALL_ARG_FN(t_cont, TABNODE *, void *) -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+IMPLEMENT_LHASH_DOALL_ARG_FN(t_cont, TABNODE, ALL_ARG) -+#else -+#define t_cont t_cont_doall_arg -+IMPLEMENT_LHASH_DOALL_ARG_FN(t_cont, TABNODE *, ALL_ARG *) -+#endif - - /* - * Remove all nodes with the given content - */ - static void --t_clean(LHASH *const tab, void *const content, const size_t cont_len) -+t_clean(LHASH_OF(TABNODE) *const tab, void *const content, const size_t cont_len) - { - ALL_ARG a; - int down_load; -@@ -158,10 +191,14 @@ t_clean(LHASH *const tab, void *const co - a.tab = tab; - a.content = content; - a.cont_len = cont_len; -- down_load = tab->down_load; -- tab->down_load = 0; -+ down_load = CHECKED_LHASH_OF(TABNODE, tab)->down_load; -+ CHECKED_LHASH_OF(TABNODE, tab)->down_load = 0; -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+ LHM_lh_doall_arg(TABNODE, tab, LHASH_DOALL_ARG_FN(t_cont), ALL_ARG, &a); -+#else - lh_doall_arg(tab, LHASH_DOALL_ARG_FN(t_cont), &a); -- tab->down_load = down_load; -+#endif -+ CHECKED_LHASH_OF(TABNODE, tab)->down_load = down_load; - return; - } - -@@ -1410,13 +1447,11 @@ typedef struct { - } DUMP_ARG; - - static void --t_dump(TABNODE *t, void *arg) -+t_dump_doall_arg(TABNODE *t, DUMP_ARG *a) - { -- DUMP_ARG *a; - BACKEND *be, *bep; - int n_be, sz; - -- a = (DUMP_ARG *)arg; - memcpy(&bep, t->content, sizeof(bep)); - for(n_be = 0, be = a->backends; be; be = be->next, n_be++) - if(be == bep) -@@ -1432,19 +1467,28 @@ t_dump(TABNODE *t, void *arg) - return; - } - --IMPLEMENT_LHASH_DOALL_ARG_FN(t_dump, TABNODE *, void *) -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+IMPLEMENT_LHASH_DOALL_ARG_FN(t_dump, TABNODE, DUMP_ARG) -+#else -+#define t_dump t_dump_doall_arg -+IMPLEMENT_LHASH_DOALL_ARG_FN(t_dump, TABNODE *, DUMP_ARG *) -+#endif - - /* - * write sessions to the control socket - */ - static void --dump_sess(const int control_sock, LHASH *const sess, BACKEND *const backends) -+dump_sess(const int control_sock, LHASH_OF(TABNODE) *const sess, BACKEND *const backends) - { - DUMP_ARG a; - - a.control_sock = control_sock; - a.backends = backends; -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+ LHM_lh_doall_arg(TABNODE, sess, LHASH_DOALL_ARG_FN(t_dump), DUMP_ARG, &a); -+#else - lh_doall_arg(sess, LHASH_DOALL_ARG_FN(t_dump), &a); -+#endif - return; - } - diff --git a/community/pragha/PKGBUILD b/community/pragha/PKGBUILD index 0938096d5..4446f7f8e 100755 --- a/community/pragha/PKGBUILD +++ b/community/pragha/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 68966 2012-04-06 15:03:02Z ttopper $ +# $Id: PKGBUILD 70293 2012-05-03 18:11:39Z ttopper $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Contributor: Alois Nespor <alois.nespor@gmail.com> # Contributor: JerichoKru <jerichokru(AT)htomail.com> pkgname=pragha -pkgver=1.0.1 +pkgver=1.0.2 pkgrel=1 pkgdesc="A lightweight GTK+ music manager - fork of Consonance Music Manager." arch=('i686' 'x86_64' 'mips64el') @@ -12,12 +12,12 @@ url="http://pragha.wikispaces.com/" license=('GPL3') depends=('libnotify' 'libcdio' 'gstreamer0.10-base' 'taglib' 'hicolor-icon-theme' 'gtk2' - 'dbus-glib' 'sqlite3' 'desktop-file-utils') + 'dbus-glib' 'sqlite' 'desktop-file-utils') optdepends=('notification-daemon: OSD notification') replaces=('dissonance') install=pragha.install source=("https://github.com/downloads/matiasdelellis/pragha/$pkgname-$pkgver.tar.bz2") -sha1sums=('607e54233305d6774dcd66327969533b6f2c6847') +sha1sums=('297381d068860c22649ca29ae2281f9f6e33c000') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/rekonq/fix-build.patch b/community/rekonq/fix-build.patch deleted file mode 100644 index 1a401ce2c..000000000 --- a/community/rekonq/fix-build.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- rekonq-0.9.0/doc/nl/index.docbook~ 2012-03-02 15:31:21.730372412 +0000 -+++ rekonq-0.9.0/doc/nl/index.docbook 2012-03-02 15:31:48.780152894 +0000 -@@ -82,7 +82,7 @@ - ></surname - > </personname> - </author> --&ged.vertaald;&Freek.de.Kruijf; -+&Freek.de.Kruijf; - </authorgroup> - <legalnotice - >&FDLNotice;</legalnotice> diff --git a/community/root/PKGBUILD b/community/root/PKGBUILD deleted file mode 100644 index c45456a91..000000000 --- a/community/root/PKGBUILD +++ /dev/null @@ -1,96 +0,0 @@ -# Maintainer: Thomas Dziedzic < gostrc at gmail > -# Contributor: Sebastian Voecking <voeck@web.de> - -pkgname=root -pkgver=5.32.02 -pkgrel=2 -pkgdesc='C++ data analysis framework and interpreter from CERN.' -arch=('i686' 'x86_64' 'mips64el') -url='http://root.cern.ch' -license=('LGPL2.1') -depends=('avahi' 'desktop-file-utils' 'ftgl' 'giflib' 'glew' 'graphviz' 'gsl' 'libldap' 'libmysqlclient' - 'libxft' 'postgresql-libs' 'python2' 'unixodbc' 'shared-mime-info' 'xmlrpc-c' 'xorg-fonts-75dpi' 'mesa' 'gcc-fortran' 'hicolor-icon-theme' 'gtk-update-icon-cache') -makedepends=('fftw') -install='root.install' -options=('!emptydirs') -source=("ftp://root.cern.ch/root/root_v${pkgver}.source.tar.gz" - 'root.sh' - 'rootd' - 'root.xml') -md5sums=('614a00632ab11fb33d2002800aabdcc7' - '0e883ad44f99da9bc7c23bc102800b62' - 'efd06bfa230cc2194b38e0c8939e72af' - 'e2cf69b204192b5889ceb5b4dedc66f7') - -build() { - cd root - - if [ ${CARCH} == 'i686' ]; then - TARGET=linux; - else - TARGET=linuxx8664gcc; - fi - - msg 'python2 switch' - find . -type f -exec sed -e 's_#!/usr/bin/env python_&2_' \ - -e 's/python -O/python2 -O/g' \ - -e 's/python -c/python2 -c/g' -i {} \; - sed \ - -e 's/python 2/python2 2/g' \ - -i configure - sed \ - -e 's/python $(pkgpyexecdir)/python2 $(pkgpyexecdir)/g' \ - -i cint/reflex/python/genreflex/Makefile.am - sed \ - -e 's/python /python2 /' \ - -i config/genreflex.in config/genreflex-rootcint.in - - local sys_libs="" - for sys_lib in ftgl freetype glew pcre zlib lzma; do - sys_libs+="--disable-builtin-${sys_lib} " - done - # move from aur if possible - #--disable-builtin-afterimage \ - - ./configure \ - ${TARGET} \ - --prefix=/usr \ - --enable-gdml \ - --enable-gsl-shared \ - --enable-minuit2 \ - --enable-soversion \ - --enable-roofit \ - --enable-python \ - --with-python-incdir=/usr/include/python2.7 \ - --with-python-libdir=/usr/lib \ - ${sys_libs} - - make -} - -package() { - cd root - - make DESTDIR=${pkgdir} install - - install -D ${srcdir}/root.sh \ - ${pkgdir}/etc/profile.d/root.sh - install -D ${srcdir}/rootd \ - ${pkgdir}/etc/rc.d/rootd - install -D -m644 ${srcdir}/root.xml \ - ${pkgdir}/usr/share/mime/packages/root.xml - - install -D -m644 ${srcdir}/root/build/package/debian/root-system-bin.desktop.in \ - ${pkgdir}/usr/share/applications/root-system-bin.desktop - # replace @prefix@ with /usr for the desktop - sed -e 's_@prefix@_/usr_' -i ${pkgdir}/usr/share/applications/root-system-bin.desktop - - install -D -m644 ${srcdir}/root/build/package/debian/root-system-bin.png \ - ${pkgdir}/usr/share/icons/hicolor/48x48/apps/root-system-bin.png - - # use a file that pacman can track instead of adding directly to ld.so.conf - install -d ${pkgdir}/etc/ld.so.conf.d - echo '/usr/lib/root' > ${pkgdir}/etc/ld.so.conf.d/root.conf - - rm -rf ${pkgdir}/etc/root/daemons -} diff --git a/community/root/root.install b/community/root/root.install deleted file mode 100644 index afabb7aea..000000000 --- a/community/root/root.install +++ /dev/null @@ -1,25 +0,0 @@ -post_install() { - update-desktop-database >/dev/null - - update-mime-database /usr/share/mime >/dev/null - - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -pre_remove() { - # leave for pre 5.30.03-3 - if [[ $(vercmp $1 5.30.03-3) == -1 ]]; then - cat etc/ld.so.conf | grep -v '/usr/lib/root' >/tmp/.pacroot - mv /tmp/.pacroot etc/ld.so.conf - chmod 644 etc/ld.so.conf - sbin/ldconfig -r . - fi -} - -post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} diff --git a/community/root/root.sh b/community/root/root.sh deleted file mode 100644 index 685e6036b..000000000 --- a/community/root/root.sh +++ /dev/null @@ -1,5 +0,0 @@ -if [ $PYTHONPATH ]; then - export PYTHONPATH=$PYTHONPATH:/usr/lib/root; -else - export PYTHONPATH=/usr/lib/root; -fi diff --git a/community/root/root.xml b/community/root/root.xml deleted file mode 100644 index af8dd69c5..000000000 --- a/community/root/root.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info"> - <mime-type type="application/x-root"> - <comment>ROOT file</comment> - <comment xml:lang="de">ROOT-Datei</comment> - <glob pattern="*.root"/> - <magic priority="80"> - <match value="root" type="string" offset="0:64"/> - </magic> - </mime-type> -</mime-info> diff --git a/community/root/rootd b/community/root/rootd deleted file mode 100755 index fb2c3388c..000000000 --- a/community/root/rootd +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/rootd` -case "$1" in - start) - stat_busy "Starting ROOT file server daemon" - [ -z "$PID" ] && /usr/bin/rootd >>/var/log/root.log 2>&1 - if [ $? -gt 0 ]; then - stat_fail - else - PID=`pidof -o %PPID /usr/sbin/rootd` - echo $PID >/var/run/rootd.pid - add_daemon rootd - stat_done - fi - ;; - stop) - stat_busy "Stopping ROOT file server daemon" - [ ! -z "$PID" ] && kill $PID &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon rootd - stat_done - fi - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/rxvt-unicode/ChangeLog b/community/rxvt-unicode/ChangeLog deleted file mode 100644 index ba267d49e..000000000 --- a/community/rxvt-unicode/ChangeLog +++ /dev/null @@ -1,14 +0,0 @@ -2012-01-22 Angel Velasquez <angvp@archlinux.org> - * Version bump to 9.15 - -2011-12-02 Angel Velasquez <angvp@archlinux.org> - * Version bump to 9.14 - -2011-12-02 Angel Velasquez <angvp@archlinux.org> - * Moved perl from optdepend to depend (closes FS#25782) - -2011-05-22 Angel Velasquez <angvp@archlinux.org> - * Rebuilt against perl 5.14.0 - -2011-05-17 Angel Velasquez <angvp@archlinux.org> - * Removed not accepted upstream patch (closes FS#23324) diff --git a/community/rxvt-unicode/rxvt-unicode.desktop b/community/rxvt-unicode/rxvt-unicode.desktop deleted file mode 100644 index 68d613dbd..000000000 --- a/community/rxvt-unicode/rxvt-unicode.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Version=1.0 -Encoding=UTF-8 -Name=rxvt-unicode -Comment=An Unicode capable rxvt clone -Exec=urxvt -Icon=terminal -Terminal=false -Type=Application -Categories=Application;System;TerminalEmulator; diff --git a/community/shotwell/fix-with-libraw-0.4.patch b/community/shotwell/fix-with-libraw-0.4.patch deleted file mode 100644 index f6f021b61..000000000 --- a/community/shotwell/fix-with-libraw-0.4.patch +++ /dev/null @@ -1,50 +0,0 @@ -Seulement dans shotwell-0.11.5-fixed/misc: gschemas.compiled -diff -ru shotwell-0.11.5/src/photos/GRaw.vala shotwell-0.11.5-fixed/src/photos/GRaw.vala ---- shotwell-0.11.5/src/photos/GRaw.vala 2011-09-24 00:52:27.000000000 +0200 -+++ shotwell-0.11.5-fixed/src/photos/GRaw.vala 2011-11-01 00:25:05.976289495 +0100 -@@ -163,9 +163,9 @@ - proc = new LibRaw.Processor(options); - } - -- public void add_masked_borders_to_bitmap() { -- proc.add_masked_borders_to_bitmap(); -- } -+// public void add_masked_borders_to_bitmap() { -+// proc.add_masked_borders_to_bitmap(); -+// } - - public void adjust_sizes_info_only() throws Exception { - throw_exception("adjust_sizes_info_only", proc.adjust_sizes_info_only()); -@@ -215,9 +215,9 @@ - throw_exception("ppm_tiff_writer", proc.ppm_tiff_writer(filename)); - } - -- public void rotate_fuji_raw() throws Exception { -- throw_exception("rotate_fuji_raw", proc.rotate_fuji_raw()); -- } -+// public void rotate_fuji_raw() throws Exception { -+// throw_exception("rotate_fuji_raw", proc.rotate_fuji_raw()); -+// } - - public void thumb_writer(string filename) throws Exception { - throw_exception("thumb_writer", proc.thumb_writer(filename)); -@@ -262,7 +262,7 @@ - // camera_profile - // bad_pixels - // dark_frame -- output_params->filtering_mode = LibRaw.Filtering.AUTOMATIC; -+ // output_params->filtering_mode = LibRaw.Filtering.AUTOMATIC; - output_params->output_bps = 8; - // output_tiff - output_params->user_flip = GRaw.Flip.FROM_SOURCE; -@@ -303,8 +303,8 @@ - case LibRaw.Result.UNSUPPORTED_THUMBNAIL: - throw new Exception.UNSUPPORTED_THUMBNAIL(msg); - -- case LibRaw.Result.CANNOT_ADDMASK: -- throw new Exception.CANNOT_ADDMASK(msg); -+// case LibRaw.Result.CANNOT_ADDMASK: -+// throw new Exception.CANNOT_ADDMASK(msg); - - case LibRaw.Result.UNSUFFICIENT_MEMORY: - throw new Exception.OUT_OF_MEMORY(msg); diff --git a/community/stone-soup/stone-soup.desktop b/community/stone-soup/stone-soup.desktop deleted file mode 100644 index f76343515..000000000 --- a/community/stone-soup/stone-soup.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Dungeon Crawl Stone Soup -Comment=An open-source, single-player, role-playing roguelike game of exploration and treasure-hunting -Icon=stone-soup.png -Exec=/usr/bin/crawl-tiles -Categories=Game;AdventureGame - diff --git a/community/swi-prolog/PKGBUILD b/community/swi-prolog/PKGBUILD deleted file mode 100644 index b4285249f..000000000 --- a/community/swi-prolog/PKGBUILD +++ /dev/null @@ -1,48 +0,0 @@ -# Maintainer: Thomas Dziedzic < gostrc at gmail > -# Contributor: John Proctor <jproctor@prium.net> -# Contributor: Juergen Hoetzel <juergen@archlinux.org> - -pkgname=swi-prolog -pkgver=6.0.1 -pkgrel=1 -pkgdesc='Prolog environment' -arch=('i686' 'x86_64' 'mips64el') -url='http://www.swi-prolog.org/' -license=('GPL' 'LGPL') -depends=('gmp' 'readline' 'openssl') -makedepends=('libxft' 'libjpeg' 'unixodbc' 'libxpm' 'libxinerama') -optdepends=('unixodbc: for using the odbc4pl library' - 'libjpeg: for using the pl2xpce library' - 'libxpm: for using the pl2xpce library' - 'libxinerama: for using the pl2xpce library' - 'libxft: for using the pl2xpce library') -options=('!makeflags') -source=("http://www.swi-prolog.org/download/stable/src/pl-${pkgver}.tar.gz") -md5sums=('a4ea80195b4e1dc63dc1b2c82a59a088') - -build() { - cd pl-${pkgver} - - # enable shared because x86 doesn't build with shared libs, upstream made it intentional... - ./configure \ - --prefix=/usr \ - --with-world \ - --enable-shared - - make -} - -check() { - cd pl-${pkgver} - - make check || true -} - -package() { - cd pl-${pkgver} - - make DESTDIR=${pkgdir} install - - # fix https://bugs.archlinux.org/task/20873 - chmod +x ${pkgdir}/usr/lib/swipl-${pkgver}/library/dialect/sicstus/swipl-lfr.pl -} diff --git a/community/vdrift/vdrift.desktop b/community/vdrift/vdrift.desktop deleted file mode 100644 index 7078f0d9c..000000000 --- a/community/vdrift/vdrift.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Type=Application -Name=VDrift -Version=2009-06-15 -GenericName=Racing Simulation -Comment=An open source driving simulation made with drift racing in mind -Exec=vdrift -Icon=vdrift.png -Terminal=false -Categories=Game;Simulation; diff --git a/community/vhba-module/vhba-kernel2.6.37.patch b/community/vhba-module/vhba-kernel2.6.37.patch deleted file mode 100644 index e2b619c74..000000000 --- a/community/vhba-module/vhba-kernel2.6.37.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 9ad7ec7fae387f05249b9f4e6accb3bc3b0b8b0f Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev <tetromino@gmail.com> -Date: Thu, 6 Jan 2011 03:39:26 -0500 -Subject: [PATCH] Make vhba compatible with kernel 2.6.37 SCSI host API - -Due to the SCSI host lock push-down changes introduced in 2.6.37 (see -http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=f281233d3eba15fb225d21ae2e228fd4553d824a -for more details), trying to use current vhba on 2.6.37 leads to oopses -and kernel panics - e.g. see http://bugs.gentoo.org/show_bug.cgi?id=350753 - -Add some #ifdefs to enable compatibility both with 2.6.37 and older API. -Note that if future kernel versions remove the DEF_SCSI_QCMD macro, this -issue will need to be revisited. - -Signed-off-by: Alexandre Rostovtsev <tetromino@gmail.com> ---- - vhba-module/vhba.c | 9 ++++++++- - 1 files changed, 8 insertions(+), 1 deletions(-) - -diff --git a/vhba-module/vhba.c b/vhba-module/vhba.c -index 059f6ce..9d13016 100644 ---- a/vhba-module/vhba.c -+++ b/vhba-module/vhba.c -@@ -27,6 +27,7 @@ - #include <linux/miscdevice.h> - #include <linux/poll.h> - #include <linux/slab.h> -+#include <linux/version.h> - #ifdef CONFIG_COMPAT - #include <linux/compat.h> - #endif -@@ -363,7 +364,7 @@ static void vhba_free_command(struct vhba_command *vcmd) - spin_unlock_irqrestore(&vhost->cmd_lock, flags); - } - --static int vhba_queuecommand(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *)) -+static int vhba_queuecommand_lck(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *)) - { - struct vhba_device *vdev; - int retval; -@@ -388,6 +389,12 @@ static int vhba_queuecommand(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmn - return retval; - } - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37) -+DEF_SCSI_QCMD(vhba_queuecommand) -+#else -+#define vhba_queuecommand vhba_queuecommand_lck -+#endif -+ - static int vhba_abort(struct scsi_cmnd *cmd) - { - struct vhba_device *vdev; --- -1.7.3.4 - diff --git a/community/vtk/PKGBUILD b/community/vtk/PKGBUILD deleted file mode 100644 index 32f262bc9..000000000 --- a/community/vtk/PKGBUILD +++ /dev/null @@ -1,116 +0,0 @@ -# $Id: PKGBUILD 63769 2012-02-05 12:13:32Z ibiru $ -# Maintainer: Thomas Dziedzic < gostrc at gmail > -# Contributor: Christofer Bertonha <christoferbertonha at gmail dot com> -# Contributor: leepesjee <lpeschier at xs4all dot nl> -# Contributor: Olivier Medoc -# Contributor: ignotus -# Contributor: Fabian Moser -# Contributor: djscholl - -pkgname=vtk -pkgver=5.8.0 -pkgrel=8 -pkgdesc='A software system for 3D computer graphics, image processing, and visualization which supports a wide variety of visualization algorithms and advanced modeling techniques.' -arch=('i686' 'x86_64' 'mips64el') -url='http://www.vtk.org' -license=('BSD') -depends=('libpng' 'libtiff' 'libjpeg-turbo' 'freetype2' 'boost' 'ffmpeg' 'qt' 'lesstif' 'mysql' 'hdf5' 'expat' 'libtheora') -makedepends=('cmake' 'java-environment' 'doxygen' 'gnuplot' 'mesa' 'python2' 'tk') -optdepends=('python2: python bindings' - 'java-runtime: java bindings' - 'tk: tcl bindings' - 'gnuplot: plotting tools' - 'graphviz: drawing tools') -source=("http://www.vtk.org/files/release/${pkgver:0:3}/vtk-${pkgver}.tar.gz" - "http://www.vtk.org/files/release/${pkgver:0:3}/vtkdata-${pkgver}.tar.gz" - 'fixkernelversioncheck.diff' - 'ffmpeg-0.8.diff' - 'fix-boost-graph-api-changes.diff') -md5sums=('37b7297d02d647cc6ca95b38174cb41f' - 'a05295b81930e894fc0e31866f399151' - '9e137af23701f76fc727222ebac23389' - 'e992321c9d1def6034d0fa6607b40c5a' - 'e715aef2aea26fc05f904efb5d0d5627') - -build() { - cd VTK - - # fix compilation error: http://vtk.org/Bug/view.php?id=12568 - # remove next pkgver bump - patch -Np1 -i ${srcdir}/fixkernelversioncheck.diff - - # fix compilation error: - # remove next pkgver bump - patch -Np1 -i ${srcdir}/ffmpeg-0.8.diff - - # fix compilation error: http://vtk.org/Bug/view.php?id=12772 - # remove next pkgver bump - patch -Np1 -i ${srcdir}/fix-boost-graph-api-changes.diff - - cd ${srcdir} - - rm -rf build - mkdir build - cd build - - # flags to enable using system libs - local cmake_system_flags="" - for lib in HDF5 EXPAT FREETYPE JPEG PNG TIFF ZLIB LIBXML2 OGGTHEORA; do # LIBPROJ4 - cmake_system_flags+="-DVTK_USE_SYSTEM_${lib}:BOOL=ON " - done - - # flags to use python2 instead of python which is 3.x.x on archlinux - local cmake_system_python_flags="-DPYTHON_EXECUTABLE:PATH=/usr/bin/python2 -DPYTHON_INCLUDE_DIR:PATH=/usr/include/python2.7 -DPYTHON_LIBRARY:PATH=/usr/lib/libpython2.7.so" - - cmake \ - -Wno-dev \ - -DBUILD_SHARED_LIBS:BOOL=ON \ - -DCMAKE_INSTALL_PREFIX:FILEPATH=/usr \ - -DVTK_DATA_ROOT:FILEPATH=${srcdir}/VTKData \ - -DBUILD_DOCUMENTATION:BOOL=ON \ - -DDOCUMENTATION_HTML_HELP:BOOL=ON \ - -DDOCUMENTATION_HTML_TARZ:BOOL=ON \ - -DBUILD_EXAMPLES:BOOL=ON \ - -DVTK_USE_HYBRID:BOOL=ON \ - -DVTK_USE_PARALLEL:BOOL=ON \ - -DVTK_USE_PATENTED:BOOL=ON \ - -DVTK_USE_BOOST:BOOL=ON \ - -DVTK_USE_INFOVIS:BOOL=ON \ - -DVTK_USE_GL2PS:BOOL=ON \ - -DVTK_USE_MYSQL:BOOL=ON \ - -DVTK_USE_FFMPEG_ENCODER:BOOL=ON \ - -DVTK_USE_TEXT_ANALYSIS:BOOL=ON \ - -DVTK_WRAP_JAVA:BOOL=ON \ - -DVTK_WRAP_PYTHON:BOOL=ON \ - -DVTK_WRAP_TCL:BOOL=ON \ - -DVTK_PYTHON_SETUP_ARGS:STRING="--root=${pkgdir}" \ - -DVTK_USE_QT:BOOL=ON \ - -DVTK_INSTALL_QT_PLUGIN_DIR:STRING="/usr/lib/qt/plugins" \ - -DVTK_USE_GUISUPPORT:BOOL=ON \ - -DCMAKE_CXX_FLAGS="-D__STDC_CONSTANT_MACROS" \ - ${cmake_system_flags} \ - ${cmake_system_python_flags} \ - ${srcdir}/VTK - - make -} - -package() { - cd build - - make DESTDIR=${pkgdir} install - - # Move the vtk.jar to the arch-specific location - install -dv ${pkgdir}/usr/share/java/vtk - mv -v ${pkgdir}/usr/lib/vtk-${pkgver:0:3}/java/vtk.jar \ - ${pkgdir}/usr/share/java/vtk - - # Install license - install -dv ${pkgdir}/usr/share/licenses/vtk - install -m644 ${srcdir}/VTK/Copyright.txt \ - ${pkgdir}/usr/share/licenses/vtk - - # Put an entry in /etc/ld.so.conf.d - install -dv ${pkgdir}/etc/ld.so.conf.d - echo "/usr/lib/vtk-${pkgver:0:3}" > ${pkgdir}/etc/ld.so.conf.d/vtk.conf -} diff --git a/community/vtk/ffmpeg-0.8.diff b/community/vtk/ffmpeg-0.8.diff deleted file mode 100644 index 523919d6f..000000000 --- a/community/vtk/ffmpeg-0.8.diff +++ /dev/null @@ -1,66 +0,0 @@ -Description: Upstream changes introduced in version 5.6.1-6.1 - This patch has been created by dpkg-source during the package build. - Here's the last changelog entry, hopefully it gives details on why - those changes were made: - . - vtk (5.6.1-6.1) unstable; urgency=low - . - [ Michael Schutte ] - * Non-maintainer upload. - * Remove absolute paths to required libraries from - /usr/lib/vtk-5.6/VTKLibraryDepends.cmake after building, closes: - #506992. Due to the multiarch transition, the original behavior - frequently causes reverse build-deps to FTBFS. This change should - probably be reverted once all required libraries are multiarched. - . - [ Steve M. Robbins ] - * Override lintian diagnostic about embedded libraries ftgl and sqlite. - * IO/vtkFFMPEGWriter.cxx: Applied fix from #638246 to build with libav - 0.7. - . - The person named in the Author field signed this changelog entry. -Author: Steve M. Robbins <smr@debian.org> -Bug-Debian: http://bugs.debian.org/506992 - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: <vendor|upstream|other>, <url of original patch> -Bug: <url in upstream bugtracker> -Bug-Debian: http://bugs.debian.org/<bugnumber> -Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber> -Forwarded: <no|not-needed|url proving that it has been forwarded> -Reviewed-By: <name and email of someone who approved the patch> -Last-Update: <YYYY-MM-DD> - ---- vtk-5.6.1.orig/IO/vtkFFMPEGWriter.cxx -+++ vtk-5.6.1/IO/vtkFFMPEGWriter.cxx -@@ -123,7 +123,7 @@ int vtkFFMPEGWriterInternal::Start() - } - - //choose avi media file format -- this->avOutputFormat = guess_format("avi", NULL, NULL); -+ this->avOutputFormat = av_guess_format("avi", NULL, NULL); - if (!this->avOutputFormat) - { - vtkGenericWarningMacro (<< "Could not open the avi media file format."); -@@ -150,7 +150,7 @@ int vtkFFMPEGWriterInternal::Start() - //Set up the codec. - AVCodecContext *c = this->avStream->codec; - c->codec_id = (CodecID)this->avOutputFormat->video_codec; -- c->codec_type = CODEC_TYPE_VIDEO; -+ c->codec_type = AVMEDIA_TYPE_VIDEO; - c->width = this->Dim[0]; - c->height = this->Dim[1]; - c->pix_fmt = PIX_FMT_YUVJ420P; -@@ -329,7 +329,7 @@ int vtkFFMPEGWriterInternal::Write(vtkIm - pkt.stream_index = this->avStream->index; - if (cc->coded_frame->key_frame) //treat keyframes well - { -- pkt.flags |= PKT_FLAG_KEY; -+ pkt.flags |= AV_PKT_FLAG_KEY; - } - pkt.duration = 0; //presentation duration in time_base units or 0 if NA - pkt.pos = -1; //byte position in stream or -1 if NA diff --git a/community/vtk/fix-boost-graph-api-changes.diff b/community/vtk/fix-boost-graph-api-changes.diff deleted file mode 100644 index 2162e7a28..000000000 --- a/community/vtk/fix-boost-graph-api-changes.diff +++ /dev/null @@ -1,42 +0,0 @@ -commit d3ecc2c459dd1df937fc97887581ace1036da533 -Author: Marcus D. Hanwell <marcus.hanwell@kitware.com> -Date: Tue Dec 13 15:36:06 2011 -0500 - - BUG: 12772 fixes for change in Boost graph API - - This fixes bug 12772, where an API change in Boost was causing - compilation failures using Boost 1.38. Thanks to Orion Poplawski for - reporting the issue and posting the patch. - - Change-Id: I491b0f1650c0be19319533306eb10597dc96fa06 - -diff --git a/Infovis/vtkBoostBreadthFirstSearchTree.cxx b/Infovis/vtkBoostBreadthFirstSearchTree.cxx -index c789f6b..cf7cd47 100644 ---- a/Infovis/vtkBoostBreadthFirstSearchTree.cxx -+++ b/Infovis/vtkBoostBreadthFirstSearchTree.cxx -@@ -47,6 +47,15 @@ using namespace boost; - vtkStandardNewMacro(vtkBoostBreadthFirstSearchTree); - - -+namespace { -+ vtkIdType unwrap_edge_id(vtkEdgeType const &e) { -+ return e.Id; -+ } -+ vtkIdType unwrap_edge_id(boost::detail::reverse_graph_edge_descriptor<vtkEdgeType> const &e) { -+ return e.underlying_desc.Id; -+ } -+} -+ - // Redefine the bfs visitor, the only visitor we - // are using is the tree_edge visitor. - template <typename IdMap> -@@ -95,7 +104,8 @@ public: - - // Copy the vertex and edge data from the graph to the tree. - tree->GetVertexData()->CopyData(graph->GetVertexData(), v, tree_v); -- tree->GetEdgeData()->CopyData(graph->GetEdgeData(), e.Id, tree_e.Id); -+ tree->GetEdgeData()->CopyData(graph->GetEdgeData(), -+ unwrap_edge_id(e), tree_e.Id); - } - - private: diff --git a/community/vtk/fixkernelversioncheck.diff b/community/vtk/fixkernelversioncheck.diff deleted file mode 100644 index 165f07366..000000000 --- a/community/vtk/fixkernelversioncheck.diff +++ /dev/null @@ -1,19 +0,0 @@ ---- a/Utilities/vtkhdf5/ConfigureChecks.cmake -+++ b/Utilities/vtkhdf5/ConfigureChecks.cmake -@@ -75,14 +75,14 @@ IF (HDF5_WANT_DCONV_EXCEPTION) - ENDIF (HDF5_WANT_DCONV_EXCEPTION) - - SET (LINUX_LFS 0) --IF (CMAKE_SYSTEM MATCHES "Linux-([3-9]\\.[0-9]|2\\.[4-9])\\.") -+IF (CMAKE_SYSTEM MATCHES "Linux") - # Linux Specific flags - ADD_DEFINITIONS (-D_POSIX_SOURCE -D_BSD_SOURCE) - OPTION (HDF5_ENABLE_LARGE_FILE "Enable support for large (64-bit) files on Linux." ON) - IF (HDF5_ENABLE_LARGE_FILE) - SET (LARGEFILE 1) - ENDIF (HDF5_ENABLE_LARGE_FILE) --ENDIF (CMAKE_SYSTEM MATCHES "Linux-([3-9]\\.[0-9]|2\\.[4-9])\\.") -+ENDIF (CMAKE_SYSTEM MATCHES "Linux") - SET (HDF5_EXTRA_FLAGS) - IF (LINUX_LFS) - SET (HDF5_EXTRA_FLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE) diff --git a/community/wings3d/PKGBUILD b/community/wings3d/PKGBUILD index fbd443548..3fa7ea7a3 100644 --- a/community/wings3d/PKGBUILD +++ b/community/wings3d/PKGBUILD @@ -5,48 +5,48 @@ pkgname=wings3d _pkgname=wings pkgver=1.4.1 -pkgrel=7 +pkgrel=8 pkgdesc="3D modeling program" arch=('x86_64' 'i686') url="http://www.wings3d.com/" license=('GPL') -depends=('esdl' 'bash' 'desktop-file-utils') +depends=('esdl' 'bash' 'desktop-file-utils' 'cl') makedepends=('setconf' 'gendesk') optdepends=('povray: rendering support via POV-Ray') -# 'kerkythea: rendering support via Kerkythea' replaces=('wings' 'wings-devel') install=$pkgname.install -source=("http://downloads.sourceforge.net/wings/$_pkgname-$pkgver.tar.bz2" - "$pkgname" +source=("$pkgname-$pkgver.tar.gz::https://nodeload.github.com/dgud/wings/tarball/dgud/r15b-driver-compat" + "$pkgname.sh" "$pkgname.png::http://img299.imageshack.us/img299/2538/wingsiconblackshiningew5.png") -sha256sums=('51aea431e18935e5634ea673caa945f586db2203855554d8dcab5e9545f2789a' +sha256sums=('cbe917601b31b7d469c2f9ed0de1b016be86f14f9e757860990d9489a84585dd' '46513cd05f8b6e778120af4a87b239c5250799c17b591592893d98cbf082359e' '6658977cc3bc8db2c9358edf3a2d6cb6bb8084c9a1d96ca573a83dd4e8781f1a') _genericname=('3D Modeler') +_dirname='dgud-wings-4f3a3ff' build() { cd "$srcdir" gendesk setconf "$pkgname.desktop" Categories "Graphics;3DGraphics;" - cd "$_pkgname-$pkgver" + cd "$_dirname" export ESDL_PATH=$(echo /usr/lib/erlang/lib/esdl-*) make make lang } package() { - cd "$srcdir/$_pkgname-$pkgver" + cd "$srcdir/$_dirname" mkdir -p "$pkgdir/usr/lib/$pkgname" for subdir in ebin fonts patches plugins shaders textures; do - cp -r "$srcdir/$_pkgname-$pkgver/$subdir/" "$pkgdir/usr/lib/$pkgname" + cp -r "$srcdir/$_dirname/$subdir/" "$pkgdir/usr/lib/$pkgname" done install -Dm644 license.terms "$pkgdir/usr/share/licenses/$pkgname/LICENSE" cd "$srcdir" - install -Dm755 "$pkgname" "$pkgdir/usr/bin/$pkgname" + install -Dm755 "$pkgname.sh" "$pkgdir/usr/bin/$pkgname" install -Dm644 "$pkgname.png" "$pkgdir/usr/share/pixmaps/$pkgname.png" install -Dm644 "$pkgname.desktop" \ "$pkgdir/usr/share/applications/$pkgname.desktop" diff --git a/community/wings3d/wings3d.png b/community/wings3d/wings3d.png Binary files differdeleted file mode 100644 index 45a1140bf..000000000 --- a/community/wings3d/wings3d.png +++ /dev/null diff --git a/community/wings3d/wings3d.sh b/community/wings3d/wings3d.sh new file mode 100644 index 000000000..c0fd3b2fb --- /dev/null +++ b/community/wings3d/wings3d.sh @@ -0,0 +1,2 @@ +#!/bin/sh +erl -noinput -smp disable -pa /usr/lib/erlang/lib/esdl-*/ebin /usr/lib/wings3d/ebin -run wings_start start_halt ${1+"$@"} diff --git a/community/zynaddsubfx/zynaddsubfx.desktop b/community/zynaddsubfx/zynaddsubfx.desktop deleted file mode 100644 index ebca740ef..000000000 --- a/community/zynaddsubfx/zynaddsubfx.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Name=ZynAddSubFX -Comment=A powerful realtime software synthesizer -Exec=zynaddsubfx -Icon=zynaddsubfx -Terminal=false -Type=Application -Categories=Application;AudioVideo; diff --git a/core/binutils/binutils-2.22-ld-13621.patch b/core/binutils/binutils-2.22-ld-13621.patch deleted file mode 100644 index ffb2ab825..000000000 --- a/core/binutils/binutils-2.22-ld-13621.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/bfd/linker.c b/bfd/linker.c -index c51c5df..0404474 100644 ---- a/bfd/linker.c -+++ b/bfd/linker.c -@@ -3208,6 +3208,12 @@ fix_syms (struct bfd_link_hash_entry *h, void *data) - op = op1; - } - -+ /* Refuse to choose a section for which we are out of bounds. */ -+ /* ??? This may make most of the above moot. */ -+ if (h->u.def.value < op->vma -+ || h->u.def.value > op->vma + op->size) -+ op = bfd_abs_section_ptr; -+ - h->u.def.value -= op->vma; - h->u.def.section = op; - } -index 95b7ef4..a9c05f9 100644 ---- a/ld/testsuite/ld-elf/warn2.d -+++ b/ld/testsuite/ld-elf/warn2.d -@@ -13,5 +13,5 @@ - # construct and that the symbol still appears as expected. - - #... -- +[0-9]+: +[0-9a-f]+ +20 +OBJECT +GLOBAL +DEFAULT +[1-9] Foo -+ +[0-9]+: +[0-9a-f]+ +20 +OBJECT +GLOBAL +DEFAULT +ABS Foo - #pass diff --git a/core/dnsutils/trusted-key.key b/core/dnsutils/trusted-key.key deleted file mode 100644 index 866cadda2..000000000 --- a/core/dnsutils/trusted-key.key +++ /dev/null @@ -1,2 +0,0 @@ -. 172800 IN DNSKEY 256 3 8 AwEAAZ/NErKzyMlImJ+2HTmK9qeH2sLUywlsF+mJbTP5GKoYFHoU2vn2 Zqr261Lk7a6jfBKYny5GX7BDRJcVvig36TgOinE9QP5KVS0RxdrOl98g KLwFMORfNf/wjCwjPdEl1GgaGYl0npJ4c+x+o6aa/xmDKJo9zUlpvb7B LxbJ7HwF -. 172800 IN DNSKEY 257 3 8 AwEAAagAIKlVZrpC6Ia7gEzahOR+9W29euxhJhVVLOyQbSEW0O8gcCjF FVQUTf6v58fLjwBd0YI0EzrAcQqBGCzh/RStIoO8g0NfnfL2MTJRkxoX bfDaUeVPQuYEhg37NZWAJQ9VnMVDxP/VHL496M/QZxkjf5/Efucp2gaD X6RS6CXpoY68LsvPVjR0ZSwzz1apAzvN9dlzEheX7ICJBBtuA6G3LQpz W5hOA2hzCTMjJPJ8LbqF6dsV6DoBQzgul0sGIcGOYl7OyQdXfZ57relS Qageu+ipAdTTJ25AsRTAoub8ONGcLmqrAmRLKBP1dfwhYB4N7knNnulq QxA+Uk1ihz0= diff --git a/core/expat/CVE-2009-3560.patch b/core/expat/CVE-2009-3560.patch deleted file mode 100644 index 5fe9c36c8..000000000 --- a/core/expat/CVE-2009-3560.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -urNad trunk~/lib/xmlparse.c trunk/lib/xmlparse.c ---- trunk~/lib/xmlparse.c 2007-05-08 04:25:35.000000000 +0200 -+++ trunk/lib/xmlparse.c 2009-12-29 21:57:22.141732904 +0100 -@@ -3703,6 +3703,9 @@ - return XML_ERROR_UNCLOSED_TOKEN; - case XML_TOK_PARTIAL_CHAR: - return XML_ERROR_PARTIAL_CHAR; -+ case -XML_TOK_PROLOG_S: -+ tok = -tok; -+ break; - case XML_TOK_NONE: - #ifdef XML_DTD - /* for internal PE NOT referenced between declarations */ diff --git a/core/expat/CVE-2009-3720.patch b/core/expat/CVE-2009-3720.patch deleted file mode 100644 index 65d16431f..000000000 --- a/core/expat/CVE-2009-3720.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urNad trunk~/lib/xmltok_impl.c trunk/lib/xmltok_impl.c ---- trunk~/lib/xmltok_impl.c 2006-11-26 18:34:46.000000000 +0100 -+++ trunk/lib/xmltok_impl.c 2009-10-22 21:42:41.000000000 +0200 -@@ -1744,7 +1744,7 @@ - const char *end, - POSITION *pos) - { -- while (ptr != end) { -+ while (ptr < end) { - switch (BYTE_TYPE(enc, ptr)) { - #define LEAD_CASE(n) \ - case BT_LEAD ## n: \ diff --git a/core/gcc/gcc-4.6.2-cloog-0.17.patch b/core/gcc/gcc-4.6.2-cloog-0.17.patch deleted file mode 100644 index 0503a05ed..000000000 --- a/core/gcc/gcc-4.6.2-cloog-0.17.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -Naur gcc-4.6-20120120-orig/configure gcc-4.6-20120120/configure ---- gcc-4.6-20120120-orig/configure 2011-12-18 20:03:44.000000000 +1000 -+++ gcc-4.6-20120120/configure 2012-02-03 17:55:14.885990135 +1000 -@@ -6049,8 +6049,8 @@ - LDFLAGS="${_cloog_saved_LDFLAGS} ${clooglibs} ${ppllibs}" - - if test "${cloog_org}" = yes ; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.16.1 of CLooG" >&5 --$as_echo_n "checking for version 0.16.1 of CLooG... " >&6; } -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.17 of CLooG" >&5 -+$as_echo_n "checking for version 0.17 of CLooG... " >&6; } - if test "${gcc_cv_cloog_ct_0_14_0+set}" = set; then : - $as_echo_n "(cached) " >&6 - else -@@ -6061,8 +6061,7 @@ - main () - { - #if CLOOG_VERSION_MAJOR != 0 \ -- || CLOOG_VERSION_MINOR != 16 \ -- || CLOOG_VERSION_REVISION < 1 -+ || CLOOG_VERSION_MINOR != 17 - choke me - #endif - ; -diff -Naur gcc-4.6-20120120-orig/gcc/graphite-clast-to-gimple.c gcc-4.6-20120120/gcc/graphite-clast-to-gimple.c ---- gcc-4.6-20120120-orig/gcc/graphite-clast-to-gimple.c 2011-03-13 08:05:38.000000000 +1000 -+++ gcc-4.6-20120120/gcc/graphite-clast-to-gimple.c 2012-02-03 17:51:47.943463879 +1000 -@@ -1367,7 +1367,7 @@ - /* Change cloog output language to C. If we do use FORTRAN instead, cloog - will stop e.g. with "ERROR: unbounded loops not allowed in FORTRAN.", if - we pass an incomplete program to cloog. */ -- options->language = LANGUAGE_C; -+ options->language = CLOOG_LANGUAGE_C; - - /* Enable complex equality spreading: removes dummy statements - (assignments) in the generated code which repeats the diff --git a/core/gcc/gcc-hash-style-both.patch b/core/gcc/gcc-hash-style-both.patch deleted file mode 100644 index 8b59f4535..000000000 --- a/core/gcc/gcc-hash-style-both.patch +++ /dev/null @@ -1,122 +0,0 @@ ---- gcc/config/alpha/linux-elf.h.orig 2010-12-09 23:27:07.000000000 +1000 -+++ gcc/config/alpha/linux-elf.h 2011-03-11 10:01:47.770000457 +1000 -@@ -41,7 +41,7 @@ - - #define ELF_DYNAMIC_LINKER LINUX_DYNAMIC_LINKER - --#define LINK_SPEC "-m elf64alpha %{G*} %{relax:-relax} \ -+#define LINK_SPEC "-m elf64alpha --hash-style=both %{G*} %{relax:-relax} \ - %{O*:-O3} %{!O*:-O1} \ - %{shared:-shared} \ - %{!shared: \ ---- gcc/config/i386/linux64.h.orig 2011-03-03 08:35:36.000000000 +1000 -+++ gcc/config/i386/linux64.h 2011-03-11 10:01:47.770000457 +1000 -@@ -78,7 +78,7 @@ - %{!mno-sse2avx:%{mavx:-msse2avx}} %{msse2avx:%{!mavx:-msse2avx}}" - - #undef LINK_SPEC --#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} \ -+#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} --hash-style=both \ - %{shared:-shared} \ - %{!shared: \ - %{!static: \ ---- gcc/config/i386/linux.h.orig 2011-01-15 04:45:06.000000000 +1000 -+++ gcc/config/i386/linux.h 2011-03-11 10:01:47.770000457 +1000 -@@ -104,7 +104,7 @@ - { "dynamic_linker", LINUX_DYNAMIC_LINKER } - - #undef LINK_SPEC --#define LINK_SPEC "-m %(link_emulation) %{shared:-shared} \ -+#define LINK_SPEC "-m %(link_emulation) --hash-style=both %{shared:-shared} \ - %{!shared: \ - %{!static: \ - %{rdynamic:-export-dynamic} \ ---- gcc/config/ia64/linux.h.orig 2010-12-09 23:27:07.000000000 +1000 -+++ gcc/config/ia64/linux.h 2011-03-11 10:01:47.770000457 +1000 -@@ -64,7 +64,7 @@ - #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2" - - #undef LINK_SPEC --#define LINK_SPEC "\ -+#define LINK_SPEC "--hash-style=both \ - %{shared:-shared} \ - %{!shared: \ - %{!static: \ ---- gcc/config/rs6000/linux64.h.orig 2011-02-11 03:30:10.000000000 +1000 -+++ gcc/config/rs6000/linux64.h 2011-03-11 10:03:34.280000457 +1000 -@@ -389,11 +389,11 @@ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64) - - --#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \ -+#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \ - %{rdynamic:-export-dynamic} \ - -dynamic-linker " LINUX_DYNAMIC_LINKER32 "}}" - --#define LINK_OS_LINUX_SPEC64 "-m elf64ppc %{!shared: %{!static: \ -+#define LINK_OS_LINUX_SPEC64 "-m elf64ppc --hash-style=both %{!shared: %{!static: \ - %{rdynamic:-export-dynamic} \ - -dynamic-linker " LINUX_DYNAMIC_LINKER64 "}}" - ---- gcc/config/rs6000/sysv4.h.orig 2011-01-28 04:36:03.000000000 +1000 -+++ gcc/config/rs6000/sysv4.h 2011-03-11 10:01:47.773333792 +1000 -@@ -830,7 +830,7 @@ - #define LINUX_DYNAMIC_LINKER \ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER) - --#define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \ -+#define LINK_OS_LINUX_SPEC "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \ - %{rdynamic:-export-dynamic} \ - -dynamic-linker " LINUX_DYNAMIC_LINKER "}}" - ---- gcc/config/s390/linux.h.orig 2010-12-09 23:27:07.000000000 +1000 -+++ gcc/config/s390/linux.h 2011-03-11 10:01:47.770000457 +1000 -@@ -77,7 +77,7 @@ - - #undef LINK_SPEC - #define LINK_SPEC \ -- "%{m31:-m elf_s390}%{m64:-m elf64_s390} \ -+ "%{m31:-m elf_s390}%{m64:-m elf64_s390} --hash-style=both \ - %{shared:-shared} \ - %{!shared: \ - %{static:-static} \ ---- gcc/config/sparc/linux64.h.orig 2011-02-17 23:57:21.000000000 +1000 -+++ gcc/config/sparc/linux64.h 2011-03-11 10:01:47.770000457 +1000 -@@ -113,7 +113,7 @@ - { "link_arch_default", LINK_ARCH_DEFAULT_SPEC }, \ - { "link_arch", LINK_ARCH_SPEC }, - --#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/usr/lib %{shared:-shared} \ -+#define LINK_ARCH32_SPEC "-m elf32_sparc --hash-style=both -Y P,%R/usr/lib %{shared:-shared} \ - %{!shared: \ - %{!static: \ - %{rdynamic:-export-dynamic} \ -@@ -121,7 +121,7 @@ - %{static:-static}} \ - " - --#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \ -+#define LINK_ARCH64_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \ - %{!shared: \ - %{!static: \ - %{rdynamic:-export-dynamic} \ -@@ -193,7 +193,7 @@ - #else /* !SPARC_BI_ARCH */ - - #undef LINK_SPEC --#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \ -+#define LINK_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \ - %{!shared: \ - %{!static: \ - %{rdynamic:-export-dynamic} \ ---- gcc/config/sparc/linux.h.orig 2011-01-27 06:30:12.000000000 +1000 -+++ gcc/config/sparc/linux.h 2011-03-11 10:01:47.770000457 +1000 -@@ -74,7 +74,7 @@ - #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" - - #undef LINK_SPEC --#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \ -+#define LINK_SPEC "-m elf32_sparc --hash-style=both -Y P,/usr/lib %{shared:-shared} \ - %{!mno-relax:%{!r:-relax}} \ - %{!shared: \ - %{!static: \ diff --git a/core/glibc/glibc-2.10-dont-build-timezone.patch b/core/glibc/glibc-2.10-dont-build-timezone.patch deleted file mode 100644 index d3abeff17..000000000 --- a/core/glibc/glibc-2.10-dont-build-timezone.patch +++ /dev/null @@ -1,13 +0,0 @@ -timezone data has been split into the package sys-libs/timezone-data - ---- glibc-2.4/Makeconfig -+++ glibc-2.4/Makeconfig -@@ -931,7 +931,7 @@ - stdlib stdio-common libio malloc string wcsmbs time dirent \ - grp pwd posix io termios resource misc socket sysvipc gmon \ - gnulib iconv iconvdata wctype manual shadow gshadow po argp \ -- crypt nss localedata timezone rt conform debug \ -+ crypt nss localedata rt conform debug \ - $(add-on-subdirs) $(dlfcn) $(binfmt-subdir) - - ifndef avoid-generated diff --git a/core/gmp/538dfce27f41.patch b/core/gmp/538dfce27f41.patch deleted file mode 100644 index 2e0a1af50..000000000 --- a/core/gmp/538dfce27f41.patch +++ /dev/null @@ -1,38 +0,0 @@ - -# HG changeset patch -# User Torbjorn Granlund <tege@gmplib.org> -# Date 1310730221 -7200 -# Node ID 538dfce27f410b910d5e2f011119269e224d16a3 -# Parent 03ed209dd7efd4f4fff0ce297bb3a8f7e7ba2366 -(mpn_dcpi1_bdiv_q): Get mpn_sub_1 size argument right. - -diff -r 03ed209dd7ef -r 538dfce27f41 mpn/generic/dcpi1_bdiv_q.c ---- a/mpn/generic/dcpi1_bdiv_q.c Thu Jun 16 12:22:24 2011 +0200 -+++ b/mpn/generic/dcpi1_bdiv_q.c Fri Jul 15 13:43:41 2011 +0200 -@@ -7,7 +7,7 @@ - SAFE TO REACH THEM THROUGH DOCUMENTED INTERFACES. IN FACT, IT IS ALMOST - GUARANTEED THAT THEY WILL CHANGE OR DISAPPEAR IN A FUTURE GMP RELEASE. - --Copyright 2006, 2007, 2009, 2010 Free Software Foundation, Inc. -+Copyright 2006, 2007, 2009, 2010, 2011 Free Software Foundation, Inc. - - This file is part of the GNU MP Library. - -@@ -28,7 +28,6 @@ - #include "gmp-impl.h" - - -- - mp_size_t - mpn_dcpi1_bdiv_q_n_itch (mp_size_t n) - { -@@ -130,7 +129,7 @@ - qn = nn - qn; - while (qn > dn) - { -- mpn_sub_1 (np + dn, np + dn, qn, cy); -+ mpn_sub_1 (np + dn, np + dn, qn - dn, cy); - cy = mpn_dcpi1_bdiv_qr_n (qp, np, dp, dn, dinv, tp); - qp += dn; - np += dn; - diff --git a/core/inetutils/domainname b/core/inetutils/domainname deleted file mode 100644 index a1b8a8c31..000000000 --- a/core/inetutils/domainname +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -exec /usr/bin/hostname -d "$@" diff --git a/core/inetutils/rexec.xinetd b/core/inetutils/rexec.xinetd deleted file mode 100644 index 4659e4745..000000000 --- a/core/inetutils/rexec.xinetd +++ /dev/null @@ -1,10 +0,0 @@ -service exec -{ - flags = REUSE - socket_type = stream - wait = no - user = root - server = /usr/sbin/rexecd - log_on_failure += USERID - disable = yes -} diff --git a/core/iproute2/fix-ip-l.patch b/core/iproute2/fix-ip-l.patch deleted file mode 100644 index 7f1749cbb..000000000 --- a/core/iproute2/fix-ip-l.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 5aa08f6bf4107f8aec43c0678466a314dbd0d054 Mon Sep 17 00:00:00 2001 -From: Stephen Hemminger <shemminger@vyatta.com> -Date: Fri, 20 Jan 2012 08:16:02 -0800 -Subject: [PATCH] ip: make 'ip l' be 'ip link' - -Restore compatiablity for those lazy typists. ---- - ip/ip.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/ip/ip.c b/ip/ip.c -index 7b4bacb..20dc3b5 100644 ---- a/ip/ip.c -+++ b/ip/ip.c -@@ -72,8 +72,8 @@ static const struct cmd { - { "neighbour", do_ipneigh }, - { "ntable", do_ipntable }, - { "ntbl", do_ipntable }, -- { "l2tp", do_ipl2tp }, - { "link", do_iplink }, -+ { "l2tp", do_ipl2tp }, - { "tunnel", do_iptunnel }, - { "tunl", do_iptunnel }, - { "tuntap", do_iptuntap }, --- -1.7.6.5 - diff --git a/core/iproute2/remove-libnl-headers.patch b/core/iproute2/remove-libnl-headers.patch deleted file mode 100644 index 921e1fa82..000000000 --- a/core/iproute2/remove-libnl-headers.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 13603f6a9e46f08576f6284a0ef1ce1fbf94ffe0 Mon Sep 17 00:00:00 2001 -From: Stephen Hemminger <shemminger@vyatta.com> -Date: Tue, 10 Jan 2012 08:50:49 -0800 -Subject: [PATCH] iplt2p: remove unused libnl headers - -Leftover from change to original code. ---- - ip/ipl2tp.c | 7 ------- - 1 files changed, 0 insertions(+), 7 deletions(-) - -diff --git a/ip/ipl2tp.c b/ip/ipl2tp.c -index 042ddb4..97f98b6 100644 ---- a/ip/ipl2tp.c -+++ b/ip/ipl2tp.c -@@ -23,13 +23,6 @@ - #include <linux/if_arp.h> - #include <linux/ip.h> - --#include <netlink/netlink.h> --#include <netlink/genl/genl.h> --#include <netlink/genl/family.h> --#include <netlink/genl/mngt.h> --#include <netlink/genl/ctrl.h> --#include <netlink/utils.h> -- - #include <linux/genetlink.h> - #include <linux/l2tp.h> - --- -1.7.6.5 - diff --git a/core/libarchive/interpret-non-posix-zips.patch b/core/libarchive/interpret-non-posix-zips.patch deleted file mode 100644 index 63bc439d9..000000000 --- a/core/libarchive/interpret-non-posix-zips.patch +++ /dev/null @@ -1,165 +0,0 @@ -Index: libarchive/archive_read_support_format_zip.c -=================================================================== ---- libarchive/archive_read_support_format_zip.c (revision 4189) -+++ libarchive/archive_read_support_format_zip.c (revision 4190) -@@ -217,14 +217,13 @@ - } - - /* -- * TODO: This is a performance sink because it forces -- * the read core to drop buffered data from the start -- * of file, which will then have to be re-read again -- * if this bidder loses. -+ * TODO: This is a performance sink because it forces the read core to -+ * drop buffered data from the start of file, which will then have to -+ * be re-read again if this bidder loses. - * -- * Consider passing in the winning bid value to subsequent -- * bidders so that this bidder in particular can avoid -- * seeking if it knows it's going to lose anyway. -+ * We workaround this a little by passing in the best bid so far so -+ * that later bidders can do nothing if they know they'll never -+ * outbid. But we can certainly do better... - */ - static int - archive_read_format_zip_seekable_bid(struct archive_read *a, int best_bid) -@@ -311,19 +310,29 @@ - external_attributes = archive_le32dec(p + 38); - zip_entry->local_header_offset = archive_le32dec(p + 42); - -+ /* If we can't guess the mode, leave it zero here; -+ when we read the local file header we might get -+ more information. */ -+ zip_entry->mode = 0; - if (zip_entry->system == 3) { - zip_entry->mode = external_attributes >> 16; -- } else { -- zip_entry->mode = AE_IFREG | 0777; - } - -- /* Do we need to parse filename here? */ -- /* Or can we wait until we read the local header? */ -+ /* We don't read the filename until we get to the -+ local file header. Reading it here would speed up -+ table-of-contents operations (removing the need to -+ find and read local file header to get the -+ filename) at the cost of requiring a lot of extra -+ space. */ -+ /* We don't read the extra block here. We assume it -+ will be duplicated at the local file header. */ - __archive_read_consume(a, - 46 + filename_length + extra_length + comment_length); - } - -- /* TODO: Sort zip entries. */ -+ /* TODO: Sort zip entries by file offset so that we -+ can optimize get_next_header() to use skip instead of -+ seek. */ - - return ARCHIVE_OK; - } -@@ -434,6 +443,11 @@ - return (30); - } - -+ /* TODO: It's worth looking ahead a little bit for a valid -+ * PK signature. In particular, that would make it possible -+ * to read some UUEncoded SFX files or SFX files coming from -+ * a network socket. */ -+ - return (0); - } - -Index: libarchive/test/test_compat_zip_6.zip.uu -=================================================================== ---- libarchive/test/test_compat_zip_6.zip.uu (revision 0) -+++ libarchive/test/test_compat_zip_6.zip.uu (revision 4190) -@@ -0,0 +1,10 @@ -+begin 755 test_compat_zip_6.zip -+M4$L#!`H``````'@3-T`````````````````6````3F5W($9O;&1E<B].97<@ -+M1F]L9&5R+U!+`P0*``````!\$S=`%4-8OPL````+````*P```$YE=R!&;VQD -+M97(O3F5W($9O;&1E<B].97<@5&5X="!$;V-U;65N="YT>'1S;VUE('1E>'0- -+M"E!+`0(4"PH``````'@3-T`````````````````6````````````$``````` -+M``!.97<@1F]L9&5R+TYE=R!&;VQD97(O4$L!`A0+"@``````?!,W0!5#6+\+ -+M````"P```"L``````````0`@````-````$YE=R!&;VQD97(O3F5W($9O;&1E -+M<B].97<@5&5X="!$;V-U;65N="YT>'102P4&``````(``@"=````B``````` -+` -+end -Index: libarchive/test/test_compat_zip.c -=================================================================== ---- libarchive/test/test_compat_zip.c (revision 4189) -+++ libarchive/test/test_compat_zip.c (revision 4190) -@@ -348,6 +348,53 @@ - free(p); - } - -+/* -+ * Issue 225: Errors extracting MSDOS Zip archives with directories. -+ */ -+static void -+compat_zip_6_verify(struct archive *a) -+{ -+ struct archive_entry *ae; -+ -+ assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); -+ assertEqualString("New Folder/New Folder/", archive_entry_pathname(ae)); -+ assertEqualInt(AE_IFDIR, archive_entry_filetype(ae)); -+ assertEqualInt(1327314468, archive_entry_mtime(ae)); -+ assertEqualInt(0, archive_entry_size(ae)); -+ assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); -+ assertEqualString("New Folder/New Folder/New Text Document.txt", archive_entry_pathname(ae)); -+ assertEqualInt(AE_IFREG, archive_entry_filetype(ae)); -+ assertEqualInt(1327314476, archive_entry_mtime(ae)); -+ assertEqualInt(11, archive_entry_size(ae)); -+ assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae)); -+} -+ -+static void -+test_compat_zip_6(void) -+{ -+ const char *refname = "test_compat_zip_6.zip"; -+ struct archive *a; -+ void *p; -+ size_t s; -+ -+ extract_reference_file(refname); -+ p = slurpfile(&s, refname); -+ -+ assert((a = archive_read_new()) != NULL); -+ assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); -+ assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); -+ assertEqualIntA(a, ARCHIVE_OK, read_open_memory_seek(a, p, s, 7)); -+ compat_zip_6_verify(a); -+ assertEqualIntA(a, ARCHIVE_OK, archive_read_free(a)); -+ -+ assert((a = archive_read_new()) != NULL); -+ assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); -+ assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); -+ assertEqualIntA(a, ARCHIVE_OK, read_open_memory(a, p, s, 7)); -+ compat_zip_6_verify(a); -+ assertEqualIntA(a, ARCHIVE_OK, archive_read_free(a)); -+} -+ - DEFINE_TEST(test_compat_zip) - { - test_compat_zip_1(); -@@ -355,6 +402,7 @@ - test_compat_zip_3(); - test_compat_zip_4(); - test_compat_zip_5(); -+ test_compat_zip_6(); - } - - -Index: Makefile.am -=================================================================== ---- Makefile.am (revision 4189) -+++ Makefile.am (revision 4190) -@@ -462,6 +462,7 @@ - libarchive/test/test_compat_zip_3.zip.uu \ - libarchive/test/test_compat_zip_4.zip.uu \ - libarchive/test/test_compat_zip_5.zip.uu \ -+ libarchive/test/test_compat_zip_6.zip.uu \ - libarchive/test/test_fuzz_1.iso.Z.uu \ - libarchive/test/test_fuzz.cab.uu \ - libarchive/test/test_fuzz.lzh.uu \ diff --git a/core/libarchive/skip-fiemap-on-unavail.patch b/core/libarchive/skip-fiemap-on-unavail.patch deleted file mode 100644 index d054aea4e..000000000 --- a/core/libarchive/skip-fiemap-on-unavail.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 293687358e2c52213a3f077bb3d8f860ea5bfda9 Mon Sep 17 00:00:00 2001 -From: Michihiro NAKAJIMA <ggcueroad@gmail.com> -Date: Mon, 6 Feb 2012 04:51:16 +0900 -Subject: [PATCH] Fix issue 238. Skip the setup sparse on linux without a - check of errno if ioctl(,FS_IOC_FIEMAP,) failed because the - errno is not fixed , for example, some file system returns - ENOTTY, another returns EOPNOTSUPP, or EINVAL and so on. We - cannot decide what errno exactly indicates an unsupported - error. - ---- - libarchive/archive_read_disk_entry_from_file.c | 13 +++---------- - 1 file changed, 3 insertions(+), 10 deletions(-) - -diff --git a/libarchive/archive_read_disk_entry_from_file.c b/libarchive/archive_read_disk_entry_from_file.c -index eef42ef74..6415008 100644 ---- a/libarchive/archive_read_disk_entry_from_file.c -+++ b/libarchive/archive_read_disk_entry_from_file.c -@@ -859,16 +859,9 @@ setup_sparse(struct archive_read_disk *a, - - r = ioctl(fd, FS_IOC_FIEMAP, fm); - if (r < 0) { -- /* When errno is ENOTTY, it is better we should -- * return ARCHIVE_OK because an earlier version -- *(<2.6.28) cannot perfom FS_IOC_FIEMAP. -- * We should also check if errno is EOPNOTSUPP, -- * it means "Operation not supported". */ -- if (errno != ENOTTY && errno != EOPNOTSUPP) { -- archive_set_error(&a->archive, errno, -- "FIEMAP failed"); -- exit_sts = ARCHIVE_FAILED; -- } -+ /* When something error happens, it is better we -+ * should return ARCHIVE_OK because an earlier -+ * version(<2.6.28) cannot perfom FS_IOC_FIEMAP. */ - goto exit_setup_sparse; - } - if (fm->fm_mapped_extents == 0) --- -1.7.9.2 - diff --git a/core/libarchive/test-with-zip-mtime.patch b/core/libarchive/test-with-zip-mtime.patch deleted file mode 100644 index 79e2f3c7e..000000000 --- a/core/libarchive/test-with-zip-mtime.patch +++ /dev/null @@ -1,23 +0,0 @@ -Index: libarchive/test/test_compat_zip.c -=================================================================== ---- libarchive/test/test_compat_zip.c (revision 4197) -+++ libarchive/test/test_compat_zip.c (revision 4198) -@@ -359,12 +359,16 @@ - assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); - assertEqualString("New Folder/New Folder/", archive_entry_pathname(ae)); - assertEqualInt(AE_IFDIR, archive_entry_filetype(ae)); -- assertEqualInt(1327314468, archive_entry_mtime(ae)); -+ /* Zip timestamps are local time, so vary by time zone. */ -+ /* TODO: A more complex assert would work here; we could -+ verify that it's within +/- 24 hours of a particular value. */ -+ /* assertEqualInt(1327314468, archive_entry_mtime(ae)); */ - assertEqualInt(0, archive_entry_size(ae)); - assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); - assertEqualString("New Folder/New Folder/New Text Document.txt", archive_entry_pathname(ae)); - assertEqualInt(AE_IFREG, archive_entry_filetype(ae)); -- assertEqualInt(1327314476, archive_entry_mtime(ae)); -+ /* Zip timestamps are local time, so vary by time zone. */ -+ /* assertEqualInt(1327314476, archive_entry_mtime(ae)); */ - assertEqualInt(11, archive_entry_size(ae)); - assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae)); - } diff --git a/core/lilo/PKGBUILD b/core/lilo/PKGBUILD deleted file mode 100644 index 8202e1853..000000000 --- a/core/lilo/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 134681 2011-08-07 15:40:03Z tpowa $ -# Maintainer: Eric Belanger <eric@archlinux.org> -# Contributor: judd <jvinet@zeroflux.org> - -pkgname=lilo -pkgver=23.2 -pkgrel=3 -pkgdesc="A bootloader for Linux" -arch=('i686' 'x86_64') -url="https://alioth.debian.org/projects/lilo/" -license=('BSD') -# While lilo should stay in the base category, -# it usually makes no sense if it is installed -# with pacman -S base, therefore, don't add -# the base group here. -#groups=('base') -backup=('etc/lilo.conf') -depends=('device-mapper' 'coreutils') -makedepends=('bin86' 'sharutils') -optdepends=('perl: to use keytab-lilo') -install=lilo.install -options=('!makeflags') -source=("http://lilo.alioth.debian.org/ftp/sources/${pkgname}-${pkgver}.tar.gz" - 'lilo.conf') -md5sums=('51b9b9db665d3b8724919e3d46054d12' - 'ca2d8cd9b63f11444861939b42df29c1') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - export LC_ALL=C - make all -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -D -m644 "${srcdir}/lilo.conf" "${pkgdir}/etc/lilo.conf" - install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/core/lilo/lilo.conf b/core/lilo/lilo.conf deleted file mode 100644 index 9d42a2333..000000000 --- a/core/lilo/lilo.conf +++ /dev/null @@ -1,28 +0,0 @@ -# -# /etc/lilo.conf -# - -boot=/dev/hda -# This line often fixes L40 errors on bootup -# disk=/dev/hda bios=0x80 - -default=arch -timeout=50 -lba32 -prompt - -image=/boot/vmlinuz-linux - label=arch - root=/dev/hda3 - initrd=/boot/initramfs-linux.img - read-only - -image=/boot/vmlinuz-linux - label=arch-fallback - root=/dev/hda3 - initrd=/boot/initramfs-linux-fallback.img - read-only - -#other=/dev/hda1 -# label=dos - diff --git a/core/lilo/lilo.install b/core/lilo/lilo.install deleted file mode 100644 index 7375fddf8..000000000 --- a/core/lilo/lilo.install +++ /dev/null @@ -1,5 +0,0 @@ -post_upgrade() { - echo - echo "If you use the LILO bootloader, you should run 'lilo' after upgrading." - echo -} diff --git a/core/nfs-utils/kernel-3.0-segfault.patch b/core/nfs-utils/kernel-3.0-segfault.patch deleted file mode 100644 index 3dba94a05..000000000 --- a/core/nfs-utils/kernel-3.0-segfault.patch +++ /dev/null @@ -1,53 +0,0 @@ -mount.nfs segfaults if kernel version number does not contain -at least 3 components delimited with a dot. - -Avoid this by matching up to three unsigned integers inialised -to zero, separated by dots. - -A version that does not start with an integer is probably a future -version where the versioning evolved to another scheme. -Return UINT_MAX which is guaranteed to be higher than existing -versions. This would also make it possible to easily identify -versions that do not start with an integer. - -Signed-off-by: Luk Claes <luk@...> ---- - utils/mount/version.h | 16 +++++++++------- - 1 files changed, 9 insertions(+), 7 deletions(-) - -diff --git a/utils/mount/version.h b/utils/mount/version.h -index af61a6f..531cf68 100644 ---- a/utils/mount/version.h -+++ b/utils/mount/version.h -@@ -23,8 +23,8 @@ - #ifndef _NFS_UTILS_MOUNT_VERSION_H - #define _NFS_UTILS_MOUNT_VERSION_H - --#include <stdlib.h> --#include <string.h> -+#include <stdio.h> -+#include <limits.h> - - #include <sys/utsname.h> - -@@ -37,14 +37,16 @@ static inline unsigned int MAKE_VERSION(unsigned int p, unsigned int q, - static inline unsigned int linux_version_code(void) - { - struct utsname my_utsname; -- unsigned int p, q, r; -+ unsigned int p, q = 0, r = 0; - -+ /* UINT_MAX as backward compatibility code should not be run */ - if (uname(&my_utsname)) -- return 0; -+ return UINT_MAX; - -- p = (unsigned int)atoi(strtok(my_utsname.release, ".")); -- q = (unsigned int)atoi(strtok(NULL, ".")); -- r = (unsigned int)atoi(strtok(NULL, ".")); -+ /* UINT_MAX as future versions might not start with an integer */ -+ if (sscanf(my_utsname.release, "%u.%u.%u", &p, &q, &r) < 1) -+ return UINT_MAX; -+ - return MAKE_VERSION(p, q, r); - } diff --git a/core/openssl/disable-tls12-client.patch b/core/openssl/disable-tls12-client.patch deleted file mode 100644 index edb87e77f..000000000 --- a/core/openssl/disable-tls12-client.patch +++ /dev/null @@ -1,36 +0,0 @@ -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/openssl/vpaes.patch b/core/openssl/vpaes.patch deleted file mode 100644 index 2688b0c0a..000000000 --- a/core/openssl/vpaes.patch +++ /dev/null @@ -1,69 +0,0 @@ -Index: openssl/crypto/aes/asm/vpaes-x86.pl -RCS File: /v/openssl/cvs/openssl/crypto/aes/asm/vpaes-x86.pl,v -rcsdiff -q -kk '-r1.5.4.4' '-r1.5.4.5' -u '/v/openssl/cvs/openssl/crypto/aes/asm/vpaes-x86.pl,v' 2>/dev/null ---- vpaes-x86.pl 2011/12/15 22:20:26 1.5.4.4 -+++ vpaes-x86.pl 2012/03/31 16:55:18 1.5.4.5 -@@ -843,6 +843,8 @@ - &mov ($out,&wparam(1)); # out - &mov ($round,&wparam(2)); # len - &mov ($key,&wparam(3)); # key -+ &sub ($round,16); -+ &jc (&label("cbc_abort")); - &lea ($base,&DWP(-56,"esp")); - &mov ($const,&wparam(4)); # ivp - &and ($base,-16); -@@ -853,7 +855,6 @@ - &mov (&DWP(48,"esp"),$base); - - &mov (&DWP(0,"esp"),$out); # save out -- &sub ($round,16); - &mov (&DWP(4,"esp"),$key) # save key - &mov (&DWP(8,"esp"),$const); # save ivp - &mov ($out,$round); # $out works as $len -@@ -896,6 +897,7 @@ - &mov ($base,&DWP(8,"esp")); # restore ivp - &mov ("esp",&DWP(48,"esp")); - &movdqu (&QWP(0,$base),"xmm1"); # write IV -+&set_label("cbc_abort"); - &function_end("${PREFIX}_cbc_encrypt"); - - &asm_finish(); -Index: openssl/crypto/aes/asm/vpaes-x86_64.pl -RCS File: /v/openssl/cvs/openssl/crypto/aes/asm/vpaes-x86_64.pl,v -rcsdiff -q -kk '-r1.4.4.2' '-r1.4.4.3' -u '/v/openssl/cvs/openssl/crypto/aes/asm/vpaes-x86_64.pl,v' 2>/dev/null ---- vpaes-x86_64.pl 2011/11/14 21:01:17 1.4.4.2 -+++ vpaes-x86_64.pl 2012/03/31 16:55:18 1.4.4.3 -@@ -263,7 +263,7 @@ - pshufb %xmm2, %xmm4 # 4 = sbou - pxor %xmm0, %xmm4 # 4 = sb1u + k - movdqa 0x70(%r10), %xmm0 # 0 : sbot -- movdqa .Lk_sr-.Lk_dsbd(%r11), %xmm2 -+ movdqa -0x160(%r11), %xmm2 # .Lk_sr-.Lk_dsbd=-0x160 - pshufb %xmm3, %xmm0 # 0 = sb1t - pxor %xmm4, %xmm0 # 0 = A - pshufb %xmm2, %xmm0 -@@ -869,6 +869,8 @@ - ___ - ($len,$key)=($key,$len); - $code.=<<___; -+ sub \$16,$len -+ jc .Lcbc_abort - ___ - $code.=<<___ if ($win64); - lea -0xb8(%rsp),%rsp -@@ -887,7 +889,6 @@ - $code.=<<___; - movdqu ($ivp),%xmm6 # load IV - sub $inp,$out -- sub \$16,$len - call _vpaes_preheat - cmp \$0,${enc}d - je .Lcbc_dec_loop -@@ -932,6 +933,7 @@ - .Lcbc_epilogue: - ___ - $code.=<<___; -+.Lcbc_abort: - ret - .size ${PREFIX}_cbc_encrypt,.-${PREFIX}_cbc_encrypt - ___ diff --git a/core/pkg-config/autoconf-2.66.patch b/core/pkg-config/autoconf-2.66.patch deleted file mode 100644 index 14cabdf9f..000000000 --- a/core/pkg-config/autoconf-2.66.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur pkg-config-0.25-old//pkg.m4 pkg-config-0.25/pkg.m4 ---- pkg-config-0.25-old//pkg.m4 2009-12-07 06:39:02.000000000 +1000 -+++ pkg-config-0.25/pkg.m4 2010-07-15 14:44:37.466942978 +1000 -@@ -135,7 +135,7 @@ - Consider adjusting the PKG_CONFIG_PATH environment variable if you - installed software in a non-standard prefix. - --_PKG_TEXT])dnl -+_PKG_TEXT])[]dnl - ]) - elif test $pkg_failed = untried; then - AC_MSG_RESULT([no]) diff --git a/core/sqlite3/PKGBUILD b/core/sqlite3/PKGBUILD deleted file mode 100644 index d7d705592..000000000 --- a/core/sqlite3/PKGBUILD +++ /dev/null @@ -1,63 +0,0 @@ -# $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/} -_docver=${_amalgamationver} #3070700 -#pkgver=${_amalgamationver2//0/.} -pkgver=3.7.11 -pkgrel=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') - replaces=('sqlite') - - 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/core/sqlite3/license.txt b/core/sqlite3/license.txt deleted file mode 100644 index 118c5d5e6..000000000 --- a/core/sqlite3/license.txt +++ /dev/null @@ -1,33 +0,0 @@ -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/core/tzdata/Makefile.patch b/core/tzdata/Makefile.patch deleted file mode 100644 index e88f9d907..000000000 --- a/core/tzdata/Makefile.patch +++ /dev/null @@ -1,140 +0,0 @@ -diff -Naur src/Makefile src-p/Makefile ---- src/Makefile 2007-08-20 16:47:41.000000000 +0200 -+++ src-p/Makefile 2007-10-02 04:07:44.000000000 +0200 -@@ -34,17 +34,17 @@ - - # Everything gets put in subdirectories of. . . - --TOPDIR= /usr/local -+TOPDIR= $(DESTDIR)/usr - - # "Compiled" time zone information is placed in the "TZDIR" directory - # (and subdirectories). - # Use an absolute path name for TZDIR unless you're just testing the software. - --TZDIR= $(TOPDIR)/etc/zoneinfo -+TZDIR= $(TOPDIR)/share/zoneinfo - - # The "tzselect", "zic", and "zdump" commands get installed in. . . - --ETCDIR= $(TOPDIR)/etc -+SBINDIR= $(TOPDIR)/sbin - - # If you "make INSTALL", the "date" command gets installed in. . . - -@@ -52,7 +52,7 @@ - - # Manual pages go in subdirectories of. . . - --MANDIR= $(TOPDIR)/man -+MANDIR= $(TOPDIR)/share/man - - # Library functions are put in an archive in LIBDIR. - -@@ -83,7 +83,7 @@ - - # Non-default libraries needed to link. - # Add -lintl if you want to use `gettext' on Solaris. --LDLIBS= -+LDLIBS=$(LDFLAGS) - - # Add the following to the end of the "CFLAGS=" line as needed. - # -Dconst= if `const' does not work (SunOS 4.x cc, OSF1 V5.0 cc) -@@ -211,7 +211,7 @@ - # before the first Monday in January when a "%V" format is used and January 1 - # falls on a Friday, Saturday, or Sunday. - --CFLAGS= -+CFLAGS += -std=gnu99 - - # If you want zic's -s option used when installing, uncomment the next line - # ZFLAGS= -s -@@ -220,7 +220,7 @@ - ZIC= $(zic) $(ZFLAGS) - - # The name of a Posix-compliant `awk' on your system. --AWK= nawk -+AWK= awk - - # The path where SGML DTDs are kept. - SGML_SEARCH_PATH= $(TOPDIR)/share/doc/sgml-lib/REC-html401-19991224/ -@@ -241,8 +241,10 @@ - - ############################################################################### - --cc= cc --CC= $(cc) -DTZDIR=\"$(TZDIR)\" -+CC+= -DTZDIR=\"$(TZDIR)\" -+ifeq ($(NLS),1) -+CC += -DHAVE_GETTEXT=1 -DTZ_DOMAIN=\"libc\" -+endif - - TZCSRCS= zic.c localtime.c asctime.c scheck.c ialloc.c - TZCOBJS= zic.o localtime.o asctime.o scheck.o ialloc.o -@@ -282,14 +284,16 @@ - - ALL: all date - --install: all $(DATA) $(REDO) $(TZLIB) $(MANS) $(TABDATA) -+install: all $(DATA) $(REDO) $(MANS) $(TABDATA) - $(ZIC) -y $(YEARISTYPE) \ - -d $(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES) - -rm -f $(TZDIR)/iso3166.tab $(TZDIR)/zone.tab - cp iso3166.tab zone.tab $(TZDIR)/. -- -mkdir $(TOPDIR) $(ETCDIR) -- cp tzselect zic zdump $(ETCDIR)/. -- -mkdir $(TOPDIR) $(MANDIR) \ -+ -mkdir -p $(TOPDIR) $(SBINDIR) -+ cp zic zdump $(SBINDIR)/. -+ -mkdir -p $(TOPDIR) $(BINDIR) -+ cp tzselect $(BINDIR)/. -+ -mkdir -p $(TOPDIR) $(MANDIR) \ - $(MANDIR)/man3 $(MANDIR)/man5 $(MANDIR)/man8 - -rm -f $(MANDIR)/man3/newctime.3 \ - $(MANDIR)/man3/newtzset.3 \ -@@ -298,13 +302,11 @@ - $(MANDIR)/man8/zdump.8 \ - $(MANDIR)/man8/zic.8 - cp newctime.3 newtzset.3 $(MANDIR)/man3/. -- cp tzfile.5 $(MANDIR)/man5/. -- cp tzselect.8 zdump.8 zic.8 $(MANDIR)/man8/. - - INSTALL: ALL install date.1 -- -mkdir $(TOPDIR) $(BINDIR) -+ -mkdir -p $(TOPDIR) $(BINDIR) - cp date $(BINDIR)/. -- -mkdir $(TOPDIR) $(MANDIR) $(MANDIR)/man1 -+ -mkdir -p $(TOPDIR) $(MANDIR) $(MANDIR)/man1 - -rm -f $(MANDIR)/man1/date.1 - cp date.1 $(MANDIR)/man1/. - -@@ -334,9 +336,9 @@ - # You must replace all of $(TZDIR) to switch from not using leap seconds - # to using them, or vice versa. - other_two: zic leapseconds $(TDATA) -- $(ZIC) -y $(YEARISTYPE) -d $(TZDIR)-posix -L /dev/null $(TDATA) -+ $(ZIC) -y $(YEARISTYPE) -d $(TZDIR)/posix -L /dev/null $(TDATA) - $(ZIC) -y $(YEARISTYPE) \ -- -d $(TZDIR)-leaps -L leapseconds $(TDATA) -+ -d $(TZDIR)/right -L leapseconds $(TDATA) - - posix_right: posix_only other_two - -@@ -367,7 +369,7 @@ - <$? >$@ - chmod +x $@ - --check: check_tables check_web -+check: check_tables - - check_tables: checktab.awk $(PRIMARY_YDATA) - $(AWK) -f checktab.awk $(PRIMARY_YDATA) -diff -Naur src/tzselect.ksh src-p/tzselect.ksh ---- src/tzselect.ksh 2007-08-20 16:47:42.000000000 +0200 -+++ src-p/tzselect.ksh 2007-10-02 04:07:44.000000000 +0200 -@@ -1,4 +1,4 @@ --#! /bin/ksh -+#! /bin/bash - - # '@(#)tzselect.ksh 8.1' - diff --git a/core/tzdata/PKGBUILD b/core/tzdata/PKGBUILD deleted file mode 100644 index c40fd5c11..000000000 --- a/core/tzdata/PKGBUILD +++ /dev/null @@ -1,47 +0,0 @@ -# $Id: PKGBUILD 152303 2012-03-06 15:04:33Z andyrtr $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> - -pkgname=tzdata -pkgver=2012b -pkgrel=1 -_tzcode=2012b -_tzdata=2012b -pkgdesc="Sources for time zone and daylight saving time data" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.iana.org/time-zones" -license=('GPL') -depends=() -makedepends=() -optdepends=('bash: required by tzselect') -options=('!emptydirs') -source=(#http://www.iana.org/time-zones/repository/releases/tzcode${_tzcode}.tar.gz - ftp://munnari.oz.au/pub/tzcode${_tzcode}.tar.gz - #http://www.iana.org/time-zones/repository/releases/${pkgname}${_tzdata}.tar.gz - ftp://munnari.oz.au/pub/${pkgname}${_tzdata}.tar.gz - Makefile.patch) -md5sums=('6137322ffd36e1fd5128885be1c57008' - '0615fd29def380a917e528433c820368' - 'a64ed97d1fc03c66ee8612c0d9f40507') - -build() { - cd ${srcdir} - - tar -xf tzcode${_tzcode}.tar.gz - tar -xf ${pkgname}${_tzdata}.tar.gz - - patch -Np1 -i "${srcdir}/Makefile.patch" - - make -} - -check() { - cd ${srcdir} - make -k check # || /bin/true -} - -package() { - cd ${srcdir} - make DESTDIR="${pkgdir}" install - - rm "${pkgdir}/usr/share/zoneinfo/localtime" -} diff --git a/core/udev/0001-reinstate-TIMEOUT-handling.patch b/core/udev/0001-reinstate-TIMEOUT-handling.patch deleted file mode 100644 index 9b251b283..000000000 --- a/core/udev/0001-reinstate-TIMEOUT-handling.patch +++ /dev/null @@ -1,126 +0,0 @@ -From 86617453cd78bf88d347f0e75a5be8b5ebac6c2e Mon Sep 17 00:00:00 2001 -From: Tom Gundersen <teg@jklm.no> -Date: Thu, 15 Mar 2012 02:12:43 +0100 -Subject: [PATCH] reinstate TIMEOUT= handling - -This reverts 43d5c5f03645c4b842659f9b5bd0ae465e885e92 and -57c6f8ae5f52a6e8ffc66a54966346f733dded39. - -Signed-off-by: Tom Gundersen <teg@jklm.no> ---- - src/libudev-device.c | 19 +++++++++++++++++++ - src/libudev-private.h | 1 + - src/udevd.c | 13 ++++++++++--- - 3 files changed, 30 insertions(+), 3 deletions(-) - -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.4 - diff --git a/core/util-linux/stable-fixes-2.21.patch b/core/util-linux/stable-fixes-2.21.patch deleted file mode 100644 index 3c6c32483..000000000 --- a/core/util-linux/stable-fixes-2.21.patch +++ /dev/null @@ -1,1516 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index d3b298c..9da5b24 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -387,6 +387,8 @@ AC_CACHE_VAL([scanf_cv_alloc_modifier], - [scanf_cv_alloc_modifier=as], - [scanf_cv_alloc_modifier=no] - ) -+ , -+ [scanf_cv_alloc_modifier=no] - ) - ) - -@@ -833,6 +835,8 @@ AC_ARG_ENABLE([ddate], - ) - UL_BUILD_INIT([ddate]) - AM_CONDITIONAL(BUILD_DDATE, test "x$build_ddate" = xyes) -+ruman1dir='${mandir}/ru/man1' -+AC_SUBST([ruman1dir]) - - - AC_ARG_ENABLE([agetty], -diff --git a/fdisk/fdiskbsdlabel.h b/fdisk/fdiskbsdlabel.h -index 9f9e091..e58e2ff 100644 ---- a/fdisk/fdiskbsdlabel.h -+++ b/fdisk/fdiskbsdlabel.h -@@ -46,7 +46,7 @@ - - #define BSD_LINUX_BOOTDIR "/usr/ucb/mdec" - --#if defined (i386) || defined (__sparc__) || defined (__arm__) || \ -+#if defined (__i386__) || defined (__sparc__) || defined (__arm__) || \ - defined (__mips__) || defined (__s390__) || defined (__sh__) || \ - defined(__x86_64__) || defined (__avr32__) || defined(__cris__) - #define BSD_LABELSECTOR 1 -diff --git a/include/list.h b/include/list.h -index 3ce46ca..d8c3bf0 100644 ---- a/include/list.h -+++ b/include/list.h -@@ -166,6 +166,10 @@ _INLINE_ void list_splice(struct list_head *list, struct list_head *head) - #define list_entry(ptr, type, member) \ - ((type *)((char *)(ptr)-(unsigned long)(&((type *)0)->member))) - -+ -+#define list_first_entry(head, type, member) \ -+ ((head) && (head)->next != (head) ? list_entry((head)->next, type, member) : NULL) -+ - /** - * list_for_each - iterate over elements in a list - * @pos: the &struct list_head to use as a loop counter. -diff --git a/lib/canonicalize.c b/lib/canonicalize.c -index ab32c10..fd18af4 100644 ---- a/lib/canonicalize.c -+++ b/lib/canonicalize.c -@@ -174,9 +174,16 @@ canonicalize_path(const char *path) - if (path == NULL) - return NULL; - -- if (!myrealpath(path, canonical, PATH_MAX+1)) -- return strdup(path); -- -+ if (!myrealpath(path, canonical, PATH_MAX+1)) { -+ char *res = strdup(path); -+ if (res) { -+ p = strrchr(res, '/'); -+ /* delete trailing slash */ -+ if (p && p > res && *(p + 1) == '\0') -+ *p = '\0'; -+ } -+ return res; -+ } - - p = strrchr(canonical, '/'); - if (p && strncmp(p, "/dm-", 4) == 0 && isdigit(*(p + 4))) { -diff --git a/libblkid/src/probe.c b/libblkid/src/probe.c -index 763f75c..6bd69d3 100644 ---- a/libblkid/src/probe.c -+++ b/libblkid/src/probe.c -@@ -388,6 +388,7 @@ void blkid_reset_probe(blkid_probe pr) - return; - - blkid_probe_reset_vals(pr); -+ blkid_probe_set_wiper(pr, 0, 0); - - pr->cur_chain = NULL; - -@@ -989,7 +990,7 @@ int blkid_do_wipe(blkid_probe pr, int dryrun) - len = sizeof(buf); - - DBG(DEBUG_LOWPROBE, printf( -- "wiping [offset=0x%jx, len=%zd, chain=%s, idx=%d, dryrun=%s]\n", -+ "do_wipe [offset=0x%jx, len=%zd, chain=%s, idx=%d, dryrun=%s]\n", - offset, len, chn->driver->name, chn->idx, dryrun ? "yes" : "not")); - - l = lseek(fd, offset, SEEK_SET); -@@ -1008,10 +1009,23 @@ int blkid_do_wipe(blkid_probe pr, int dryrun) - if (chn->idx >= 0) { - chn->idx--; - DBG(DEBUG_LOWPROBE, -- printf("wipe: moving %s chain index to %d\n", -+ printf("do_wipe: moving %s chain index to %d\n", - chn->driver->name, - chn->idx)); - } -+ if (chn->idx == -1) { -+ /* blkid_do_probe() goes to the next chain if the index -+ * of the current chain is -1, so we have to set the -+ * chain pointer to the previos chain. -+ */ -+ size_t idx = chn->driver->id > 0 ? -+ chn->driver->id - 1 : 0; -+ -+ if (idx > 0) -+ pr->cur_chain = &pr->chains[idx]; -+ else if (idx == 0) -+ pr->cur_chain = NULL; -+ } - } - return 0; - } -@@ -1579,8 +1593,9 @@ size_t blkid_rtrim_whitespace(unsigned char *str) - * for later resolution to conflicts between superblocks. - * - * For example we found valid LVM superblock, LVM wipes 8KiB at the begin of -- * the device. If we found another signature (for example MBR) this wiped area -- * then the signature has been added later and LVM superblock should be ignore. -+ * the device. If we found another signature (for example MBR) within the -+ * wiped area then the signature has been added later and LVM superblock -+ * should be ignore. - * - * Note that this heuristic is not 100% reliable, for example "pvcreate --zero - * n" allows to keep the begin of the device unmodified. It's probably better -@@ -1588,6 +1603,16 @@ size_t blkid_rtrim_whitespace(unsigned char *str) - * than for conflicts between filesystem superblocks -- existence of unwanted - * partition table is very unusual, because PT is pretty visible (parsed and - * interpreted by kernel). -+ * -+ * Note that we usually expect only one signature on the device, it means that -+ * we have to remember only one wiped area from previously successfully -+ * detected signature. -+ * -+ * blkid_probe_set_wiper() -- defines wiped area (e.g. LVM) -+ * blkid_probe_use_wiper() -- try to use area (e.g. MBR) -+ * -+ * Note that there is not relation between _wiper and blkid_to_wipe(). -+ * - */ - void blkid_probe_set_wiper(blkid_probe pr, blkid_loff_t off, blkid_loff_t size) - { -@@ -1638,12 +1663,17 @@ int blkid_probe_is_wiped(blkid_probe pr, struct blkid_chain **chn, - return 0; - } - -+/* -+ * Try to use any area -- if the area has been previously wiped then the -+ * previous probing result should be ignored (reseted). -+ */ - void blkid_probe_use_wiper(blkid_probe pr, blkid_loff_t off, blkid_loff_t size) - { - struct blkid_chain *chn = NULL; - - if (blkid_probe_is_wiped(pr, &chn, off, size) && chn) { -- DBG(DEBUG_LOWPROBE, printf("wiped area detected -- ignore previous results\n")); -+ DBG(DEBUG_LOWPROBE, printf("previously wiped area modified " -+ " -- ignore previous results\n")); - blkid_probe_set_wiper(pr, 0, 0); - blkid_probe_chain_reset_vals(pr, chn); - } -diff --git a/libmount/src/context.c b/libmount/src/context.c -index 1f30292..f97dd36 100644 ---- a/libmount/src/context.c -+++ b/libmount/src/context.c -@@ -1165,6 +1165,10 @@ int mnt_context_prepare_srcpath(struct libmnt_context *cxt) - - src = mnt_fs_get_source(cxt->fs); - -+ if (!src && (cxt->mountflags & MS_PROPAGATION)) -+ /* mount --make-{shared,private,...} */ -+ return mnt_fs_set_source(cxt->fs, "none"); -+ - /* ignore filesystems without source or filesystems - * where the source is quasi-path (//foo/bar) - */ -@@ -1203,7 +1207,7 @@ int mnt_context_prepare_srcpath(struct libmnt_context *cxt) - - if ((cxt->mountflags & (MS_BIND | MS_MOVE | MS_PROPAGATION)) || - mnt_fs_is_pseudofs(cxt->fs)) { -- DBG(CXT, mnt_debug_h(cxt, "PROPAGATION/pseudo FS source: %s", path)); -+ DBG(CXT, mnt_debug_h(cxt, "BIND/MOVE/pseudo FS source: %s", path)); - return rc; - } - -diff --git a/libmount/src/context_mount.c b/libmount/src/context_mount.c -index 8cbc25b..c56ffd4 100644 ---- a/libmount/src/context_mount.c -+++ b/libmount/src/context_mount.c -@@ -369,7 +369,12 @@ static int exec_helper(struct libmnt_context *cxt) - args[i++] = mnt_fs_get_srcpath(cxt->fs);/* 2 */ - args[i++] = mnt_fs_get_target(cxt->fs); /* 3 */ - -- if (mnt_context_is_sloppy(cxt)) -+ /* -+ * TODO: remove the exception for "nfs", -s is documented -+ * for years should be usable everywhere. -+ */ -+ if (mnt_context_is_sloppy(cxt) && -+ type && startswith(type, "nfs")) - args[i++] = "-s"; /* 4 */ - if (mnt_context_is_fake(cxt)) - args[i++] = "-f"; /* 5 */ -@@ -446,9 +451,14 @@ static int do_mount(struct libmnt_context *cxt, const char *try_type) - src = mnt_fs_get_srcpath(cxt->fs); - target = mnt_fs_get_target(cxt->fs); - -- if (!src || !target) -+ if (!target) - return -EINVAL; -- -+ if (!src) { -+ /* unnecessary, should be already resolved in -+ * mnt_context_prepare_srcpath(), but for sure... */ -+ DBG(CXT, mnt_debug_h(cxt, "WARNING: source is NULL -- using \"none\"!")); -+ src = "none"; -+ } - type = try_type ? : mnt_fs_get_fstype(cxt->fs); - - if (!(flags & MS_MGC_MSK)) -diff --git a/libmount/src/fs.c b/libmount/src/fs.c -index a28e66c..19650cb 100644 ---- a/libmount/src/fs.c -+++ b/libmount/src/fs.c -@@ -304,11 +304,7 @@ int __mnt_fs_set_source_ptr(struct libmnt_fs *fs, char *source) - - assert(fs); - -- if (source && !strcmp(source, "none")) { -- free(source); -- source = NULL; -- -- } else if (source && strchr(source, '=')) { -+ if (source && strchr(source, '=')) { - if (blkid_parse_tag_string(source, &t, &v) != 0) - return -1; - } -@@ -341,6 +337,7 @@ int mnt_fs_set_source(struct libmnt_fs *fs, const char *source) - - if (!fs) - return -EINVAL; -+ - if (source) { - p = strdup(source); - if (!p) -@@ -353,6 +350,41 @@ int mnt_fs_set_source(struct libmnt_fs *fs, const char *source) - return rc; - } - -+/* -+ * Compares @fs source path with @path. The tailing slash is ignored. -+ * See also mnt_fs_match_source(). -+ * -+ * Returns: 1 if @fs source path equal to @path, otherwise 0. -+ */ -+int mnt_fs_streq_srcpath(struct libmnt_fs *fs, const char *path) -+{ -+ const char *p; -+ -+ if (!fs) -+ return 0; -+ -+ p = mnt_fs_get_srcpath(fs); -+ -+ if (!mnt_fs_is_pseudofs(fs)) -+ return streq_except_trailing_slash(p, path); -+ -+ if (!p && !path) -+ return 1; -+ -+ return p && path && strcmp(p, path) == 0; -+} -+ -+/* -+ * Compares @fs target path with @path. The tailing slash is ignored. -+ * See also mnt_fs_match_target(). -+ * -+ * Returns: 1 if @fs target path equal to @path, otherwise 0. -+ */ -+int mnt_fs_streq_target(struct libmnt_fs *fs, const char *path) -+{ -+ return fs && streq_except_trailing_slash(mnt_fs_get_target(fs), path); -+} -+ - /** - * mnt_fs_get_tag: - * @fs: fs -@@ -1114,7 +1146,7 @@ int mnt_fs_match_target(struct libmnt_fs *fs, const char *target, - return 0; - - /* 1) native paths */ -- rc = !strcmp(target, fs->target); -+ rc = mnt_fs_streq_target(fs, target); - - if (!rc && cache) { - /* 2) - canonicalized and non-canonicalized */ -@@ -1146,10 +1178,6 @@ int mnt_fs_match_target(struct libmnt_fs *fs, const char *target, - * The 2nd, 3rd and 4th attempts are not performed when @cache is NULL. The - * 2nd and 3rd attempts are not performed if @fs->source is tag. - * -- * Note that valid source path is NULL; the libmount uses NULL instead of -- * "none". The "none" is used in /proc/{mounts,self/mountninfo} for pseudo -- * filesystems. -- * - * Returns: 1 if @fs source is equal to @source else 0. - */ - int mnt_fs_match_source(struct libmnt_fs *fs, const char *source, -@@ -1161,15 +1189,15 @@ int mnt_fs_match_source(struct libmnt_fs *fs, const char *source, - if (!fs) - return 0; - -- /* undefined source -- "none" in /proc */ -- if (source == NULL && fs->source == NULL) -+ /* 1) native paths... */ -+ if (mnt_fs_streq_srcpath(fs, source) == 1) - return 1; - -- if (source == NULL || fs->source == NULL) -+ if (!source || !fs->source) - return 0; - -- /* 1) native paths/tags */ -- if (streq_except_trailing_slash(source, fs->source)) -+ /* ... and tags */ -+ if (fs->tagname && strcmp(source, fs->source) == 0) - return 1; - - if (!cache) -@@ -1183,7 +1211,7 @@ int mnt_fs_match_source(struct libmnt_fs *fs, const char *source, - - /* 2) canonicalized and native */ - src = mnt_fs_get_srcpath(fs); -- if (src && streq_except_trailing_slash(cn, src)) -+ if (src && mnt_fs_streq_srcpath(fs, cn)) - return 1; - - /* 3) canonicalized and canonicalized */ -diff --git a/libmount/src/mountP.h b/libmount/src/mountP.h -index fa0edf5..a7b5c0d 100644 ---- a/libmount/src/mountP.h -+++ b/libmount/src/mountP.h -@@ -367,6 +367,11 @@ extern struct libmnt_fs *mnt_copy_mtab_fs(const struct libmnt_fs *fs); - extern int __mnt_fs_set_source_ptr(struct libmnt_fs *fs, char *source); - extern int __mnt_fs_set_fstype_ptr(struct libmnt_fs *fs, char *fstype); - -+/* exported in v2.22 */ -+extern int mnt_fs_streq_srcpath(struct libmnt_fs *fs, const char *path); -+extern int mnt_fs_streq_target(struct libmnt_fs *fs, const char *path); -+ -+ - /* context.c */ - extern int mnt_context_prepare_srcpath(struct libmnt_context *cxt); - extern int mnt_context_prepare_target(struct libmnt_context *cxt); -diff --git a/libmount/src/tab.c b/libmount/src/tab.c -index 37f47bd..f3ec573 100644 ---- a/libmount/src/tab.c -+++ b/libmount/src/tab.c -@@ -286,6 +286,11 @@ int mnt_table_next_child_fs(struct libmnt_table *tb, struct libmnt_iter *itr, - - id = mnt_fs_get_id(fs); - -+ /* avoid infinite loop. This only happens in rare cases -+ * such as in early userspace when the rootfs is its own parent */ -+ if (id == parent_id) -+ continue; -+ - if ((!lastchld_id || id > lastchld_id) && - (!*chld || id < chld_id)) { - *chld = fs; -@@ -438,7 +443,7 @@ struct libmnt_fs *mnt_table_find_target(struct libmnt_table *tb, const char *pat - /* native @target */ - mnt_reset_iter(&itr, direction); - while(mnt_table_next_fs(tb, &itr, &fs) == 0) { -- if (fs->target && strcmp(fs->target, path) == 0) -+ if (mnt_fs_streq_target(fs, path)) - return fs; - } - if (!tb->cache || !(cn = mnt_resolve_path(path, tb->cache))) -@@ -447,7 +452,7 @@ struct libmnt_fs *mnt_table_find_target(struct libmnt_table *tb, const char *pat - /* canonicalized paths in struct libmnt_table */ - mnt_reset_iter(&itr, direction); - while(mnt_table_next_fs(tb, &itr, &fs) == 0) { -- if (fs->target && strcmp(fs->target, cn) == 0) -+ if (mnt_fs_streq_target(fs, cn)) - return fs; - } - -@@ -456,12 +461,13 @@ struct libmnt_fs *mnt_table_find_target(struct libmnt_table *tb, const char *pat - while(mnt_table_next_fs(tb, &itr, &fs) == 0) { - char *p; - -- if (!fs->target || !mnt_fs_is_swaparea(fs) || -+ if (!fs->target || mnt_fs_is_swaparea(fs) || - (*fs->target == '/' && *(fs->target + 1) == '\0')) - continue; - - p = mnt_resolve_path(fs->target, tb->cache); -- if (strcmp(cn, p) == 0) -+ /* both canonicalized, strcmp() is fine here */ -+ if (p && strcmp(cn, p) == 0) - return fs; - } - return NULL; -@@ -480,9 +486,8 @@ struct libmnt_fs *mnt_table_find_target(struct libmnt_table *tb, const char *pat - * The 2nd, 3rd and 4th iterations are not performed when @tb cache is not - * set (see mnt_table_set_cache()). - * -- * Note that valid source path is NULL; the libmount uses NULL instead of -- * "none". The "none" is used in /proc/{mounts,self/mountninfo} for pseudo -- * filesystems. -+ * Note that NULL is a valid source path; it will be replaced with "none". The -+ * "none" is used in /proc/{mounts,self/mountinfo} for pseudo filesystems. - * - * Returns: a tab entry or NULL. - */ -@@ -501,16 +506,10 @@ struct libmnt_fs *mnt_table_find_srcpath(struct libmnt_table *tb, const char *pa - /* native paths */ - mnt_reset_iter(&itr, direction); - while(mnt_table_next_fs(tb, &itr, &fs) == 0) { -- const char *src = mnt_fs_get_source(fs); -- -- p = mnt_fs_get_srcpath(fs); -- -- if (path == NULL && src == NULL) -- return fs; /* source is "none" */ -- if (path && p && streq_except_trailing_slash(p, path)) -+ if (mnt_fs_streq_srcpath(fs, path)) - return fs; -- if (!p && src) -- ntags++; /* mnt_fs_get_srcpath() returs nothing, it's TAG */ -+ if (mnt_fs_get_tag(fs, NULL, NULL) == 0) -+ ntags++; - } - - if (!path || !tb->cache || !(cn = mnt_resolve_path(path, tb->cache))) -@@ -520,8 +519,7 @@ struct libmnt_fs *mnt_table_find_srcpath(struct libmnt_table *tb, const char *pa - if (ntags < mnt_table_get_nents(tb)) { - mnt_reset_iter(&itr, direction); - while(mnt_table_next_fs(tb, &itr, &fs) == 0) { -- p = mnt_fs_get_srcpath(fs); -- if (p && streq_except_trailing_slash(p, cn)) -+ if (mnt_fs_streq_srcpath(fs, cn)) - return fs; - } - } -@@ -552,7 +550,9 @@ struct libmnt_fs *mnt_table_find_srcpath(struct libmnt_table *tb, const char *pa - if (mnt_fs_get_tag(fs, &t, &v)) - continue; - x = mnt_resolve_tag(t, v, tb->cache); -- if (x && streq_except_trailing_slash(x, cn)) -+ -+ /* both canonicalized, strcmp() is fine here */ -+ if (x && strcmp(x, cn) == 0) - return fs; - } - } -@@ -567,7 +567,9 @@ struct libmnt_fs *mnt_table_find_srcpath(struct libmnt_table *tb, const char *pa - p = mnt_fs_get_srcpath(fs); - if (p) - p = mnt_resolve_path(p, tb->cache); -- if (p && streq_except_trailing_slash(cn, p)) -+ -+ /* both canonicalized, strcmp() is fine here */ -+ if (p && strcmp(p, cn) == 0) - return fs; - } - } -@@ -702,16 +704,18 @@ struct libmnt_fs *mnt_table_find_pair(struct libmnt_table *tb, const char *sourc - } - - /* -- * @tb: /proc/self/mountinfo -- * @fs: filesystem -- * @mountflags: MS_BIND or 0 -- * @fsroot: fs-root that will be probably used in the mountinfo file -+ * tb: /proc/self/mountinfo -+ * fs: filesystem -+ * mountflags: MS_BIND or 0 -+ * fsroot: fs-root that will be probably used in the mountinfo file - * for @fs after mount(2) - * - * For btrfs subvolumes this function returns NULL, but @fsroot properly set. - * - * Returns: entry from @tb that will be used as a source for @fs if the @fs is - * bindmount. -+ * -+ * Don't export to library API! - */ - struct libmnt_fs *mnt_table_get_fs_root(struct libmnt_table *tb, - struct libmnt_fs *fs, -@@ -814,6 +818,20 @@ err: - return NULL; - } - -+static int is_mountinfo(struct libmnt_table *tb) -+{ -+ struct libmnt_fs *fs; -+ -+ if (!tb) -+ return 0; -+ -+ fs = list_first_entry(&tb->ents, struct libmnt_fs, ents); -+ if (fs && mnt_fs_is_kernel(fs) && mnt_fs_get_root(fs)) -+ return 1; -+ -+ return 0; -+} -+ - /** - * mnt_table_is_mounted: - * @tb: /proc/self/mountinfo file -@@ -829,10 +847,9 @@ err: - int mnt_table_is_fs_mounted(struct libmnt_table *tb, struct libmnt_fs *fstab_fs) - { - char *root = NULL; -- struct libmnt_fs *src_fs; -- const char *src, *tgt; -- char *xsrc = NULL; -- int flags = 0, rc = 0; -+ const char *src = NULL; -+ char *xsrc = NULL, *tgt; -+ int rc = 0; - - assert(tb); - assert(fstab_fs); -@@ -840,39 +857,49 @@ int mnt_table_is_fs_mounted(struct libmnt_table *tb, struct libmnt_fs *fstab_fs) - if (mnt_fs_is_swaparea(fstab_fs)) - return 0; - -- if (mnt_fs_get_option(fstab_fs, "bind", NULL, NULL) == 0) -- flags = MS_BIND; -+ if (is_mountinfo(tb)) { -+ /* @tb is mountinfo, so we can try to use fs-roots */ -+ struct libmnt_fs *fs; -+ int flags = 0; -+ -+ if (mnt_fs_get_option(fstab_fs, "bind", NULL, NULL) == 0) -+ flags = MS_BIND; - -- src_fs = mnt_table_get_fs_root(tb, fstab_fs, flags, &root); -- if (src_fs) -- src = mnt_fs_get_srcpath(src_fs); -+ fs = mnt_table_get_fs_root(tb, fstab_fs, flags, &root); -+ if (fs) -+ src = mnt_fs_get_srcpath(fs); -+ } -+ -+ if (src) -+ src = xsrc = mnt_resolve_spec(src, tb->cache); - else if (mnt_fs_is_pseudofs(fstab_fs)) - src = mnt_fs_get_source(fstab_fs); - else - src = xsrc = mnt_resolve_spec(mnt_fs_get_source(fstab_fs), - tb->cache); - -- tgt = mnt_fs_get_target(fstab_fs); -+ tgt = mnt_resolve_path(mnt_fs_get_target(fstab_fs), tb->cache); - -- if (tgt && src && root) { -+ if (tgt && src) { - struct libmnt_iter itr; - struct libmnt_fs *fs; - - mnt_reset_iter(&itr, MNT_ITER_FORWARD); - - while(mnt_table_next_fs(tb, &itr, &fs) == 0) { -- const char *s = mnt_fs_get_srcpath(fs), -- *t = mnt_fs_get_target(fs), -- *r = mnt_fs_get_root(fs); -- -- /* -- * Note that kernel can add tailing slash to the -- * network filesystem source paths. -- */ -- if (t && s && r && -- strcmp(t, tgt) == 0 && -- streq_except_trailing_slash(s, src) && -- strcmp(r, root) == 0) -+ -+ if (root) { -+ /* mountinfo: compare root, source and target */ -+ const char *r = mnt_fs_get_root(fs); -+ -+ if (r && strcmp(r, root) == 0 && -+ mnt_fs_streq_srcpath(fs, src) && -+ mnt_fs_streq_target(fs, tgt)) -+ break; -+ } -+ /* mtab: compare source and target */ -+ else if (mnt_fs_streq_srcpath(fs, src) && -+ mnt_fs_streq_target(fs, tgt)) - break; - } - if (fs) -@@ -881,6 +908,8 @@ int mnt_table_is_fs_mounted(struct libmnt_table *tb, struct libmnt_fs *fstab_fs) - - if (xsrc && !tb->cache) - free(xsrc); -+ if (!tb->cache) -+ free(tgt); - - free(root); - return rc; -diff --git a/libmount/src/tab_parse.c b/libmount/src/tab_parse.c -index 0f618bb..28c8536 100644 ---- a/libmount/src/tab_parse.c -+++ b/libmount/src/tab_parse.c -@@ -180,12 +180,7 @@ static int mnt_parse_mountinfo_line(struct libmnt_fs *fs, char *s) - unmangle_string(fs->vfs_optstr); - unmangle_string(fstype); - unmangle_string(src); -- -- if (!strcmp(fs->fs_optstr, "none")) { -- free(fs->fs_optstr); -- fs->fs_optstr = NULL; -- } else -- unmangle_string(fs->fs_optstr); -+ unmangle_string(fs->fs_optstr); - - rc = __mnt_fs_set_fstype_ptr(fs, fstype); - if (!rc) { -@@ -733,21 +728,14 @@ static struct libmnt_fs *mnt_table_merge_user_fs(struct libmnt_table *tb, struct - mnt_reset_iter(&itr, MNT_ITER_BACKWARD); - - while(mnt_table_next_fs(tb, &itr, &fs) == 0) { -- const char *s = mnt_fs_get_srcpath(fs), -- *t = mnt_fs_get_target(fs), -- *r = mnt_fs_get_root(fs); -+ const char *r = mnt_fs_get_root(fs); - - if (fs->flags & MNT_FS_MERGED) - continue; - -- /* -- * Note that kernel can add tailing slash to the network -- * filesystem source path -- */ -- if (s && t && r && -- strcmp(t, target) == 0 && -- streq_except_trailing_slash(s, src) && -- strcmp(r, root) == 0) -+ if (r && strcmp(r, root) == 0 -+ && mnt_fs_streq_target(fs, target) -+ && mnt_fs_streq_srcpath(fs, src)) - break; - } - -diff --git a/libmount/src/utils.c b/libmount/src/utils.c -index c7a1fd1..4d316d1 100644 ---- a/libmount/src/utils.c -+++ b/libmount/src/utils.c -@@ -235,6 +235,7 @@ int mnt_fstype_is_pseudofs(const char *type) - strcmp(type, "binfmt_misc") == 0 || - strcmp(type, "fuse.gvfs-fuse-daemon") == 0 || - strcmp(type, "debugfs") == 0 || -+ strcmp(type, "nfsd") == 0 || - strcmp(type, "spufs") == 0) - return 1; - return 0; -diff --git a/login-utils/login.c b/login-utils/login.c -index 84d8b1b..4f448f8 100644 ---- a/login-utils/login.c -+++ b/login-utils/login.c -@@ -128,6 +128,22 @@ static int timeout = LOGIN_TIMEOUT; - static int child_pid = 0; - static volatile int got_sig = 0; - -+#ifdef LOGIN_CHOWN_VCS -+/* true if the filedescriptor fd is a console tty, very Linux specific */ -+static int is_consoletty(int fd) -+{ -+ struct stat stb; -+ -+ if ((fstat(fd, &stb) >= 0) -+ && (major(stb.st_rdev) == TTY_MAJOR) -+ && (minor(stb.st_rdev) < 64)) { -+ return 1; -+ } -+ return 0; -+} -+#endif -+ -+ - /* - * Robert Ambrose writes: - * A couple of my users have a problem with login processes hanging around -@@ -316,15 +332,15 @@ static void chown_tty(struct login_context *cxt) - - #ifdef LOGIN_CHOWN_VCS - if (is_consoletty(0)) { -- if (chown(cxt->vcs, uid, gid)) /* vcs */ -- chown_err(cxt->vcs, uid, gid); -- if (chmod(cxt->vcs, cxt->tty_mode)) -- chmod_err(cxt->vcs, cxt->tty_mode); -- -- if (chown(cxt->vcsa, uid, gid)) /* vcsa */ -- chown_err(cxt->vcsa, uid, gid); -- if (chmod(cxt->vcsa, cxt->tty_mode)) -- chmod_err(cxt->vcsa, cxt->tty_mode); -+ if (chown(cxt->vcsn, uid, gid)) /* vcs */ -+ chown_err(cxt->vcsn, uid, gid); -+ if (chmod(cxt->vcsn, cxt->tty_mode)) -+ chmod_err(cxt->vcsn, cxt->tty_mode); -+ -+ if (chown(cxt->vcsan, uid, gid)) /* vcsa */ -+ chown_err(cxt->vcsan, uid, gid); -+ if (chmod(cxt->vcsan, cxt->tty_mode)) -+ chmod_err(cxt->vcsan, cxt->tty_mode); - } - #endif - } -@@ -403,21 +419,6 @@ static void init_tty(struct login_context *cxt) - } - - --#ifdef LOGIN_CHOWN_VCS --/* true if the filedescriptor fd is a console tty, very Linux specific */ --static int is_consoletty(int fd) --{ -- struct stat stb; -- -- if ((fstat(fd, &stb) >= 0) -- && (major(stb.st_rdev) == TTY_MAJOR) -- && (minor(stb.st_rdev) < 64)) { -- return 1; -- } -- return 0; --} --#endif -- - /* - * Log failed login attempts in _PATH_BTMP if that exists. - * Must be called only with username the name of an actual user. -@@ -1145,13 +1146,10 @@ static void init_environ(struct login_context *cxt) - setenv("TERM", termenv, 1); - - if (pwd->pw_uid) -- setenv("PATH", getlogindefs_str("ENV_PATH", _PATH_DEFPATH), 1); -- else { -- const char *x = getlogindefs_str("ENV_ROOTPATH", NULL); -- if (!x) -- x = getlogindefs_str("ENV_SUPATH", _PATH_DEFPATH_ROOT); -- setenv("PATH", x, 1); -- } -+ logindefs_setenv("PATH", "ENV_PATH", _PATH_DEFPATH); -+ -+ else if (logindefs_setenv("PATH", "ENV_ROOTPATH", NULL) != 0) -+ logindefs_setenv("PATH", "ENV_SUPATH", _PATH_DEFPATH_ROOT); - - /* mailx will give a funny error msg if you forget this one */ - len = snprintf(tmp, sizeof(tmp), "%s/%s", _PATH_MAILDIR, pwd->pw_name); -diff --git a/login-utils/logindefs.c b/login-utils/logindefs.c -index fe590e9..e9517ac 100644 ---- a/login-utils/logindefs.c -+++ b/login-utils/logindefs.c -@@ -211,6 +211,43 @@ const char *getlogindefs_str(const char *name, const char *dflt) - return ptr->value; - } - -+/* -+ * For compatibililty with shadow-utils we have tu support additional -+ * syntax for environment variables in login.defs(5) file. The standard -+ * syntax is: -+ * -+ * ENV_FOO data -+ * -+ * but shadow-utils supports also -+ * -+ * ENV_FOO FOO=data -+ * -+ * the FOO= prefix has to be remove before we call setenv(). -+ */ -+int logindefs_setenv(const char *name, const char *conf, const char *dflt) -+{ -+ const char *val = getlogindefs_str(conf, dflt); -+ const char *p; -+ -+ if (!val) -+ return -1; -+ -+ p = strchr(val, '='); -+ if (p) { -+ size_t sz = strlen(name); -+ -+ if (strncmp(val, name, sz) == 0 && *(p + 1)) { -+ val = p + 1; -+ if (*val == '"') -+ val++; -+ if (!*val) -+ val = dflt; -+ } -+ } -+ -+ return val ? setenv(name, val, 1) : -1; -+} -+ - #ifdef TEST_PROGRAM - int main(int argc, char *argv[]) - { -diff --git a/login-utils/logindefs.h b/login-utils/logindefs.h -index 37d19e1..163869d 100644 ---- a/login-utils/logindefs.h -+++ b/login-utils/logindefs.h -@@ -5,5 +5,6 @@ extern int getlogindefs_bool(const char *name, int dflt); - extern long getlogindefs_num(const char *name, long dflt); - extern const char *getlogindefs_str(const char *name, const char *dflt); - extern void free_getlogindefs_data(void); -+extern int logindefs_setenv(const char *name, const char *conf, const char *dflt); - - #endif /* UTIL_LINUX_LOGINDEFS_H */ -diff --git a/man/ru/Makefile.am b/man/ru/Makefile.am -index 799feca..281ec23 100644 ---- a/man/ru/Makefile.am -+++ b/man/ru/Makefile.am -@@ -1,9 +1,6 @@ - include $(top_srcdir)/config/include-Makefile.am - --mandir = @mandir@/ru -- --dist_man_MANS = -- - if BUILD_DDATE --dist_man_MANS += ddate.1 -+ruman1_DATA = ddate.1 -+EXTRA_DIST = $(ruman1_DATA) - endif -diff --git a/misc-utils/lsblk.8 b/misc-utils/lsblk.8 -index 028b19f..286d54b 100644 ---- a/misc-utils/lsblk.8 -+++ b/misc-utils/lsblk.8 -@@ -59,7 +59,7 @@ Use key="value" output format. - Use the raw output format. - .IP "\fB\-t, \-\-topology\fP" - Output info about block device topology. --This option is equivalent to "-o NAME,ALIGNMENT,MIN-IO,OPT-IO,PHY-SEC,LOG-SEC,ROTA,SCHED". -+This option is equivalent to "-o NAME,ALIGNMENT,MIN-IO,OPT-IO,PHY-SEC,LOG-SEC,ROTA,SCHED,RQ-SIZE". - .SH NOTES - For the partitions are some information (e.g. queue attributes) inherited from - parental device. -diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c -index 8468b3f..54bf360 100644 ---- a/misc-utils/lsblk.c -+++ b/misc-utils/lsblk.c -@@ -478,9 +478,14 @@ static void set_tt_data(struct blkdev_cxt *cxt, int col, int id, struct tt_line - switch(id) { - case COL_NAME: - if (cxt->dm_name) { -- snprintf(buf, sizeof(buf), "%s (%s)", -+ if ((lsblk->tt->flags & TT_FL_RAW) || -+ (lsblk->tt->flags & TT_FL_EXPORT)) -+ tt_line_set_data(ln, col, xstrdup(cxt->dm_name)); -+ else { -+ snprintf(buf, sizeof(buf), "%s (%s)", - cxt->dm_name, cxt->name); -- tt_line_set_data(ln, col, xstrdup(buf)); -+ tt_line_set_data(ln, col, xstrdup(buf)); -+ } - break; - } - case COL_KNAME: -diff --git a/mount/fstab.5 b/mount/fstab.5 -index b0cd763..c618947 100644 ---- a/mount/fstab.5 -+++ b/mount/fstab.5 -@@ -167,7 +167,7 @@ support filesystem - The subtype is defined by '.subtype' suffix. For - example 'fuse.sshfs'. It's recommended to use subtype notation rather than add - any prefix to the first fstab field (for example 'sshfs#example.com' is --depreacated). -+deprecated). - .RE - - .B The fourth field -diff --git a/sys-utils/losetup.8 b/sys-utils/losetup.8 -index a68836e..f50b072 100644 ---- a/sys-utils/losetup.8 -+++ b/sys-utils/losetup.8 -@@ -80,6 +80,8 @@ for non-root users. - force loop driver to reread size of the file associated with the specified loop device - .IP "\fB\-d, \-\-detach\fP \fIloopdev\fP..." - detach the file or device associated with the specified loop device(s) -+.IP "\fB\-D, \-\-detach-all\fP" -+detach all associated loop devices - .IP "\fB\-e, \-E, \-\-encryption \fIencryption_type\fP" - enable data encryption with specified name or number - .IP "\fB\-f, \-\-find\fP" -diff --git a/sys-utils/losetup.c b/sys-utils/losetup.c -index 16ace6f..9f03151 100644 ---- a/sys-utils/losetup.c -+++ b/sys-utils/losetup.c -@@ -362,7 +362,7 @@ int main(int argc, char **argv) - if (flags & LOOPDEV_FL_OFFSET) - loopcxt_set_offset(&lc, offset); - if (flags & LOOPDEV_FL_SIZELIMIT) -- loopcxt_set_offset(&lc, sizelimit); -+ loopcxt_set_sizelimit(&lc, sizelimit); - if (lo_flags) - loopcxt_set_flags(&lc, lo_flags); - if ((res = loopcxt_set_backing_file(&lc, file))) { -diff --git a/sys-utils/mount.8 b/sys-utils/mount.8 -index 78e7a41..44d4402 100644 ---- a/sys-utils/mount.8 -+++ b/sys-utils/mount.8 -@@ -2760,6 +2760,10 @@ mount failure - .TP - .BR 64 - some mount succeeded -+.RE -+ -+The command mount -a returns 0 (all success), 32 (all failed) or 64 (some -+failed, some success). - - .SH NOTES - The syntax of external mount helpers is: -diff --git a/sys-utils/mount.c b/sys-utils/mount.c -index 15510e0..12ec372 100644 ---- a/sys-utils/mount.c -+++ b/sys-utils/mount.c -@@ -182,6 +182,8 @@ static int mount_all(struct libmnt_context *cxt) - struct libmnt_fs *fs; - int mntrc, ignored, rc = MOUNT_EX_SUCCESS; - -+ int nsucc = 0, nerrs = 0; -+ - itr = mnt_new_iter(MNT_ITER_FORWARD); - if (!itr) { - warn(_("failed to initialize libmount iterator")); -@@ -197,31 +199,40 @@ static int mount_all(struct libmnt_context *cxt) - printf(ignored == 1 ? _("%-25s: ignored\n") : - _("%-25s: already mounted\n"), - tgt); -- - } else if (mnt_context_is_fork(cxt)) { - if (mnt_context_is_verbose(cxt)) - printf("%-25s: mount successfully forked\n", tgt); - } else { -- rc |= mk_exit_code(cxt, mntrc); -+ mk_exit_code(cxt, mntrc); /* to print warnings */ - - if (mnt_context_get_status(cxt)) { -- rc |= MOUNT_EX_SOMEOK; -+ nsucc++; - - if (mnt_context_is_verbose(cxt)) - printf("%-25s: successfully mounted\n", tgt); -- } -+ } else -+ nerrs++; - } - } - - if (mnt_context_is_parent(cxt)) { - /* wait for mount --fork children */ -- int nerrs = 0, nchildren = 0; -+ int nchildren = 0; -+ -+ nerrs = 0, nsucc = 0; - - rc = mnt_context_wait_for_children(cxt, &nchildren, &nerrs); - if (!rc && nchildren) -- rc = nchildren == nerrs ? MOUNT_EX_FAIL : MOUNT_EX_SOMEOK; -+ nsucc = nchildren - nerrs; - } - -+ if (nerrs == 0) -+ rc = MOUNT_EX_SUCCESS; /* all success */ -+ else if (nsucc == 0) -+ rc = MOUNT_EX_FAIL; /* all failed */ -+ else -+ rc = MOUNT_EX_SOMEOK; /* some success, some failed */ -+ - mnt_free_iter(itr); - return rc; - } -@@ -290,6 +301,25 @@ static void selinux_warning(struct libmnt_context *cxt, const char *tgt) - # define selinux_warning(_x, _y) - #endif - -+/* temporary in mount(8) for v2.21.x releases, in v2.22 will be in libmount -+ */ -+static int mnt_fs_streq_srcpath(struct libmnt_fs *fs, const char *path) -+{ -+ const char *p; -+ -+ if (!fs) -+ return 0; -+ -+ p = mnt_fs_get_srcpath(fs); -+ -+ if (!mnt_fs_is_pseudofs(fs)) -+ return streq_except_trailing_slash(p, path); -+ -+ if (!p && !path) -+ return 1; -+ -+ return p && path && strcmp(p, path) == 0; -+} - - /* - * rc = 0 success -@@ -336,7 +366,11 @@ try_readonly: - return MOUNT_EX_USAGE; - } - -- if (src == NULL || tgt == NULL) { -+ /* -+ * TODO: add mnt_context_fstab_applied() to check if we found -+ * target/source in the file. -+ */ -+ if (!tgt) { - if (mflags & MS_REMOUNT) - warnx(_("%s not mounted"), src ? src : tgt); - else -@@ -408,7 +442,7 @@ try_readonly: - const char *s = mnt_fs_get_srcpath(fs), - *t = mnt_fs_get_target(fs); - -- if (t && s && streq_except_trailing_slash(s, src)) -+ if (t && s && mnt_fs_streq_srcpath(fs, src)) - fprintf(stderr, _( - " %s is already mounted on %s\n"), s, t); - } -@@ -697,7 +731,7 @@ int main(int argc, char **argv) - longopts, NULL)) != -1) { - - /* only few options are allowed for non-root users */ -- if (mnt_context_is_restricted(cxt) && !strchr("hlLUVvpr", c)) -+ if (mnt_context_is_restricted(cxt) && !strchr("hlLUVvpri", c)) - exit_non_root(option_to_longopt(c, longopts)); - - switch(c) { -diff --git a/sys-utils/mountpoint.c b/sys-utils/mountpoint.c -index 5cc833d..d0a0069 100644 ---- a/sys-utils/mountpoint.c -+++ b/sys-utils/mountpoint.c -@@ -40,12 +40,12 @@ - - static int quiet; - --static dev_t dir_to_device(const char *spec) -+static int dir_to_device(const char *spec, dev_t *dev) - { - struct libmnt_table *tb = mnt_new_table_from_file("/proc/self/mountinfo"); - struct libmnt_fs *fs; - struct libmnt_cache *cache; -- dev_t res = 0; -+ int rc = -1; - - if (!tb) { - /* -@@ -57,7 +57,7 @@ static dev_t dir_to_device(const char *spec) - int len; - - if (stat(spec, &st) != 0) -- return 0; -+ return -1; - - cn = mnt_resolve_path(spec, NULL); /* canonicalize */ - -@@ -65,15 +65,17 @@ static dev_t dir_to_device(const char *spec) - free(cn); - - if (len < 0 || (size_t) len + 1 > sizeof(buf)) -- return 0; -+ return -1; - if (stat(buf, &pst) !=0) -- return 0; -+ return -1; - - if ((st.st_dev != pst.st_dev) || -- (st.st_dev == pst.st_dev && st.st_ino == pst.st_ino)) -- return st.st_dev; -+ (st.st_dev == pst.st_dev && st.st_ino == pst.st_ino)) { -+ *dev = st.st_dev; -+ return 0; -+ } - -- return 0; -+ return -1; - } - - /* to canonicalize all necessary paths */ -@@ -81,12 +83,14 @@ static dev_t dir_to_device(const char *spec) - mnt_table_set_cache(tb, cache); - - fs = mnt_table_find_target(tb, spec, MNT_ITER_BACKWARD); -- if (fs && mnt_fs_get_target(fs)) -- res = mnt_fs_get_devno(fs); -+ if (fs && mnt_fs_get_target(fs)) { -+ *dev = mnt_fs_get_devno(fs); -+ rc = 0; -+ } - - mnt_free_table(tb); - mnt_free_cache(cache); -- return res; -+ return rc; - } - - static int print_devno(const char *devname, struct stat *st) -@@ -185,8 +189,8 @@ int main(int argc, char **argv) - errx(EXIT_FAILURE, _("%s: not a directory"), spec); - return EXIT_FAILURE; - } -- src = dir_to_device(spec); -- if (!src) { -+ -+ if ( dir_to_device(spec, &src)) { - if (!quiet) - printf(_("%s is not a mountpoint\n"), spec); - return EXIT_FAILURE; -diff --git a/term-utils/script.c b/term-utils/script.c -index 58f9790..0d891b8 100644 ---- a/term-utils/script.c -+++ b/term-utils/script.c -@@ -437,6 +437,16 @@ doshell(void) { - else - shname = shell; - -+ /* -+ * When invoked from within /etc/csh.login, script spawns a csh shell -+ * that spawns programs that cannot be killed with a SIGTERM. This is -+ * because csh has a documented behaviour wherein it disables all -+ * signals when processing the /etc/csh.* files. -+ * -+ * Let's restore the default behavior. -+ */ -+ signal(SIGTERM, SIG_DFL); -+ - if (cflg) - execl(shell, shname, "-c", cflg, NULL); - else -diff --git a/tests/Makefile.am b/tests/Makefile.am -index fd62519..2c72318 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -7,5 +7,5 @@ EXTRA_DIST = expected \ - functions.sh \ - run.sh - --distclean-local: -+clean-local: - rm -rf output diff -diff --git a/tests/expected/libmount/tabfiles-find-target2 b/tests/expected/libmount/tabfiles-find-target2 -new file mode 100644 -index 0000000..8a6c57b ---- /dev/null -+++ b/tests/expected/libmount/tabfiles-find-target2 -@@ -0,0 +1,5 @@ -+------ fs: -+source: /dev/foo -+target: /any/foo/ -+fstype: auto -+optstr: defaults -diff --git a/tests/expected/libmount/tabfiles-find-target3 b/tests/expected/libmount/tabfiles-find-target3 -new file mode 100644 -index 0000000..8a6c57b ---- /dev/null -+++ b/tests/expected/libmount/tabfiles-find-target3 -@@ -0,0 +1,5 @@ -+------ fs: -+source: /dev/foo -+target: /any/foo/ -+fstype: auto -+optstr: defaults -diff --git a/tests/expected/libmount/tabfiles-parse-fstab b/tests/expected/libmount/tabfiles-parse-fstab -index 14bdfb4..d661526 100644 ---- a/tests/expected/libmount/tabfiles-parse-fstab -+++ b/tests/expected/libmount/tabfiles-parse-fstab -@@ -58,3 +58,8 @@ target: /mnt/gogogo - fstype: cifs - optstr: user=SRGROUP/baby,noauto - user-optstr: user=SRGROUP/baby,noauto -+------ fs: -+source: /dev/foo -+target: /any/foo/ -+fstype: auto -+optstr: defaults -diff --git a/tests/expected/libmount/tabfiles-parse-mountinfo b/tests/expected/libmount/tabfiles-parse-mountinfo -index 95182dd..4470801 100644 ---- a/tests/expected/libmount/tabfiles-parse-mountinfo -+++ b/tests/expected/libmount/tabfiles-parse-mountinfo -@@ -296,7 +296,7 @@ id: 41 - parent: 20 - devno: 253:0 - ------ fs: --source: (null) -+source: none - target: /proc/sys/fs/binfmt_misc - fstype: binfmt_misc - optstr: rw,relatime -diff --git a/tests/expected/libmount/tabfiles-parse-mtab b/tests/expected/libmount/tabfiles-parse-mtab -index d7171ea..ffd0c13 100644 ---- a/tests/expected/libmount/tabfiles-parse-mtab -+++ b/tests/expected/libmount/tabfiles-parse-mtab -@@ -42,7 +42,7 @@ fstype: ext4 - optstr: rw,noatime - VFS-optstr: rw,noatime - ------ fs: --source: (null) -+source: none - target: /proc/sys/fs/binfmt_misc - fstype: binfmt_misc - optstr: rw -diff --git a/tests/expected/libmount/update-utab-mount b/tests/expected/libmount/update-utab-mount -index 1784e00..58a0179 100644 ---- a/tests/expected/libmount/update-utab-mount -+++ b/tests/expected/libmount/update-utab-mount -@@ -1,3 +1,3 @@ - SRC=/dev/sdb1 TARGET=/mnt/bar ROOT=/ OPTS=user - SRC=/dev/sda2 TARGET=/mnt/xyz ROOT=/ OPTS=loop=/dev/loop0,uhelper=hal --TARGET=/proc ROOT=/ OPTS=user -+SRC=none TARGET=/proc ROOT=/ OPTS=user -diff --git a/tests/expected/libmount/update-utab-move b/tests/expected/libmount/update-utab-move -index 12917cc..6008140 100644 ---- a/tests/expected/libmount/update-utab-move -+++ b/tests/expected/libmount/update-utab-move -@@ -1,3 +1,3 @@ - SRC=/dev/sdb1 TARGET=/mnt/newbar ROOT=/ OPTS=user - SRC=/dev/sda2 TARGET=/mnt/newxyz ROOT=/ OPTS=loop=/dev/loop0,uhelper=hal --TARGET=/proc ROOT=/ OPTS=user -+SRC=none TARGET=/proc ROOT=/ OPTS=user -diff --git a/tests/expected/libmount/update-utab-remount b/tests/expected/libmount/update-utab-remount -index 737e2a3..8e344b3 100644 ---- a/tests/expected/libmount/update-utab-remount -+++ b/tests/expected/libmount/update-utab-remount -@@ -1,3 +1,3 @@ - SRC=/dev/sdb1 TARGET=/mnt/newbar ROOT=/ OPTS=user - SRC=/dev/sda2 TARGET=/mnt/newxyz ROOT=/ OPTS=user --TARGET=/proc ROOT=/ OPTS=user -+SRC=none TARGET=/proc ROOT=/ OPTS=user -diff --git a/tests/expected/mount/fstab-none b/tests/expected/mount/fstab-none -new file mode 100644 -index 0000000..3582111 ---- /dev/null -+++ b/tests/expected/mount/fstab-none -@@ -0,0 +1 @@ -+Success -diff --git a/tests/expected/mount/shared-subtree b/tests/expected/mount/shared-subtree -new file mode 100644 -index 0000000..3582111 ---- /dev/null -+++ b/tests/expected/mount/shared-subtree -@@ -0,0 +1 @@ -+Success -diff --git a/tests/expected/mount/shared-subtree-make-private b/tests/expected/mount/shared-subtree-make-private -new file mode 100644 -index 0000000..39cdd0d ---- /dev/null -+++ b/tests/expected/mount/shared-subtree-make-private -@@ -0,0 +1 @@ -+- -diff --git a/tests/expected/mount/shared-subtree-make-shared b/tests/expected/mount/shared-subtree-make-shared -new file mode 100644 -index 0000000..8a205e8 ---- /dev/null -+++ b/tests/expected/mount/shared-subtree-make-shared -@@ -0,0 +1 @@ -+shared -diff --git a/tests/expected/mount/shared-subtree-make-unbindable b/tests/expected/mount/shared-subtree-make-unbindable -new file mode 100644 -index 0000000..376cfac ---- /dev/null -+++ b/tests/expected/mount/shared-subtree-make-unbindable -@@ -0,0 +1 @@ -+unbindable -diff --git a/tests/functions.sh b/tests/functions.sh -index 85b1621..6556e4e 100644 ---- a/tests/functions.sh -+++ b/tests/functions.sh -@@ -93,6 +93,8 @@ function ts_init_core_subtest_env { - TS_MOUNTPOINT="$TS_OUTDIR/${TS_TESTNAME}-${TS_SUBNAME}-mnt" - - rm -f $TS_OUTPUT $TS_VGDUMP -+ [ -d "$TS_OUTDIR" ] || mkdir -p "$TS_OUTDIR" -+ - touch $TS_OUTPUT - [ -n "$TS_VALGRIND_CMD" ] && touch $TS_VGDUMP - } -@@ -127,8 +129,6 @@ function ts_init_env { - - BLKID_FILE="$TS_OUTDIR/${TS_TESTNAME}.blkidtab" - -- [ -d "$TS_OUTDIR" ] || mkdir -p "$TS_OUTDIR" -- [ -d "$TS_DIFFDIR" ] || mkdir -p "$TS_DIFFDIR" - - declare -a TS_SUID_PROGS - declare -a TS_SUID_USER -@@ -141,6 +141,8 @@ function ts_init_env { - export BLKID_FILE - - rm -f $TS_OUTPUT $TS_VGDUMP -+ [ -d "$TS_OUTDIR" ] || mkdir -p "$TS_OUTDIR" -+ - touch $TS_OUTPUT - [ -n "$TS_VALGRIND_CMD" ] && touch $TS_VGDUMP - -@@ -219,8 +221,15 @@ function ts_gen_diff { - local res=0 - - if [ -s "$TS_OUTPUT" ]; then -+ -+ [ -d "$TS_DIFFDIR" ] || mkdir -p "$TS_DIFFDIR" - diff -u $TS_EXPECTED $TS_OUTPUT > $TS_DIFF -- [ -s $TS_DIFF ] && res=1 -+ -+ if [ -s $TS_DIFF ]; then -+ res=1 -+ else -+ rm -f $TS_DIFF; -+ fi - else - res=1 - fi -diff --git a/tests/ts/build-sys/config b/tests/ts/build-sys/config -index 7ede38c..e2c2b00 100755 ---- a/tests/ts/build-sys/config -+++ b/tests/ts/build-sys/config -@@ -52,9 +52,18 @@ for conf in $config_gen_dir/config-gen.d/*.conf; do - esac - fi - done -+ -+ # clean the tree, but exclude tests/{diff,output} dirs -+ # -+ [ -d tests/diff ] && mv tests/diff tests/diff.save -+ [ -d tests/output ] && mv tests/output tests/output.save -+ - make -j clean &> /dev/null -- cd $olddir - -+ [ -d tests/diff.save ] && mv tests/diff.save tests/diff -+ [ -d tests/output.save ] && mv tests/output.save tests/output -+ -+ cd $olddir - ts_finalize_subtest - done - -diff --git a/tests/ts/libmount/context-utab b/tests/ts/libmount/context-utab -index aa49806..4c1d117 100755 ---- a/tests/ts/libmount/context-utab -+++ b/tests/ts/libmount/context-utab -@@ -67,6 +67,8 @@ grep -q $DEVICE /proc/mounts || \ - echo "(by device) cannot find $DEVICE in /proc/mounts" >> $TS_OUTPUT 2>&1 - ts_finalize_subtest - -+sleep 1 -+ - ts_init_subtest "umount-by-devname" - ts_valgrind $TESTPROG --umount $DEVICE >> $TS_OUTPUT 2>&1 - grep -q $DEVICE /proc/mounts && -@@ -81,6 +83,8 @@ grep -q $DEVICE $LIBMOUNT_UTAB || \ - echo "(by label) cannot find $DEVICE in $LIBMOUNT_UTAB" >> $TS_OUTPUT 2>&1 - ts_finalize_subtest - -+sleep 1 -+ - ts_init_subtest "umount" - ts_valgrind $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>&1 - grep -q $DEVICE $LIBMOUNT_UTAB && \ -@@ -94,6 +98,8 @@ if [ -x "/sbin/mkfs.btrfs" ]; then - /sbin/btrfsctl -S sub $MOUNTPOINT &> /dev/null - umount $MOUNTPOINT &> /dev/null - -+ sleep 1 -+ - ts_init_subtest "mount-uhelper-subvol" - mkdir -p $MOUNTPOINT &> /dev/null - ts_valgrind $TESTPROG --mount -o uhelper=foo,rw,subvol=sub $DEVICE $MOUNTPOINT >> $TS_OUTPUT 2>&1 -@@ -105,6 +111,8 @@ if [ -x "/sbin/mkfs.btrfs" ]; then - $TS_CMD_FINDMNT --mtab $MOUNTPOINT -o OPTIONS -n >> $TS_OUTPUT 2>&1 - ts_log "---" - -+ sleep 1 -+ - ts_init_subtest "umount-subvol" - ts_valgrind $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>&1 - grep -q $DEVICE $LIBMOUNT_UTAB && \ -diff --git a/tests/ts/libmount/files/fstab b/tests/ts/libmount/files/fstab -index 2503065..a8f73bc 100644 ---- a/tests/ts/libmount/files/fstab -+++ b/tests/ts/libmount/files/fstab -@@ -10,3 +10,5 @@ proc /proc proc defaults 0 0 - - foo.com:/mnt/share /mnt/remote nfs noauto - //bar.com/gogogo /mnt/gogogo cifs user=SRGROUP/baby,noauto -+ -+/dev/foo /any/foo/ auto defaults 0 0 -diff --git a/tests/ts/libmount/tabfiles b/tests/ts/libmount/tabfiles -index 7f4913e..671c649 100755 ---- a/tests/ts/libmount/tabfiles -+++ b/tests/ts/libmount/tabfiles -@@ -47,6 +47,16 @@ ts_valgrind $TESTPROG --find-forward "$TS_SELF/files/fstab" target /home/foo &> - sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT - ts_finalize_subtest - -+ts_init_subtest "find-target2" -+ts_valgrind $TESTPROG --find-forward "$TS_SELF/files/fstab" target /any/foo &> $TS_OUTPUT -+sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT -+ts_finalize_subtest -+ -+ts_init_subtest "find-target3" -+ts_valgrind $TESTPROG --find-forward "$TS_SELF/files/fstab" target /any/foo/ &> $TS_OUTPUT -+sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT -+ts_finalize_subtest -+ - ts_init_subtest "find-pair" - ts_valgrind $TESTPROG --find-pair "$TS_SELF/files/mtab" /dev/mapper/kzak-home /home/kzak &> $TS_OUTPUT - sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT -diff --git a/tests/ts/mount/fstab-none b/tests/ts/mount/fstab-none -new file mode 100755 -index 0000000..62a89ca ---- /dev/null -+++ b/tests/ts/mount/fstab-none -@@ -0,0 +1,30 @@ -+#!/bin/bash -+ -+TS_TOPDIR="$(dirname $0)/../.." -+TS_DESC="none" -+ -+. $TS_TOPDIR/functions.sh -+ts_init "$*" -+ts_skip_nonroot -+ -+set -o pipefail -+ -+ts_fstab_add "none" "$TS_MOUNTPOINT" "tmpfs" "rw,nosuid,nodev,relatime" -+ -+mkdir -p $TS_MOUNTPOINT -+ -+$TS_CMD_MOUNT $TS_MOUNTPOINT 2>&1 >> $TS_OUTPUT -+ -+$TS_CMD_FINDMNT --target "$TS_MOUNTPOINT" &> /dev/null -+[ $? -eq 0 ] || ts_die "Not found target (mount failed?)" -+ -+$TS_CMD_FINDMNT --source "none" --target "$TS_MOUNTPOINT" &> /dev/null -+[ $? -eq 0 ] || ts_die "Not found source and target" -+ -+$TS_CMD_UMOUNT $TS_MOUNTPOINT || ts_die "Cannot umount $TS_MOUNTPOINT" -+ -+ts_fstab_clean -+ -+ts_log "Success" -+ts_finalize -+ -diff --git a/tests/ts/mount/shared-subtree b/tests/ts/mount/shared-subtree -new file mode 100755 -index 0000000..a0a76c5 ---- /dev/null -+++ b/tests/ts/mount/shared-subtree -@@ -0,0 +1,58 @@ -+#!/bin/bash -+ -+TS_TOPDIR="$(dirname $0)/../.." -+TS_DESC="shared-subtree" -+ -+. $TS_TOPDIR/functions.sh -+ts_init "$*" -+ts_skip_nonroot -+ -+function get_attr() -+{ -+ # It's usually stupid idea to use 'grep | awk', -+ # but use paths in awk /regex/ is too tricky... -+ # -+ # TODO; improve libmount and findmnt to return the -+ # shared-subtree flags -+ # -+ echo $(grep "$1" /proc/self/mountinfo | \ -+ awk '{print $7}' | \ -+ awk -F ':' '{ print $1 }') -+} -+ -+[ -d $TS_MOUNTPOINT ] || mkdir -p $TS_MOUNTPOINT -+ -+# bind -+$TS_CMD_MOUNT --bind $TS_MOUNTPOINT $TS_MOUNTPOINT -+ -+# check the bind -+$TS_CMD_FINDMNT --kernel --target $TS_MOUNTPOINT &> /dev/null -+[ "$?" == "0" ] || ts_die "Cannot find binded $TS_MOUNTPOINT in /proc/self/mountinfo" -+ -+# use the same mounpoint for all sub-tests -+MOUNTPOINT="$TS_MOUNTPOINT" -+ -+ -+ts_init_subtest "make-shared" -+$TS_CMD_MOUNT --make-shared $MOUNTPOINT >> $TS_OUTPUT 2>&1 -+echo "$(get_attr $MOUNTPOINT)" >> $TS_OUTPUT -+ts_finalize_subtest -+ -+ts_init_subtest "make-private" -+$TS_CMD_MOUNT --make-private $MOUNTPOINT >> $TS_OUTPUT 2>&1 -+echo "$(get_attr $MOUNTPOINT)" >> $TS_OUTPUT -+ts_finalize_subtest -+ -+ts_init_subtest "make-unbindable" -+$TS_CMD_MOUNT --make-unbindable $MOUNTPOINT >> $TS_OUTPUT 2>&1 -+echo "$(get_attr $MOUNTPOINT)" >> $TS_OUTPUT -+ts_finalize_subtest -+ -+ -+# clean up -+$TS_CMD_UMOUNT $TS_MOUNTPOINT -+rmdir $TS_MOUNTPOINT -+ -+ts_log "Success" -+ts_finalize -+ diff --git a/extra/babl/PKGBUILD b/extra/babl/PKGBUILD index 45f2d5cef..99db414f3 100644 --- a/extra/babl/PKGBUILD +++ b/extra/babl/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 144898 2011-12-09 11:56:58Z eric $ +# $Id: PKGBUILD 158344 2012-05-03 19:33:15Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=babl -pkgver=0.1.6 +pkgver=0.1.10 pkgrel=1 pkgdesc="Dynamic, any to any, pixel format conversion library" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ license=('LGPL3') depends=('glibc') options=('!libtool' '!makeflags') source=(ftp://ftp.gimp.org/pub/babl/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('3178ec9f988efe895d00e2d432ad9b6ec10211e9') +sha1sums=('ee60089e8e9d9390e730d3ae5e41074549928b7a') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/calligra/do-not-build-hancomword.patch b/extra/calligra/do-not-build-hancomword.patch deleted file mode 100644 index 0c010b706..000000000 --- a/extra/calligra/do-not-build-hancomword.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/filters/words/CMakeLists.txt -+++ b/filters/words/CMakeLists.txt -@@ -75,7 +75,6 @@ IF( NOT TINY ) - add_subdirectory( docbook ) - # add_subdirectory( html ) - add_subdirectory( kword1.3 ) -- add_subdirectory( hancomword ) - add_subdirectory( oowriter ) - add_subdirectory( palmdoc ) - add_subdirectory( wml ) - diff --git a/extra/calligra/fix-docx-support.patch b/extra/calligra/fix-docx-support.patch deleted file mode 100644 index 304e200e3..000000000 --- a/extra/calligra/fix-docx-support.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/libs/odf/KoXmlWriter.h -+++ b/libs/odf/KoXmlWriter.h -@@ -252,6 +252,14 @@ private: - Tag(const char* t = 0, bool ind = true) - : tagName(t), hasChildren(false), lastChildIsText(false), - openingTagClosed(false), indentInside(ind) {} -+ Tag(const Tag &original) -+ { -+ tagName = original.tagName; -+ hasChildren = original.hasChildren; -+ lastChildIsText = original.lastChildIsText; -+ openingTagClosed = original.openingTagClosed; -+ indentInside = original.indentInside; -+ } - const char* tagName; - bool hasChildren : 1; ///< element or text children - bool lastChildIsText : 1; ///< last child is a text node - diff --git a/extra/cmus/PKGBUILD b/extra/cmus/PKGBUILD deleted file mode 100644 index 0013d3c44..000000000 --- a/extra/cmus/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 144025 2011-12-02 04:00:48Z eric $ -# Maintainer: Aaron Griffin <aaron@archlinux.org> -# Contributor: dorphell <dorphell@archlinux.org> - -pkgname=cmus -pkgver=2.4.3 -pkgrel=1 -pkgdesc="A very feature-rich ncurses-based music player" -arch=('i686' 'x86_64' 'mips64el') -url="http://cmus.sourceforge.net/" -license=('GPL') -depends=('ncurses') -makedepends=('libao' 'libmpcdec' 'ffmpeg' 'flac' 'libmad' 'faad2' 'libmodplug' - 'libvorbis' 'libpulse' 'wavpack' 'libmp4v2') -optdepends=('alsa-lib: for ALSA output plugin support' - 'libao: for AO output plugin support' - 'libpulse: for PulseAudio output plugin support' - 'ffmpeg: for ffmpeg input plugin support' - 'libmodplug: for modplug input plugin support' - 'faad2: for input AAC plugin support' - 'libmad: for mp3 input plugin support' - 'libmpcdec: for musepack input plugin support' - 'wavpack: for wavpack input plugin support' - 'libvorbis: for vorbis input plugin support' - 'flac: for flac input plugin support' - 'libmp4v2: for mp4 input plugin support') -source=("http://downloads.sourceforge.net/$pkgname/$pkgname-v$pkgver.tar.bz2") -sha1sums=('ba63a417b0df42fa9a4850dd8b922a95a426f7f5') - -build() { - cd "$srcdir/$pkgname-v$pkgver" - ./configure prefix=/usr - make -} - -package() { - cd "$srcdir/$pkgname-v$pkgver" - make DESTDIR="$pkgdir" install - install -D -m 644 contrib/_cmus "$pkgdir/usr/share/zsh/site-functions/_cmus" -} diff --git a/extra/colord/fix-compilation.patch b/extra/colord/fix-compilation.patch deleted file mode 100644 index b956cb9f6..000000000 --- a/extra/colord/fix-compilation.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 638a98fef16fa15946522d4112660b4b20c0d630 Mon Sep 17 00:00:00 2001 -From: Richard Hughes <richard@hughsie.com> -Date: Thu, 23 Feb 2012 10:43:37 +0000 -Subject: [PATCH] trivial: Fix compile with older versions of GLib - -g_mapped_file_new_from_fd() was introduced in 2.31.0 not 2.30.0 as the -docs suggested. - -Resoves https://bugs.freedesktop.org/show_bug.cgi?id=46481 ---- - src/cd-profile.c | 10 ++++++++++ - 1 files changed, 10 insertions(+), 0 deletions(-) - -diff --git a/src/cd-profile.c b/src/cd-profile.c -index a292616..323588b 100644 ---- a/src/cd-profile.c -+++ b/src/cd-profile.c -@@ -1066,7 +1066,17 @@ cd_profile_set_fd (CdProfile *profile, - } - - /* create a mapped file */ -+#if GLIB_CHECK_VERSION(2,31,0) - priv->mapped_file = g_mapped_file_new_from_fd (fd, FALSE, error); -+ if (priv->mapped_file == NULL) { -+ g_set_error (error, -+ CD_MAIN_ERROR, -+ CD_MAIN_ERROR_FAILED, -+ "failed to create mapped file from fd %i", -+ fd); -+ goto out; -+ } -+#endif - - /* parse the ICC file */ - lcms_profile = cmsOpenProfileFromStream (stream, "r"); --- -1.7.6 - diff --git a/extra/conky/PKGBUILD b/extra/conky/PKGBUILD index fa5098c03..bb4b7786b 100644 --- a/extra/conky/PKGBUILD +++ b/extra/conky/PKGBUILD @@ -1,32 +1,28 @@ -# $Id: PKGBUILD 150215 2012-02-15 03:04:18Z bisson $ +# $Id: PKGBUILD 158528 2012-05-03 23:54:02Z bisson $ # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: James Rayner <james@archlinux.org> # Contributor: Partha Chowdhury <kira.laucas@gmail.com> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=conky -pkgver=1.8.2git20111107 -pkgrel=2 +pkgver=1.9.0 +pkgrel=1 pkgdesc='Lightweight system monitor for X' url='http://conky.sourceforge.net/' license=('BSD' 'GPL') arch=('i686' 'x86_64' 'mips64el') options=('!emptydirs') -makedepends=('pkg-config' 'docbook2x') +makedepends=('docbook2x') depends=('alsa-lib' 'libxml2' 'curl' 'wireless_tools' 'libxft' 'glib2' 'libxdamage' 'imlib2') backup=('etc/conky/conky.conf' 'etc/conky/conky_no_x11.conf') -source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz") -sha1sums=('133fc6fdc725162af9a98c72c1b7349efc22447c') - -# git clone git://git.omp.am/conky.git; cd conky; git archive --prefix=${pkgname}-${pkgver}/ origin/1.8.2 | xz > ../${pkgname}-${pkgver}.tar.xz +source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz") +sha1sums=('a8d26d002370c9b877ae77ad3a3bbd2566b38e5d') replaces=('torsmo') build() { cd "${srcdir}/${pkgname}-${pkgver}" - sh autogen.sh - CPPFLAGS="${CXXFLAGS}" LIBS="${LDFLAGS}" ./configure \ --prefix=/usr \ --sysconfdir=/etc \ diff --git a/extra/dcron/PKGBUILD b/extra/dcron/PKGBUILD deleted file mode 100644 index c898df935..000000000 --- a/extra/dcron/PKGBUILD +++ /dev/null @@ -1,44 +0,0 @@ -# Maintainer: Paul Mattal <paul.archlinux.org> - -pkgname=dcron -pkgver=4.5 -pkgrel=2 -pkgdesc="dillon's lightweight cron daemon" -arch=('i686' 'x86_64' 'mips64el') -license=('GPL') -url="http://www.jimpryor.net/linux/dcron" -backup=('var/spool/cron/root' 'etc/conf.d/crond') -depends=('bash') -provides=('cron') -conflicts=('cron') -source=("http://www.jimpryor.net/linux/releases/${pkgname}-${pkgver}.tar.gz") -md5sums=('078833f3281f96944fc30392b1888326') -optdepends=('smtp-server: sending cron job output via email') -install=$pkgname.install - -build() { - cd "$srcdir/${pkgname}-${pkgver}" - - # by default, any member of group "users" can edit their own crontab - make \ - PREFIX=/usr \ - CRONTAB_GROUP=users \ - CRONTABS=/var/spool/cron \ - CRONSTAMPS=/var/spool/cronstamps -} - -package() { - cd "$srcdir/${pkgname}-${pkgver}" - make DESTDIR="$pkgdir" install - - # install standard configuration and scripts - install -d -m755 "$pkgdir/etc/cron."{hourly,daily,weekly,monthly} - - install -D -m755 extra/run-cron "$pkgdir/usr/sbin/run-cron" - install -D -m0600 extra/root.crontab "$pkgdir/var/spool/cron/root" - install -D -m755 extra/crond.rc "$pkgdir/etc/rc.d/crond" - install -D -m0644 extra/crond.conf "$pkgdir/etc/conf.d/crond" - install -D -m644 extra/crontab.vim "$pkgdir/usr/share/vim/vimfiles/ftplugin/crontab.vim" - sed -i -e 's=/var/spool/cron/cronstamps=/var/spool/cronstamps=' extra/prune-cronstamps - install -D -m755 extra/prune-cronstamps "$pkgdir/etc/cron.d/prune-cronstamps" -} diff --git a/extra/dcron/dcron.install b/extra/dcron/dcron.install deleted file mode 100644 index df23d0224..000000000 --- a/extra/dcron/dcron.install +++ /dev/null @@ -1,6 +0,0 @@ -post_upgrade() { - if [ $(vercmp $2 4.0) -lt 0 ] - then - echo "Restart crond, since you're upgrading to the dcron 4.x series." - fi -} diff --git a/extra/emelfm2/emelfm2-0.8.0-dsofix.patch b/extra/emelfm2/emelfm2-0.8.0-dsofix.patch deleted file mode 100644 index e9eb12405..000000000 --- a/extra/emelfm2/emelfm2-0.8.0-dsofix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Makefile 2011-06-06 11:10:28.000000000 +0200 -+++ b/Makefile 2012-02-27 18:20:11.000000000 +0100 -@@ -382,7 +382,7 @@ - - $(TARGET): $(OBJECTS) - @echo "linking binary '$(TARGET)'" -- @$(CC) $(LDFLAGS) $(OBJECTS) -o $(TARGET) -Wl,--as-needed $(lLIBS) -+ @$(CC) $(LDFLAGS) $(OBJECTS) -o $(TARGET) -lm -ldl -Wl,--as-needed $(lLIBS) - ifeq ($(STRIP), 1) - ifneq ($(DEBUG), 1) - @echo "stripping binary '$(TARGET)'" diff --git a/extra/epiphany-extensions/rss-link-dbus-glib.patch b/extra/epiphany-extensions/rss-link-dbus-glib.patch deleted file mode 100644 index 1737c49ea..000000000 --- a/extra/epiphany-extensions/rss-link-dbus-glib.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 2066084961b77810477b658cabbb7f6e90a17b94 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev <tetromino@gentoo.org> -Date: Sat, 19 Nov 2011 01:01:12 -0500 -Subject: [PATCH] rss: add DBUS_LIBS to librssextension_la_LIBADD - -Otherwise, epiphany-3.2 crashes. - -https://bugzilla.gnome.org/show_bug.cgi?id=664369 ---- - extensions/rss/Makefile.am | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -diff --git a/extensions/rss/Makefile.am b/extensions/rss/Makefile.am -index ed6962f..da669c8 100644 ---- a/extensions/rss/Makefile.am -+++ b/extensions/rss/Makefile.am -@@ -25,6 +25,9 @@ librssextension_la_LDFLAGS = \ - -export-symbols $(top_srcdir)/ephy-extension.symbols \ - $(AM_LDFLAGS) - -+librssextension_la_LIBADD = \ -+ $(DBUS_LIBS) -+ - uidir = $(pkgdatadir)/ui - ui_DATA = rss-ui.ui - --- -1.7.8.rc3 - diff --git a/extra/farsight2/PKGBUILD b/extra/farsight2/PKGBUILD deleted file mode 100644 index 02144244e..000000000 --- a/extra/farsight2/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 140265 2011-10-11 14:15:08Z ibiru $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> -# Contributor: William Díaz <wdiaz@archlinux.us> - -pkgname=farsight2 -pkgver=0.0.31 -pkgrel=1 -pkgdesc="Audio/Video conference software for Instant Messengers" -arch=('i686' 'x86_64' 'mips64el') -url="http://farsight.freedesktop.org" -license=('LGPL') -depends=('libnice' 'gstreamer0.10-base-plugins' 'gstreamer0.10-good' 'gstreamer0.10-bad' 'gstreamer0.10-python' 'pygobject') -optdepends=('gstreamer0.10-ugly-plugins: h264 codec') -options=('!libtool' '!emptydirs') -source=(http://farsight.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('3771d8268f025b28261cc1e977fab27f') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr \ - --with-package-name='Arch Linux farsight2 package' \ - --with-package-origin='http://archlinux.org' \ - --disable-static \ - --disable-valgrind \ - --disable-debug - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR=${pkgdir} install -} diff --git a/extra/foomatic/PKGBUILD b/extra/foomatic/PKGBUILD deleted file mode 100644 index d020b951e..000000000 --- a/extra/foomatic/PKGBUILD +++ /dev/null @@ -1,76 +0,0 @@ -# $Id: PKGBUILD 155771 2012-04-06 10:09:10Z andyrtr $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> - -pkgbase="foomatic" -pkgname=('foomatic-db' 'foomatic-filters' 'foomatic-db-engine') -arch=('i686' 'x86_64' 'mips64el') # needs to be changed in the subpackages when makepkg will support it -_snapdate=20120406 -_filtersver=4.0.15 -_enginever=4.0.8 -pkgver=${_filtersver}_${_snapdate} -pkgrel=1 -epoch=1 -makedepends=('cups' 'perl' 'libxml2' 'enscript' 'perl' 'net-snmp' 'bash') -#_url=http://www.openprinting.org/download/foomatic/ # switch after build -_url=ftp://ftp.archlinux.org/other/foomatic/ -source=(${_url}/$pkgbase-filters-${_filtersver}.tar.gz - ${_url}/$pkgbase-db-engine-${_enginever}.tar.gz - ${_url}/$pkgbase-db-4.0-${_snapdate}.tar.gz) -url="http://www.linuxprinting.org/foomatic.html" -options=('!emptydirs') -md5sums=('1b7efcdc57340915647daa5b5c15b0ef' - '5283cd5125a96dc0b35d896326512b1a' - 'ccb72c201e14bfc5eb23ea839ecc0623') - -package_foomatic-db() { - - pkgdesc="Foomatic - The collected knowledge about printers, drivers, and driver options in XML files, used by foomatic-db-engine to generate PPD files." -# arch=('any') - license=('GPL' 'custom') - depends=('perl' 'libxml2') - replaces=('foomatic-db-ppd' 'foomatic-db-hpijs') - conflicts=('foomatic-db-ppd' 'foomatic-db-hpijs') - provides=('foomatic-db-hpijs') - - cd ${srcdir}/${pkgname}-${_snapdate} - ./configure --prefix=/usr - make DESTDIR=${pkgdir} install - install -v -Dm644 ${srcdir}/${pkgname}-${_snapdate}/COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING -} - -package_foomatic-filters() { - - pkgdesc="Foomatic - Filter scripts used by the printer spoolers to convert the incoming PostScript data into the printer's native format." -# arch=('i686' 'x86_64') - license=('GPL') - backup=(etc/foomatic/filter.conf) - depends=('glibc' 'dbus-core') - optdepends=('perl: for the "beh" Backend End Handler used by cups' - 'net-snmp: certain (mostly HP) printers need it to work') - - cd ${srcdir}/foomatic-filters-${_filtersver} - ./configure --prefix=/usr --sysconfdir=/etc - make - make DESTDIR=${pkgdir} install -} - -package_foomatic-db-engine() { - - pkgdesc="Foomatic - Foomatic's database engine generates PPD files from the data in Foomatic's XML database. It also contains scripts to directly generate print queues and handle jobs." -# arch=(i686 x86_64) - license=('GPL') - depends=('perl' 'libxml2' 'foomatic-filters' 'bash') - - cd ${srcdir}/foomatic-db-engine-${_enginever} - ./configure --prefix=/usr - make - eval `perl -V:archname` - make DESTDIR=${pkgdir} \ - INSTALLARCHLIB=/usr/lib/perl5/vendor_perl/ \ - INSTALLSITELIB=/usr/lib/perl5/vendor_perl/ \ - INSTALLSITEARCH=/usr/lib/perl5/vendor_perl/ install - /usr/bin/find ${pkgdir} -name '.packlist' -delete - # fix permissions - chmod 755 ${pkgdir}/usr/lib{,/perl5,/perl5/vendor_perl} -} - diff --git a/extra/fuse/fuse.install b/extra/fuse/fuse.install deleted file mode 100644 index f186d64c7..000000000 --- a/extra/fuse/fuse.install +++ /dev/null @@ -1,10 +0,0 @@ -post_install() { - cat << 'EOM' -==> You must load the fuse kernel module to use FUSE. - -> Run 'modprobe fuse' to load the module now. - -> Add fuse to $MODULES in /etc/rc.conf to load on every boot. -==> You will need a /dev/fuse device node to use FUSE. - -> If you use udev, nothing needs to be done - -> For a static /dev, run: mknod /dev/fuse -m 0666 c 10 229 -EOM -} diff --git a/extra/fwbuilder/PKGBUILD b/extra/fwbuilder/PKGBUILD deleted file mode 100644 index a5e936748..000000000 --- a/extra/fwbuilder/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 153570 2012-03-16 04:12:42Z eric $ -# Maintainer: Kevin Piche <kevin@archlinux.org> -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> - -pkgname=fwbuilder -pkgver=5.0.1.3592 -pkgrel=1 -pkgdesc="Object-oriented GUI and set of compilers for various firewall platforms" -url="http://www.fwbuilder.org/" -arch=('i686' 'x86_64' 'mips64el') -license=('GPL') -depends=('libxslt' 'net-snmp' 'qt') -conflicts=('libfwbuilder') -install=fwbuilder.install -source=("http://sourceforge.net/projects/fwbuilder/files/Current_Packages/${pkgver%.*}/fwbuilder-${pkgver}.tar.gz" - "gcc47.patch") -md5sums=('50b567a9752e9dd4f4cd0d988d74d879' - '864cc741b11c8a2e8c6c27cbe82c511d') - -build() { - cd "${srcdir}/fwbuilder-${pkgver}" - patch -p1 -i "$srcdir/gcc47.patch" - ./autogen.sh - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/fwbuilder-${pkgver}" - make INSTALL_ROOT="${pkgdir}" install -} diff --git a/extra/fwbuilder/fwbuilder.install b/extra/fwbuilder/fwbuilder.install deleted file mode 100644 index 45f0c2242..000000000 --- a/extra/fwbuilder/fwbuilder.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} - diff --git a/extra/fwbuilder/gcc47.patch b/extra/fwbuilder/gcc47.patch deleted file mode 100644 index 2581e9b43..000000000 --- a/extra/fwbuilder/gcc47.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ru fwbuilder-5.0.1.3592.orig/src/libfwbuilder/src/fwbuilder/ThreadTools.h fwbuilder-5.0.1.3592/src/libfwbuilder/src/fwbuilder/ThreadTools.h ---- fwbuilder-5.0.1.3592.orig/src/libfwbuilder/src/fwbuilder/ThreadTools.h 2012-04-21 19:25:26.684127714 +0200 -+++ fwbuilder-5.0.1.3592/src/libfwbuilder/src/fwbuilder/ThreadTools.h 2012-04-21 19:26:05.308091572 +0200 -@@ -31,6 +31,7 @@ - - #include <time.h> //for time_t definition - #include <pthread.h> -+#include <unistd.h> // for ssize_t - - #include <string> - #include <queue> diff --git a/extra/gnome-bluetooth/PKGBUILD b/extra/gnome-bluetooth/PKGBUILD index 8d992fa0c..841f1b154 100644 --- a/extra/gnome-bluetooth/PKGBUILD +++ b/extra/gnome-bluetooth/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 156801 2012-04-23 09:06:01Z ibiru $ +# $Id: PKGBUILD 158129 2012-05-03 13:11:10Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Roman Kyrylych <roman@archlinux.org> pkgname=gnome-bluetooth pkgver=3.4.0 -pkgrel=1 +pkgrel=2 pkgdesc="The GNOME Bluetooth Subsystem" arch=('i686' 'x86_64' 'mips64el') url="http://live.gnome.org/GnomeBluetooth" @@ -34,5 +34,5 @@ package() { make DESTDIR="$pkgdir" install install -m644 -D "$srcdir/61-gnome-bluetooth-rfkill.rules" \ - "$pkgdir/lib/udev/rules.d//61-gnome-bluetooth-rfkill.rules" + "$pkgdir/usr/lib/udev/rules.d//61-gnome-bluetooth-rfkill.rules" } diff --git a/extra/gnome-disk-utility/fix-freeze.patch b/extra/gnome-disk-utility/fix-freeze.patch deleted file mode 100644 index 262748bfb..000000000 --- a/extra/gnome-disk-utility/fix-freeze.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 82489b51443e1280dfb9fb251ea2693df1809aec Mon Sep 17 00:00:00 2001 -From: Pascal Terjan <pterjan@mandriva.com> -Date: Mon, 3 May 2010 14:01:22 +0200 -Subject: [PATCH] Force GduPresentable ids to be UTF-8 (#616198) - -GduPresentable created in gdu pool include intheir id some strings -in local encoding like _("Peripheral Devices"). This patch -enforces them to be UTF-8. - -This fixes a crash of gvfs-gdu-volume-monitor when USB devices are -available on a non UTF-8 system. ---- - src/gdu/gdu-pool.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -diff --git a/src/gdu/gdu-pool.c b/src/gdu/gdu-pool.c -index bd5eccf..cf6be53 100644 ---- a/src/gdu/gdu-pool.c -+++ b/src/gdu/gdu-pool.c -@@ -473,6 +473,9 @@ gdu_pool_class_init (GduPoolClass *klass) - g_cclosure_marshal_VOID__OBJECT, - G_TYPE_NONE, 1, - GDU_TYPE_PRESENTABLE); -+#ifdef HAVE_BIND_TEXTDOMAIN_CODESET -+ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); -+#endif - } - - static void --- -1.7.1 - diff --git a/extra/gnome-games/gnome-sudoku-fix.patch b/extra/gnome-games/gnome-sudoku-fix.patch deleted file mode 100644 index ec29f34ab..000000000 --- a/extra/gnome-games/gnome-sudoku-fix.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 8ab5a3a28281e6b1b649d9ef93628b3433ddd887 Mon Sep 17 00:00:00 2001 -From: John (J5) Palmieri <johnp@redhat.com> -Date: Mon, 02 Jan 2012 18:39:05 +0000 -Subject: fix type check so gnome-sudoku works with pygobject >= 3.0.3 - -gnome-sudoku was using if type(grid) == str to check if it needed -to convert the game board to a list. Unicode fixes in the latest -pygobject returns unicode strings for any string stored in a -TreeStore. The fix was to correctly check for any string using -isinstance(grid, basestring) - -Note this will not work in python3 so needs to be looked at when -porting ---- -diff --git a/gnome-sudoku/src/lib/sudoku.py b/gnome-sudoku/src/lib/sudoku.py -index a345593..7d28608 100644 ---- a/gnome-sudoku/src/lib/sudoku.py -+++ b/gnome-sudoku/src/lib/sudoku.py -@@ -130,7 +130,7 @@ class SudokuGrid(object): - for n, col in enumerate([[(x, y) for y in range(self.group_size)] for x in range(self.group_size)]): - self.col_coords[n] = col - if grid: -- if type(grid) == str: -+ if isinstance(grid, basestring): - g = re.split("\s+", grid) - side = int(math.sqrt(len(g))) - grid = [] --- -cgit v0.9.0.2 diff --git a/extra/gnome-keyring/silence_no_socket_to_connect.patch b/extra/gnome-keyring/silence_no_socket_to_connect.patch deleted file mode 100644 index e6eba7855..000000000 --- a/extra/gnome-keyring/silence_no_socket_to_connect.patch +++ /dev/null @@ -1,717 +0,0 @@ -From 5ca7387952f99bf318d337df2d853f5bc3c0ddd2 Mon Sep 17 00:00:00 2001 -From: Stef Walter <stefw@collabora.co.uk> -Date: Mon, 19 Dec 2011 12:08:51 +0000 -Subject: rpc-layer: Correctly handle case where gnome-keyring-daemon not running - - * In the gnome-keyring-pkcs11.so module return stand in info - when the gnome-keyring-daemon info is not running. - * In addition no slots will be listed - -https://bugzilla.gnome.org/show_bug.cgi?id=665961 ---- -diff --git a/pkcs11/rpc-layer/gkm-rpc-module.c b/pkcs11/rpc-layer/gkm-rpc-module.c -index ea939a7..b95bee1 100644 ---- a/pkcs11/rpc-layer/gkm-rpc-module.c -+++ b/pkcs11/rpc-layer/gkm-rpc-module.c -@@ -228,10 +228,8 @@ call_connect (CallState *cs) - assert (cs->socket == -1); - assert (cs->call_status == CALL_INVALID); - -- if (!pkcs11_socket_path) { -- warning (("no socket to connect to")); -+ if (!pkcs11_socket_path) - return CKR_DEVICE_REMOVED; -- } - - debug (("connecting to: %s", pkcs11_socket_path)); - -@@ -968,13 +966,14 @@ proto_read_sesssion_info (GkmRpcMessage *msg, CK_SESSION_INFO_PTR info) - * CALL MACROS - */ - --#define BEGIN_CALL(call_id) \ -+#define BEGIN_CALL_OR(call_id, if_no_daemon) \ - debug ((#call_id ": enter")); \ - return_val_if_fail (pkcs11_initialized, CKR_CRYPTOKI_NOT_INITIALIZED); \ - { \ - CallState *_cs; \ - CK_RV _ret = CKR_OK; \ - _ret = call_lookup (&_cs); \ -+ if (_ret == CKR_DEVICE_REMOVED) return (if_no_daemon); \ - if (_ret != CKR_OK) return _ret; \ - _ret = call_prepare (_cs, GKM_RPC_CALL_##call_id); \ - if (_ret != CKR_OK) goto _cleanup; -@@ -1198,16 +1197,18 @@ rpc_C_Initialize (CK_VOID_PTR init_args) - } - } - -- /* Call through and initialize the daemon */ -- ret = call_lookup (&cs); -- if (ret == CKR_OK) { -- ret = call_prepare (cs, GKM_RPC_CALL_C_Initialize); -- if (ret == CKR_OK) -- if (!gkm_rpc_message_write_byte_array (cs->req, GKM_RPC_HANDSHAKE, GKM_RPC_HANDSHAKE_LEN)) -- ret = CKR_HOST_MEMORY; -- if (ret == CKR_OK) -- ret = call_run (cs); -- call_done (cs, ret); -+ /* Call through and initialize the daemon if available */ -+ if (pkcs11_socket_path != NULL) { -+ ret = call_lookup (&cs); -+ if (ret == CKR_OK) { -+ ret = call_prepare (cs, GKM_RPC_CALL_C_Initialize); -+ if (ret == CKR_OK) -+ if (!gkm_rpc_message_write_byte_array (cs->req, GKM_RPC_HANDSHAKE, GKM_RPC_HANDSHAKE_LEN)) -+ ret = CKR_HOST_MEMORY; -+ if (ret == CKR_OK) -+ ret = call_run (cs); -+ call_done (cs, ret); -+ } - } - - done: -@@ -1232,7 +1233,7 @@ static CK_RV - rpc_C_Finalize (CK_VOID_PTR reserved) - { - CallState *cs; -- CK_RV ret; -+ CK_RV ret = CKR_OK; - - debug (("C_Finalize: enter")); - return_val_if_fail (pkcs11_initialized, CKR_CRYPTOKI_NOT_INITIALIZED); -@@ -1240,17 +1241,18 @@ rpc_C_Finalize (CK_VOID_PTR reserved) - - pthread_mutex_lock (&init_mutex); - -- ret = call_lookup (&cs); -- if (ret == CKR_OK) { -- ret = call_prepare (cs, GKM_RPC_CALL_C_Finalize); -+ if (pkcs11_socket_path != NULL) { -+ ret = call_lookup (&cs); - if (ret == CKR_OK) { -- ret = call_run (cs); -+ ret = call_prepare (cs, GKM_RPC_CALL_C_Finalize); -+ if (ret == CKR_OK) -+ ret = call_run (cs); -+ call_done (cs, ret); - } -- call_done (cs, ret); -- } - -- if (ret != CKR_OK) -- warning (("finalizing the daemon returned an error: %d", ret)); -+ if (ret != CKR_OK) -+ warning (("finalizing the daemon returned an error: %d", ret)); -+ } - - /* This should stop all other calls in */ - pkcs11_initialized = 0; -@@ -1265,11 +1267,26 @@ rpc_C_Finalize (CK_VOID_PTR reserved) - } - - static CK_RV -+fill_stand_in_info (CK_INFO_PTR info) -+{ -+ static CK_INFO stand_in_info = { -+ { CRYPTOKI_VERSION_MAJOR, CRYPTOKI_VERSION_MINOR }, -+ "GNOME Keyring ", -+ 0, -+ "GNOME Keyring (without daemon) ", -+ { 1, 1 }, -+ }; -+ memcpy (info, &stand_in_info, sizeof (CK_INFO)); -+ return CKR_OK; -+ -+} -+ -+static CK_RV - rpc_C_GetInfo (CK_INFO_PTR info) - { - return_val_if_fail (info, CKR_ARGUMENTS_BAD); - -- BEGIN_CALL (C_GetInfo); -+ BEGIN_CALL_OR (C_GetInfo, fill_stand_in_info (info)); - PROCESS_CALL; - OUT_INFO (info); - END_CALL; -@@ -1287,7 +1304,7 @@ rpc_C_GetSlotList (CK_BBOOL token_present, CK_SLOT_ID_PTR slot_list, CK_ULONG_PT - { - return_val_if_fail (count, CKR_ARGUMENTS_BAD); - -- BEGIN_CALL (C_GetSlotList); -+ BEGIN_CALL_OR (C_GetSlotList, (*count = 0, CKR_OK)); - IN_BYTE (token_present); - IN_ULONG_BUFFER (slot_list, count); - PROCESS_CALL; -@@ -1300,7 +1317,7 @@ rpc_C_GetSlotInfo (CK_SLOT_ID id, CK_SLOT_INFO_PTR info) - { - return_val_if_fail (info, CKR_ARGUMENTS_BAD); - -- BEGIN_CALL (C_GetSlotInfo); -+ BEGIN_CALL_OR (C_GetSlotInfo, CKR_SLOT_ID_INVALID); - IN_ULONG (id); - PROCESS_CALL; - OUT_SLOT_INFO (info); -@@ -1312,7 +1329,7 @@ rpc_C_GetTokenInfo (CK_SLOT_ID id, CK_TOKEN_INFO_PTR info) - { - return_val_if_fail (info, CKR_ARGUMENTS_BAD); - -- BEGIN_CALL (C_GetTokenInfo); -+ BEGIN_CALL_OR (C_GetTokenInfo, CKR_SLOT_ID_INVALID); - IN_ULONG (id); - PROCESS_CALL; - OUT_TOKEN_INFO (info); -@@ -1325,7 +1342,7 @@ rpc_C_GetMechanismList (CK_SLOT_ID id, CK_MECHANISM_TYPE_PTR mechanism_list, - { - return_val_if_fail (count, CKR_ARGUMENTS_BAD); - -- BEGIN_CALL (C_GetMechanismList); -+ BEGIN_CALL_OR (C_GetMechanismList, CKR_SLOT_ID_INVALID); - IN_ULONG (id); - IN_ULONG_BUFFER (mechanism_list, count); - PROCESS_CALL; -@@ -1340,7 +1357,7 @@ rpc_C_GetMechanismInfo (CK_SLOT_ID id, CK_MECHANISM_TYPE type, - { - return_val_if_fail (info, CKR_ARGUMENTS_BAD); - -- BEGIN_CALL (C_GetMechanismInfo); -+ BEGIN_CALL_OR (C_GetMechanismInfo, CKR_SLOT_ID_INVALID); - IN_ULONG (id); - IN_MECHANISM_TYPE (type); - PROCESS_CALL; -@@ -1352,7 +1369,7 @@ static CK_RV - rpc_C_InitToken (CK_SLOT_ID id, CK_UTF8CHAR_PTR pin, CK_ULONG pin_len, - CK_UTF8CHAR_PTR label) - { -- BEGIN_CALL (C_InitToken); -+ BEGIN_CALL_OR (C_InitToken, CKR_SLOT_ID_INVALID); - IN_ULONG (id); - IN_BYTE_ARRAY (pin, pin_len); - IN_STRING (label); -@@ -1365,7 +1382,7 @@ rpc_C_WaitForSlotEvent (CK_FLAGS flags, CK_SLOT_ID_PTR slot, CK_VOID_PTR reserve - { - return_val_if_fail (slot, CKR_ARGUMENTS_BAD); - -- BEGIN_CALL (C_WaitForSlotEvent); -+ BEGIN_CALL_OR (C_WaitForSlotEvent, CKR_DEVICE_REMOVED); - IN_ULONG (flags); - PROCESS_CALL; - OUT_ULONG (slot); -@@ -1378,7 +1395,7 @@ rpc_C_OpenSession (CK_SLOT_ID id, CK_FLAGS flags, CK_VOID_PTR user_data, - { - return_val_if_fail (session, CKR_ARGUMENTS_BAD); - -- BEGIN_CALL (C_OpenSession); -+ BEGIN_CALL_OR (C_OpenSession, CKR_SLOT_ID_INVALID); - IN_ULONG (id); - IN_ULONG (flags); - PROCESS_CALL; -@@ -1389,7 +1406,7 @@ rpc_C_OpenSession (CK_SLOT_ID id, CK_FLAGS flags, CK_VOID_PTR user_data, - static CK_RV - rpc_C_CloseSession (CK_SESSION_HANDLE session) - { -- BEGIN_CALL (C_CloseSession); -+ BEGIN_CALL_OR (C_CloseSession, CKR_SESSION_HANDLE_INVALID); - IN_ULONG (session); - PROCESS_CALL; - END_CALL; -@@ -1398,7 +1415,7 @@ rpc_C_CloseSession (CK_SESSION_HANDLE session) - static CK_RV - rpc_C_CloseAllSessions (CK_SLOT_ID id) - { -- BEGIN_CALL (C_CloseAllSessions); -+ BEGIN_CALL_OR (C_CloseAllSessions, CKR_SLOT_ID_INVALID); - IN_ULONG (id); - PROCESS_CALL; - END_CALL; -@@ -1407,7 +1424,7 @@ rpc_C_CloseAllSessions (CK_SLOT_ID id) - static CK_RV - rpc_C_GetFunctionStatus (CK_SESSION_HANDLE session) - { -- BEGIN_CALL (C_GetFunctionStatus); -+ BEGIN_CALL_OR (C_GetFunctionStatus, CKR_SESSION_HANDLE_INVALID); - IN_ULONG (session); - PROCESS_CALL; - END_CALL; -@@ -1416,7 +1433,7 @@ rpc_C_GetFunctionStatus (CK_SESSION_HANDLE session) - static CK_RV - rpc_C_CancelFunction (CK_SESSION_HANDLE session) - { -- BEGIN_CALL (C_CancelFunction); -+ BEGIN_CALL_OR (C_CancelFunction, CKR_SESSION_HANDLE_INVALID); - IN_ULONG (session); - PROCESS_CALL; - END_CALL; -@@ -1427,7 +1444,7 @@ rpc_C_GetSessionInfo(CK_SESSION_HANDLE session, CK_SESSION_INFO_PTR info) - { - return_val_if_fail (info, CKR_ARGUMENTS_BAD); - -- BEGIN_CALL (C_GetSessionInfo); -+ BEGIN_CALL_OR (C_GetSessionInfo, CKR_SESSION_HANDLE_INVALID); - IN_ULONG (session); - PROCESS_CALL; - OUT_SESSION_INFO (info); -@@ -1438,7 +1455,7 @@ static CK_RV - rpc_C_InitPIN (CK_SESSION_HANDLE session, CK_UTF8CHAR_PTR pin, - CK_ULONG pin_len) - { -- BEGIN_CALL (C_InitPIN); -+ BEGIN_CALL_OR (C_InitPIN, CKR_SESSION_HANDLE_INVALID); - IN_ULONG (session); - IN_BYTE_ARRAY (pin, pin_len); - PROCESS_CALL; -@@ -1449,7 +1466,7 @@ static CK_RV - rpc_C_SetPIN (CK_SESSION_HANDLE session, CK_UTF8CHAR_PTR old_pin, - CK_ULONG old_pin_len, CK_UTF8CHAR_PTR new_pin, CK_ULONG new_pin_len) - { -- BEGIN_CALL (C_SetPIN); -+ BEGIN_CALL_OR (C_SetPIN, CKR_SESSION_HANDLE_INVALID); - IN_ULONG (session); - IN_BYTE_ARRAY (old_pin, old_pin_len); - IN_BYTE_ARRAY (new_pin, old_pin_len); -@@ -1463,7 +1480,7 @@ rpc_C_GetOperationState (CK_SESSION_HANDLE session, CK_BYTE_PTR operation_state, - { - return_val_if_fail (operation_state_len, CKR_ARGUMENTS_BAD); - -- BEGIN_CALL (C_GetOperationState); -+ BEGIN_CALL_OR (C_GetOperationState, CKR_SESSION_HANDLE_INVALID); - IN_ULONG (session); - IN_BYTE_BUFFER (operation_state, operation_state_len); - PROCESS_CALL; -@@ -1476,7 +1493,7 @@ rpc_C_SetOperationState (CK_SESSION_HANDLE session, CK_BYTE_PTR operation_state, - CK_ULONG operation_state_len, CK_OBJECT_HANDLE encryption_key, - CK_OBJECT_HANDLE authentication_key) - { -- BEGIN_CALL (C_SetOperationState); -+ BEGIN_CALL_OR (C_SetOperationState, CKR_SESSION_HANDLE_INVALID); - IN_ULONG (session); - IN_BYTE_ARRAY (operation_state, operation_state_len); - IN_ULONG (encryption_key); -@@ -1489,7 +1506,7 @@ static CK_RV - rpc_C_Login (CK_SESSION_HANDLE session, CK_USER_TYPE user_type, - CK_UTF8CHAR_PTR pin, CK_ULONG pin_len) - { -- BEGIN_CALL (C_Login); -+ BEGIN_CALL_OR (C_Login, CKR_SESSION_HANDLE_INVALID); - IN_ULONG (session); - IN_ULONG (user_type); - IN_BYTE_ARRAY (pin, pin_len); -@@ -1500,7 +1517,7 @@ rpc_C_Login (CK_SESSION_HANDLE session, CK_USER_TYPE user_type, - static CK_RV - rpc_C_Logout (CK_SESSION_HANDLE session) - { -- BEGIN_CALL (C_Logout); -+ BEGIN_CALL_OR (C_Logout, CKR_SESSION_HANDLE_INVALID); - IN_ULONG (session); - PROCESS_CALL; - END_CALL; -@@ -1512,7 +1529,7 @@ rpc_C_CreateObject (CK_SESSION_HANDLE session, CK_ATTRIBUTE_PTR template, - { - return_val_if_fail (new_object, CKR_ARGUMENTS_BAD); - -- BEGIN_CALL (C_CreateObject); -+ BEGIN_CALL_OR (C_CreateObject, CKR_SESSION_HANDLE_INVALID); - IN_ULONG (session); - IN_ATTRIBUTE_ARRAY (template, count); - PROCESS_CALL; -@@ -1527,7 +1544,7 @@ rpc_C_CopyObject (CK_SESSION_HANDLE session, CK_OBJECT_HANDLE object, - { - return_val_if_fail (new_object, CKR_ARGUMENTS_BAD); - -- BEGIN_CALL (C_CopyObject); -+ BEGIN_CALL_OR (C_CopyObject, CKR_SESSION_HANDLE_INVALID); - IN_ULONG (session); - IN_ULONG (object); - IN_ATTRIBUTE_ARRAY (template, count); -@@ -1540,7 +1557,7 @@ rpc_C_CopyObject (CK_SESSION_HANDLE session, CK_OBJECT_HANDLE object, - static CK_RV - rpc_C_DestroyObject (CK_SESSION_HANDLE session, CK_OBJECT_HANDLE object) - { -- BEGIN_CALL (C_DestroyObject); -+ BEGIN_CALL_OR (C_DestroyObject, CKR_SESSION_HANDLE_INVALID); - IN_ULONG (session); - IN_ULONG (object); - PROCESS_CALL; -@@ -1553,7 +1570,7 @@ rpc_C_GetObjectSize (CK_SESSION_HANDLE session, CK_OBJECT_HANDLE object, - { - return_val_if_fail (size, CKR_ARGUMENTS_BAD); - -- BEGIN_CALL (C_GetObjectSize); -+ BEGIN_CALL_OR (C_GetObjectSize, CKR_SESSION_HANDLE_INVALID); - IN_ULONG (session); - IN_ULONG (object); - PROCESS_CALL; -@@ -1565,7 +1582,7 @@ static CK_RV - rpc_C_GetAttributeValue (CK_SESSION_HANDLE session, CK_OBJECT_HANDLE object, - CK_ATTRIBUTE_PTR template, CK_ULONG count) - { -- BEGIN_CALL (C_GetAttributeValue); -+ BEGIN_CALL_OR (C_GetAttributeValue, CKR_SESSION_HANDLE_INVALID); - IN_ULONG (session); - IN_ULONG (object); - IN_ATTRIBUTE_BUFFER (template, count); -@@ -1578,7 +1595,7 @@ static CK_RV - rpc_C_SetAttributeValue (CK_SESSION_HANDLE session, CK_OBJECT_HANDLE object, - CK_ATTRIBUTE_PTR template, CK_ULONG count) - { -- BEGIN_CALL (C_SetAttributeValue); -+ BEGIN_CALL_OR (C_SetAttributeValue, CKR_SESSION_HANDLE_INVALID); - IN_ULONG (session); - IN_ULONG (object); - IN_ATTRIBUTE_ARRAY (template, count); -@@ -1590,7 +1607,7 @@ static CK_RV - rpc_C_FindObjectsInit (CK_SESSION_HANDLE session, CK_ATTRIBUTE_PTR template, - CK_ULONG count) - { -- BEGIN_CALL (C_FindObjectsInit); -+ BEGIN_CALL_OR (C_FindObjectsInit, CKR_SESSION_HANDLE_INVALID); - IN_ULONG (session); - IN_ATTRIBUTE_ARRAY (template, count); - PROCESS_CALL; -@@ -1606,7 +1623,7 @@ rpc_C_FindObjects (CK_SESSION_HANDLE session, CK_OBJECT_HANDLE_PTR objects, - - return_val_if_fail (count, CKR_ARGUMENTS_BAD); - -- BEGIN_CALL (C_FindObjects); -+ BEGIN_CALL_OR (C_FindObjects, CKR_SESSION_HANDLE_INVALID); - IN_ULONG (session); - IN_ULONG_BUFFER (objects, address_of_max_count); - PROCESS_CALL; -@@ -1618,7 +1635,7 @@ rpc_C_FindObjects (CK_SESSION_HANDLE session, CK_OBJECT_HANDLE_PTR objects, - static CK_RV - rpc_C_FindObjectsFinal (CK_SESSION_HANDLE session) - { -- BEGIN_CALL (C_FindObjectsFinal); -+ BEGIN_CALL_OR (C_FindObjectsFinal, CKR_SESSION_HANDLE_INVALID); - IN_ULONG (session); - PROCESS_CALL; - END_CALL; -@@ -1628,7 +1645,7 @@ static CK_RV - rpc_C_EncryptInit (CK_SESSION_HANDLE session, CK_MECHANISM_PTR mechanism, - CK_OBJECT_HANDLE key) - { -- BEGIN_CALL (C_EncryptInit); -+ BEGIN_CALL_OR (C_EncryptInit, CKR_SESSION_HANDLE_INVALID); - IN_ULONG (session); - IN_MECHANISM (mechanism); - IN_ULONG (key); -@@ -1642,7 +1659,7 @@ rpc_C_Encrypt (CK_SESSION_HANDLE session, CK_BYTE_PTR data, CK_ULONG data_len, - { - return_val_if_fail (encrypted_data_len, CKR_ARGUMENTS_BAD); - -- BEGIN_CALL (C_Encrypt); -+ BEGIN_CALL_OR (C_Encrypt, CKR_SESSION_HANDLE_INVALID); - IN_ULONG (session); - IN_BYTE_ARRAY (data, data_len); - IN_BYTE_BUFFER (encrypted_data, encrypted_data_len); -@@ -1658,7 +1675,7 @@ rpc_C_EncryptUpdate (CK_SESSION_HANDLE session, CK_BYTE_PTR part, - { - return_val_if_fail (encrypted_part_len, CKR_ARGUMENTS_BAD); - -- BEGIN_CALL (C_EncryptUpdate); -+ BEGIN_CALL_OR (C_EncryptUpdate, CKR_SESSION_HANDLE_INVALID); - IN_ULONG (session); - IN_BYTE_ARRAY (part, part_len); - IN_BYTE_BUFFER (encrypted_part, encrypted_part_len); -@@ -1673,7 +1690,7 @@ rpc_C_EncryptFinal (CK_SESSION_HANDLE session, CK_BYTE_PTR last_part, - { - return_val_if_fail (last_part_len, CKR_ARGUMENTS_BAD); - -- BEGIN_CALL (C_EncryptFinal); -+ BEGIN_CALL_OR (C_EncryptFinal, CKR_SESSION_HANDLE_INVALID); - IN_ULONG (session); - IN_BYTE_BUFFER (last_part, last_part_len); - PROCESS_CALL; -@@ -1685,7 +1702,7 @@ static CK_RV - rpc_C_DecryptInit (CK_SESSION_HANDLE session, CK_MECHANISM_PTR mechanism, - CK_OBJECT_HANDLE key) - { -- BEGIN_CALL (C_DecryptInit); -+ BEGIN_CALL_OR (C_DecryptInit, CKR_SESSION_HANDLE_INVALID); - IN_ULONG (session); - IN_MECHANISM (mechanism); - IN_ULONG (key); -@@ -1699,7 +1716,7 @@ rpc_C_Decrypt (CK_SESSION_HANDLE session, CK_BYTE_PTR enc_data, - { - return_val_if_fail (data_len, CKR_ARGUMENTS_BAD); - -- BEGIN_CALL (C_Decrypt); -+ BEGIN_CALL_OR (C_Decrypt, CKR_SESSION_HANDLE_INVALID); - IN_ULONG (session); - IN_BYTE_ARRAY (enc_data, enc_data_len); - IN_BYTE_BUFFER (data, data_len); -@@ -1714,7 +1731,7 @@ rpc_C_DecryptUpdate (CK_SESSION_HANDLE session, CK_BYTE_PTR enc_part, - { - return_val_if_fail (part_len, CKR_ARGUMENTS_BAD); - -- BEGIN_CALL (C_DecryptUpdate); -+ BEGIN_CALL_OR (C_DecryptUpdate, CKR_SESSION_HANDLE_INVALID); - IN_ULONG (session); - IN_BYTE_ARRAY (enc_part, enc_part_len); - IN_BYTE_BUFFER (part, part_len); -@@ -1729,7 +1746,7 @@ rpc_C_DecryptFinal (CK_SESSION_HANDLE session, CK_BYTE_PTR last_part, - { - return_val_if_fail (last_part_len, CKR_ARGUMENTS_BAD); - -- BEGIN_CALL (C_DecryptFinal); -+ BEGIN_CALL_OR (C_DecryptFinal, CKR_SESSION_HANDLE_INVALID); - IN_ULONG (session); - IN_BYTE_BUFFER (last_part, last_part_len); - PROCESS_CALL; -@@ -1740,7 +1757,7 @@ rpc_C_DecryptFinal (CK_SESSION_HANDLE session, CK_BYTE_PTR last_part, - static CK_RV - rpc_C_DigestInit (CK_SESSION_HANDLE session, CK_MECHANISM_PTR mechanism) - { -- BEGIN_CALL (C_DigestInit); -+ BEGIN_CALL_OR (C_DigestInit, CKR_SESSION_HANDLE_INVALID); - IN_ULONG (session); - IN_MECHANISM (mechanism); - PROCESS_CALL; -@@ -1753,7 +1770,7 @@ rpc_C_Digest (CK_SESSION_HANDLE session, CK_BYTE_PTR data, CK_ULONG data_len, - { - return_val_if_fail (digest_len, CKR_ARGUMENTS_BAD); - -- BEGIN_CALL (C_Digest); -+ BEGIN_CALL_OR (C_Digest, CKR_SESSION_HANDLE_INVALID); - IN_ULONG (session); - IN_BYTE_ARRAY (data, data_len); - IN_BYTE_BUFFER (digest, digest_len); -@@ -1765,7 +1782,7 @@ rpc_C_Digest (CK_SESSION_HANDLE session, CK_BYTE_PTR data, CK_ULONG data_len, - static CK_RV - rpc_C_DigestUpdate (CK_SESSION_HANDLE session, CK_BYTE_PTR part, CK_ULONG part_len) - { -- BEGIN_CALL (C_DigestUpdate); -+ BEGIN_CALL_OR (C_DigestUpdate, CKR_SESSION_HANDLE_INVALID); - IN_ULONG (session); - IN_BYTE_ARRAY (part, part_len); - PROCESS_CALL; -@@ -1775,7 +1792,7 @@ rpc_C_DigestUpdate (CK_SESSION_HANDLE session, CK_BYTE_PTR part, CK_ULONG part_l - static CK_RV - rpc_C_DigestKey (CK_SESSION_HANDLE session, CK_OBJECT_HANDLE key) - { -- BEGIN_CALL (C_DigestKey); -+ BEGIN_CALL_OR (C_DigestKey, CKR_SESSION_HANDLE_INVALID); - IN_ULONG (session); - IN_ULONG (key); - PROCESS_CALL; -@@ -1788,7 +1805,7 @@ rpc_C_DigestFinal (CK_SESSION_HANDLE session, CK_BYTE_PTR digest, - { - return_val_if_fail (digest_len, CKR_ARGUMENTS_BAD); - -- BEGIN_CALL (C_DigestFinal); -+ BEGIN_CALL_OR (C_DigestFinal, CKR_SESSION_HANDLE_INVALID); - IN_ULONG (session); - IN_BYTE_BUFFER (digest, digest_len); - PROCESS_CALL; -@@ -1800,7 +1817,7 @@ static CK_RV - rpc_C_SignInit (CK_SESSION_HANDLE session, CK_MECHANISM_PTR mechanism, - CK_OBJECT_HANDLE key) - { -- BEGIN_CALL (C_SignInit); -+ BEGIN_CALL_OR (C_SignInit, CKR_SESSION_HANDLE_INVALID); - IN_ULONG (session); - IN_MECHANISM (mechanism); - IN_ULONG (key); -@@ -1814,7 +1831,7 @@ rpc_C_Sign (CK_SESSION_HANDLE session, CK_BYTE_PTR data, CK_ULONG data_len, - { - return_val_if_fail (signature_len, CKR_ARGUMENTS_BAD); - -- BEGIN_CALL (C_Sign); -+ BEGIN_CALL_OR (C_Sign, CKR_SESSION_HANDLE_INVALID); - IN_ULONG (session); - IN_BYTE_ARRAY (data, data_len); - IN_BYTE_BUFFER (signature, signature_len); -@@ -1828,7 +1845,7 @@ rpc_C_SignUpdate (CK_SESSION_HANDLE session, CK_BYTE_PTR part, CK_ULONG part_len - { - return_val_if_fail (part_len, CKR_ARGUMENTS_BAD); - -- BEGIN_CALL (C_SignUpdate); -+ BEGIN_CALL_OR (C_SignUpdate, CKR_SESSION_HANDLE_INVALID); - IN_ULONG (session); - IN_BYTE_ARRAY (part, part_len); - PROCESS_CALL; -@@ -1841,7 +1858,7 @@ rpc_C_SignFinal (CK_SESSION_HANDLE session, CK_BYTE_PTR signature, - { - return_val_if_fail (signature_len, CKR_ARGUMENTS_BAD); - -- BEGIN_CALL (C_SignFinal); -+ BEGIN_CALL_OR (C_SignFinal, CKR_SESSION_HANDLE_INVALID); - IN_ULONG (session); - IN_BYTE_BUFFER (signature, signature_len); - PROCESS_CALL; -@@ -1853,7 +1870,7 @@ static CK_RV - rpc_C_SignRecoverInit (CK_SESSION_HANDLE session, CK_MECHANISM_PTR mechanism, - CK_OBJECT_HANDLE key) - { -- BEGIN_CALL (C_SignRecoverInit); -+ BEGIN_CALL_OR (C_SignRecoverInit, CKR_SESSION_HANDLE_INVALID); - IN_ULONG (session); - IN_MECHANISM (mechanism); - IN_ULONG (key); -@@ -1867,7 +1884,7 @@ rpc_C_SignRecover (CK_SESSION_HANDLE session, CK_BYTE_PTR data, CK_ULONG data_le - { - return_val_if_fail (signature_len, CKR_ARGUMENTS_BAD); - -- BEGIN_CALL (C_SignRecover); -+ BEGIN_CALL_OR (C_SignRecover, CKR_SESSION_HANDLE_INVALID); - IN_ULONG (session); - IN_BYTE_ARRAY (data, data_len); - IN_BYTE_BUFFER (signature, signature_len); -@@ -1880,7 +1897,7 @@ static CK_RV - rpc_C_VerifyInit (CK_SESSION_HANDLE session, CK_MECHANISM_PTR mechanism, - CK_OBJECT_HANDLE key) - { -- BEGIN_CALL (C_VerifyInit); -+ BEGIN_CALL_OR (C_VerifyInit, CKR_SESSION_HANDLE_INVALID); - IN_ULONG (session); - IN_MECHANISM (mechanism); - IN_ULONG (key); -@@ -1892,7 +1909,7 @@ static CK_RV - rpc_C_Verify (CK_SESSION_HANDLE session, CK_BYTE_PTR data, CK_ULONG data_len, - CK_BYTE_PTR signature, CK_ULONG signature_len) - { -- BEGIN_CALL (C_Verify); -+ BEGIN_CALL_OR (C_Verify, CKR_SESSION_HANDLE_INVALID); - IN_ULONG (session); - IN_BYTE_ARRAY (data, data_len); - IN_BYTE_ARRAY (signature, signature_len); -@@ -1903,7 +1920,7 @@ rpc_C_Verify (CK_SESSION_HANDLE session, CK_BYTE_PTR data, CK_ULONG data_len, - static CK_RV - rpc_C_VerifyUpdate (CK_SESSION_HANDLE session, CK_BYTE_PTR part, CK_ULONG part_len) - { -- BEGIN_CALL (C_VerifyUpdate); -+ BEGIN_CALL_OR (C_VerifyUpdate, CKR_SESSION_HANDLE_INVALID); - IN_ULONG (session); - IN_BYTE_ARRAY (part, part_len); - PROCESS_CALL; -@@ -1914,7 +1931,7 @@ static CK_RV - rpc_C_VerifyFinal (CK_SESSION_HANDLE session, CK_BYTE_PTR signature, - CK_ULONG signature_len) - { -- BEGIN_CALL (C_VerifyFinal); -+ BEGIN_CALL_OR (C_VerifyFinal, CKR_SESSION_HANDLE_INVALID); - IN_ULONG (session); - IN_BYTE_ARRAY (signature, signature_len); - PROCESS_CALL; -@@ -1925,7 +1942,7 @@ static CK_RV - rpc_C_VerifyRecoverInit (CK_SESSION_HANDLE session, CK_MECHANISM_PTR mechanism, - CK_OBJECT_HANDLE key) - { -- BEGIN_CALL (C_VerifyRecoverInit); -+ BEGIN_CALL_OR (C_VerifyRecoverInit, CKR_SESSION_HANDLE_INVALID); - IN_ULONG (session); - IN_MECHANISM (mechanism); - IN_ULONG (key); -@@ -1939,7 +1956,7 @@ rpc_C_VerifyRecover (CK_SESSION_HANDLE session, CK_BYTE_PTR signature, - { - return_val_if_fail (data_len, CKR_ARGUMENTS_BAD); - -- BEGIN_CALL (C_VerifyRecover); -+ BEGIN_CALL_OR (C_VerifyRecover, CKR_SESSION_HANDLE_INVALID); - IN_ULONG (session); - IN_BYTE_ARRAY (signature, signature_len); - IN_BYTE_BUFFER (data, data_len); -@@ -1955,7 +1972,7 @@ rpc_C_DigestEncryptUpdate (CK_SESSION_HANDLE session, CK_BYTE_PTR part, - { - return_val_if_fail (enc_part_len, CKR_ARGUMENTS_BAD); - -- BEGIN_CALL (C_DigestEncryptUpdate); -+ BEGIN_CALL_OR (C_DigestEncryptUpdate, CKR_SESSION_HANDLE_INVALID); - IN_ULONG (session); - IN_BYTE_ARRAY (part, part_len); - IN_BYTE_BUFFER (enc_part, enc_part_len); -@@ -1971,7 +1988,7 @@ rpc_C_DecryptDigestUpdate (CK_SESSION_HANDLE session, CK_BYTE_PTR enc_part, - { - return_val_if_fail (part_len, CKR_ARGUMENTS_BAD); - -- BEGIN_CALL (C_DecryptDigestUpdate); -+ BEGIN_CALL_OR (C_DecryptDigestUpdate, CKR_SESSION_HANDLE_INVALID); - IN_ULONG (session); - IN_BYTE_ARRAY (enc_part, enc_part_len); - IN_BYTE_BUFFER (part, part_len); -@@ -1987,7 +2004,7 @@ rpc_C_SignEncryptUpdate (CK_SESSION_HANDLE session, CK_BYTE_PTR part, - { - return_val_if_fail (enc_part_len, CKR_ARGUMENTS_BAD); - -- BEGIN_CALL (C_SignEncryptUpdate); -+ BEGIN_CALL_OR (C_SignEncryptUpdate, CKR_SESSION_HANDLE_INVALID); - IN_ULONG (session); - IN_BYTE_ARRAY (part, part_len); - IN_BYTE_BUFFER (enc_part, enc_part_len); -@@ -2003,7 +2020,7 @@ rpc_C_DecryptVerifyUpdate (CK_SESSION_HANDLE session, CK_BYTE_PTR enc_part, - { - return_val_if_fail (part_len, CKR_ARGUMENTS_BAD); - -- BEGIN_CALL (C_DecryptVerifyUpdate); -+ BEGIN_CALL_OR (C_DecryptVerifyUpdate, CKR_SESSION_HANDLE_INVALID); - IN_ULONG (session); - IN_BYTE_ARRAY (enc_part, enc_part_len); - IN_BYTE_BUFFER (part, part_len); -@@ -2017,7 +2034,7 @@ rpc_C_GenerateKey (CK_SESSION_HANDLE session, CK_MECHANISM_PTR mechanism, - CK_ATTRIBUTE_PTR template, CK_ULONG count, - CK_OBJECT_HANDLE_PTR key) - { -- BEGIN_CALL (C_GenerateKey); -+ BEGIN_CALL_OR (C_GenerateKey, CKR_SESSION_HANDLE_INVALID); - IN_ULONG (session); - IN_MECHANISM (mechanism); - IN_ATTRIBUTE_ARRAY (template, count); -@@ -2032,7 +2049,7 @@ rpc_C_GenerateKeyPair (CK_SESSION_HANDLE session, CK_MECHANISM_PTR mechanism, - CK_ATTRIBUTE_PTR priv_template, CK_ULONG priv_count, - CK_OBJECT_HANDLE_PTR pub_key, CK_OBJECT_HANDLE_PTR priv_key) - { -- BEGIN_CALL (C_GenerateKeyPair); -+ BEGIN_CALL_OR (C_GenerateKeyPair, CKR_SESSION_HANDLE_INVALID); - IN_ULONG (session); - IN_MECHANISM (mechanism); - IN_ATTRIBUTE_ARRAY (pub_template, pub_count); -@@ -2050,7 +2067,7 @@ rpc_C_WrapKey (CK_SESSION_HANDLE session, CK_MECHANISM_PTR mechanism, - { - return_val_if_fail (wrapped_key_len, CKR_ARGUMENTS_BAD); - -- BEGIN_CALL (C_WrapKey); -+ BEGIN_CALL_OR (C_WrapKey, CKR_SESSION_HANDLE_INVALID); - IN_ULONG (session); - IN_MECHANISM (mechanism); - IN_ULONG (wrapping_key); -@@ -2067,7 +2084,7 @@ rpc_C_UnwrapKey (CK_SESSION_HANDLE session, CK_MECHANISM_PTR mechanism, - CK_ULONG wrapped_key_len, CK_ATTRIBUTE_PTR template, - CK_ULONG count, CK_OBJECT_HANDLE_PTR key) - { -- BEGIN_CALL (C_UnwrapKey); -+ BEGIN_CALL_OR (C_UnwrapKey, CKR_SESSION_HANDLE_INVALID); - IN_ULONG (session); - IN_MECHANISM (mechanism); - IN_ULONG (unwrapping_key); -@@ -2083,7 +2100,7 @@ rpc_C_DeriveKey (CK_SESSION_HANDLE session, CK_MECHANISM_PTR mechanism, - CK_OBJECT_HANDLE base_key, CK_ATTRIBUTE_PTR template, - CK_ULONG count, CK_OBJECT_HANDLE_PTR key) - { -- BEGIN_CALL (C_DeriveKey); -+ BEGIN_CALL_OR (C_DeriveKey, CKR_SESSION_HANDLE_INVALID); - IN_ULONG (session); - IN_MECHANISM (mechanism); - IN_ULONG (base_key); -@@ -2096,7 +2113,7 @@ rpc_C_DeriveKey (CK_SESSION_HANDLE session, CK_MECHANISM_PTR mechanism, - static CK_RV - rpc_C_SeedRandom (CK_SESSION_HANDLE session, CK_BYTE_PTR seed, CK_ULONG seed_len) - { -- BEGIN_CALL (C_SeedRandom); -+ BEGIN_CALL_OR (C_SeedRandom, CKR_SESSION_HANDLE_INVALID); - IN_ULONG (session); - IN_BYTE_ARRAY (seed, seed_len); - PROCESS_CALL; -@@ -2107,9 +2124,9 @@ static CK_RV - rpc_C_GenerateRandom (CK_SESSION_HANDLE session, CK_BYTE_PTR random_data, - CK_ULONG random_len) - { -- BEGIN_CALL (C_GenerateRandom); -+ CK_ULONG_PTR address = &random_len; -+ BEGIN_CALL_OR (C_GenerateRandom, CKR_SESSION_HANDLE_INVALID); - IN_ULONG (session); -- CK_ULONG_PTR address = &random_len; - IN_BYTE_BUFFER (random_data, address); - PROCESS_CALL; - OUT_BYTE_ARRAY (random_data, address); --- -cgit v0.9.0.2 diff --git a/extra/gnome-utils/PKGBUILD b/extra/gnome-utils/PKGBUILD deleted file mode 100644 index 50c0ecbb1..000000000 --- a/extra/gnome-utils/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 140921 2011-10-20 05:43:36Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=gnome-utils -pkgver=3.2.1 -pkgrel=1 -pkgdesc="Common GNOME utilities for viewing disk usage, logs and fonts, taking screenshots, managing dictionaries and searching files" -arch=(i686 x86_64 mips64el) -license=('GPL') -depends=('libgtop' 'libcanberra' 'libsm' 'gconf' 'gsettings-desktop-schemas' 'hicolor-icon-theme' 'desktop-file-utils' 'dconf') -makedepends=('gnome-doc-utils' 'pkgconfig' 'intltool') -options=('!libtool' '!emptydirs') -url="http://www.gnome.org" -groups=('gnome-extra') -install=gnome-utils.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('3ac1942dbf4d9d394e2fcc5f30a4480b1b1e5d44ee0c2d4f61689f4a221ba328') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --libexecdir=/usr/lib/gnome-utils \ - --localstatedir=/var --disable-static \ - --disable-scrollkeeper \ - --disable-schemas-compile \ - --disable-schemas-install - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-utils-2.0 ${pkgdir}/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas - - # remove it also from Xfce menu that ships its own thingy - sed -i -e "s/NotShowIn\=KDE\;/NotShowIn\=KDE\;XFCE\;/" ${pkgdir}/usr/share/applications/gnome-dictionary.desktop - sed -i -e "s/NotShowIn\=KDE\;/NotShowIn\=KDE\;XFCE\;/" ${pkgdir}/usr/share/applications/gnome-screenshot.desktop -} diff --git a/extra/gnome-utils/gnome-utils.install b/extra/gnome-utils/gnome-utils.install deleted file mode 100644 index a04bda405..000000000 --- a/extra/gnome-utils/gnome-utils.install +++ /dev/null @@ -1,26 +0,0 @@ -pkgname=gnome-utils - -post_install() { - usr/sbin/gconfpkg --install ${pkgname} - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - update-desktop-database -q -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} -} - -post_remove() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - update-desktop-database -q -} diff --git a/extra/gtk3/PKGBUILD b/extra/gtk3/PKGBUILD index aaed4e8d5..af3455eb8 100644 --- a/extra/gtk3/PKGBUILD +++ b/extra/gtk3/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 156874 2012-04-23 09:08:04Z ibiru $ +# $Id: PKGBUILD 158335 2012-05-03 17:45:08Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gtk3 -pkgver=3.4.1 -pkgrel=1 +pkgver=3.4.2 +pkgrel=2 pkgdesc="GObject-based multi-platform GUI toolkit (v3)" arch=('i686' 'x86_64' 'mips64el') url="http://www.gtk.org/" @@ -14,11 +14,16 @@ options=('!libtool') backup=(etc/gtk-3.0/settings.ini) license=('LGPL') source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz - settings.ini) -sha256sums=('0716b533de0ff2ffdec1076bb85c7a95e2b7b6ac9ece71e84625043ae3eb25f7' - 'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621') + settings.ini wacom.patch) +sha256sums=('b1ab72bc61434418160ff0c7edfd93c74758ed8a35e2ed3d07e3e218c2705480' + 'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621' + '86bda95a14a99d0f596c4ecb2ed715689f71c207c65dfc90a39d4ae7f1c0c0f5') build() { cd "gtk+-$pkgver" + + # Partially revert BGO#673440 in order to fix BGO#674157 + patch -Np1 -i ../wacom.patch + CXX=/bin/false ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ diff --git a/extra/gtk3/empty_grid.patch b/extra/gtk3/empty_grid.patch deleted file mode 100644 index 45aefde47..000000000 --- a/extra/gtk3/empty_grid.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 97c1df4bb05966a4ce53b07271eff2f53284e235 Mon Sep 17 00:00:00 2001 -From: Matthias Clasen <mclasen@redhat.com> -Date: Fri, 21 Oct 2011 20:23:03 +0000 -Subject: Fix natural/min widht calculations for empty grids - -https://bugzilla.gnome.org/show_bug.cgi?id=660139 ---- -diff --git a/gtk/gtkgrid.c b/gtk/gtkgrid.c -index a122ad4..78ae2ff 100644 ---- a/gtk/gtkgrid.c -+++ b/gtk/gtkgrid.c -@@ -927,8 +927,13 @@ gtk_grid_request_sum (GtkGridRequest *request, - linedata = &priv->linedata[orientation]; - lines = &request->lines[orientation]; - -- min = (nonempty - 1) * linedata->spacing; -- nat = (nonempty - 1) * linedata->spacing; -+ min = 0; -+ nat = 0; -+ if (nonempty > 0) -+ { -+ min = (nonempty - 1) * linedata->spacing; -+ nat = (nonempty - 1) * linedata->spacing; -+ } - - for (i = 0; i < lines->max - lines->min; i++) - { --- -cgit v0.9.0.2 diff --git a/extra/gtk3/wacom.patch b/extra/gtk3/wacom.patch new file mode 100644 index 000000000..79ad84fc6 --- /dev/null +++ b/extra/gtk3/wacom.patch @@ -0,0 +1,12 @@ +diff -u -r gtk+-3.4.2/gdk/x11/gdkdevicemanager-xi2.c gtk+-3.4.2-wacom/gdk/x11/gdkdevicemanager-xi2.c +--- gtk+-3.4.2/gdk/x11/gdkdevicemanager-xi2.c 2012-05-02 14:45:04.000000000 +0200 ++++ gtk+-3.4.2-wacom/gdk/x11/gdkdevicemanager-xi2.c 2012-05-03 18:34:18.034807644 +0200 +@@ -331,6 +331,8 @@ + input_source = GDK_SOURCE_ERASER; + else if (strstr (tmp_name, "cursor")) + input_source = GDK_SOURCE_CURSOR; ++ else if (strstr (tmp_name, "finger")) ++ input_source = GDK_SOURCE_TOUCHSCREEN; + else if (strstr (tmp_name, "wacom") || + strstr (tmp_name, "pen")) + input_source = GDK_SOURCE_PEN; diff --git a/extra/ivtv-utils/PKGBUILD b/extra/ivtv-utils/PKGBUILD deleted file mode 100644 index 42115abe1..000000000 --- a/extra/ivtv-utils/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 143788 2011-11-29 11:25:59Z giovanni $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Andrea Scarpino <andrea@archlinux.org> - -pkgname=ivtv-utils -pkgver=1.4.1 -pkgrel=4 -pkgdesc="Userspace utilities for Hauppauge PVR cards" -arch=('i686' 'x86_64' 'mips64el') -license=('GPL') -url="http://ivtvdriver.org" -source=("http://dl.ivtvdriver.org/ivtv/stable/${pkgname}-${pkgver}.tar.gz" - "http://dl.ivtvdriver.org/ivtv/firmware/ivtv-firmware.tar.gz") -depends=('gcc-libs') -md5sums=('3a4219d698262ca2b28e41f0f547b0a2' - 'b9a871f1c569025be9c48a77b3515faf') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" PREFIX=/usr install - - cd "${srcdir}" - for file in v4l-cx2341x-dec.fw v4l-cx2341x-enc.fw v4l-pvrusb2-24xxx-01.fw v4l-pvrusb2-29xxx-01.fw v4l-cx2341x-init.mpg; do - install -D -m644 $file "${pkgdir}/lib/firmware/$file" - done - - # FS#15133 - files already provided by the kernel-headers package - rm -rf "${pkgdir}"/usr/include - # Resolve conflict with v4l-utils - rm -f "${pkgdir}"/usr/bin/v4l2-ctl -} diff --git a/extra/kactivities/PKGBUILD b/extra/kactivities/PKGBUILD index 9edd45203..cec376c29 100644 --- a/extra/kactivities/PKGBUILD +++ b/extra/kactivities/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 155537 2012-04-04 14:12:49Z andrea $ +# $Id: PKGBUILD 158375 2012-05-03 22:30:53Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kactivities -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') pkgdesc='API for using and interacting with Activities' @@ -11,7 +11,7 @@ license=('GPL' 'FDL') depends=('kdelibs') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('e97d0b82661fd3d886b87d673d7a1191073af7ff') +sha1sums=('de382701c5a9f8c04de78124a4b2c19f3707656c') build() { cd "${srcdir}" diff --git a/extra/kdeaccessibility-jovie/PKGBUILD b/extra/kdeaccessibility-jovie/PKGBUILD index 6304b9afc..feb2f952a 100644 --- a/extra/kdeaccessibility-jovie/PKGBUILD +++ b/extra/kdeaccessibility-jovie/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 155557 2012-04-04 14:13:33Z andrea $ +# $Id: PKGBUILD 158395 2012-05-03 22:31:31Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeaccessibility-jovie -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 arch=('i686' 'x86_64') pkgdesc='A text to speech application' @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdeaccessibility-kttsd') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/jovie-${pkgver}.tar.xz") -sha1sums=('eac0fe5006b54914f17dd529a723da4964f59a0b') +sha1sums=('d8ec774abfc4ec4f8e43103365b37ef99f62aa3f') build() { cd "${srcdir}" diff --git a/extra/kdeaccessibility-kaccessible/PKGBUILD b/extra/kdeaccessibility-kaccessible/PKGBUILD index c96c342fa..2767ba84d 100644 --- a/extra/kdeaccessibility-kaccessible/PKGBUILD +++ b/extra/kdeaccessibility-kaccessible/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 155559 2012-04-04 14:13:36Z andrea $ +# $Id: PKGBUILD 158397 2012-05-03 22:31:35Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeaccessibility-kaccessible -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 arch=('i686' 'x86_64') pkgdesc='Provides accessibility services like focus tracking and a screenreader' @@ -12,7 +12,7 @@ groups=('kde' 'kdeaccessibility') depends=('kdelibs' 'speech-dispatcher') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/kaccessible-${pkgver}.tar.xz") -sha1sums=('bc5cd13decd2456c91fd6973be038e6fea0da256') +sha1sums=('50b2c1b5df4652c7ba078820d1e073ef14c8b9ee') build() { cd "${srcdir}" diff --git a/extra/kdeaccessibility-kmag/PKGBUILD b/extra/kdeaccessibility-kmag/PKGBUILD index 0133eabbe..fee84e809 100644 --- a/extra/kdeaccessibility-kmag/PKGBUILD +++ b/extra/kdeaccessibility-kmag/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 155561 2012-04-04 14:13:39Z andrea $ +# $Id: PKGBUILD 158399 2012-05-03 22:31:39Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeaccessibility-kmag -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 arch=('i686' 'x86_64') pkgdesc='Screen Magnifier' @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kmag-${pkgver}.tar.xz") -sha1sums=('5a88645d7af1f407e87fcd91911b1e94e4ffb271') +sha1sums=('20a72ae6eaf120bdc6449f8bf048688ade5c584a') build() { cd "${srcdir}" diff --git a/extra/kdeaccessibility-kmousetool/PKGBUILD b/extra/kdeaccessibility-kmousetool/PKGBUILD index 4e0ec3b69..edc407e50 100644 --- a/extra/kdeaccessibility-kmousetool/PKGBUILD +++ b/extra/kdeaccessibility-kmousetool/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 155563 2012-04-04 14:13:42Z andrea $ +# $Id: PKGBUILD 158401 2012-05-03 22:31:42Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeaccessibility-kmousetool -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 arch=('i686' 'x86_64') pkgdesc='Clicks the mouse for you, reducing the effects of RSI' @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kmousetool-${pkgver}.tar.xz") -sha1sums=('e0a66c42324d9ac09c3e85fea12a24a5ae2abb9b') +sha1sums=('95f888155714dbec9a886ab86c247eb695ea2999') build() { cd "${srcdir}" diff --git a/extra/kdeaccessibility-kmouth/PKGBUILD b/extra/kdeaccessibility-kmouth/PKGBUILD index f0e6c403e..cf72c9ee1 100644 --- a/extra/kdeaccessibility-kmouth/PKGBUILD +++ b/extra/kdeaccessibility-kmouth/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 155565 2012-04-04 14:13:47Z andrea $ +# $Id: PKGBUILD 158403 2012-05-03 22:31:46Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeaccessibility-kmouth -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 arch=('i686' 'x86_64') pkgdesc='Speech Synthesizer Frontend' @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kmouth-${pkgver}.tar.xz") -sha1sums=('f0192e531161544a803f8822b041d8c50ec9bb58') +sha1sums=('2bf8356df5207de3a7c95a931070fb6b2d0fba6f') build() { cd "${srcdir}" diff --git a/extra/kdeadmin/PKGBUILD b/extra/kdeadmin/PKGBUILD index 8b77b9aa9..e794d2aeb 100644 --- a/extra/kdeadmin/PKGBUILD +++ b/extra/kdeadmin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 155567 2012-04-04 14:13:53Z andrea $ +# $Id: PKGBUILD 158405 2012-05-03 22:31:50Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -7,7 +7,7 @@ pkgname=('kdeadmin-kcron' 'kdeadmin-ksystemlog' 'kdeadmin-kuser' 'kdeadmin-system-config-printer-kde') -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -16,7 +16,7 @@ groups=('kde' 'kdeadmin') 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=('2952e5111f5e71671384db40d305630bd50c01c0' +sha1sums=('6de6dd896c43fa6825e569b1c1eea522454e152c' '20095ce6e0f3e5b6800a7c6e52de6fddba62c031') build() { diff --git a/extra/kdeartwork/PKGBUILD b/extra/kdeartwork/PKGBUILD index ce960b897..4b21a2d96 100644 --- a/extra/kdeartwork/PKGBUILD +++ b/extra/kdeartwork/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 155569 2012-04-04 14:13:58Z andrea $ +# $Id: PKGBUILD 158407 2012-05-03 22:31:52Z 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.2 +pkgver=4.8.3 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -22,7 +22,7 @@ groups=('kde' 'kdeartwork') makedepends=('cmake' 'automoc4' 'xscreensaver' 'eigen' 'kdebase-workspace' 'libkexiv2') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('828d8f36eb55bc93800a8d799b3cf20c22146021') +sha1sums=('fa2dd6f3a1b9e82564b1250be003577c4ef77185') build() { cd $srcdir diff --git a/extra/kdebase-konsole/PKGBUILD b/extra/kdebase-konsole/PKGBUILD index 423450c27..fd0c6c4b8 100644 --- a/extra/kdebase-konsole/PKGBUILD +++ b/extra/kdebase-konsole/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 155571 2012-04-04 14:14:02Z andrea $ +# $Id: PKGBUILD 158409 2012-05-03 22:31:58Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebase-konsole -pkgver=4.8.2 -pkgrel=2 +pkgver=4.8.3 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://kde.org/applications/system/konsole/' pkgdesc="Terminal" @@ -12,7 +12,7 @@ groups=('kde' 'kdebase') depends=('kdebase-runtime' 'kdebase-lib') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/konsole-${pkgver}.tar.xz") -sha1sums=('4e9e9d373ce77160b098dbf4fe24b319e7942ff1') +sha1sums=('f9dff6e2d66c7533474146b6a4b19112f866796b') build() { cd "${srcdir}" diff --git a/extra/kdebase-runtime/PKGBUILD b/extra/kdebase-runtime/PKGBUILD index 9cba859f5..d39578fc9 100644 --- a/extra/kdebase-runtime/PKGBUILD +++ b/extra/kdebase-runtime/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 155515 2012-04-04 14:12:10Z andrea $ +# $Id: PKGBUILD 158353 2012-05-03 22:30:13Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdebase-runtime -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 pkgdesc="KDE Base Runtime Environment" arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ optdepends=('htdig: to build the search index in khelpcenter' 'gdb: drkonq crash handler') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.xz") -sha1sums=('d2931b8a7c744d6c2fc95d46b2195ed2cd253c00') +sha1sums=('500ada503708aa89e2cbfa3ddb6353c3d350d96f') build() { cd "${srcdir}" diff --git a/extra/kdebase-runtime/kdebase-runtime.install b/extra/kdebase-runtime/kdebase-runtime.install index 3f06b8deb..c77e68041 100644 --- a/extra/kdebase-runtime/kdebase-runtime.install +++ b/extra/kdebase-runtime/kdebase-runtime.install @@ -1,6 +1,7 @@ post_install() { xdg-icon-resource forceupdate --theme hicolor &> /dev/null update-mime-database usr/share/mime &> /dev/null + update-desktop-database -q } post_upgrade() { diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD index 2be4a1867..08a2aaac4 100644 --- a/extra/kdebase-workspace/PKGBUILD +++ b/extra/kdebase-workspace/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 155539 2012-04-04 14:12:55Z andrea $ +# $Id: PKGBUILD 158377 2012-05-03 22:30:58Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdebase-workspace _pkgname=kde-workspace -pkgver=4.8.2 -pkgrel=2 +pkgver=4.8.3 +pkgrel=1 pkgdesc="KDE Base Workspace" arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -18,13 +18,9 @@ depends=('kdepim-runtime' 'lm_sensors' 'libraw1394' 'libqalculate' 'qimageblitz' 'polkit-kde' 'consolekit' 'xorg-xprop' 'libxdamage' 'libxklavier' 'xorg-xsetroot' 'libxcomposite' 'libxinerama' 'xorg-xrdb' 'libgles' 'libegl' 'kactivities' 'libxres' 'libxtst' - 'xorg-xrandr') + 'xorg-xrandr' 'xorg-xmessage') 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') -conflicts=('kde-common' 'guidance-power-manager' 'policykit-kde' - 'kdebase-kinfocenter') install="${pkgname}.install" backup=('usr/share/config/kdm/kdmrc' 'etc/pam.d/kde' @@ -34,7 +30,7 @@ options=('emptydirs') 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=('3cd36ed633def0db74ad872a0d6385bf06662121' +sha1sums=('23dbd023f76769ba6ea77dbc11314eca504ad3d2' '5db3a245201bd4a50e65aa2ef583cf5490e4f646' '712a90999bd429883dcef5dcaf288aace332ced8' 'b321b5e613b60231330e606fdf1e124646148388' diff --git a/extra/kdebase/PKGBUILD b/extra/kdebase/PKGBUILD index 73eb7a1b4..f31c1f391 100644 --- a/extra/kdebase/PKGBUILD +++ b/extra/kdebase/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 155541 2012-04-04 14:13:00Z andrea $ +# $Id: PKGBUILD 158379 2012-05-03 22:31:05Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -11,7 +11,7 @@ pkgname=('kdebase-dolphin' 'kdebase-konq-plugins' 'kdebase-lib' 'kdebase-plasma') -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -19,7 +19,7 @@ license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdebase') makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml') source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz") -sha1sums=('13dc2e6c8639feadc9a5a334d0720a60b1e3ccb6') +sha1sums=('593053e7fdd50b32e6f9264edf2a69e499ddc0a6') build() { cd ${srcdir} diff --git a/extra/kdebindings-kimono/PKGBUILD b/extra/kdebindings-kimono/PKGBUILD index 17565ee4e..528fe45aa 100644 --- a/extra/kdebindings-kimono/PKGBUILD +++ b/extra/kdebindings-kimono/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 155573 2012-04-04 14:14:05Z andrea $ +# $Id: PKGBUILD 158411 2012-05-03 22:32:01Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-kimono -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 pkgdesc=".NET/Mono bindings for the KDE libraries" url="http://kde.org/" @@ -13,7 +13,7 @@ depends=('kdebindings-qyoto' 'kdebindings-smokekde') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' 'kdepimlibs') conflicts=('kdebindings-csharp') source=("http://download.kde.org/stable/${pkgver}/src/kimono-${pkgver}.tar.xz") -sha1sums=('ffe572e5df8f8a5d2a6b94db8e460b603af711e6') +sha1sums=('b509d3511204d858049009c827a5ffe395296124') build() { cd "${srcdir}" diff --git a/extra/kdebindings-korundum/PKGBUILD b/extra/kdebindings-korundum/PKGBUILD index a10e6213f..23508f358 100644 --- a/extra/kdebindings-korundum/PKGBUILD +++ b/extra/kdebindings-korundum/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 155575 2012-04-04 14:14:08Z andrea $ +# $Id: PKGBUILD 158413 2012-05-03 22:32:04Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-korundum -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 pkgdesc="KDE bindings for ruby" url="http://kde.org/" @@ -16,7 +16,7 @@ conflicts=('kdebindings-ruby') options=('!makeflags') source=("http://download.kde.org/stable/${pkgver}/src/korundum-${pkgver}.tar.xz" 'korundum-4.8.0-ruby19.patch') -sha1sums=('59db0c58a26849aaf4c1839d175239f768257d5b' +sha1sums=('e949fae573d1399e67830c3eef0ebaa853905026' '73299f56a891d8a5475ac07dd485619859312f70') build() { diff --git a/extra/kdebindings-kross/PKGBUILD b/extra/kdebindings-kross/PKGBUILD index 45789736e..8ae537213 100644 --- a/extra/kdebindings-kross/PKGBUILD +++ b/extra/kdebindings-kross/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 155577 2012-04-04 14:14:12Z andrea $ +# $Id: PKGBUILD 158415 2012-05-03 22:32:08Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=kdebindings-kross pkgname=('kdebindings-kross-python' # 'kdebindings-kross-ruby' 'kdebindings-kross-java') -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 url="http://kde.org/" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ license=('GPL' 'LGPL' 'FDL') groups=('kdebindings') makedepends=('kdelibs' 'cmake' 'automoc4' 'python2' 'java-environment') source=("http://download.kde.org/stable/${pkgver}/src/kross-interpreters-${pkgver}.tar.xz") -sha1sums=('dfee7d8098db258bcd26d447553775434d299113') +sha1sums=('1191563f2a925a261b40d61b62f1d1b7e01238aa') build() { cd "${srcdir}" diff --git a/extra/kdebindings-perlkde/PKGBUILD b/extra/kdebindings-perlkde/PKGBUILD index 36f05392d..2a5d2f122 100644 --- a/extra/kdebindings-perlkde/PKGBUILD +++ b/extra/kdebindings-perlkde/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 155579 2012-04-04 14:14:15Z andrea $ +# $Id: PKGBUILD 158417 2012-05-03 22:32:11Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-perlkde -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 pkgdesc="Perl bindings for the KDE libraries" url="http://kde.org/" @@ -13,7 +13,7 @@ depends=('kdebindings-perlqt' 'kdebindings-smokekde') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'kdepimlibs' 'kdegraphics-okular' 'kdesdk-kate') source=("http://download.kde.org/stable/${pkgver}/src/perlkde-${pkgver}.tar.xz") -sha1sums=('cfb7d44bd88a899aef56e6200b6a6ff34516a316') +sha1sums=('bfc1c3a86789832cf7747dfc854d586d86c10a99') build() { cd "${srcdir}" diff --git a/extra/kdebindings-perlqt/PKGBUILD b/extra/kdebindings-perlqt/PKGBUILD index 97fdaaa35..0e6fb1143 100644 --- a/extra/kdebindings-perlqt/PKGBUILD +++ b/extra/kdebindings-perlqt/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 155529 2012-04-04 14:12:36Z andrea $ +# $Id: PKGBUILD 158367 2012-05-03 22:30:39Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-perlqt -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 pkgdesc="Perl bindings for the Qt libraries" url="http://kde.org/" @@ -12,7 +12,7 @@ groups=('kdebindings') depends=('kdebindings-smokeqt' 'perl-list-moreutils') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') source=("http://download.kde.org/stable/${pkgver}/src/perlqt-${pkgver}.tar.xz") -sha1sums=('e9ccef109d2a2a7d10f43f87691356c44a733b54') +sha1sums=('d0d0d5da1fd9c50bd19ff2bb49d6a71a2d97759f') build() { cd "${srcdir}" diff --git a/extra/kdebindings-python/PKGBUILD b/extra/kdebindings-python/PKGBUILD index 3437c2690..aae528961 100644 --- a/extra/kdebindings-python/PKGBUILD +++ b/extra/kdebindings-python/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 155531 2012-04-04 14:12:38Z andrea $ +# $Id: PKGBUILD 158369 2012-05-03 22:30:43Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=kdebindings-python pkgname=('kdebindings-python' 'kdebindings-python2') -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 url='http://kde.org/' arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('GPL' 'LGPL' 'FDL') groups=('kdebindings') makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'python2-pyqt' 'qscintilla') source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.xz") -sha1sums=('7d1a41e00794dba160ce8e2a3f750c9a4298ef15') +sha1sums=('e88ef838b492802f401b0242205e87149c19d032') build() { export PYTHONDONTWRITEBYTECODE="TRUE" diff --git a/extra/kdebindings-qtruby/PKGBUILD b/extra/kdebindings-qtruby/PKGBUILD index 868faa123..ffcf5d2f7 100644 --- a/extra/kdebindings-qtruby/PKGBUILD +++ b/extra/kdebindings-qtruby/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 155535 2012-04-04 14:12:47Z andrea $ +# $Id: PKGBUILD 158373 2012-05-03 22:30:50Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-qtruby -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 pkgdesc="Qt bindings for ruby" url="http://kde.org/" @@ -13,7 +13,7 @@ depends=('kdebindings-smokeqt' 'ruby') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') conflicts=('kdebindings-ruby') source=("http://download.kde.org/stable/${pkgver}/src/qtruby-${pkgver}.tar.xz") -sha1sums=('86643ab8ea52f4a1abcefa3620cea62d2225f949') +sha1sums=('aa88b382034cb66f283c200a10c04d3ba2170492') build() { cd "${srcdir}" diff --git a/extra/kdebindings-qyoto/PKGBUILD b/extra/kdebindings-qyoto/PKGBUILD index b5f8304f3..477779e95 100644 --- a/extra/kdebindings-qyoto/PKGBUILD +++ b/extra/kdebindings-qyoto/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 155533 2012-04-04 14:12:43Z andrea $ +# $Id: PKGBUILD 158371 2012-05-03 22:30:46Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-qyoto -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 pkgdesc=".NET/Mono bindings for the Qt libraries" url="http://kde.org/" @@ -13,7 +13,7 @@ depends=('kdebindings-smokeqt' 'mono') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') conflicts=('kdebindings-csharp') source=("http://download.kde.org/stable/${pkgver}/src/qyoto-${pkgver}.tar.xz") -sha1sums=('6d7b8dcac2a92b143bae0d329793864a7a23aa8f') +sha1sums=('7d20a80fef76d4cdfb8d03a66e07b82074df69b0') build() { cd "${srcdir}" diff --git a/extra/kdebindings-smokegen/PKGBUILD b/extra/kdebindings-smokegen/PKGBUILD index 5d425cdf2..8834b12a3 100644 --- a/extra/kdebindings-smokegen/PKGBUILD +++ b/extra/kdebindings-smokegen/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 155519 2012-04-04 14:12:17Z andrea $ +# $Id: PKGBUILD 158357 2012-05-03 22:30:21Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-smokegen -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 pkgdesc="A general purpose C++ parser with a plugin infrastructure" url="http://kde.org/" @@ -12,7 +12,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') conflicts=('kdebindings-smoke') source=("http://download.kde.org/stable/${pkgver}/src/smokegen-${pkgver}.tar.xz") -sha1sums=('8ba52937f10fb83470e1fbd724d767ab90921c41') +sha1sums=('0ea29388a8a8116e8b4fa7fe6e8a0b270e99cdcd') build() { cd "${srcdir}" diff --git a/extra/kdebindings-smokekde/PKGBUILD b/extra/kdebindings-smokekde/PKGBUILD index 13efb3f6b..d0aca9bb2 100644 --- a/extra/kdebindings-smokekde/PKGBUILD +++ b/extra/kdebindings-smokekde/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 155527 2012-04-04 14:12:33Z andrea $ +# $Id: PKGBUILD 158365 2012-05-03 22:30:36Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-smokekde -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 pkgdesc="Language independent library for KDE bindings" url="http://kde.org/" @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' 'kdepimlibs' 'kdegraphics-okular' 'kdesdk-kate') conflicts=('kdebindings-smoke') source=("http://download.kde.org/stable/${pkgver}/src/smokekde-${pkgver}.tar.xz") -sha1sums=('5cc24772b72c13555dd716ef7b6d77e81d826d79') +sha1sums=('b02b4b12dd5a23b2a87787bdde4491161d6a4e8d') build() { cd "${srcdir}" diff --git a/extra/kdebindings-smokeqt/PKGBUILD b/extra/kdebindings-smokeqt/PKGBUILD index d2cc28c1b..6e634826a 100644 --- a/extra/kdebindings-smokeqt/PKGBUILD +++ b/extra/kdebindings-smokeqt/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 155521 2012-04-04 14:12:21Z andrea $ +# $Id: PKGBUILD 158359 2012-05-03 22:30:25Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-smokeqt -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 pkgdesc="Language independent library for Qt bindings" url="http://kde.org/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'qimageblitz' 'qscintilla' 'kdebindings-smokegen') makedepends=('cmake' 'automoc4') conflicts=('kdebindings-smoke') source=("http://download.kde.org/stable/${pkgver}/src/smokeqt-${pkgver}.tar.xz") -sha1sums=('0d798ecfc7ec881871723e51ed1e4f32ef009c3a') +sha1sums=('a1f5e5ed2a8ea94bf785771b2b43bf2dcb3b7808') build() { cd "${srcdir}" diff --git a/extra/kdeedu-analitza/PKGBUILD b/extra/kdeedu-analitza/PKGBUILD index 15fb9d18c..7871097bf 100644 --- a/extra/kdeedu-analitza/PKGBUILD +++ b/extra/kdeedu-analitza/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 155555 2012-04-04 14:13:29Z andrea $ +# $Id: PKGBUILD 158393 2012-05-03 22:31:29Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-analitza -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 pkgdesc="A library to add mathematical features to your program" url="http://kde.org/" arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdeedu') -depends=('kdelibs') +depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/analitza-${pkgver}.tar.xz") -sha1sums=('bf76411269246581b09df98ca8ae33be200c4427') +sha1sums=('bec5927a68028b74193afb6e7f2a36f97ba25543') build() { cd "${srcdir}" diff --git a/extra/kdeedu-blinken/PKGBUILD b/extra/kdeedu-blinken/PKGBUILD index 87fcdf5f2..37f0c7e70 100644 --- a/extra/kdeedu-blinken/PKGBUILD +++ b/extra/kdeedu-blinken/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 155581 2012-04-04 14:14:17Z andrea $ +# $Id: PKGBUILD 158419 2012-05-03 22:32:14Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-blinken -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 pkgdesc="Memory Enhancement Game" url="http://kde.org/applications/education/blinken/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/blinken-${pkgver}.tar.xz") -sha1sums=('c86a67b2e3506e2c56307871afc77e3e67a967d6') +sha1sums=('66b94eb99a9e2075465fd60d8e5635d4b064ecb9') build() { cd "${srcdir}" diff --git a/extra/kdeedu-cantor/PKGBUILD b/extra/kdeedu-cantor/PKGBUILD index 298a7edea..bca8ed48d 100644 --- a/extra/kdeedu-cantor/PKGBUILD +++ b/extra/kdeedu-cantor/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 155583 2012-04-04 14:14:22Z andrea $ +# $Id: PKGBUILD 158421 2012-05-03 22:32:18Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-cantor -pkgver=4.8.2 -pkgrel=2 +pkgver=4.8.3 +pkgrel=1 pkgdesc="KDE Frontend to Mathematical Software" url="http://kde.org/applications/education/cantor/" arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ optdepends=('maxima: Maxima backend' 'r: R backend') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/cantor-${pkgver}.tar.xz") -sha1sums=('53a13c3594ea82b87a421e96b408355eea76fa89') +sha1sums=('e4aba48e30a4bee444f7e01eab807619908cd903') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kalgebra/PKGBUILD b/extra/kdeedu-kalgebra/PKGBUILD index cf59f1a81..03d31d712 100644 --- a/extra/kdeedu-kalgebra/PKGBUILD +++ b/extra/kdeedu-kalgebra/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 155585 2012-04-04 14:14:27Z andrea $ +# $Id: PKGBUILD 158423 2012-05-03 22:32:22Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kalgebra -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 pkgdesc="Graph Calculator" url="http://kde.org/applications/education/kalgebra/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu' 'kdeedu-analitza') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kalgebra-${pkgver}.tar.xz") -sha1sums=('560efe77d842c0410986b294323eabef6226e6ff') +sha1sums=('bea6a48ff5ae650e95fd443134dced3b08b169d5') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kalzium/PKGBUILD b/extra/kdeedu-kalzium/PKGBUILD index 650a3593c..2a55f9640 100644 --- a/extra/kdeedu-kalzium/PKGBUILD +++ b/extra/kdeedu-kalzium/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 155587 2012-04-04 14:14:33Z andrea $ +# $Id: PKGBUILD 158425 2012-05-03 22:32:24Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kalzium -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 pkgdesc="Periodic Table of Elements" url="http://kde.org/applications/education/kalzium/" @@ -13,7 +13,7 @@ depends=('kdelibs' 'avogadro' 'ocaml' 'facile') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kalzium-${pkgver}.tar.xz") -sha1sums=('e685430d183339dd06e718c0dee3c6aacdd1536a') +sha1sums=('33629c565b82c755af0b73746c675ac44c234028') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kanagram/PKGBUILD b/extra/kdeedu-kanagram/PKGBUILD index 73134c353..e696d3f32 100644 --- a/extra/kdeedu-kanagram/PKGBUILD +++ b/extra/kdeedu-kanagram/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 155589 2012-04-04 14:14:41Z andrea $ +# $Id: PKGBUILD 158427 2012-05-03 22:32:28Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kanagram -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 pkgdesc="Letter Order Game" url="http://kde.org/applications/education/kanagram/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kanagram-${pkgver}.tar.xz") -sha1sums=('25f7733ddc451738575fe1af5a89833ab8295493') +sha1sums=('36036b57bec5896945e5edaeb183120df4b90ed1') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kbruch/PKGBUILD b/extra/kdeedu-kbruch/PKGBUILD index 33044da28..6536940ea 100644 --- a/extra/kdeedu-kbruch/PKGBUILD +++ b/extra/kdeedu-kbruch/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 155591 2012-04-04 14:14:53Z andrea $ +# $Id: PKGBUILD 158429 2012-05-03 22:32:33Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kbruch -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 pkgdesc="Exercise Fractions" url="http://kde.org/applications/education/kbruch/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kbruch-${pkgver}.tar.xz") -sha1sums=('92cc810935b3aeebe68a970720f4b418490488d8') +sha1sums=('6cbb2ef86950e306bb4824e190e7689f8dacca2e') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kgeography/PKGBUILD b/extra/kdeedu-kgeography/PKGBUILD index b01f4b7e8..7df73c987 100644 --- a/extra/kdeedu-kgeography/PKGBUILD +++ b/extra/kdeedu-kgeography/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 155593 2012-04-04 14:15:00Z andrea $ +# $Id: PKGBUILD 158431 2012-05-03 22:32:36Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kgeography -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 pkgdesc="Geography Trainer" url="http://kde.org/applications/education/kgeography/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kgeography-${pkgver}.tar.xz") -sha1sums=('795ddfb81e5f75d81b8eb332a07f58af85321197') +sha1sums=('70a5577a5303fd8d97efbc06220bd896ec00574f') build() { cd "${srcdir}" diff --git a/extra/kdeedu-khangman/PKGBUILD b/extra/kdeedu-khangman/PKGBUILD index 0329ba99b..fa15d1c15 100644 --- a/extra/kdeedu-khangman/PKGBUILD +++ b/extra/kdeedu-khangman/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 155595 2012-04-04 14:15:04Z andrea $ +# $Id: PKGBUILD 158433 2012-05-03 22:32:41Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-khangman -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 pkgdesc="Hangman Game" url="http://kde.org/applications/education/khangman/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/khangman-${pkgver}.tar.xz") -sha1sums=('3e37d43965c190ccf5bc4c4485751dbe3139bda6') +sha1sums=('75d0147a2e374b8940cf472550ca7f45a5c63587') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kig/PKGBUILD b/extra/kdeedu-kig/PKGBUILD index b74d30a3d..5d7c59f2e 100644 --- a/extra/kdeedu-kig/PKGBUILD +++ b/extra/kdeedu-kig/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 155597 2012-04-04 14:15:08Z andrea $ +# $Id: PKGBUILD 158435 2012-05-03 22:32:44Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kig -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 pkgdesc="Interactive Geometry" url="http://kde.org/applications/education/kig/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kig-${pkgver}.tar.xz") -sha1sums=('7532bb454d6379af2c0ff37819c76c6c1f20deac') +sha1sums=('f7bd8d16cbb98ca44868df7bfd6b7a9e608c9ff4') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kiten/PKGBUILD b/extra/kdeedu-kiten/PKGBUILD index 55df05bd3..e4b55a58f 100644 --- a/extra/kdeedu-kiten/PKGBUILD +++ b/extra/kdeedu-kiten/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 155599 2012-04-04 14:15:11Z andrea $ +# $Id: PKGBUILD 158437 2012-05-03 22:32:48Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kiten -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 pkgdesc="Japanese Reference/Study Tool" url="http://kde.org/applications/education/kiten/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kiten-${pkgver}.tar.xz") -sha1sums=('db608b5550281e8ca0097e3c4ed15abe6018a002') +sha1sums=('8d94c45907a18db22117801ab1773cc43afb8c23') build() { cd "${srcdir}" diff --git a/extra/kdeedu-klettres/PKGBUILD b/extra/kdeedu-klettres/PKGBUILD index ee9575817..22e2654a2 100644 --- a/extra/kdeedu-klettres/PKGBUILD +++ b/extra/kdeedu-klettres/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 155601 2012-04-04 14:15:14Z andrea $ +# $Id: PKGBUILD 158439 2012-05-03 22:32:52Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-klettres -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 pkgdesc="Learn The Alphabet" url="http://kde.org/applications/education/klettres/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/klettres-${pkgver}.tar.xz") -sha1sums=('2b107d5d4f07ab3a1364a5eb3cc5ba5a35b5ffa4') +sha1sums=('e0156053117b07bf0a81a4258f7cce6f0ba4f60e') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kmplot/PKGBUILD b/extra/kdeedu-kmplot/PKGBUILD index 6dc64e0da..727a93d77 100644 --- a/extra/kdeedu-kmplot/PKGBUILD +++ b/extra/kdeedu-kmplot/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 155603 2012-04-04 14:15:16Z andrea $ +# $Id: PKGBUILD 158441 2012-05-03 22:32:55Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kmplot -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 pkgdesc="Mathematical Function Plotter" url="http://kde.org/applications/education/kmplot/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kmplot-${pkgver}.tar.xz") -sha1sums=('17c20bc1916be9be2510040302406f6fe861d878') +sha1sums=('c34c93266fd00d7c9b0d6f16625dbed13dba2a20') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kstars/PKGBUILD b/extra/kdeedu-kstars/PKGBUILD index 4e58b39bf..fd678a103 100644 --- a/extra/kdeedu-kstars/PKGBUILD +++ b/extra/kdeedu-kstars/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 155605 2012-04-04 14:15:19Z andrea $ +# $Id: PKGBUILD 158443 2012-05-03 22:32:58Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kstars -pkgver=4.8.2 -pkgrel=2 +pkgver=4.8.3 +pkgrel=1 pkgdesc="Desktop Planetarium" url="http://kde.org/applications/education/kstars/" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libindi') makedepends=('cmake' 'automoc4' 'eigen') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kstars-${pkgver}.tar.xz") -sha1sums=('6447338ebed2f822c4c852bcfe50264ccaba2acb') +sha1sums=('3c06bfb4f1e84565ac4de8126cfe47111217c995') build() { cd "${srcdir}" diff --git a/extra/kdeedu-ktouch/PKGBUILD b/extra/kdeedu-ktouch/PKGBUILD index 711e63633..19b879f37 100644 --- a/extra/kdeedu-ktouch/PKGBUILD +++ b/extra/kdeedu-ktouch/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 155607 2012-04-04 14:15:22Z andrea $ +# $Id: PKGBUILD 158445 2012-05-03 22:33:03Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-ktouch -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 pkgdesc="Touch Typing Tutor" url="http://kde.org/applications/education/ktouch/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ktouch-${pkgver}.tar.xz") -sha1sums=('5f19f77d3d80058f70b7df2376ce339fda6239e0') +sha1sums=('f098df93bb5c3dfd349104d168f3fcb1eb73ffb6') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kturtle/PKGBUILD b/extra/kdeedu-kturtle/PKGBUILD index a74f7b658..74a8cff6d 100644 --- a/extra/kdeedu-kturtle/PKGBUILD +++ b/extra/kdeedu-kturtle/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 155609 2012-04-04 14:15:25Z andrea $ +# $Id: PKGBUILD 158447 2012-05-03 22:33:06Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kturtle -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 pkgdesc="Educational Programming Environment" url="http://kde.org/applications/education/kturtle/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kturtle-${pkgver}.tar.xz") -sha1sums=('e27f02ae08b8cb3e6be4c0ad971681be5d55db8e') +sha1sums=('6f8c102e4bf41c9e214b5f71bd79f56f5651c1dc') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kwordquiz/PKGBUILD b/extra/kdeedu-kwordquiz/PKGBUILD index c83bf9f08..983c599cf 100644 --- a/extra/kdeedu-kwordquiz/PKGBUILD +++ b/extra/kdeedu-kwordquiz/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 155611 2012-04-04 14:15:27Z andrea $ +# $Id: PKGBUILD 158449 2012-05-03 22:33:08Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kwordquiz -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 pkgdesc="Flash Card Trainer" url="http://kde.org/applications/education/kwordquiz/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kwordquiz-${pkgver}.tar.xz") -sha1sums=('4507a07bdf62e5af1ce14ba18523a44b065d090e') +sha1sums=('65adea1b68f1f4d7ff36ef70bdd29fafc0e36e9e') build() { cd "${srcdir}" diff --git a/extra/kdeedu-marble/PKGBUILD b/extra/kdeedu-marble/PKGBUILD index 9069f6283..d224eeb3f 100644 --- a/extra/kdeedu-marble/PKGBUILD +++ b/extra/kdeedu-marble/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 155545 2012-04-04 14:13:08Z andrea $ +# $Id: PKGBUILD 158383 2012-05-03 22:31:12Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-marble -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 pkgdesc="Desktop Globe" url="http://kde.org/applications/education/marble/" @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4' 'gpsd') optdepends=('gpsd: gps support') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.xz") -sha1sums=('f57f134976b27fd0622ba2a24e32128ab23f5494') +sha1sums=('d33d73d757b14a42640176b994ad5930ebc1df30') build() { cd "${srcdir}" diff --git a/extra/kdeedu-parley/PKGBUILD b/extra/kdeedu-parley/PKGBUILD index 6d4d8b44c..8922ed967 100644 --- a/extra/kdeedu-parley/PKGBUILD +++ b/extra/kdeedu-parley/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 155613 2012-04-04 14:15:32Z andrea $ +# $Id: PKGBUILD 158451 2012-05-03 22:33:11Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-parley -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 pkgdesc="Vocabulary Trainer" url="http://kde.org/applications/education/parley/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/parley-${pkgver}.tar.xz") -sha1sums=('3b656361108b5c48e0c582c3ce724f6a439c7fe2') +sha1sums=('4a524209b19dcb174f4ce4258b4ec85adfa19ccb') build() { cd "${srcdir}" diff --git a/extra/kdeedu-rocs/PKGBUILD b/extra/kdeedu-rocs/PKGBUILD index d7c7806cf..89dd06109 100644 --- a/extra/kdeedu-rocs/PKGBUILD +++ b/extra/kdeedu-rocs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 155615 2012-04-04 14:15:36Z andrea $ +# $Id: PKGBUILD 158453 2012-05-03 22:33:15Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-rocs -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 pkgdesc="Rocs Graph Theory" url="http://kde.org/applications/education/rocs/" @@ -12,7 +12,7 @@ groups=('kde' 'kdeedu') depends=('kdebase-runtime') makedepends=('cmake' 'automoc4' 'boost') source=("http://download.kde.org/stable/${pkgver}/src/rocs-${pkgver}.tar.xz") -sha1sums=('3e22d284ec0ba40bc82dfc5f3b58b4a5721a8c64') +sha1sums=('772a80277edb483d4e189595a1723a2d1877d8d4') options=('!makeflags') build() { diff --git a/extra/kdeedu-step/PKGBUILD b/extra/kdeedu-step/PKGBUILD index bf67c523f..cc39e448c 100644 --- a/extra/kdeedu-step/PKGBUILD +++ b/extra/kdeedu-step/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 155617 2012-04-04 14:15:41Z andrea $ +# $Id: PKGBUILD 158455 2012-05-03 22:33:19Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-step -pkgver=4.8.2 -pkgrel=2 +pkgver=4.8.3 +pkgrel=1 pkgdesc="Interactive Physical Simulator" url="http://kde.org/applications/education/step/" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libqalculate' 'gsl') makedepends=('cmake' 'automoc4' 'eigen') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/step-${pkgver}.tar.xz") -sha1sums=('0620924f7683c29e855482af8822067722ced080') +sha1sums=('2356c87aa3faec080a4963fc69a4d07c2d44a67d') build() { cd "${srcdir}" diff --git a/extra/kdegames/PKGBUILD b/extra/kdegames/PKGBUILD index ab6977fb0..d09bc8779 100644 --- a/extra/kdegames/PKGBUILD +++ b/extra/kdegames/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 155619 2012-04-04 14:15:57Z andrea $ +# $Id: PKGBUILD 158457 2012-05-03 22:33:28Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -43,7 +43,7 @@ pkgname=('kdegames-bomber' 'kdegames-libkmahjongg' 'kdegames-lskat' 'kdegames-palapeli') -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -52,7 +52,7 @@ groups=('kde' 'kdegames') makedepends=('cmake' 'automoc4' 'ggz-client-libs' 'twisted' 'kdebindings-python2' 'openal') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('9aeeccbc5f79f7f6b1e91bac41857ac3818cd989') +sha1sums=('eea3a13a9e713d387b48d30c615b68336945eac5') build() { cd $srcdir diff --git a/extra/kdegames/kdegames-kpatience.install b/extra/kdegames/kdegames-kpatience.install index 9b20edb30..3af34a012 100644 --- a/extra/kdegames/kdegames-kpatience.install +++ b/extra/kdegames/kdegames-kpatience.install @@ -1,5 +1,6 @@ post_install() { xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-mime-database usr/share/mime &> /dev/null update-desktop-database -q } diff --git a/extra/kdegraphics-gwenview/PKGBUILD b/extra/kdegraphics-gwenview/PKGBUILD index bf3fb9f95..c0eb31076 100644 --- a/extra/kdegraphics-gwenview/PKGBUILD +++ b/extra/kdegraphics-gwenview/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 155621 2012-04-04 14:16:01Z andrea $ +# $Id: PKGBUILD 158459 2012-05-03 22:33:34Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-gwenview -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 pkgdesc="A fast and easy to use image viewer for KDE" url="http://kde.org/applications/graphics/gwenview/" @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4') optdepends=('kipi-plugins: extra plugins to share photos') install=$pkgname.install source=("http://download.kde.org/stable/${pkgver}/src/gwenview-${pkgver}.tar.xz") -sha1sums=('1c5293c258b5afeba5551bdd2029d83eb2ae7df3') +sha1sums=('be5fd73872be0e46a99b8d5b1c54e1e0328350c8') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kamera/PKGBUILD b/extra/kdegraphics-kamera/PKGBUILD index e30576c9a..497098a08 100644 --- a/extra/kdegraphics-kamera/PKGBUILD +++ b/extra/kdegraphics-kamera/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 155623 2012-04-04 14:16:04Z andrea $ +# $Id: PKGBUILD 158461 2012-05-03 22:33:36Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kamera -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 pkgdesc="Configure Kamera" url="http://kde.org/applications/graphics/kamera/" @@ -12,7 +12,7 @@ groups=('kde' 'kdegraphics') depends=('kdebase-runtime' 'gphoto2') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/kamera-${pkgver}.tar.xz") -sha1sums=('45beaa52b384e80a3c66f15587abc2938b64c4f1') +sha1sums=('af58ef6b0762bd6e3bd75f7914c6ba575c205ba8') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kcolorchooser/PKGBUILD b/extra/kdegraphics-kcolorchooser/PKGBUILD index a12e28741..3c74db3fa 100644 --- a/extra/kdegraphics-kcolorchooser/PKGBUILD +++ b/extra/kdegraphics-kcolorchooser/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 155625 2012-04-04 14:16:07Z andrea $ +# $Id: PKGBUILD 158463 2012-05-03 22:33:39Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kcolorchooser -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 pkgdesc="Color Chooser" url="http://kde.org/applications/graphics/kcolorchooser/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kcolorchooser-${pkgver}.tar.xz") -sha1sums=('0d1b46b7c90fc2910b3c7422469422efcebc39aa') +sha1sums=('08595a7388abc65b96fd91a874d5cedeb889c217') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kgamma/PKGBUILD b/extra/kdegraphics-kgamma/PKGBUILD index d350f2043..748cdd941 100644 --- a/extra/kdegraphics-kgamma/PKGBUILD +++ b/extra/kdegraphics-kgamma/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 155627 2012-04-04 14:16:10Z andrea $ +# $Id: PKGBUILD 158465 2012-05-03 22:33:42Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kgamma -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 pkgdesc="A monitor calibration tool" url="http://kde.org/applications/graphics/kgamma/" @@ -15,7 +15,7 @@ groups=('kde' 'kdegraphics') depends=('kdebase-runtime' 'libxxf86vm') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/kgamma-${pkgver}.tar.xz") -sha1sums=('222c2f7f16bae3dd450b04225b88596f4817e3a6') +sha1sums=('bfb32bbe49cd715390d24e3705d23171fdf0e2c9') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kolourpaint/PKGBUILD b/extra/kdegraphics-kolourpaint/PKGBUILD index 2834680bd..c199c0b73 100644 --- a/extra/kdegraphics-kolourpaint/PKGBUILD +++ b/extra/kdegraphics-kolourpaint/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 155629 2012-04-04 14:16:13Z andrea $ +# $Id: PKGBUILD 158467 2012-05-03 22:33:46Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kolourpaint -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 pkgdesc="Paint Program" url="http://kde.org/applications/graphics/kolourpaint/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'qimageblitz') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kolourpaint-${pkgver}.tar.xz") -sha1sums=('1a51dce10d29f5694216d99cb7c9b0964181fe50') +sha1sums=('2030505b4169448914ef693f88874f3f323fb49c') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kruler/PKGBUILD b/extra/kdegraphics-kruler/PKGBUILD index 8641f1cf7..fd7ec3983 100644 --- a/extra/kdegraphics-kruler/PKGBUILD +++ b/extra/kdegraphics-kruler/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 155631 2012-04-04 14:16:15Z andrea $ +# $Id: PKGBUILD 158469 2012-05-03 22:33:49Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kruler -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 pkgdesc="Screen Ruler" url="http://kde.org/applications/graphics/kruler/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kruler-${pkgver}.tar.xz") -sha1sums=('3db2efcc53a0ef1ba46d5f908f732da708b2b14c') +sha1sums=('baf3015a781e4389e9fa66067906e18765322132') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-ksaneplugin/PKGBUILD b/extra/kdegraphics-ksaneplugin/PKGBUILD index 5932811fb..abb28a34d 100644 --- a/extra/kdegraphics-ksaneplugin/PKGBUILD +++ b/extra/kdegraphics-ksaneplugin/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 155633 2012-04-04 14:16:18Z andrea $ +# $Id: PKGBUILD 158471 2012-05-03 22:33:52Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-ksaneplugin -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 pkgdesc="A scan plugin that implements the scanning" url="http://kde.org/" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/ksaneplugin-${pkgver}.tar.xz") -sha1sums=('04a75bc260f0780a9c9dcbdd6b75418168ad5631') +sha1sums=('d6c5588bb2e5b45aecb0de1b37775e22b7cd696c') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-ksnapshot/PKGBUILD b/extra/kdegraphics-ksnapshot/PKGBUILD index 5473aa118..bb1f14068 100644 --- a/extra/kdegraphics-ksnapshot/PKGBUILD +++ b/extra/kdegraphics-ksnapshot/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 155635 2012-04-04 14:16:21Z andrea $ +# $Id: PKGBUILD 158473 2012-05-03 22:33:57Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-ksnapshot -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 pkgdesc="Screen Capture Program" url="http://kde.org/applications/graphics/ksnapshot/" @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4') optdepends=('kipi-plugins') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ksnapshot-${pkgver}.tar.xz") -sha1sums=('373362717f42b5996883eb405a756c8a570ce128') +sha1sums=('7b90bba6e11aff524ed759e7c7043fc97116b92c') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-mobipocket/PKGBUILD b/extra/kdegraphics-mobipocket/PKGBUILD index fc2ac6c44..b61a315de 100644 --- a/extra/kdegraphics-mobipocket/PKGBUILD +++ b/extra/kdegraphics-mobipocket/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 155637 2012-04-04 14:16:24Z andrea $ +# $Id: PKGBUILD 158475 2012-05-03 22:34:01Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-mobipocket -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 pkgdesc="A collection of plugins to handle mobipocket files" url="http://kde.org/" @@ -14,7 +14,7 @@ replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('60ea4e3e0e7030ed61c35761c5542d967cd161fc') +sha1sums=('97a19a437e53f1b0ec538d7d35bbf25605e6845e') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-okular/PKGBUILD b/extra/kdegraphics-okular/PKGBUILD index 9b5ef29a1..764a60089 100644 --- a/extra/kdegraphics-okular/PKGBUILD +++ b/extra/kdegraphics-okular/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 155523 2012-04-04 14:12:25Z andrea $ +# $Id: PKGBUILD 158361 2012-05-03 22:30:29Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-okular -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 pkgdesc='Document Viewer' arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ makedepends=('cmake' 'automoc4') optdepends=('kdegraphics-mobipocket: mobipocket support') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/okular-${pkgver}.tar.xz") -sha1sums=('174ff248e3a90246ee84d8aed4014d9864f9f807') +sha1sums=('7c43076df3e9d6217e2a5cbb8ef6d8af89f8ae37') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-strigi-analyzer/PKGBUILD b/extra/kdegraphics-strigi-analyzer/PKGBUILD index ed88cdabb..bb26764d4 100644 --- a/extra/kdegraphics-strigi-analyzer/PKGBUILD +++ b/extra/kdegraphics-strigi-analyzer/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 155639 2012-04-04 14:16:26Z andrea $ +# $Id: PKGBUILD 158477 2012-05-03 22:34:04Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-strigi-analyzer -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 pkgdesc="Strigi analyzers for various graphics file formats" url="http://kde.org/" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('6b61e1a949d0de92d5f4f1a822fe6dcaaa52b03c') +sha1sums=('8e0cbcbd36b1ac5fdfb7665bc456a87dd3ba59ef') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-svgpart/PKGBUILD b/extra/kdegraphics-svgpart/PKGBUILD index 231d060d9..38f411fe6 100644 --- a/extra/kdegraphics-svgpart/PKGBUILD +++ b/extra/kdegraphics-svgpart/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 155641 2012-04-04 14:16:29Z andrea $ +# $Id: PKGBUILD 158479 2012-05-03 22:34:07Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-svgpart -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 pkgdesc="A KPart for viewving SVGs" url="http://kde.org/" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/svgpart-${pkgver}.tar.xz") -sha1sums=('f29c38a0d82d96140770a4a354d8087aaca9ddb8') +sha1sums=('53d69e810acbad5d1cb606a74cf218e3ceccd876') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-thumbnailers/PKGBUILD b/extra/kdegraphics-thumbnailers/PKGBUILD index 8a03c6208..a09afde67 100644 --- a/extra/kdegraphics-thumbnailers/PKGBUILD +++ b/extra/kdegraphics-thumbnailers/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 155643 2012-04-04 14:16:31Z andrea $ +# $Id: PKGBUILD 158481 2012-05-03 22:34:12Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-thumbnailers -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 pkgdesc="Thumbnailers for various graphics file formats" url="http://kde.org/" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('cd6e99a6c0db6bda765c765356ba9bbd601fba0d') +sha1sums=('3a7839030e1e49addfdb275acfa1c0288aa95431') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia/PKGBUILD b/extra/kdemultimedia/PKGBUILD index 537764efa..35e512182 100644 --- a/extra/kdemultimedia/PKGBUILD +++ b/extra/kdemultimedia/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 155645 2012-04-04 14:16:38Z andrea $ +# $Id: PKGBUILD 158483 2012-05-03 22:34:18Z 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.2 +pkgver=4.8.3 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -20,7 +20,7 @@ makedepends=('cmake' 'automoc4' 'kdelibs' 'tunepimp' 'ffmpeg' 'mplayer' 'pulseaudio' 'libmusicbrainz3') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" 'mplayerthumbs.config') -sha1sums=('8f54038cc68f91acef07fed711f83407c113b88b' +sha1sums=('8f2b9181d5ccab5a9efd62f2778cf6c2b88abb3e' 'ba016fa2563c14ffcba852c62506b66bfc6ee683') build() { diff --git a/extra/kdenetwork/PKGBUILD b/extra/kdenetwork/PKGBUILD index e34e49d9f..07bd4b966 100644 --- a/extra/kdenetwork/PKGBUILD +++ b/extra/kdenetwork/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 155647 2012-04-04 14:16:47Z andrea $ +# $Id: PKGBUILD 158485 2012-05-03 22:34:22Z 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.2 -pkgrel=1 +pkgver=4.8.3 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') @@ -20,10 +20,15 @@ makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr' 'ppp' 'qca-ossl' 'kdebase-workspace' 'kdebase-lib' 'libvncserver' 'libmsn' 'v4l-utils' 'libidn' 'rdesktop' 'qimageblitz' 'libxdamage' 'libgadu' 'libktorrent' 'libmms' 'mediastreamer') -source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('a899a9ef1637612a5ec14bb3ff950f3ed565d60e') +source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" + 'gcc47.patch') +sha1sums=('9da87317c6a10243d6fff8c121c04146415f65cd' + '0e1325569e296d98e7b1be12305c1c018104685b') build() { + cd "${srcdir}"/${pkgbase}-${pkgver} + patch -p4 -i "${srcdir}"/gcc47.patch + cd "${srcdir}" mkdir build cd build @@ -33,7 +38,8 @@ build() { -DCMAKE_INSTALL_PREFIX=/usr \ -DMOZPLUGIN_INSTALL_DIR=/usr/lib/mozilla/plugins/ \ -DWITH_Xmms=OFF \ - -DWITH_LibMeanwhile=OFF + -DWITH_LibMeanwhile=OFF \ + -DWITH_qq=OFF make } diff --git a/extra/kdenetwork/gcc47.patch b/extra/kdenetwork/gcc47.patch new file mode 100644 index 000000000..78af901dc --- /dev/null +++ b/extra/kdenetwork/gcc47.patch @@ -0,0 +1,59 @@ +--- branches/KDE/4.8/kdenetwork/kopete/protocols/jabber/googletalk/libjingle/talk/base/socketaddress.cc 2012/05/03 16:03:23 1292761 ++++ branches/KDE/4.8/kdenetwork/kopete/protocols/jabber/googletalk/libjingle/talk/base/socketaddress.cc 2012/05/03 16:11:00 1292762 +@@ -31,6 +31,7 @@ + #include <netinet/in.h> + #include <arpa/inet.h> + #include <netdb.h> ++#include <unistd.h> + #endif + + #include <cstring> +--- branches/KDE/4.8/kdenetwork/kopete/protocols/jabber/googletalk/libjingle/talk/base/ssladapter.cc 2012/05/03 16:03:23 1292761 ++++ branches/KDE/4.8/kdenetwork/kopete/protocols/jabber/googletalk/libjingle/talk/base/ssladapter.cc 2012/05/03 16:11:00 1292762 +@@ -27,6 +27,12 @@ + + #include "talk/base/ssladapter.h" + ++#ifdef POSIX ++extern "C" { ++#include <unistd.h> ++} ++#endif ++ + #if !defined(SSL_USE_SCHANNEL) && !defined(SSL_USE_OPENSSL) + #ifdef WIN32 + #define SSL_USE_SCHANNEL 1 +--- branches/KDE/4.8/kdenetwork/kopete/protocols/jabber/googletalk/libjingle/talk/base/stringutils.h 2012/05/03 16:03:23 1292761 ++++ branches/KDE/4.8/kdenetwork/kopete/protocols/jabber/googletalk/libjingle/talk/base/stringutils.h 2012/05/03 16:11:00 1292762 +@@ -198,15 +198,6 @@ + } + + template<class CTYPE> +-size_t sprintfn(CTYPE* buffer, size_t buflen, const CTYPE* format, ...) { +- va_list args; +- va_start(args, format); +- size_t len = vsprintfn(buffer, buflen, format, args); +- va_end(args); +- return len; +-} +- +-template<class CTYPE> + size_t vsprintfn(CTYPE* buffer, size_t buflen, const CTYPE* format, + va_list args) { + int len = vsnprintf(buffer, buflen, format, args); +@@ -217,6 +208,15 @@ + return len; + } + ++template<class CTYPE> ++size_t sprintfn(CTYPE* buffer, size_t buflen, const CTYPE* format, ...) { ++ va_list args; ++ va_start(args, format); ++ size_t len = vsprintfn(buffer, buflen, format, args); ++ va_end(args); ++ return len; ++} ++ + /////////////////////////////////////////////////////////////////////////////// + // Allow safe comparing and copying ascii (not UTF-8) with both wide and + // non-wide character strings. diff --git a/extra/kdepim-runtime/PKGBUILD b/extra/kdepim-runtime/PKGBUILD index f80f8c9e7..d5915b8dc 100644 --- a/extra/kdepim-runtime/PKGBUILD +++ b/extra/kdepim-runtime/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 155517 2012-04-04 14:12:14Z andrea $ +# $Id: PKGBUILD 158355 2012-05-03 22:30:17Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdepim-runtime -pkgver=4.8.2 -pkgrel=2 +pkgver=4.8.3 +pkgrel=1 pkgdesc='KDE PIM Runtime Environment' arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -13,7 +13,7 @@ depends=('kdepimlibs' 'kdebase-runtime') makedepends=('cmake' 'automoc4' 'boost') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('4db39cfa14a41702591609a342962348a9250777') +sha1sums=('f1c6691522113887dc5f098678ccbbacfecb9390') build() { cd "${srcdir}" diff --git a/extra/kdepim-runtime/kdepim-runtime.install b/extra/kdepim-runtime/kdepim-runtime.install index ce5c32e1b..c77e68041 100644 --- a/extra/kdepim-runtime/kdepim-runtime.install +++ b/extra/kdepim-runtime/kdepim-runtime.install @@ -1,6 +1,7 @@ post_install() { xdg-icon-resource forceupdate --theme hicolor &> /dev/null update-mime-database usr/share/mime &> /dev/null + update-desktop-database -q } post_upgrade() { @@ -9,4 +10,4 @@ post_upgrade() { post_remove() { post_install -}
\ No newline at end of file +} diff --git a/extra/kdepim/PKGBUILD b/extra/kdepim/PKGBUILD index 0aa684fea..e8600f9ce 100644 --- a/extra/kdepim/PKGBUILD +++ b/extra/kdepim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 155649 2012-04-04 14:16:56Z andrea $ +# $Id: PKGBUILD 158487 2012-05-03 22:34:29Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -19,7 +19,7 @@ pkgname=('kdepim-akonadiconsole' 'kdepim-kresources' 'kdepim-ktimetracker' 'kdepim-libkdepim') -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://pim.kde.org' @@ -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=('1c3a459ef4d76e1247ac47816bf2b7ea6e37908a') +sha1sums=('1d40a820fc343bd6c492e937b9da2e7226cd3e78') build() { cd "${srcdir}" diff --git a/extra/kdepim/fix-kalarm-issue-with-alarms.patch b/extra/kdepim/fix-kalarm-issue-with-alarms.patch deleted file mode 100644 index a69778b06..000000000 --- a/extra/kdepim/fix-kalarm-issue-with-alarms.patch +++ /dev/null @@ -1,48 +0,0 @@ -From: David Jarvie <djarvie@kde.org> -Date: Wed, 07 Mar 2012 22:08:50 +0000 -Subject: Fix error saving changed alarms when closing Edit Alarm dialogue -X-Git-Url: http://quickgit.kde.org/?p=kdepim.git&a=commitdiff&h=ae66e32fb194e01e06521c78e9c72d772d291261 ---- -Fix error saving changed alarms when closing Edit Alarm dialogue ---- - - ---- a/kalarm/Changelog -+++ b/kalarm/Changelog -@@ -1,6 +1,10 @@ - KAlarm Change Log - --=== Version 2.8.1 --- 19 February 2012 === -+=== Version 2.8.2 --- 7 March 2012 === -+- [Akonadi] Fix error saving changed alarms when closing Edit Alarm dialogue. -+- [Akonadi] Show old-format calendars in read-only colour in calendar list. -+ -+=== Version 2.8.1 (KDE 4.8.1) --- 19 February 2012 === - - [Akonadi] Don't give option to save new alarms in old format calendars. - - [Akonadi] Prevent duplicate prompts to update format of new calendar resource. - - [Akonadi] Automatically disable duplicated calendar resources. - ---- a/kalarm/akonadimodel.cpp -+++ b/kalarm/akonadimodel.cpp -@@ -1284,7 +1284,7 @@ KAEvent AkonadiModel::event(const Item& - if (e.isValid()) - { - -- Collection c = data(index, ParentCollectionRole).value<Collection>(); -+ Collection c = data(ix, ParentCollectionRole).value<Collection>(); - // Set collection ID using a const method, to avoid unnecessary copying of KAEvent - e.setCollectionId_const(c.id()); - if (collection) - ---- a/kalarm/kalarm.h -+++ b/kalarm/kalarm.h -@@ -28,7 +28,7 @@ - #else - #define VERSION_SUFFIX "-res" - #endif --#define KALARM_VERSION "2.8.1" VERSION_SUFFIX -+#define KALARM_VERSION "2.8.2" VERSION_SUFFIX - - #define KALARM_NAME "KAlarm" - #define KALARM_DBUS_SERVICE "org.kde.kalarm" // D-Bus service name of KAlarm application - diff --git a/extra/kdepimlibs/PKGBUILD b/extra/kdepimlibs/PKGBUILD index e6b924f4d..942ea50c0 100644 --- a/extra/kdepimlibs/PKGBUILD +++ b/extra/kdepimlibs/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 155512 2012-04-04 14:12:05Z andrea $ +# $Id: PKGBUILD 158350 2012-05-03 22:30:07Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdepimlibs -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 pkgdesc="KDE PIM Libraries" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('kdelibs' 'gpgme' 'akonadi' 'libical' 'prison') makedepends=('cmake' 'automoc4' 'boost' 'cyrus-sasl') install='kdepimlibs.install' source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('038474d1c8a3d5c430f25823e25330fa464cfe40') +sha1sums=('453badec44fa2fd8b551fc9f8df2d51c88930dca') build() { cd ${srcdir} diff --git a/extra/kdeplasma-addons/PKGBUILD b/extra/kdeplasma-addons/PKGBUILD index f49a67cea..2fda927ab 100644 --- a/extra/kdeplasma-addons/PKGBUILD +++ b/extra/kdeplasma-addons/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 155651 2012-04-04 14:17:04Z andrea $ +# $Id: PKGBUILD 158489 2012-05-03 22:34:34Z 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.2 +pkgver=4.8.3 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -83,7 +83,7 @@ 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/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('1f9db32c724ce9aee6f46bc11a8d2fc073975657') +sha1sums=('64bda8ca1d68ab07596d8eaa6381255d815346bc') build() { cd "${srcdir}" diff --git a/extra/kdesdk-kate/PKGBUILD b/extra/kdesdk-kate/PKGBUILD index 76f744bf3..19160872c 100644 --- a/extra/kdesdk-kate/PKGBUILD +++ b/extra/kdesdk-kate/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 155525 2012-04-04 14:12:29Z andrea $ +# $Id: PKGBUILD 158363 2012-05-03 22:30:33Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=kdesdk-kate pkgname=('kdebase-katepart' 'kdebase-kwrite' 'kdesdk-kate') -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'FDL') makedepends=('kdelibs ''cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/kate-${pkgver}.tar.xz" 'pkgbuild-syntax-highlight.patch') -sha1sums=('6bf4796574a003a4edadfb2029725805235bd086' +sha1sums=('100fcc86de792d3418ea0f9995233bdd8871d7f9' '0a928253bd2077f0264d96a6c8823c69c47b6a8d') build() { diff --git a/extra/kdesdk/PKGBUILD b/extra/kdesdk/PKGBUILD index 43f727a52..d8f968af2 100644 --- a/extra/kdesdk/PKGBUILD +++ b/extra/kdesdk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 155653 2012-04-04 14:17:11Z andrea $ +# $Id: PKGBUILD 158491 2012-05-03 22:34:45Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -22,8 +22,8 @@ pkgname=('kdesdk-cervisia' 'kdesdk-scripts' 'kdesdk-strigi-analyzer' 'kdesdk-umbrello') -pkgver=4.8.2 -pkgrel=2 +pkgver=4.8.3 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') @@ -32,7 +32,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'subversion' 'antlr2' 'kdepimlibs' 'kdebase-lib') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" 'fix-python2-path.patch') -sha1sums=('8c02ce158f42fa80b5f8536d885e3e232614bc7f' +sha1sums=('e7366cd627fd8324d89e7854361be8a141d030c1' '923cabd7a877cf9a68efeb24fbf3d5827e1d949e') build() { @@ -137,7 +137,7 @@ package_kdesdk-kompare() { pkgdesc='Diff/Patch Frontend' depends=('kdebase-runtime') url="http://kde.org/applications/development/kompare/" - install='kdesdk.install' + install='kdesdk-kompare.install' cd $srcdir/build/kompare make DESTDIR=$pkgdir install cd $srcdir/build/doc/kompare diff --git a/extra/kdetoys/PKGBUILD b/extra/kdetoys/PKGBUILD index c13954877..0b1d044e5 100644 --- a/extra/kdetoys/PKGBUILD +++ b/extra/kdetoys/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 155655 2012-04-04 14:17:15Z andrea $ +# $Id: PKGBUILD 158493 2012-05-03 22:34:49Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -6,7 +6,7 @@ pkgbase=kdetoys pkgname=('kdetoys-amor' 'kdetoys-kteatime' 'kdetoys-ktux') -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -14,7 +14,7 @@ license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdetoys') makedepends=('cmake' 'automoc4' 'kdebase-workspace') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('d6414aadd77a4c84fdd1d72c32bc066251b30bde') +sha1sums=('b3050335f3f6b95dfc293cbbd999e21d9ff4f967') build() { cd $srcdir diff --git a/extra/kdeutils-filelight/PKGBUILD b/extra/kdeutils-filelight/PKGBUILD index ee391edcf..1e0af253f 100644 --- a/extra/kdeutils-filelight/PKGBUILD +++ b/extra/kdeutils-filelight/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 155659 2012-04-04 14:17:20Z andrea $ +# $Id: PKGBUILD 158497 2012-05-03 22:34:58Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-filelight -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 pkgdesc='View disk usage information' url='http://kde.org/applications/utilities/filelight' @@ -15,7 +15,7 @@ replaces=('filelight') conflicts=('filelight') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/filelight-${pkgver}.tar.xz") -sha1sums=('76d8c729e259e2395258f6114e737b07b6671846') +sha1sums=('1d1a8141b50e0eef2f2c8c13c6060ff11aab130e') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kcalc/PKGBUILD b/extra/kdeutils-kcalc/PKGBUILD index 8be148b80..77dd528b7 100644 --- a/extra/kdeutils-kcalc/PKGBUILD +++ b/extra/kdeutils-kcalc/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 155661 2012-04-04 14:17:23Z andrea $ +# $Id: PKGBUILD 158499 2012-05-03 22:35:00Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kcalc -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 pkgdesc='Scientific Calculator' url='http://kde.org/applications/utilities/kcalc/' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kcalc-${pkgver}.tar.xz") -sha1sums=('f2bbed3d7f991a4cd0484cc4fafe8c04bd29d986') +sha1sums=('36c4c46ba05911dd174c7d1fa8526430d932c84f') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kcharselect/PKGBUILD b/extra/kdeutils-kcharselect/PKGBUILD index f2c259ed8..ceaa2cf19 100644 --- a/extra/kdeutils-kcharselect/PKGBUILD +++ b/extra/kdeutils-kcharselect/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 155663 2012-04-04 14:17:25Z andrea $ +# $Id: PKGBUILD 158501 2012-05-03 22:35:04Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kcharselect -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 pkgdesc='Character Selector' url="http://kde.org/applications/utilities/kcharselect/" @@ -12,7 +12,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') source=("http://download.kde.org/stable/${pkgver}/src/kcharselect-${pkgver}.tar.xz") -sha1sums=('527d28bf3bb22d38665a006ab835ff6d75f592a4') +sha1sums=('a4196b6ef1f665fabd2ba91f040b2f858c58f397') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kdf/PKGBUILD b/extra/kdeutils-kdf/PKGBUILD index fba3b196d..0862af56a 100644 --- a/extra/kdeutils-kdf/PKGBUILD +++ b/extra/kdeutils-kdf/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 155665 2012-04-04 14:17:28Z andrea $ +# $Id: PKGBUILD 158503 2012-05-03 22:35:08Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kdf -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 url="http://kde.org/applications/system/kdiskfree/" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kdf-${pkgver}.tar.xz") -sha1sums=('50754775bacf562ff53862b2005901501f8eb1c4') +sha1sums=('3c4a05df8daa526f89c2b7d4a6a66dacbd4a92cc') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kfloppy/PKGBUILD b/extra/kdeutils-kfloppy/PKGBUILD index dcb27d273..1858983bf 100644 --- a/extra/kdeutils-kfloppy/PKGBUILD +++ b/extra/kdeutils-kfloppy/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 155667 2012-04-04 14:17:30Z andrea $ +# $Id: PKGBUILD 158505 2012-05-03 22:35:11Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kfloppy -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 pkgdesc='Floppy Formatter' url='http://kde.org/applications/utilities/kfloppy/' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kfloppy-${pkgver}.tar.xz") -sha1sums=('abbbd2908caeade32912cff7db13a50199fae453') +sha1sums=('e507d66f29df3ded849be74c609ce13a38e78b60') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kgpg/PKGBUILD b/extra/kdeutils-kgpg/PKGBUILD index 5908ddb0a..2a5515e46 100644 --- a/extra/kdeutils-kgpg/PKGBUILD +++ b/extra/kdeutils-kgpg/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 155669 2012-04-04 14:17:33Z andrea $ +# $Id: PKGBUILD 158507 2012-05-03 22:35:15Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kgpg -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 pkgdesc='A GnuPG frontend' url='http://kde.org/applications/utilities/kgpg/' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kgpg-${pkgver}.tar.xz") -sha1sums=('ef4833daa82e277f2336e68c0d586cf180a1510f') +sha1sums=('70a99932697bd7bf37c3991c24831c9ef94f1302') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kremotecontrol/PKGBUILD b/extra/kdeutils-kremotecontrol/PKGBUILD index e2bcdf689..30ca87072 100644 --- a/extra/kdeutils-kremotecontrol/PKGBUILD +++ b/extra/kdeutils-kremotecontrol/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kremotecontrol -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 pkgdesc='Configure your remote controls for use with applications' url='http://kde.org/applications/utilities/kremotecontrol/' @@ -15,7 +15,7 @@ replaces=('kdeutils-kdelirc') conflicts=('kdeutils-kdelirc') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kremotecontrol-${pkgver}.tar.xz") -sha1sums=('2269320a9a33a29511c14c7e6c46bff22474076a') +sha1sums=('38eec5beac2b62086d21c9e97ee549af913db844') build() { cd "${srcdir}" diff --git a/extra/kdeutils-ksecrets/PKGBUILD b/extra/kdeutils-ksecrets/PKGBUILD index efdffc660..258695a7e 100644 --- a/extra/kdeutils-ksecrets/PKGBUILD +++ b/extra/kdeutils-ksecrets/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 155673 2012-04-04 14:17:39Z andrea $ +# $Id: PKGBUILD 158511 2012-05-03 22:35:27Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-ksecrets -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 pkgdesc='Secrets Management Infrastructure for KDE' url='http://techbase.kde.org/Projects/Utils/ksecretsservice' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ksecrets-${pkgver}.tar.xz") -sha1sums=('53a13dfd7b6f97195a9519497cd48d3304e6e39d') +sha1sums=('e5a2526af64a340abbf1423760e1ceb2eae3189f') build() { cd "${srcdir}" diff --git a/extra/kdeutils-ktimer/PKGBUILD b/extra/kdeutils-ktimer/PKGBUILD index 5029948ab..096b0b5d2 100644 --- a/extra/kdeutils-ktimer/PKGBUILD +++ b/extra/kdeutils-ktimer/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 155675 2012-04-04 14:17:42Z andrea $ +# $Id: PKGBUILD 158513 2012-05-03 22:35:30Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-ktimer -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 pkgdesc='Countdown Launcher' url='http://kde.org/applications/utilities/ktimer/' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ktimer-${pkgver}.tar.xz") -sha1sums=('4e92e995041043a8dcd62caf21ff91d602aaefdf') +sha1sums=('232555ab5630219b3ced8486f4493ca61eb99f51') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kwallet/PKGBUILD b/extra/kdeutils-kwallet/PKGBUILD index 93c50c1df..7fe331e46 100644 --- a/extra/kdeutils-kwallet/PKGBUILD +++ b/extra/kdeutils-kwallet/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 155677 2012-04-04 14:17:44Z andrea $ +# $Id: PKGBUILD 158515 2012-05-03 22:35:35Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kwallet -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 pkgdesc='Wallet Management Tool' url='http://kde.org/applications/system/kwalletmanager/' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kwallet-${pkgver}.tar.xz") -sha1sums=('3a9b13fff2c156fb642b2fff1f93180b4b564c20') +sha1sums=('b99a380bdb864d3eb6461e9a8627963fe4c1a4b8') build() { cd "${srcdir}" diff --git a/extra/kdeutils-superkaramba/PKGBUILD b/extra/kdeutils-superkaramba/PKGBUILD index aa83583b2..dc14790c2 100644 --- a/extra/kdeutils-superkaramba/PKGBUILD +++ b/extra/kdeutils-superkaramba/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 155680 2012-04-04 14:17:48Z andrea $ +# $Id: PKGBUILD 158518 2012-05-03 22:35:40Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-superkaramba -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 pkgdesc='An engine for cool desktop eyecandy' url='http://kde.org/applications/utilities/superkaramba/' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/superkaramba-${pkgver}.tar.xz") -sha1sums=('5cddf45820903fe3f44873ceda907e100dbdc66b') +sha1sums=('9376f27c311d3e9c6f21719eb7d0b2ccc893908e') build() { cd "${srcdir}" diff --git a/extra/kdeutils-sweeper/PKGBUILD b/extra/kdeutils-sweeper/PKGBUILD index de7866d3f..f1338760e 100644 --- a/extra/kdeutils-sweeper/PKGBUILD +++ b/extra/kdeutils-sweeper/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 155682 2012-04-04 14:17:52Z andrea $ +# $Id: PKGBUILD 158520 2012-05-03 22:35:45Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-sweeper -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 pkgdesc='System Cleaner' url='http://kde.org/applications/utilities/sweeper' @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') source=("http://download.kde.org/stable/${pkgver}/src/sweeper-${pkgver}.tar.xz") -sha1sums=('ddb2eeb947e43e52e166cad962b5b4bddd5efd37') +sha1sums=('ad2c9ec51458e1615714e81cd5907f5d2393984f') build() { cd "${srcdir}" diff --git a/extra/kdewebdev/PKGBUILD b/extra/kdewebdev/PKGBUILD index a13928bb3..05e292e18 100644 --- a/extra/kdewebdev/PKGBUILD +++ b/extra/kdewebdev/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 155684 2012-04-04 14:17:57Z andrea $ +# $Id: PKGBUILD 158522 2012-05-03 22:35:51Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -7,7 +7,7 @@ pkgname=('kdewebdev-kfilereplace' 'kdewebdev-kimagemapeditor' 'kdewebdev-klinkstatus' 'kdewebdev-kommander') -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -15,7 +15,7 @@ license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdewebdev') makedepends=('cmake' 'automoc4' 'ruby' 'tidyhtml' 'kdepimlibs' 'boost') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('34b229bf778109e0cbd10765c0bd7341f95cd46d') +sha1sums=('481863c8a59b48613b0823c16cfff8566d03f5ae') build() { cd $srcdir diff --git a/extra/koffice/PKGBUILD b/extra/koffice/PKGBUILD deleted file mode 100644 index b2aa736d2..000000000 --- a/extra/koffice/PKGBUILD +++ /dev/null @@ -1,306 +0,0 @@ -# $Id: PKGBUILD 148804 2012-02-05 11:51:14Z ibiru $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: BlackEagle < ike DOT devolder AT gmail DOT com > - -pkgbase=koffice -pkgname=( - 'koffice-filters' - 'koffice-interfaces' - 'koffice-libs' - 'koffice-plugins' - 'koffice-pics' - 'koffice-servicetypes' - 'koffice-templates' - 'koffice-tools' - 'koffice-karbon' - 'koffice-karbon-doc' -# 'koffice-kchart' -# 'koffice-kchart-doc' - 'koffice-kexi' - 'koffice-kexi-doc' - 'koffice-kformula' - 'koffice-kformula-doc' - 'koffice-kounavail' - 'koffice-kplato' -# 'koffice-kplato-doc' - 'koffice-kpresenter' - 'koffice-kpresenter-doc' - 'koffice-krita' -# 'koffice-krita-doc' # no krita-doc anymore upstream - 'koffice-kspread' - 'koffice-kspread-doc' - 'koffice-kword' -# 'koffice-kword-doc' # see http://userbase.kde.org/KWord/Manual for documentation (not supplied by upstream anymore in the sources) - 'koffice-handbook' - 'koffice-thesaurus-doc' -# 'koffice-kdgantt' # still an empty package -) -pkgver=2.3.3 -pkgrel=12 -arch=('i686' 'x86_64' 'mips64el') -url='http://koffice.kde.org' -license=('GPL' 'LGPL' 'FDL') -makedepends=('pkg-config' 'cmake' 'automoc4' 'boost' 'eigen' 'gsl' 'lcms' - 'glew' 'qimageblitz' 'kdepimlibs' 'pstoedit' 'poppler-qt' 'libwpd' - 'libwpg' 'opengtl' 'libkdcraw' 'oxygen-icons' 'libgsf') -groups=('koffice') -source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2" - 'kde4-koffice-libwpg02.patch' 'gcc46.patch' 'qt48fix.patch') -sha256sums=('31ba0d98c0d29c7b8ab97efdeb6c618b82177b2b0ec85da088178254da43c099' - '69106deb4081d71b5bd8f2e4f5af67ca689e4ce9f2bb49c11dbce5fb3409d612' - 'e095c0b2bbedf41da6535a68b2275464dafd3f194566028d0135322f596e4739' - 'a20d7412ceeefdf7987b1c5179a740c7ee188e314ffb94cc226967ee194bc2aa') -build() { - cd "${srcdir}/${pkgbase}-${pkgver}" - - patch -p1 -i "${srcdir}/kde4-koffice-libwpg02.patch" - patch -p1 -i "${srcdir}"/gcc46.patch - patch -p1 -i "${srcdir}"/qt48fix.patch - - cd "${srcdir}" - mkdir build - cd build - cmake ../${pkgbase}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -##### 1st package common files, depends, optdepends of the koffice applications ##### - -package_koffice-filters(){ - pkgdesc="Filters for the KDE office suite" - depends=('shared-mime-info' 'libgsf') - optdepends=('libwpd: WordPerfect document importer' - 'libwpg: Corel WordPerfect Graphics image importer' 'pstoedit: Karbon EPS import filter' - 'libkdcraw: support for raw images' 'poppler: support for pdf' - 'koffice-kspread: Kspread filters' 'koffice-karbon: Karbon filters' - 'koffice-kplato: Kplato filters') - install=filters.install - cd "${srcdir}/build/filters" - make DESTDIR="${pkgdir}" install -} - -package_koffice-interfaces(){ - pkgdesc="Interfaces for the KDE office suite" - depends=('koffice-libs') - cd "${srcdir}/build/interfaces" - make DESTDIR="${pkgdir}" install -} - -package_koffice-libs(){ - pkgdesc="Libs for the KDE office suite" - depends=('kdepimlibs' 'lcms' 'koffice-servicetypes') - cd "${srcdir}/build/libs" - make DESTDIR="${pkgdir}" install -} - -package_koffice-plugins(){ - pkgdesc="Plugins for the KDE office suite" - depends=('koffice-libs') - replaces=('koffice-kchart') - conflicts=('koffice-kchart') - cd "${srcdir}/build/plugins" - make DESTDIR="${pkgdir}" install -} - -package_koffice-pics(){ - pkgdesc="Icons for the KDE office suite" - depends=('desktop-file-utils' 'xdg-utils') - install=koffice.install - cd "${srcdir}/build/pics" - make DESTDIR="${pkgdir}" install -} - -package_koffice-servicetypes(){ - pkgdesc="Servicetypes for the KDE office suite" - cd "${srcdir}/build/servicetypes" - make DESTDIR="${pkgdir}" install -} - -package_koffice-templates(){ - pkgdesc="Templates for the KDE office suite" - cd "${srcdir}/build/templates" - make DESTDIR="${pkgdir}" install -} - -package_koffice-tools(){ - pkgdesc="Tools for the KDE office suite" - depends=('koffice-libs' 'oxygen-icons') - cd "${srcdir}/build/tools" - make DESTDIR="${pkgdir}" install -} - -#### package common files done ##### - -#### package apps and their docs ##### - -package_koffice-karbon(){ - pkgdesc="Vector drawing application for KDE" - depends=('koffice-libs' 'koffice-templates' 'oxygen-icons') - optdepends=('koffice-filters: import/export filters') - install=koffice.install - cd "${srcdir}/build/karbon" - make DESTDIR="${pkgdir}" install -} - -package_koffice-karbon-doc(){ - pkgdesc="Documentation for karbon" - cd "${srcdir}/build/doc/karbon" - make DESTDIR="${pkgdir}" install -} - -package_koffice-kexi(){ - pkgdesc="Integrated data management application for the KDE office suite" - depends=('koffice-kspread' 'oxygen-icons') - install=koffice.install - cd "${srcdir}/build/kexi" - make DESTDIR="${pkgdir}" install -} - -package_koffice-kexi-doc(){ - pkgdesc="Documentation for kexi" - cd "${srcdir}/build/doc/kexi" - make DESTDIR="${pkgdir}" install -} - -package_koffice-kformula(){ - pkgdesc="Formula editor for the KDE office suite" - depends=('koffice-libs') - install=koffice.install - cd "${srcdir}/build/kformula" - make DESTDIR="${pkgdir}" install -} - -package_koffice-kformula-doc() { - pkgdesc="Documentation for koffice-kformula" - cd "${srcdir}/build/doc/kformula" - make DESTDIR="${pkgdir}" install -} - - -package_koffice-kounavail(){ - pkgdesc="Kounavail for the KDE office suite" - depends=('koffice-libs') - cd "${srcdir}/build/kounavail" - make DESTDIR="${pkgdir}" install -} - -package_koffice-kplato(){ - pkgdesc="Project management application for KDE" - depends=('koffice-kword' 'oxygen-icons') - install=koffice.install - cd "${srcdir}/build/kplato" - make DESTDIR="${pkgdir}" install -} - -#package_koffice-kplato-doc(){ -# pkgdesc="Documentation for kplato" -# cd ${srcdir}/build/doc/kplato -# make DESTDIR="${pkgdir}" install -#} - -package_koffice-kpresenter(){ - pkgdesc="Presentation tool for KDE" - depends=('koffice-libs' 'koffice-templates' 'oxygen-icons') - optdepends=('koffice-filters: import/export filters') - install=koffice.install - cd "${srcdir}/build/kpresenter" - make DESTDIR="${pkgdir}" install -} - -package_koffice-kpresenter-doc(){ - pkgdesc="Documentation for kpresenter" - cd "${srcdir}/build/doc/kpresenter" - make DESTDIR="${pkgdir}" install -} - -package_koffice-krita(){ - pkgdesc="Graphics editor for KDE" - depends=('glew' 'qimageblitz' 'oxygen-icons' 'koffice-templates' \ - 'koffice-plugins' 'poppler-qt' 'opengtl') - optdepends=('koffice-filters: import/export filters' 'libkdcraw: support for raw images') - install=krita.install - cd "${srcdir}/build/krita" - make DESTDIR="${pkgdir}" install -} - -#package_koffice-krita-doc(){ -# pkgdesc="Documentation for krita" -# cd ${srcdir}/build/doc/krita -# make DESTDIR="${pkgdir}" install -#} - - -package_koffice-kspread(){ - pkgdesc="Spreadsheet application for KDE" - depends=('gsl' 'koffice-templates' 'koffice-plugins' 'oxygen-icons') - optdepends=('koffice-filters: import/export filters') - install=koffice.install - cd "${srcdir}/build/kspread" - make DESTDIR="${pkgdir}" install -} - -package_koffice-kspread-doc(){ - pkgdesc="Documentation for kspread" - cd "${srcdir}/build/doc/kspread" - make DESTDIR="${pkgdir}" install -} - -package_koffice-kword(){ - pkgdesc="Wordprocessor for KDE" - depends=('koffice-templates' 'koffice-pics' 'oxygen-icons' \ - 'koffice-kounavail' 'koffice-plugins') - optdepends=('koffice-filters: import/export filters') - install=koffice.install - cd "${srcdir}/build/kword" - make DESTDIR="${pkgdir}" install - - # some sed lines to have python2 in extension scripts - sed -i "s|/usr/bin/env python|/usr/bin/env python2|" "${pkgdir}/usr/share/apps/kword/scripts/extensions/oouno.py" - sed -i "s|/usr/bin/env python|/usr/bin/env python2|" "${pkgdir}/usr/share/apps/kword/scripts/extensions/importdoxyxml.py" - sed -i "s|/usr/bin/env python|/usr/bin/env python2|" "${pkgdir}/usr/share/apps/kword/scripts/extensions/onlinehelp.py" -} - -#package_koffice-kword-doc(){ -# pkgdesc="Documentation for kword" -# cd ${srcdir}/build/doc/kword -# make DESTDIR="${pkgdir}" install -#} - -##### package apps done ##### - -#package_koffice-kchart(){ -# pkgdesc="Charting tool for KDE" -# depends=('hicolor-icon-theme' 'koffice-interfaces' 'koffice-templates') -# optdepends=('koffice-filters: import/export filters') -# install=koffice.install -# cd "${srcdir}/build/kchart" -# make DESTDIR="${pkgdir}" install -#} - -#package_koffice-kchart-doc(){ -# pkgdesc="Documentation for kchart" -# cd "${srcdir}/build/doc/kchart" -# make DESTDIR="${pkgdir}" install -#} - -#package_koffice-kdgantt(){ -# pkgdesc="Gantt for KDE" -# cd "${srcdir}/build/kdgantt" -# make DESTDIR="${pkgdir}" install -#} - -package_koffice-handbook() { - pkgdesc="Documentation for koffice" - cd "${srcdir}/build/doc/koffice" - make DESTDIR="${pkgdir}" install -} - -package_koffice-thesaurus-doc(){ - pkgdesc="Documentation for koffice-thesaurus" - cd "${srcdir}/build/doc/thesaurus" - make DESTDIR="${pkgdir}" install -} diff --git a/extra/koffice/filters.install b/extra/koffice/filters.install deleted file mode 100644 index 7c8a8bd2b..000000000 --- a/extra/koffice/filters.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-mime-database usr/share/mime &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/koffice/gcc46.patch b/extra/koffice/gcc46.patch deleted file mode 100644 index dcf8a4f85..000000000 --- a/extra/koffice/gcc46.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -up koffice-2.3.2/krita/plugins/formats/exr/exr_converter.cc.gcc46 koffice-2.3.2/krita/plugins/formats/exr/exr_converter.cc ---- koffice-2.3.2/krita/plugins/formats/exr/exr_converter.cc.gcc46 2011-02-17 06:13:40.000000000 -0600 -+++ koffice-2.3.2/krita/plugins/formats/exr/exr_converter.cc 2011-02-19 21:15:56.597142885 -0600 -@@ -80,6 +80,9 @@ ImageType imfTypeToKisType(Imf::PixelTyp - return IT_FLOAT16; - case Imf::FLOAT: - return IT_FLOAT32; -+ default: -+ // shouldn't reach here -+ return IT_UNSUPPORTED; - } - } - -@@ -93,6 +96,9 @@ const KoColorSpace* kisTypeToColorSpace( - case IT_UNKNOWN: - case IT_UNSUPPORTED: - return 0; -+ default: -+ // shouldn't reach here -+ return 0; - } - } - diff --git a/extra/koffice/kde4-koffice-libwpg02.patch b/extra/koffice/kde4-koffice-libwpg02.patch deleted file mode 100644 index e2a55a216..000000000 --- a/extra/koffice/kde4-koffice-libwpg02.patch +++ /dev/null @@ -1,1323 +0,0 @@ -diff -Nur koffice-2.3.1/filters/karbon/wpg/import/CMakeLists.txt koffice-2.3.1-libwpg02/filters/karbon/wpg/import/CMakeLists.txt ---- koffice-2.3.1/filters/karbon/wpg/import/CMakeLists.txt 2011-01-15 21:05:35.000000000 +0100 -+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/CMakeLists.txt 2011-01-18 07:40:25.000000000 +0100 -@@ -1,16 +1,11 @@ - -- - include_directories(${CMAKE_BINARY_DIR}/filters/ ${WPD_INCLUDE_DIR} ${LIBWPG_INCLUDE_DIR}/) - --set(wpgimport_PART_SRCS --WPGImport.cpp --OdgExporter.cxx --FileOutputHandler.cxx --GraphicsElement.cxx) -+set(wpgimport_PART_SRCS WPGImport.cpp) - - kde4_add_plugin(wpgimport ${wpgimport_PART_SRCS}) - --target_link_libraries(wpgimport komain ${LIBWPG_LIBRARIES} ${LIBWPG_STREAM_LIBRARIES}) -+target_link_libraries(wpgimport komain ${LIBWPG_LIBRARIES} ${LIBWPG_STREAM_LIBRARIES} ${WPD_LIBRARIES}) - - install(TARGETS wpgimport DESTINATION ${PLUGIN_INSTALL_DIR}) - install(FILES karbon_wpg_import.desktop DESTINATION ${SERVICES_INSTALL_DIR}) -diff -Nur koffice-2.3.1/filters/karbon/wpg/import/FileOutputHandler.cxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/FileOutputHandler.cxx ---- koffice-2.3.1/filters/karbon/wpg/import/FileOutputHandler.cxx 2011-01-15 21:05:35.000000000 +0100 -+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/FileOutputHandler.cxx 1970-01-01 01:00:00.000000000 +0100 -@@ -1,95 +0,0 @@ --/* libwpg -- * Copyright (C) 2006 Fridrich Strba (fridrich.strba@bluewin.ch) -- * -- * This library is free software; you can redistribute it and/or -- * modify it under the terms of the GNU Library General Public -- * License as published by the Free Software Foundation; either -- * version 2 of the License, or (at your option) any later version. -- * -- * This library is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- * Library General Public License for more details. -- * -- * You should have received a copy of the GNU Library General Public -- * License along with this library; if not, write to the -- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -- * Boston, MA 02111-1301 USA -- * -- * For further information visit http://libwpg.sourceforge.net -- */ -- --/* "This product is not manufactured, approved, or supported by -- * Corel Corporation or Corel Corporation Limited." -- */ -- --#include "FileOutputHandler.hxx" -- --FileOutputHandler::FileOutputHandler(std::ostringstream &contentStream) : -- mbIsTagOpened(false), -- mContentStream(contentStream) --{ --} -- --void FileOutputHandler::startDocument() --{ --} -- --void FileOutputHandler::startElement(const char *psName, const std::vector<std::pair<std::string, std::string> > &xPropList) --{ -- if (mbIsTagOpened) -- { -- mContentStream << ">"; -- mbIsTagOpened = false; -- } -- mContentStream << "<" << psName; -- -- for (std::vector<std::pair<std::string, std::string> >::const_iterator i = xPropList.begin(); i != xPropList.end(); i++) -- { -- mContentStream << " " << (*i).first.c_str() << "=\"" << (*i).second.c_str() << "\""; -- } -- mbIsTagOpened = true; -- msOpenedTagName = psName; --} -- --void FileOutputHandler::endElement(const char *psName) --{ -- if (mbIsTagOpened) -- { -- if( msOpenedTagName == psName ) -- { -- mContentStream << "/>"; -- mbIsTagOpened = false; -- } -- else // should not happen, but handle it -- { -- mContentStream << ">"; -- mContentStream << "</" << psName << ">"; -- mbIsTagOpened = false; -- } -- } -- else -- { -- mContentStream << "</" << psName << ">"; -- mbIsTagOpened = false; -- } --} -- --void FileOutputHandler::characters(const std::string &sCharacters) --{ -- if (mbIsTagOpened) -- { -- mContentStream << ">"; -- mbIsTagOpened = false; -- } -- mContentStream << sCharacters.c_str(); --} -- --void FileOutputHandler::endDocument() --{ -- if (mbIsTagOpened) -- { -- mContentStream << ">"; -- mbIsTagOpened = false; -- } --} -diff -Nur koffice-2.3.1/filters/karbon/wpg/import/FileOutputHandler.hxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/FileOutputHandler.hxx ---- koffice-2.3.1/filters/karbon/wpg/import/FileOutputHandler.hxx 2011-01-15 21:05:35.000000000 +0100 -+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/FileOutputHandler.hxx 1970-01-01 01:00:00.000000000 +0100 -@@ -1,49 +0,0 @@ --/* libwpg -- * Copyright (C) 2006 Fridrich Strba (fridrich.strba@bluewin.ch) -- * -- * This library is free software; you can redistribute it and/or -- * modify it under the terms of the GNU Library General Public -- * License as published by the Free Software Foundation; either -- * version 2 of the License, or (at your option) any later version. -- * -- * This library is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- * Library General Public License for more details. -- * -- * You should have received a copy of the GNU Library General Public -- * License along with this library; if not, write to the -- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -- * Boston, MA 02111-1301 USA -- * -- * For further information visit http://libwpg.sourceforge.net -- */ -- --/* "This product is not manufactured, approved, or supported by -- * Corel Corporation or Corel Corporation Limited." -- */ -- --#ifndef FILEOUTPUTHANDLER_H --#define FILEOUTPUTHANDLER_H -- --#include <iostream> --#include <sstream> --#include <string> --#include "GraphicsHandler.hxx" -- --class FileOutputHandler : public GraphicsHandler --{ -- public: -- explicit FileOutputHandler(std::ostringstream &contentStream); -- virtual void startDocument(); -- virtual void endDocument(); -- virtual void startElement(const char *psName, const std::vector<std::pair<std::string, std::string> > &xPropList); -- virtual void endElement(const char *psName); -- virtual void characters(const std::string &sCharacters); -- -- private: -- bool mbIsTagOpened; -- std::string msOpenedTagName; -- std::ostringstream &mContentStream; --}; --#endif -diff -Nur koffice-2.3.1/filters/karbon/wpg/import/GraphicsElement.cxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsElement.cxx ---- koffice-2.3.1/filters/karbon/wpg/import/GraphicsElement.cxx 2011-01-15 21:05:35.000000000 +0100 -+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsElement.cxx 1970-01-01 01:00:00.000000000 +0100 -@@ -1,66 +0,0 @@ --/* GraphicsElement: The items we are collecting to be put into the Writer -- * document: paragraph and spans of text, as well as section breaks. -- * -- * Copyright (C) 2002-2003 William Lachance (william.lachance@sympatico.ca) -- * -- * This program is free software; you can redistribute it and/or -- * modify it under the terms of the GNU Lesser General Public -- * License as published by the Free Software Foundation; either -- * version 2 of the License, or (at your option) any later version. -- * -- * This program is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- * Library General Public License for more details. -- * -- * You should have received a copy of the GNU Library General Public -- * License along with this library; if not, write to the -- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -- * Boston, MA 02111-1301 USA -- * -- * For further information visit http://libwpg.sourceforge.net -- * -- */ -- --/* "This product is not manufactured, approved, or supported by -- * Corel Corporation or Corel Corporation Limited." -- */ -- --#include "GraphicsElement.hxx" --#include "GraphicsHandler.hxx" --#include <string.h> -- --#define ASCII_SPACE 0x0020 -- --void TagGraphicsElement::print() const --{ --} -- --void OpenTagGraphicsElement::write(GraphicsHandler *pHandler) const --{ -- pHandler->startElement(getTagName().c_str(), maAttrList); --} -- --void OpenTagGraphicsElement::print() const --{ -- TagGraphicsElement::print(); --} -- --void OpenTagGraphicsElement::addAttribute(const std::string &szAttributeName, const std::string &sAttributeValue) --{ -- std::pair<std::string, std::string> tmpAttribute; -- tmpAttribute.first = szAttributeName; -- tmpAttribute.second = sAttributeValue; -- maAttrList.push_back(tmpAttribute); --} -- --void CloseTagGraphicsElement::write(GraphicsHandler *pHandler) const --{ -- -- pHandler->endElement(getTagName().c_str()); --} -- --void CharDataGraphicsElement::write(GraphicsHandler *pHandler) const --{ -- pHandler->characters(msData); --} -diff -Nur koffice-2.3.1/filters/karbon/wpg/import/GraphicsElement.hxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsElement.hxx ---- koffice-2.3.1/filters/karbon/wpg/import/GraphicsElement.hxx 2011-01-15 21:05:35.000000000 +0100 -+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsElement.hxx 1970-01-01 01:00:00.000000000 +0100 -@@ -1,84 +0,0 @@ --/* GraphicsElement: The items we are collecting to be put into the Writer -- * document: paragraph and spans of text, as well as section breaks. -- * -- * Copyright (C) 2002-2003 William Lachance (william.lachance@sympatico.ca) -- * -- * This program is free software; you can redistribute it and/or -- * modify it under the terms of the GNU Lesser General Public -- * License as published by the Free Software Foundation; either -- * version 2 of the License, or (at your option) any later version. -- * -- * This program is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- * Library General Public License for more details. -- * -- * You should have received a copy of the GNU Library General Public -- * License along with this library; if not, write to the -- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -- * Boston, MA 02111-1301 USA -- * -- * For further information visit http://libwpd.sourceforge.net -- * -- */ -- --/* "This product is not manufactured, approved, or supported by -- * Corel Corporation or Corel Corporation Limited." -- */ -- --#ifndef _GRAPHICSELEMENT_H --#define _GRAPHICSELEMENT_H --#include <string> --#include <map> --#include <vector> -- --#include "GraphicsHandler.hxx" -- --class GraphicsElement --{ --public: -- virtual ~GraphicsElement() {} -- virtual void write(GraphicsHandler *pHandler) const = 0; -- virtual void print() const {} --}; -- --class TagGraphicsElement : public GraphicsElement --{ --public: -- explicit TagGraphicsElement(const char *szTagName) : msTagName(szTagName) {} -- const std::string &getTagName() const { return msTagName; } -- virtual void print() const; --private: -- const std::string msTagName; --}; -- --class OpenTagGraphicsElement : public TagGraphicsElement --{ --public: -- explicit OpenTagGraphicsElement(const char *szTagName) : TagGraphicsElement(szTagName) {} -- ~OpenTagGraphicsElement() {} -- void addAttribute(const std::string &szAttributeName, const std::string &sAttributeValue); -- virtual void write(GraphicsHandler *pHandler) const; -- virtual void print () const; --private: -- std::vector<std::pair<std::string, std::string> > maAttrList; --}; -- --class CloseTagGraphicsElement : public TagGraphicsElement --{ --public: -- explicit CloseTagGraphicsElement(const char *szTagName) : TagGraphicsElement(szTagName) {} -- virtual void write(GraphicsHandler *pHandler) const; --}; -- --class CharDataGraphicsElement : public GraphicsElement --{ --public: -- CharDataGraphicsElement(const char *sData) : GraphicsElement(), msData(sData) {} -- virtual void write(GraphicsHandler *pHandler) const; --private: -- std::string msData; --}; -- -- --#endif -diff -Nur koffice-2.3.1/filters/karbon/wpg/import/GraphicsHandler.hxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsHandler.hxx ---- koffice-2.3.1/filters/karbon/wpg/import/GraphicsHandler.hxx 2011-01-15 21:05:35.000000000 +0100 -+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsHandler.hxx 1970-01-01 01:00:00.000000000 +0100 -@@ -1,43 +0,0 @@ --/* -- * Copyright (C) 2004 William Lachance (wlach@interlog.com) -- * Copyright (C) 2004 Net Integration Technologies (http://www.net-itech.com) -- * -- * This program is free software; you can redistribute it and/or -- * modify it under the terms of the GNU General Public License -- * as published by the Free Software Foundation; either version 2 -- * of the License, or (at your option) any later version. -- * -- * This program is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- * GNU General Public License for more details. -- * -- * You should have received a copy of the GNU Library General Public -- * License along with this library; if not, write to the -- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -- * Boston, MA 02111-1301 USA -- * -- * Contributor(s): Martin Gallwey (gallwey@sun.com) -- * -- */ -- --/* "This product is not manufactured, approved, or supported by -- * Corel Corporation or Corel Corporation Limited." -- */ --#ifndef _GRAPHICSHANDLER_H --#define _GRAPHICSHANDLER_H --#include <string> --#include <map> --#include <vector> -- --class GraphicsHandler --{ --public: -- virtual ~GraphicsHandler() {} -- virtual void startDocument() = 0; -- virtual void endDocument() = 0; -- virtual void startElement(const char *psName, const std::vector< std::pair <std::string, std::string> > &xPropList) = 0; -- virtual void endElement(const char *psName) = 0; -- virtual void characters(const std::string &sCharacters) = 0; --}; --#endif -diff -Nur koffice-2.3.1/filters/karbon/wpg/import/OdgExporter.cxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/OdgExporter.cxx ---- koffice-2.3.1/filters/karbon/wpg/import/OdgExporter.cxx 2011-01-15 21:05:35.000000000 +0100 -+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/OdgExporter.cxx 1970-01-01 01:00:00.000000000 +0100 -@@ -1,662 +0,0 @@ --/* libwpg -- * Copyright (C) 2006 Ariya Hidayat (ariya@kde.org) -- * Copyright (C) 2006 Fridrich Strba (fridrich.strba@bluewin.ch) -- * -- * This library is free software; you can redistribute it and/or -- * modify it under the terms of the GNU Library General Public -- * License as published by the Free Software Foundation; either -- * version 2 of the License, or (at your option) any later version. -- * -- * This library is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- * Library General Public License for more details. -- * -- * You should have received a copy of the GNU Library General Public -- * License along with this library; if not, write to the -- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -- * Boston, MA 02111-1301 USA -- * -- * For further information visit http://libwpg.sourceforge.net -- */ -- --/* "This product is not manufactured, approved, or supported by -- * Corel Corporation or Corel Corporation Limited." -- */ -- --#include "OdgExporter.hxx" --#include "GraphicsElement.hxx" --#include "GraphicsHandler.hxx" --#include <locale.h> -- --static std::string doubleToString(const double value) --{ -- std::ostringstream tempStream; -- tempStream << value; -- std::string decimalPoint(localeconv()->decimal_point); -- if ((decimalPoint.size() == 0) || (decimalPoint == ".")) -- return tempStream.str(); -- std::string stringValue(tempStream.str()); -- if (!stringValue.empty()) -- { -- std::string::size_type pos; -- while ((pos = stringValue.find(decimalPoint)) != std::string::npos) -- stringValue.replace(pos,decimalPoint.size(),"."); -- } -- return stringValue; --} -- -- --OdgExporter::OdgExporter(GraphicsHandler *pHandler, const bool isFlatXML): -- mpHandler(pHandler), -- m_fillRule(AlternatingFill), -- m_gradientIndex(1), -- m_dashIndex(1), -- m_styleIndex(1), -- m_width(0.0f), -- m_height(0.0f), -- m_isFlatXML(isFlatXML) --{ --} -- --OdgExporter::~OdgExporter() --{ -- for (std::vector <GraphicsElement *>::iterator iterStroke = mStrokeDashElements.begin(); -- iterStroke != mStrokeDashElements.end(); iterStroke++) -- delete (*iterStroke); -- -- for (std::vector <GraphicsElement *>::iterator iterGradient = mGradientElements.begin(); -- iterGradient != mGradientElements.end(); iterGradient++) -- delete (*iterGradient); -- -- for (std::vector <GraphicsElement *>::iterator iterAutomaticStyles = mAutomaticStylesElements.begin(); -- iterAutomaticStyles != mAutomaticStylesElements.end(); iterAutomaticStyles++) -- delete (*iterAutomaticStyles); -- -- for (std::vector<GraphicsElement *>::iterator bodyIter = mBodyElements.begin(); -- bodyIter != mBodyElements.end(); bodyIter++) -- delete (*bodyIter); --} -- --void OdgExporter::startGraphics(double width, double height) --{ -- m_gradientIndex = 1; -- m_dashIndex = 1; -- m_styleIndex = 1; -- m_width = width; -- m_height = height; -- -- -- mpHandler->startDocument(); -- OpenTagGraphicsElement tmpOfficeDocumentContent("office:document"); -- tmpOfficeDocumentContent.addAttribute("xmlns:office", "urn:oasis:names:tc:opendocument:xmlns:office:1.0"); -- tmpOfficeDocumentContent.addAttribute("xmlns:style", "urn:oasis:names:tc:opendocument:xmlns:style:1.0"); -- tmpOfficeDocumentContent.addAttribute("xmlns:text", "urn:oasis:names:tc:opendocument:xmlns:text:1.0"); -- tmpOfficeDocumentContent.addAttribute("xmlns:draw", "urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"); -- tmpOfficeDocumentContent.addAttribute("xmlns:dc", "http://purl.org/dc/elements/1.1/"); -- tmpOfficeDocumentContent.addAttribute("xmlns:svg", "urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"); -- tmpOfficeDocumentContent.addAttribute("xmlns:fo", "urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"); -- tmpOfficeDocumentContent.addAttribute("xmlns:config", "urn:oasis:names:tc:opendocument:xmlns:config:1.0"); -- tmpOfficeDocumentContent.addAttribute("xmlns:ooo", "http://openoffice.org/2004/office"); -- tmpOfficeDocumentContent.addAttribute("office:version", "1.0"); -- if (m_isFlatXML) -- tmpOfficeDocumentContent.addAttribute("office:mimetype", "application/x-vnd.oasis.openoffice.drawing"); -- tmpOfficeDocumentContent.write(mpHandler); -- -- OpenTagGraphicsElement("office:settings").write(mpHandler); -- -- OpenTagGraphicsElement configItemSetOpenElement("config:config-item-set"); -- configItemSetOpenElement.addAttribute("config:name", "ooo:view-settings"); -- configItemSetOpenElement.write(mpHandler); -- -- OpenTagGraphicsElement configItemOpenElement1("config:config-item"); -- configItemOpenElement1.addAttribute("config:name", "VisibleAreaTop"); -- configItemOpenElement1.addAttribute("config:type", "int"); -- configItemOpenElement1.write(mpHandler); -- mpHandler->characters("0"); -- mpHandler->endElement("config:config-item"); -- -- OpenTagGraphicsElement configItemOpenElement2("config:config-item"); -- configItemOpenElement2.addAttribute("config:name", "VisibleAreaLeft"); -- configItemOpenElement2.addAttribute("config:type", "int"); -- configItemOpenElement2.write(mpHandler); -- mpHandler->characters("0"); -- mpHandler->endElement("config:config-item"); -- -- OpenTagGraphicsElement configItemOpenElement3("config:config-item"); -- configItemOpenElement3.addAttribute("config:name", "VisibleAreaWidth"); -- configItemOpenElement3.addAttribute("config:type", "int"); -- configItemOpenElement3.write(mpHandler); -- m_value.str(""); -- m_value << (unsigned)(2540 * width); -- mpHandler->characters(m_value.str()); -- mpHandler->endElement("config:config-item"); -- -- OpenTagGraphicsElement configItemOpenElement4("config:config-item"); -- configItemOpenElement4.addAttribute("config:name", "VisibleAreaHeight"); -- configItemOpenElement4.addAttribute("config:type", "int"); -- configItemOpenElement4.write(mpHandler); -- m_value.str(""); -- m_value << (unsigned)(2540 * height); -- mpHandler->characters(m_value.str()); -- mpHandler->endElement("config:config-item"); -- -- mpHandler->endElement("config:config-item-set"); -- -- mpHandler->endElement("office:settings"); -- --} -- --void OdgExporter::endGraphics() --{ -- OpenTagGraphicsElement("office:styles").write(mpHandler); -- -- for (std::vector <GraphicsElement *>::const_iterator iterStroke = mStrokeDashElements.begin(); -- iterStroke != mStrokeDashElements.end(); iterStroke++) -- (*iterStroke)->write(mpHandler); -- -- for (std::vector <GraphicsElement *>::const_iterator iterGradient = mGradientElements.begin(); -- iterGradient != mGradientElements.end(); iterGradient++) -- (*iterGradient)->write(mpHandler); -- -- mpHandler->endElement("office:styles"); -- -- OpenTagGraphicsElement("office:automatic-styles").write(mpHandler); -- -- for (std::vector <GraphicsElement *>::const_iterator iterAutomaticStyles = mAutomaticStylesElements.begin(); -- iterAutomaticStyles != mAutomaticStylesElements.end(); iterAutomaticStyles++) -- (*iterAutomaticStyles)->write(mpHandler); -- -- OpenTagGraphicsElement tmpStylePageLayoutOpenElement("style:page-layout"); -- tmpStylePageLayoutOpenElement.addAttribute("style:name", "PM0"); -- tmpStylePageLayoutOpenElement.write(mpHandler); -- -- OpenTagGraphicsElement tmpStylePageLayoutPropertiesOpenElement("style:page-layout-properties"); -- tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-top", "0in"); -- tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-bottom", "0in"); -- tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-left", "0in"); -- tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-right", "0in"); -- m_value.str(""); -- m_value << doubleToString(m_width) << "in"; -- tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:page-width", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(m_height) << "in"; -- tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:page-height", m_value.str()); -- m_value.str(""); -- tmpStylePageLayoutPropertiesOpenElement.addAttribute("style:print-orientation", "portrait"); -- tmpStylePageLayoutPropertiesOpenElement.write(mpHandler); -- -- mpHandler->endElement("style:page-layout-properties"); -- -- mpHandler->endElement("style:page-layout"); -- -- OpenTagGraphicsElement tmpStyleStyleOpenElement("style:style"); -- tmpStyleStyleOpenElement.addAttribute("style:name", "dp1"); -- tmpStyleStyleOpenElement.addAttribute("style:family", "drawing-page"); -- tmpStyleStyleOpenElement.write(mpHandler); -- -- OpenTagGraphicsElement tmpStyleDrawingPagePropertiesOpenElement("style:drawing-page-properties"); -- // tmpStyleDrawingPagePropertiesOpenElement.addAttribute("draw:background-size", "border"); -- tmpStyleDrawingPagePropertiesOpenElement.addAttribute("draw:fill", "none"); -- tmpStyleDrawingPagePropertiesOpenElement.write(mpHandler); -- -- mpHandler->endElement("style:drawing-page-properties"); -- -- mpHandler->endElement("style:style"); -- -- mpHandler->endElement("office:automatic-styles"); -- -- OpenTagGraphicsElement("office:master-styles").write(mpHandler); -- -- OpenTagGraphicsElement tmpStyleMasterPageOpenElement("style:master-page"); -- tmpStyleMasterPageOpenElement.addAttribute("style:name", "Default"); -- tmpStyleMasterPageOpenElement.addAttribute("style:page-layout-name", "PM0"); -- tmpStyleMasterPageOpenElement.addAttribute("draw:style-name", "dp1"); -- tmpStyleMasterPageOpenElement.write(mpHandler); -- -- mpHandler->endElement("style:master-page"); -- -- mpHandler->endElement("office:master-styles"); -- -- OpenTagGraphicsElement("office:body").write(mpHandler); -- -- OpenTagGraphicsElement("office:drawing").write(mpHandler); -- -- OpenTagGraphicsElement tmpDrawPageOpenElement("draw:page"); -- tmpDrawPageOpenElement.addAttribute("draw:name", "page1"); -- tmpDrawPageOpenElement.addAttribute("draw:style-name", "dp1"); -- tmpDrawPageOpenElement.addAttribute("draw:master-page-name", "Default"); -- tmpDrawPageOpenElement.write(mpHandler); -- -- for (std::vector<GraphicsElement *>::const_iterator bodyIter = mBodyElements.begin(); -- bodyIter != mBodyElements.end(); bodyIter++) -- { -- (*bodyIter)->write(mpHandler); -- } -- -- mpHandler->endElement("draw:page"); -- mpHandler->endElement("office:drawing"); -- mpHandler->endElement("office:body"); -- mpHandler->endElement("office:document"); -- -- mpHandler->endDocument(); --} -- --void OdgExporter::setPen(const libwpg::WPGPen& pen) --{ -- m_pen = pen; --} -- --void OdgExporter::setBrush(const libwpg::WPGBrush& brush) --{ -- m_brush = brush; --} -- --void OdgExporter::setFillRule(FillRule rule) --{ -- m_fillRule = rule; --} -- --void OdgExporter::startLayer(unsigned int) --{ --} -- --void OdgExporter::endLayer(unsigned int) --{ --} -- --void OdgExporter::drawRectangle(const libwpg::WPGRect& rect, double rx, double ) --{ -- writeStyle(); -- OpenTagGraphicsElement *pDrawRectElement = new OpenTagGraphicsElement("draw:rect"); -- m_value.str(""); -- m_value << "gr" << m_styleIndex-1; -- pDrawRectElement->addAttribute("draw:style-name", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(rect.x1) << "in"; -- pDrawRectElement->addAttribute("svg:x", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(rect.y1) << "in"; -- pDrawRectElement->addAttribute("svg:y", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(rect.x2-rect.x1) << "in"; -- pDrawRectElement->addAttribute("svg:width", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(rect.y2-rect.y1) << "in"; -- pDrawRectElement->addAttribute("svg:height", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(rx) << "in"; -- // FIXME: what to do when rx != ry ? -- pDrawRectElement->addAttribute("draw:corner-radius", m_value.str()); -- m_value.str(""); -- mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawRectElement)); -- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:rect"))); --} -- --void OdgExporter::drawEllipse(const libwpg::WPGPoint& center, double rx, double ry) --{ -- writeStyle(); -- OpenTagGraphicsElement *pDrawEllipseElement = new OpenTagGraphicsElement("draw:ellipse"); -- m_value.str(""); -- m_value << "gr" << m_styleIndex-1; -- pDrawEllipseElement->addAttribute("draw:style-name", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(center.x - rx) << "in"; -- pDrawEllipseElement->addAttribute("svg:x", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(center.y - ry) << "in"; -- pDrawEllipseElement->addAttribute("svg:y", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(2 * rx) << "in"; -- pDrawEllipseElement->addAttribute("svg:width", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(2 * ry) << "in"; -- pDrawEllipseElement->addAttribute("svg:height", m_value.str()); -- m_value.str(""); -- mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawEllipseElement)); -- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:ellipse"))); --} -- --void OdgExporter::drawPolygon(const libwpg::WPGPointArray& vertices) --{ -- if(vertices.count() < 2) -- return; -- -- if(vertices.count() == 2) -- { -- const libwpg::WPGPoint& p1 = vertices[0]; -- const libwpg::WPGPoint& p2 = vertices[1]; -- -- writeStyle(); -- OpenTagGraphicsElement *pDrawLineElement = new OpenTagGraphicsElement("draw:line"); -- m_value.str(""); -- m_value << "gr" << m_styleIndex-1; -- pDrawLineElement->addAttribute("draw:style-name", m_value.str()); -- m_value.str(""); -- pDrawLineElement->addAttribute("draw:text-style-name", "P1"); -- pDrawLineElement->addAttribute("draw:layer", "layout"); -- m_value << doubleToString(p1.x) << "in"; -- pDrawLineElement->addAttribute("svg:x1", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(p1.y) << "in"; -- pDrawLineElement->addAttribute("svg:y1", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(p2.x) << "in"; -- pDrawLineElement->addAttribute("svg:x2", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(p2.y) << "in"; -- pDrawLineElement->addAttribute("svg:y2", m_value.str()); -- m_value.str(""); -- mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawLineElement)); -- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:line"))); -- } -- else -- { -- // draw as path -- libwpg::WPGPath path; -- path.moveTo(vertices[0]); -- for(unsigned long ii = 1; ii < vertices.count(); ii++) -- path.lineTo(vertices[ii]); -- path.closed = true; -- drawPath(path); -- } --} -- --void OdgExporter::drawPath(const libwpg::WPGPath& path) --{ -- if(path.count() == 0) -- return; -- -- // try to find the bounding box -- // this is simple convex hull technique, the bounding box might not be -- // accurate but that should be enough for this purpose -- libwpg::WPGPoint p = path.element(0).point; -- libwpg::WPGPoint q = path.element(0).point; -- for(unsigned k = 0; k < path.count(); k++) -- { -- libwpg::WPGPathElement element = path.element(k); -- p.x = (p.x > element.point.x) ? element.point.x : p.x; -- p.y = (p.y > element.point.y) ? element.point.y : p.y; -- q.x = (q.x < element.point.x) ? element.point.x : q.x; -- q.y = (q.y < element.point.y) ? element.point.y : q.y; -- if(element.type == libwpg::WPGPathElement::CurveToElement) -- { -- p.x = (p.x > element.extra1.x) ? element.extra1.x : p.x; -- p.y = (p.y > element.extra1.y) ? element.extra1.y : p.y; -- q.x = (q.x < element.extra1.x) ? element.extra1.x : q.x; -- q.y = (q.y < element.extra1.y) ? element.extra1.y : q.y; -- p.x = (p.x > element.extra2.x) ? element.extra2.x : p.x; -- p.y = (p.y > element.extra2.y) ? element.extra2.y : p.y; -- q.x = (q.x < element.extra2.x) ? element.extra2.x : q.x; -- q.y = (q.y < element.extra2.y) ? element.extra2.y : q.y; -- } -- } -- double vw = q.x - p.x; -- double vh = q.y - p.y; -- -- writeStyle(); -- -- OpenTagGraphicsElement *pDrawPathElement = new OpenTagGraphicsElement("draw:path"); -- m_value.str(""); -- m_value << "gr" << m_styleIndex-1; -- pDrawPathElement->addAttribute("draw:style-name", m_value.str()); -- m_value.str(""); -- pDrawPathElement->addAttribute("draw:text-style-name", "P1"); -- pDrawPathElement->addAttribute("draw:layer", "layout"); -- m_value << doubleToString(p.x) << "in"; -- pDrawPathElement->addAttribute("svg:x", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(p.y) << "in"; -- pDrawPathElement->addAttribute("svg:y", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(vw) << "in"; -- pDrawPathElement->addAttribute("svg:width", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(vh) << "in"; -- pDrawPathElement->addAttribute("svg:height", m_value.str()); -- m_value.str(""); -- m_value << "0 0 " << (int)(vw*2540) << " " << (int)(vh*2540); -- pDrawPathElement->addAttribute("svg:viewBox", m_value.str()); -- m_value.str(""); -- -- for(unsigned i = 0; i < path.count(); i++) -- { -- libwpg::WPGPathElement element = path.element(i); -- libwpg::WPGPoint point = element.point; -- switch(element.type) -- { -- // 2540 is 2.54*1000, 2.54 in = 1 in -- case libwpg::WPGPathElement::MoveToElement: -- m_value << "M" << (int)((point.x-p.x)*2540) << " "; -- m_value << (int)((point.y-p.y)*2540); -- break; -- -- case libwpg::WPGPathElement::LineToElement: -- m_value << "L" << (int)((point.x-p.x)*2540) << " "; -- m_value << (int)((point.y-p.y)*2540); -- break; -- -- case libwpg::WPGPathElement::CurveToElement: -- m_value << "C" << (int)((element.extra1.x-p.x)*2540) << " "; -- m_value << (int)((element.extra1.y-p.y)*2540) << " "; -- m_value << (int)((element.extra2.x-p.x)*2540) << " "; -- m_value << (int)((element.extra2.y-p.y)*2540) << " "; -- m_value << (int)((point.x-p.x)*2540) << " "; -- m_value << (int)((point.y-p.y)*2540); -- break; -- -- default: -- break; -- } -- } -- if(path.closed) -- m_value << " Z"; -- pDrawPathElement->addAttribute("svg:d", m_value.str()); -- m_value.str(""); -- mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawPathElement)); -- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:path"))); --} -- -- --void OdgExporter::drawBitmap(const libwpg::WPGBitmap& bitmap) --{ -- OpenTagGraphicsElement *pDrawFrameElement = new OpenTagGraphicsElement("draw:frame"); -- m_value.str(""); -- m_value << doubleToString(bitmap.rect.x1) << "in"; -- pDrawFrameElement->addAttribute("svg:x", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(bitmap.rect.y1) << "in"; -- pDrawFrameElement->addAttribute("svg:y", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(bitmap.rect.height()) << "in"; -- pDrawFrameElement->addAttribute("svg:height", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(bitmap.rect.width()) << "in"; -- pDrawFrameElement->addAttribute("svg:width", m_value.str()); -- mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawFrameElement)); -- -- mBodyElements.push_back(static_cast<GraphicsElement *>(new OpenTagGraphicsElement("draw:image"))); -- -- mBodyElements.push_back(static_cast<GraphicsElement *>(new OpenTagGraphicsElement("office:binary-data"))); -- -- libwpg::WPGString base64Binary; -- bitmap.generateBase64DIB(base64Binary); -- mBodyElements.push_back(static_cast<GraphicsElement *>(new CharDataGraphicsElement(base64Binary.cstr()))); -- -- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("office:binary-data"))); -- -- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:image"))); -- -- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:frame"))); --} -- --void OdgExporter::drawImageObject(const libwpg::WPGBinaryData& binaryData) --{ -- if (binaryData.mimeType.length() <= 0) -- return; -- OpenTagGraphicsElement *pDrawFrameElement = new OpenTagGraphicsElement("draw:frame"); -- m_value.str(""); -- m_value << doubleToString(binaryData.rect.x1) << "in"; -- pDrawFrameElement->addAttribute("svg:x", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(binaryData.rect.y1) << "in"; -- pDrawFrameElement->addAttribute("svg:y", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(binaryData.rect.height()) << "in"; -- pDrawFrameElement->addAttribute("svg:height", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(binaryData.rect.width()) << "in"; -- pDrawFrameElement->addAttribute("svg:width", m_value.str()); -- mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawFrameElement)); -- -- mBodyElements.push_back(static_cast<GraphicsElement *>(new OpenTagGraphicsElement("draw:image"))); -- -- mBodyElements.push_back(static_cast<GraphicsElement *>(new OpenTagGraphicsElement("office:binary-data"))); -- -- libwpg::WPGString base64Binary = binaryData.getBase64Data(); -- mBodyElements.push_back(static_cast<GraphicsElement *>(new CharDataGraphicsElement(base64Binary.cstr()))); -- -- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("office:binary-data"))); -- -- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:image"))); -- -- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:frame"))); --} -- -- --static std::string colorToHex(const libwpg::WPGColor& color) --{ -- char hexdigits[] = "0123456789abcdef"; -- char buffer[] = "123456"; -- buffer[0] = hexdigits[(color.red >> 4) & 15]; -- buffer[1] = hexdigits[color.red & 15]; -- buffer[2] = hexdigits[(color.green >> 4) & 15]; -- buffer[3] = hexdigits[color.green & 15]; -- buffer[4] = hexdigits[(color.blue >> 4) & 15]; -- buffer[5] = hexdigits[color.blue & 15]; -- return std::string(buffer); --} -- --void OdgExporter::writeStyle() --{ -- m_value.str(""); -- m_name.str(""); -- -- if(!m_pen.solid && (m_pen.dashArray.count() >=2 ) ) -- { -- // ODG only supports dashes with the same length of spaces inbetween -- // here we take the first space and assume everything else the same -- // note that dash length is written in percentage -- double distance = m_pen.dashArray.at(1); -- OpenTagGraphicsElement *tmpDrawStrokeDashElement = new OpenTagGraphicsElement("draw:stroke-dash"); -- tmpDrawStrokeDashElement->addAttribute("draw:style", "rect"); -- m_value << "Dash_" << m_dashIndex++; -- tmpDrawStrokeDashElement->addAttribute("draw:name", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(distance*100) << "%"; -- tmpDrawStrokeDashElement->addAttribute("draw:distance", m_value.str()); -- m_value.str(""); -- for(unsigned i = 0; i < m_pen.dashArray.count()/2; i++) -- { -- m_name << "draw:dots" << i+1; -- tmpDrawStrokeDashElement->addAttribute(m_name.str(), "1"); -- m_name.str(""); -- m_name << "draw:dots" << i+1 << "-length"; -- m_value << doubleToString(100*m_pen.dashArray.at(i*2)) << "%"; -- tmpDrawStrokeDashElement->addAttribute(m_name.str(), m_value.str()); -- m_name.str(""); -- m_value.str(""); -- } -- mStrokeDashElements.push_back(static_cast<GraphicsElement *>(tmpDrawStrokeDashElement)); -- mStrokeDashElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:stroke-dash"))); -- } -- -- if(m_brush.style == libwpg::WPGBrush::Gradient) -- { -- OpenTagGraphicsElement *tmpDrawGradientElement = new OpenTagGraphicsElement("draw:gradient"); -- tmpDrawGradientElement->addAttribute("draw:style", "linear"); -- m_value << "Gradient_" << m_gradientIndex++; -- tmpDrawGradientElement->addAttribute("draw:name", m_value.str()); -- m_value.str(""); -- -- // ODG angle unit is 0.1 degree -- double angle = -m_brush.gradient.angle(); -- while(angle < 0) -- angle += 360; -- while(angle > 360) -- angle -= 360; -- -- m_value << (unsigned)(angle*10); -- tmpDrawGradientElement->addAttribute("draw:angle", m_value.str()); -- m_value.str(""); -- -- libwpg::WPGColor startColor = m_brush.gradient.stopColor(0); -- libwpg::WPGColor stopColor = m_brush.gradient.stopColor(1); -- m_value << "#" << colorToHex(startColor); -- tmpDrawGradientElement->addAttribute("draw:start-color", m_value.str()); -- m_value.str(""); -- m_value << "#" << colorToHex(stopColor); -- tmpDrawGradientElement->addAttribute("draw:end-color", m_value.str()); -- m_value.str(""); -- tmpDrawGradientElement->addAttribute("draw:start-intensity", "100%"); -- tmpDrawGradientElement->addAttribute("draw:end-intensity", "100%"); -- tmpDrawGradientElement->addAttribute("draw:border", "0%"); -- mGradientElements.push_back(static_cast<GraphicsElement *>(tmpDrawGradientElement)); -- mGradientElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:gradient"))); -- } -- -- OpenTagGraphicsElement *tmpStyleStyleElement = new OpenTagGraphicsElement("style:style"); -- m_value << "gr" << m_styleIndex; -- tmpStyleStyleElement->addAttribute("style:name", m_value.str()); -- m_value.str(""); -- tmpStyleStyleElement->addAttribute("style:family", "graphic"); -- tmpStyleStyleElement->addAttribute("style:parent-style-name", "standard"); -- mAutomaticStylesElements.push_back(static_cast<GraphicsElement *>(tmpStyleStyleElement)); -- -- OpenTagGraphicsElement *tmpStyleGraphicPropertiesElement = new OpenTagGraphicsElement("style:graphic-properties"); -- -- if(m_pen.width > 0.0) -- { -- m_value << doubleToString(m_pen.width) << "in"; -- tmpStyleGraphicPropertiesElement->addAttribute("svg:stroke-width", m_value.str()); -- m_value.str(""); -- m_value << "#" << colorToHex(m_pen.foreColor); -- tmpStyleGraphicPropertiesElement->addAttribute("svg:stroke-color", m_value.str()); -- m_value.str(""); -- -- if(!m_pen.solid) -- { -- tmpStyleGraphicPropertiesElement->addAttribute("draw:stroke", "dash"); -- m_value << "Dash_" << m_dashIndex-1; -- tmpStyleGraphicPropertiesElement->addAttribute("draw:stroke-dash", m_value.str()); -- m_value.str(""); -- } -- } -- else -- tmpStyleGraphicPropertiesElement->addAttribute("draw:stroke", "none"); -- -- if(m_brush.style == libwpg::WPGBrush::NoBrush) -- tmpStyleGraphicPropertiesElement->addAttribute("draw:fill", "none"); -- -- if(m_brush.style == libwpg::WPGBrush::Solid) -- { -- tmpStyleGraphicPropertiesElement->addAttribute("draw:fill", "solid"); -- m_value << "#" << colorToHex(m_brush.foreColor); -- tmpStyleGraphicPropertiesElement->addAttribute("draw:fill-color", m_value.str()); -- m_value.str(""); -- } -- -- if(m_brush.style == libwpg::WPGBrush::Gradient) -- { -- tmpStyleGraphicPropertiesElement->addAttribute("draw:fill", "gradient"); -- m_value << "Gradient_" << m_gradientIndex-1; -- tmpStyleGraphicPropertiesElement->addAttribute("draw:fill-gradient-name", m_value.str()); -- m_value.str(""); -- } -- -- mAutomaticStylesElements.push_back(static_cast<GraphicsElement *>(tmpStyleGraphicPropertiesElement)); -- mAutomaticStylesElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("style:graphic-properties"))); -- -- mAutomaticStylesElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("style:style"))); -- m_styleIndex++; --} -diff -Nur koffice-2.3.1/filters/karbon/wpg/import/OdgExporter.hxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/OdgExporter.hxx ---- koffice-2.3.1/filters/karbon/wpg/import/OdgExporter.hxx 2011-01-15 21:05:35.000000000 +0100 -+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/OdgExporter.hxx 1970-01-01 01:00:00.000000000 +0100 -@@ -1,116 +0,0 @@ --/* libwpg -- * Copyright (C) 2006 Ariya Hidayat (ariya@kde.org) -- * -- * This library is free software; you can redistribute it and/or -- * modify it under the terms of the GNU Library General Public -- * License as published by the Free Software Foundation; either -- * version 2 of the License, or (at your option) any later version. -- * -- * This library is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- * Library General Public License for more details. -- * -- * You should have received a copy of the GNU Library General Public -- * License along with this library; if not, write to the -- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -- * Boston, MA 02111-1301 USA -- * -- * For further information visit http://libwpg.sourceforge.net -- */ -- --/* "This product is not manufactured, approved, or supported by -- * Corel Corporation or Corel Corporation Limited." -- */ -- --#ifndef __ODGEXPORTER_H__ --#define __ODGEXPORTER_H__ -- --#include <iostream> --#include <sstream> --#include <string> -- --#include <libwpg/libwpg.h> --#include "GraphicsElement.hxx" -- --class OdgExporter : public libwpg::WPGPaintInterface { --public: -- explicit OdgExporter(GraphicsHandler *pHandler, -- const bool isFlatXML = false); -- ~OdgExporter(); -- --#if LIBWPG_VERSION_MINOR<2 -- void startGraphics(double imageWidth, double imageHeight); -- void endGraphics(); -- void startLayer(unsigned int id); -- void endLayer(unsigned int id); -- -- void setPen(const libwpg::WPGPen& pen); -- void setBrush(const libwpg::WPGBrush& brush); -- void setFillRule(FillRule rule); -- -- void drawRectangle(const libwpg::WPGRect& rect, double rx, double ry); -- void drawEllipse(const libwpg::WPGPoint& center, double rx, double ry); -- void drawPolygon(const libwpg::WPGPointArray& vertices); -- void drawPath(const libwpg::WPGPath& path); -- void drawBitmap(const libwpg::WPGBitmap& bitmap); -- void drawImageObject(const libwpg::WPGBinaryData& binaryData); -- --private: -- std::vector <GraphicsElement *> mBodyElements; -- std::vector <GraphicsElement *> mAutomaticStylesElements; -- std::vector <GraphicsElement *> mStrokeDashElements; -- std::vector <GraphicsElement *> mGradientElements; -- GraphicsHandler *mpHandler; -- -- libwpg::WPGPen m_pen; -- libwpg::WPGBrush m_brush; -- FillRule m_fillRule; -- int m_gradientIndex; -- int m_dashIndex; -- int m_styleIndex; -- void writeStyle(); -- std::ostringstream m_value, m_name; -- double m_width, m_height; -- const bool m_isFlatXML; --#else -- virtual void startGraphics(const ::WPXPropertyList &propList); -- virtual void endGraphics(); -- virtual void setStyle(const ::WPXPropertyList &propList, const ::WPXPropertyListVector &gradient); -- virtual void startLayer(const ::WPXPropertyList &propList); -- virtual void endLayer(); -- virtual void drawRectangle(const ::WPXPropertyList& propList); -- virtual void drawEllipse(const ::WPXPropertyList& propList); -- virtual void drawPolygon(const ::WPXPropertyListVector &vertices); -- virtual void drawPath(const ::WPXPropertyListVector &path); -- virtual void drawGraphicObject(const ::WPXPropertyList &propList, const ::WPXBinaryData &binaryData); -- virtual void startEmbeddedGraphics(const ::WPXPropertyList &propList); -- virtual void endEmbeddedGraphics(); -- virtual void drawPolyline(const ::WPXPropertyListVector &vertices); -- virtual void startTextObject(const ::WPXPropertyList &propList, const ::WPXPropertyListVector &path); -- virtual void endTextObject(); -- virtual void startTextLine(const ::WPXPropertyList &propList); -- virtual void endTextLine(); -- virtual void startTextSpan(const ::WPXPropertyList &propList); -- virtual void endTextSpan(); -- virtual void insertText(const ::WPXString &str); -- -- --private: -- std::vector <GraphicsElement *> mBodyElements; -- std::vector <GraphicsElement *> mAutomaticStylesElements; -- std::vector <GraphicsElement *> mStrokeDashElements; -- std::vector <GraphicsElement *> mGradientElements; -- GraphicsHandler *mpHandler; -- -- int m_gradientIndex; -- int m_dashIndex; -- int m_styleIndex; -- void writeStyle(); -- std::ostringstream m_value, m_name; -- double m_width, m_height; -- const bool m_isFlatXML; --#endif --}; -- --#endif // __ODGEXPORTER_H__ -diff -Nur koffice-2.3.1/filters/karbon/wpg/import/WPGImport.cpp koffice-2.3.1-libwpg02/filters/karbon/wpg/import/WPGImport.cpp ---- koffice-2.3.1/filters/karbon/wpg/import/WPGImport.cpp 2011-01-15 21:05:35.000000000 +0100 -+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/WPGImport.cpp 2011-01-02 17:46:15.000000000 +0100 -@@ -20,28 +20,26 @@ - #include <WPGImport.h> - #include <WPGImport.moc> - --#include <QBuffer> --#include <QByteArray> --#include <QString> -- --#include <kdebug.h> - #include <KoFilterChain.h> - #include <KoGlobal.h> - #include <KoUnit.h> -+#include <KoXmlWriter.h> -+ - #include <kpluginfactory.h> -+#include <KDebug> - --#include <KoXmlWriter.h> -+ -+#include <QtCore/QString> -+#include <QtCore/QFile> - - #include <libwpg/libwpg.h> - #if LIBWPG_VERSION_MINOR<2 - #include <libwpg/WPGStreamImplementation.h> - #else - #include <libwpd-stream/libwpd-stream.h> -+#include <libwpd/libwpd.h> - #endif - --#include "FileOutputHandler.hxx" --#include "OdgExporter.hxx" -- - #include <iostream> - - K_PLUGIN_FACTORY(WPGImportFactory, registerPlugin<WPGImport>();) -@@ -56,35 +54,13 @@ - { - } - --static QByteArray createManifest() --{ -- KoXmlWriter* manifestWriter; -- QByteArray manifestData; -- QBuffer manifestBuffer(&manifestData); -- -- manifestBuffer.open(QIODevice::WriteOnly); -- manifestWriter = new KoXmlWriter(&manifestBuffer); -- -- manifestWriter->startDocument("manifest:manifest"); -- manifestWriter->startElement("manifest:manifest"); -- manifestWriter->addAttribute("xmlns:manifest", "urn:oasis:names:tc:openoffice:xmlns:manifest:1.0"); -- manifestWriter->addManifestEntry("/", "application/vnd.oasis.opendocument.graphics"); -- //manifestWriter->addManifestEntry( "styles.xml", "text/xml" ); -- manifestWriter->addManifestEntry("content.xml", "text/xml"); -- manifestWriter->endElement(); -- manifestWriter->endDocument(); -- delete manifestWriter; -- -- return manifestData; --} -- - - KoFilter::ConversionStatus WPGImport::convert(const QByteArray& from, const QByteArray& to) - { - if (from != "application/x-wpg") - return KoFilter::NotImplemented; - -- if (to != "application/vnd.oasis.opendocument.graphics") -+ if (to != "image/svg+xml") - return KoFilter::NotImplemented; - - #if LIBWPG_VERSION_MINOR<2 -@@ -96,6 +72,7 @@ - input = olestream; - } - } -+ libwpg::WPGString output; - #else - WPXInputStream* input = new WPXFileStream(m_chain->inputFile().toLocal8Bit()); - if (input->isOLEStream()) { -@@ -105,59 +82,31 @@ - input = olestream; - } - } -+ ::WPXString output; - #endif - - if (!libwpg::WPGraphics::isSupported(input)) { -- std::cerr << "ERROR: Unsupported file format (unsupported version) or file is encrypted!" << std::endl; -+ kWarning() << "ERROR: Unsupported file format (unsupported version) or file is encrypted!"; - delete input; - return KoFilter::NotImplemented; - } - -- // do the conversion -- std::ostringstream tmpStringStream; -- FileOutputHandler tmpHandler(tmpStringStream); -- OdgExporter exporter(&tmpHandler); -- libwpg::WPGraphics::parse(input, &exporter); -- delete input; -- -- -- // create output store -- KoStore* storeout; -- storeout = KoStore::createStore(m_chain->outputFile(), KoStore::Write, -- "application/vnd.oasis.opendocument.graphics", KoStore::Zip); -- -- if (!storeout) { -- kWarning() << "Couldn't open the requested file."; -- return KoFilter::FileNotFound; -- } -- --#if 0 -- if (!storeout->open("styles.xml")) { -- kWarning() << "Couldn't open the file 'styles.xml'."; -- return KoFilter::CreationError; -+ if (!libwpg::WPGraphics::generateSVG(input, output)) { -+ kWarning() << "ERROR: SVG Generation failed!"; -+ delete input; -+ return KoFilter::ParsingError; - } -- //storeout->write( createStyles() ); -- storeout->close(); --#endif - -- if (!storeout->open("content.xml")) { -- kWarning() << "Couldn't open the file 'content.xml'."; -- return KoFilter::CreationError; -- } -- storeout->write(tmpStringStream.str().c_str()); -- storeout->close(); -+ delete input; - -- // store document manifest -- storeout->enterDirectory("META-INF"); -- if (!storeout->open("manifest.xml")) { -- kWarning() << "Couldn't open the file 'META-INF/manifest.xml'."; -- return KoFilter::CreationError; -+ QFile outputFile(m_chain->outputFile()); -+ if(!outputFile.open(QIODevice::WriteOnly | QIODevice::Text)) { -+ kWarning() << "ERROR: Could not open output file" << m_chain->outputFile(); -+ return KoFilter::InternalError; - } -- storeout->write(createManifest()); -- storeout->close(); - -- // we are done! -- delete storeout; -+ outputFile.write(output.cstr()); -+ outputFile.close(); - - return KoFilter::OK; - } - diff --git a/extra/koffice/koffice.install b/extra/koffice/koffice.install deleted file mode 100644 index 6c87527e2..000000000 --- a/extra/koffice/koffice.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/koffice/krita.install b/extra/koffice/krita.install deleted file mode 100644 index 5d458de55..000000000 --- a/extra/koffice/krita.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-mime-database usr/share/mime &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/koffice/qt48fix.patch b/extra/koffice/qt48fix.patch deleted file mode 100644 index de72926d5..000000000 --- a/extra/koffice/qt48fix.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- koffice-2.3.3/plugins/chartshape/kdchart/src/KDChartBackgroundAttributes.cpp 2011-02-17 13:10:38.000000000 +0100 -+++ koffice-2.3.3/plugins/chartshape/kdchart/src/KDChartBackgroundAttributes.cpp 2011-09-08 15:03:31.932039128 +0200 -@@ -150,7 +150,6 @@ QDebug operator<<(QDebug dbg, const KDCh - << "visible="<<ba.isVisible() - << "brush="<<ba.brush() - << "pixmapmode="<<ba.pixmapMode() -- << "pixmap="<<ba.pixmap() - << ")"; - return dbg; - } diff --git a/extra/ldns/Makefile.patch b/extra/ldns/Makefile.patch deleted file mode 100644 index d98291ac9..000000000 --- a/extra/ldns/Makefile.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- old/Makefile.in 2012-01-12 00:11:36.000000000 +1100 -+++ new/Makefile.in 2012-01-27 11:36:16.110154453 +1100 -@@ -130,7 +130,7 @@ - exit -1 ; \ - fi - drill/drill: $(DRILL_LOBJS) $(LIB) -- $(LINK_EXE) $(DRILL_LOBJS) $(LIBS) -lldns -o drill/drill -+ $(LINK_EXE) $(DRILL_LOBJS) $(LIBS) $(LIBSSL_LIBS) -lldns -o drill/drill - - install-drill: drill/drill - $(INSTALL) -m 755 -d $(DESTDIR)$(bindir) -@@ -157,7 +157,7 @@ - exit -1 ; \ - fi - $(EXAMPLE_PROGS): $(EXAMPLE_LOBJS) $(LIB) -- $(LINK_EXE) $@.lo $(LIBS) -lldns -o $@ -+ $(LINK_EXE) $@.lo $(LIBS) $(LIBSSL_LIBS) -lldns -o $@ - - $(TESTNS): $(TESTNS_LOBJS) $(LIB) - $(LINK_EXE) $(TESTNS_LOBJS) $(LIBS) -lldns -o $(TESTNS) diff --git a/extra/ldns/PKGBUILD b/extra/ldns/PKGBUILD deleted file mode 100644 index e228c5355..000000000 --- a/extra/ldns/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# $Id: PKGBUILD 156644 2012-04-22 07:34:09Z bisson $ -# Maintainer: Gaetan Bisson <bisson@archlinux.org> -# Contributor: mathieui <mathieui@mathieui.net> -# Contributor: jiribb <jiribb@gmail.com> - -pkgname=ldns -pkgver=1.6.12 -pkgrel=1 -pkgdesc='Fast DNS library supporting recent RFCs, including Drill and other tools' -url='http://www.nlnetlabs.nl/projects/ldns/' -license=('custom:BSD') -arch=('i686' 'x86_64') -options=('!libtool') -depends=('openssl') -makedepends=('libpcap') -optdepends=('libpcap: ldns-dpa tool') -source=("http://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 'Makefile.patch') -sha1sums=('1d61df0f666908551d5a62768f77d63e727810aa' - '01bce260e9639d9cd26109a689dddf2498e5026a') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - patch -p1 -i ../Makefile.patch - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --enable-static=no \ - --disable-rpath \ - --with-drill \ - --with-examples \ - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install - - install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/extra/libcanberra/PKGBUILD b/extra/libcanberra/PKGBUILD index 3d299bb4c..10183bdae 100644 --- a/extra/libcanberra/PKGBUILD +++ b/extra/libcanberra/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 157775 2012-04-29 10:03:21Z allan $ +# $Id: PKGBUILD 158131 2012-05-03 13:15:53Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=libcanberra pkgname=(libcanberra libcanberra-pulse libcanberra-gstreamer) pkgver=0.28 -pkgrel=3 +pkgrel=4 pkgdesc="A small and lightweight implementation of the XDG Sound Theme Specification" arch=(i686 x86_64 'mips64el') license=('LGPL') -depends=('libvorbis' 'libtool' 'alsa-lib' 'tdb') +depends=('libvorbis' 'libltdl' 'alsa-lib' 'tdb') makedepends=('gtk-doc' 'libpulse' 'gstreamer0.10' 'gtk2' 'gtk3') options=(!emptydirs) url=http://0pointer.de/lennart/projects/libcanberra diff --git a/extra/libkdcraw/PKGBUILD b/extra/libkdcraw/PKGBUILD index a4d210cd4..e720f6d65 100644 --- a/extra/libkdcraw/PKGBUILD +++ b/extra/libkdcraw/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 155547 2012-04-04 14:13:12Z andrea $ +# $Id: PKGBUILD 158385 2012-05-03 22:31:14Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkdcraw -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 pkgdesc="A C++ interface used to decode RAW picture" url="http://kde.org/" @@ -14,7 +14,7 @@ replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('38708f1b223740ae105295cdaa6ee372e31c43bc') +sha1sums=('99fc4a00fe77df18aca53a8bdd0cfca79cab6e8b') build() { cd "${srcdir}" diff --git a/extra/libkdeedu/PKGBUILD b/extra/libkdeedu/PKGBUILD index cf73d39c5..4dfd3b155 100644 --- a/extra/libkdeedu/PKGBUILD +++ b/extra/libkdeedu/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 155543 2012-04-04 14:13:04Z andrea $ +# $Id: PKGBUILD 158381 2012-05-03 22:31:08Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkdeedu -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 pkgdesc="Libraries used by KDE Education applications" url="http://kde.org/" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') install=${pkgname}.install replaces=('kdeedu-libkdeedu' 'kdeedu-data') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('7c2bebb2d29793a1cab949382c19d2420398bf08') +sha1sums=('6d7ce71dea0a4ee16cdec8cfaf3b6dbd64c3eaa0') build() { cd "${srcdir}" diff --git a/extra/libkexiv2/PKGBUILD b/extra/libkexiv2/PKGBUILD index ead6dce95..eee0323d4 100644 --- a/extra/libkexiv2/PKGBUILD +++ b/extra/libkexiv2/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 155549 2012-04-04 14:13:17Z andrea $ +# $Id: PKGBUILD 158387 2012-05-03 22:31:17Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkexiv2 -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 pkgdesc="A library to manipulate pictures metadata" url="http://kde.org/" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('fe32631401be655d4692fec724743d5f623b880d') +sha1sums=('6b7c6833479faa29916d3cc294a15f78c154c438') build() { cd "${srcdir}" diff --git a/extra/libkipi/PKGBUILD b/extra/libkipi/PKGBUILD index f8a29142f..80df81d79 100644 --- a/extra/libkipi/PKGBUILD +++ b/extra/libkipi/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkipi -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 pkgdesc="An interface to use kipi-plugins from a KDE application" url="http://kde.org/" @@ -14,7 +14,7 @@ replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('c2f788e05f5e6d52e10578ebd58a2b1dd8f65c89') +sha1sums=('1646eca0521524eabcc8c1c97d8d2f85ff181cac') build() { cd "${srcdir}" diff --git a/extra/libksane/PKGBUILD b/extra/libksane/PKGBUILD index d5cad5cfb..56bb02e97 100644 --- a/extra/libksane/PKGBUILD +++ b/extra/libksane/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 155553 2012-04-04 14:13:26Z andrea $ +# $Id: PKGBUILD 158391 2012-05-03 22:31:25Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libksane -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 pkgdesc="An image scanning library" url="http://kde.org/" @@ -14,7 +14,7 @@ replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('fe9376710687c2e9354bd5f8245755c53e2ad91c') +sha1sums=('ccacaec0d1a46689cdf5f5294f14b442d0f4317b') build() { cd "${srcdir}" diff --git a/extra/libmusicbrainz4/0001-Make-sure-gcc-4.7-can-find-usleep-declaration.patch b/extra/libmusicbrainz4/0001-Make-sure-gcc-4.7-can-find-usleep-declaration.patch deleted file mode 100644 index e1c099aae..000000000 --- a/extra/libmusicbrainz4/0001-Make-sure-gcc-4.7-can-find-usleep-declaration.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 64c68ad42a9089c92dfa4e74f55b6c1b65b8f11c Mon Sep 17 00:00:00 2001 -From: Christophe Fergeau <cfergeau@redhat.com> -Date: Sun, 4 Mar 2012 14:32:49 +0100 -Subject: [PATCH] Make sure gcc 4.7 can find usleep declaration - -Without this, compilation fails with: - -libmusicbrainz-4.0.0/src/Query.cc: In member function 'void MusicBrainz4::CQuery::WaitRequest() const': -libmusicbrainz-4.0.0/src/Query.cc:295:19: error: 'usleep' was not declared in this scope ---- - src/Query.cc | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -diff --git a/src/Query.cc b/src/Query.cc -index 5f5934f..9332346 100644 ---- a/src/Query.cc -+++ b/src/Query.cc -@@ -33,6 +33,7 @@ - - #include <string.h> - #include <sys/time.h> -+#include <unistd.h> - - #include <ne_uri.h> - --- -1.7.7.6 - diff --git a/extra/libreoffice/buildfix_boost.diff b/extra/libreoffice/buildfix_boost.diff deleted file mode 100644 index d8608d0d4..000000000 --- a/extra/libreoffice/buildfix_boost.diff +++ /dev/null @@ -1,40 +0,0 @@ -From bae4fdbd105142cd3f317445eddc826da529a732 Mon Sep 17 00:00:00 2001 -From: Caolán McNamara <caolanm@redhat.com> -Date: Tue, 05 Apr 2011 14:07:02 +0000 -Subject: silence some more of that annoying gcc#47679 - ---- -diff --git a/boost/boost.gcc47679.patch b/boost/boost.gcc47679.patch -index 1c804aa..9b33a5f 100644 ---- a/boost/boost.gcc47679.patch -+++ b/boost/boost.gcc47679.patch -@@ -36,3 +36,26 @@ - template <int MaxDigits> - inline bool allow_more_digits(std::size_t i) - { -+--- misc/boost_1_44_0/boost/optional/optional.hpp 2011-04-05 13:19:01.223587256 +0100 -++++ misc/build/boost_1_44_0/boost/optional/optional.hpp 2011-04-05 13:19:01.223587256 +0100 -+@@ -31,6 +31,8 @@ -+ -+ #include "boost/optional/optional_fwd.hpp" -+ -++#include <string.h> -++ -+ #if BOOST_WORKAROUND(BOOST_MSVC, == 1200) -+ // VC6.0 has the following bug: -+ // When a templated assignment operator exist, an implicit conversion -+@@ -114,6 +116,11 @@ -+ -+ public: -+ -++ aligned_storage() -++ { -++ memset(&dummy_, 0, sizeof(dummy_)); -++ } -++ -+ void const* address() const { return &dummy_.data[0]; } -+ void * address() { return &dummy_.data[0]; } -+ } ; --- -cgit v0.8.3-6-g21f6 - diff --git a/extra/libreoffice/buildfix_ct2n.diff b/extra/libreoffice/buildfix_ct2n.diff deleted file mode 100644 index 979587f79..000000000 --- a/extra/libreoffice/buildfix_ct2n.diff +++ /dev/null @@ -1,17 +0,0 @@ -From 90de903b28cb1884042be0eae3f8a55458c5bc29 Mon Sep 17 00:00:00 2001 -From: Caolán McNamara <caolanm@redhat.com> -Date: Tue, 12 Apr 2011 19:35:51 +0000 -Subject: duplicate NULLs - ---- -diff --git a/ct2n/prj/build.lst b/ct2n/prj/build.lst -index 91f44b7..714d926 100644 ---- a/ct2n/prj/build.lst -+++ b/ct2n/prj/build.lst -@@ -1,3 +1,3 @@ --ct2n ct2n : solenv NULL NULL -+ct2n ct2n : solenv NULL - ct2n ct2n usr1 - all ct2n_mkout NULL - ct2n ct2n nmake - all ct2n_ct2n NULL --- -cgit v0.8.3-6-g21f6 diff --git a/extra/libreoffice/gcc462_buildfix.diff b/extra/libreoffice/gcc462_buildfix.diff deleted file mode 100644 index c19e520dc..000000000 --- a/extra/libreoffice/gcc462_buildfix.diff +++ /dev/null @@ -1,138 +0,0 @@ ---- ./framework/source/accelerators/acceleratorcache.cxx.orig 2011-12-15 15:08:41.329168423 -0200 -+++ ./framework/source/accelerators/acceleratorcache.cxx 2011-12-15 15:17:59.473190664 -0200 -@@ -61,7 +61,7 @@ AcceleratorCache::AcceleratorCache() - AcceleratorCache::AcceleratorCache(const AcceleratorCache& rCopy) - : ThreadHelpBase(&Application::GetSolarMutex()) - { -- m_lCommand2Keys = rCopy.m_lCommand2Keys; -+ m_lCommand2Keys = const_cast< framework::BaseHash<comphelper::SequenceAsVector<com::sun::star::awt::KeyEvent> >& > (rCopy.m_lCommand2Keys); - m_lKey2Commands = rCopy.m_lKey2Commands; - } - -@@ -78,7 +78,7 @@ void AcceleratorCache::takeOver(const Ac - // SAFE -> ---------------------------------- - WriteGuard aWriteLock(m_aLock); - -- m_lCommand2Keys = rCopy.m_lCommand2Keys; -+ m_lCommand2Keys = const_cast< framework::BaseHash<comphelper::SequenceAsVector<com::sun::star::awt::KeyEvent> >& > (rCopy.m_lCommand2Keys); - m_lKey2Commands = rCopy.m_lKey2Commands; - - aWriteLock.unlock(); ---- ./framework/source/loadenv/loadenv.cxx.orig 2011-12-15 15:08:15.771487938 -0200 -+++ ./framework/source/loadenv/loadenv.cxx 2011-12-15 15:19:06.038358483 -0200 -@@ -255,7 +255,8 @@ void LoadEnv::initializeLoading(const :: - // take over all new parameters. - m_xTargetFrame.clear(); - m_xBaseFrame = xBaseFrame ; -- m_lMediaDescriptor = impl_mergeMediaDescriptorWithMightExistingModelArgs(lMediaDescriptor); -+ ::comphelper::MediaDescriptor tmp = impl_mergeMediaDescriptorWithMightExistingModelArgs(lMediaDescriptor); -+ m_lMediaDescriptor = tmp; - m_sTarget = sTarget ; - m_nSearchFlags = nSearchFlags ; - m_eFeature = eFeature ; ---- ./framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx.orig 2011-12-15 15:08:49.033072112 -0200 -+++ ./framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx 2011-12-15 15:11:07.209344668 -0200 -@@ -175,6 +175,15 @@ namespace framework - sal_Int16 nElementType; - UIElementDataHashMap aElementsHashMap; - com::sun::star::uno::Reference< com::sun::star::embed::XStorage > xStorage; -+ UIElementType& operator=(const UIElementType& rRight) { -+ bModified = rRight.bModified; -+ bLoaded = rRight.bLoaded; -+ bDefaultLayer = rRight.bDefaultLayer; -+ nElementType = rRight.nElementType; -+ aElementsHashMap = rRight.aElementsHashMap; -+ xStorage = rRight.xStorage; -+ return *this; -+ }; - }; - - typedef ::std::vector< UIElementType > UIElementTypesVector; ---- ./framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx.orig 2011-12-19 11:10:56.000000000 +0000 -+++ ./framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx 2011-12-19 11:12:06.000000000 +0000 -@@ -185,6 +185,15 @@ namespace framework - sal_Int16 nElementType; - UIElementDataHashMap aElementsHashMap; - com::sun::star::uno::Reference< com::sun::star::embed::XStorage > xStorage; -+ UIElementType& operator=(const UIElementType& rRight) { -+ bModified = rRight.bModified; -+ bLoaded = rRight.bLoaded; -+ bDefaultLayer = rRight.bDefaultLayer; -+ nElementType = rRight.nElementType; -+ aElementsHashMap = rRight.aElementsHashMap; -+ xStorage = rRight.xStorage; -+ return *this; -+ }; - }; - - typedef ::std::vector< UIElementType > UIElementTypesVector; ---- ./framework/inc/uiconfiguration/uiconfigurationmanager.hxx.orig 2011-12-19 11:14:17.000000000 +0000 -+++ ./framework/inc/uiconfiguration/uiconfigurationmanager.hxx 2011-12-19 11:15:16.000000000 +0000 -@@ -171,6 +171,15 @@ namespace framework - sal_Int16 nElementType; - UIElementDataHashMap aElementsHashMap; - com::sun::star::uno::Reference< com::sun::star::embed::XStorage > xStorage; -+ UIElementType& operator=(const UIElementType& rRight) { -+ bModified = rRight.bModified; -+ bLoaded = rRight.bLoaded; -+ bDefaultLayer = rRight.bDefaultLayer; -+ nElementType = rRight.nElementType; -+ aElementsHashMap = rRight.aElementsHashMap; -+ xStorage = rRight.xStorage; -+ return *this; -+ }; - }; - - typedef ::std::vector< UIElementType > UIElementTypesVector; - ---- ./padmin/source/prtsetup.cxx.orig 2011-12-15 15:09:05.133870823 -0200 -+++ ./padmin/source/prtsetup.cxx 2011-12-15 15:13:55.626239170 -0200 -@@ -813,7 +813,7 @@ extern "C" { - - if( aDialog.Execute() ) - { -- rJobData = aDialog.getSetup(); -+ rJobData = const_cast< ::psp::PrinterInfo & > ( aDialog.getSetup() ); - nRet = 1; - } - ---- ./sfx2/source/doc/guisaveas.cxx.orig 2011-12-15 15:08:58.332955848 -0200 -+++ ./sfx2/source/doc/guisaveas.cxx 2011-12-15 15:12:39.953185212 -0200 -@@ -731,7 +731,7 @@ sal_Int8 ModelData_Impl::CheckFilter( co - if ( aFilterName.getLength() ) - m_pOwner->GetFilterConfiguration()->getByName( aFilterName ) >>= aFilterProps; - -- aFiltPropsHM = ::comphelper::SequenceAsHashMap( aFilterProps ); -+ aFiltPropsHM << aFilterProps; - nFiltFlags = aFiltPropsHM.getUnpackedValueOrDefault( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Flags")), (sal_Int32)0 ); - } - ---- ./framework/inc/classes/filtercachedata.hxx.orig 2011-12-17 13:14:22.102898902 +0000 -+++ ./framework/inc/classes/filtercachedata.hxx 2011-12-17 13:17:51.524424012 +0000 -@@ -230,7 +230,7 @@ - { - bPreferred = rCopy.bPreferred ; - sName = rCopy.sName ; -- lUINames = rCopy.lUINames ; -+ lUINames = const_cast < framework::BaseHash<rtl::OUString>& > (rCopy.lUINames); - sMediaType = rCopy.sMediaType ; - sClipboardFormat = rCopy.sClipboardFormat; - nDocumentIconID = rCopy.nDocumentIconID ; -@@ -298,7 +298,7 @@ - nOrder = rCopy.nOrder ; - sName = rCopy.sName ; - sType = rCopy.sType ; -- lUINames = rCopy.lUINames ; -+ lUINames = const_cast < framework::BaseHash<rtl::OUString>& > (rCopy.lUINames); - sDocumentService = rCopy.sDocumentService ; - sFilterService = rCopy.sFilterService ; - sUIComponent = rCopy.sUIComponent ; -@@ -405,7 +405,7 @@ - inline Loader& impl_copy( const Loader& rCopy ) - { - sName = rCopy.sName ; -- lUINames = rCopy.lUINames ; -+ lUINames = const_cast < framework::BaseHash<rtl::OUString>& > (rCopy.lUINames); - lTypes = rCopy.lTypes ; - return (*this); - } diff --git a/extra/libreoffice/scp2-more-reasonable-file-access-rights.diff b/extra/libreoffice/scp2-more-reasonable-file-access-rights.diff deleted file mode 100644 index fd61cb4ca..000000000 --- a/extra/libreoffice/scp2-more-reasonable-file-access-rights.diff +++ /dev/null @@ -1,15 +0,0 @@ ---- scp2/inc/macros.inc.old 2011-05-18 17:51:47.000000000 +0200 -+++ scp2/inc/macros.inc 2011-07-18 19:58:27.000000000 +0200 -@@ -92,10 +92,10 @@ - #endif - - #define BIN_FILE_BODY \ -- UnixRights = 555 -+ UnixRights = 755 - - #define TXT_FILE_BODY \ -- UnixRights = 444 -+ UnixRights = 644 - - #define USER_FILE_BODY \ - UnixRights = 644 diff --git a/extra/libreoffice/vbahelper.visibility.patch b/extra/libreoffice/vbahelper.visibility.patch deleted file mode 100644 index 5739100d0..000000000 --- a/extra/libreoffice/vbahelper.visibility.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- vbahelper/inc/vbahelper/vbacollectionimpl.hxx 2011-01-28 20:27:51.507604173 +0000 -+++ vbahelper/inc/vbahelper/vbacollectionimpl.hxx 2011-01-28 20:28:26.230045727 +0000 -@@ -238,7 +238,7 @@ - - // including a HelperInterface implementation - template< typename Ifc1 > --class ScVbaCollectionBase : public InheritedHelperInterfaceImpl< Ifc1 > -+class VBAHELPER_DLLPUBLIC ScVbaCollectionBase : public InheritedHelperInterfaceImpl< Ifc1 > - { - typedef InheritedHelperInterfaceImpl< Ifc1 > BaseColBase; - protected: ---- sc/Library_vbaobj.mk -+++ sc/Library_vbaobj.mk -@@ -118,7 +118,6 @@ $(eval $(call gb_Library_add_exception_objects,vbaobj,\ - sc/source/ui/vba/vbaquerytable \ - sc/source/ui/vba/vbarange \ - sc/source/ui/vba/vbasheetobject \ -- sc/source/ui/vba/vbasheetobjects \ - sc/source/ui/vba/vbastyle \ - sc/source/ui/vba/vbastyles \ - sc/source/ui/vba/vbatextboxshape \ -@@ -133,6 +132,11 @@ $(eval $(call gb_Library_add_exception_objects,vbaobj,\ - sc/source/ui/vba/vbawsfunction \ - )) - -+$(eval $(call gb_Library_add_cxxobjects,vbaobj,\ -+ sc/source/ui/vba/vbasheetobjects \ -+ , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \ -+)) -+ - ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD, $(OS))) - $(eval $(call gb_Library_set_ldflags,vbaobj,\ - $$(LDFLAGS) \ diff --git a/extra/libwebkit/libwebkit.install b/extra/libwebkit/libwebkit.install deleted file mode 100644 index 24072f316..000000000 --- a/extra/libwebkit/libwebkit.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/libxfce4menu/PKGBUILD b/extra/libxfce4menu/PKGBUILD deleted file mode 100644 index a397d90f0..000000000 --- a/extra/libxfce4menu/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 149268 2012-02-06 17:05:53Z foutrelis $ -# Maintainer: tobias <tobias funnychar archlinux.org> - -pkgname=libxfce4menu -pkgver=4.6.2 -pkgrel=2 -pkgdesc="A freedesktop.org compliant menu implementation for Xfce" -arch=('i686' 'x86_64' 'mips64el') -license=('GPL2') -url="http://www.xfce.org/" -depends=("libxfce4util>=4.6.2") -makedepends=('pkgconfig' 'intltool' 'gtk2') -options=('!libtool') -source=(http://archive.xfce.org/src/xfce/${pkgname}/4.6/${pkgname}-${pkgver}.tar.bz2) -md5sums=('ff10cacb76803ee37159e3a43345f0d1') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib \ - --localstatedir=/var \ - --disable-static - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install -} diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index b5ed6b412..f750a0926 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 157806 2012-04-29 18:29:57Z giovanni $ +# $Id: PKGBUILD 158337 2012-05-03 18:12:02Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Gilles CHAUVIN <gcnweb@gmail.com> pkgname=live-media -pkgver=2012.04.27 +pkgver=2012.05.03 pkgrel=1 pkgdesc="A set of C++ libraries for multimedia streaming" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ license=('LGPL') url="http://live555.com/liveMedia" depends=('gcc-libs') source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz") -md5sums=('463acc2cab4640544d120af933fde9f1') +md5sums=('333ea9577af0871474646720113fef31') build() { cd ${srcdir}/live diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD index 9a51493bd..23ae7bacf 100644 --- a/extra/mercurial/PKGBUILD +++ b/extra/mercurial/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 155397 2012-04-03 11:09:44Z giovanni $ +# $Id: PKGBUILD 158285 2012-05-03 15:12:33Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=mercurial -pkgver=2.1.2 +pkgver=2.2 pkgrel=1 pkgdesc="A scalable distributed SCM tool" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ optdepends=('tk: for the hgk GUI') backup=('etc/mercurial/hgrc') source=("http://mercurial.selenic.com/release/${pkgname}-${pkgver}.tar.gz" 'mercurial.profile') -md5sums=('15354d739504ec46f68a0fee2ecfbf25' +md5sums=('e52ab7ab35105c768a4cd1658de0e1a5' '43e1d36564d4c7fbe9a091d3ea370a44') package() { diff --git a/extra/openjpeg/openjpeg-1.4-autoconf.patch b/extra/openjpeg/openjpeg-1.4-autoconf.patch deleted file mode 100644 index 988b72b7d..000000000 --- a/extra/openjpeg/openjpeg-1.4-autoconf.patch +++ /dev/null @@ -1,78 +0,0 @@ -diff -up openjpeg_v1_4_sources_r697/doc/Makefile.am.autoconf_DESTDIR openjpeg_v1_4_sources_r697/doc/Makefile.am ---- openjpeg_v1_4_sources_r697/doc/Makefile.am.autoconf_DESTDIR 2011-01-02 12:14:47.000000000 -0600 -+++ openjpeg_v1_4_sources_r697/doc/Makefile.am 2011-01-12 12:12:20.959518549 -0600 -@@ -20,30 +20,30 @@ all-local: - @cp man/man3/* . - - install-data-hook: -- $(INSTALL) -d $(doc_dir) -- $(INSTALL) -d ${mandir}/man1 ${mandir}/man3 -+ $(INSTALL) -d $(DESTDIR)$(doc_dir) -+ $(INSTALL) -d $(DESTDIR)${mandir}/man1 $(DESTDIR)${mandir}/man3 - if with_libjpwl -- @(cd ${mandir}/man1 && $(RM) JPWL_image_to_j2k* JPWL_j2k_to_image*) -- @(cd ${mandir}/man3 && $(RM) JPWL_libopenjpeg* ) -+ @(cd $(DESTDIR)${mandir}/man1 && $(RM) JPWL_image_to_j2k* JPWL_j2k_to_image*) -+ @(cd $(DESTDIR)${mandir}/man3 && $(RM) JPWL_libopenjpeg* ) - endif -- @(cd ${mandir}/man1 && $(RM) image_to_j2k* j2k_to_image* j2k_dump* ) -- @(cd ${mandir}/man3 && $(RM) libopenjpeg* ) -+ @(cd $(DESTDIR)${mandir}/man1 && $(RM) image_to_j2k* j2k_to_image* j2k_dump* ) -+ @(cd $(DESTDIR)${mandir}/man3 && $(RM) libopenjpeg* ) - @gzip -f image_to_j2k.1 j2k_to_image.1 j2k_dump.1 libopenjpeg.3 -- @cp image_to_j2k.1.gz j2k_to_image.1.gz j2k_dump.1.gz ${mandir}/man1 -- @cp libopenjpeg.3.gz ${mandir}/man3 -+ @cp image_to_j2k.1.gz j2k_to_image.1.gz j2k_dump.1.gz $(DESTDIR)${mandir}/man1 -+ @cp libopenjpeg.3.gz $(DESTDIR)${mandir}/man3 - @$(RM) *\.gz - if with_libjpwl -- @(cd ${mandir}/man1 && \ -+ @(cd $(DESTDIR)${mandir}/man1 && \ - $(LN_S) image_to_j2k.1.gz JPWL_image_to_j2k.1.gz && \ - $(LN_S) j2k_to_image.1.gz JPWL_j2k_to_image.1.gz) - @(cd ${mandir}/man3 && $(LN_S) libopenjpeg.3.gz JPWL_libopenjpeg.3.gz) - endif -- @$(INSTALL) -m 644 ../LICENSE ../CHANGES $(doc_dir) -+ @$(INSTALL) -m 644 ../LICENSE ../CHANGES $(DESTDIR)$(doc_dir) - - uninstall-hook: -- @(cd ${mandir}/man1 && $(RM) JPWL_image_to_j2k* JPWL_j2k_to_image* && \ -+ @(cd $(DESTDIR)${mandir}/man1 && $(RM) JPWL_image_to_j2k* JPWL_j2k_to_image* && \ - $(RM) image_to_j2k* j2k_to_image* j2k_dump* ) -- @(cd ${mandir}/man3 && $(RM) JPWL_libopenjpeg* && \ -+ @(cd $(DESTDIR)${mandir}/man3 && $(RM) JPWL_libopenjpeg* && \ - $(RM) libopenjpeg* ) -- @(cd $(doc_dir) && $(RM) * ) -- @rmdir $(doc_dir) -+ @(cd $(DESTDIR)$(doc_dir) && $(RM) * ) -+ @rmdir $(DESTDIR)$(doc_dir) -diff -up openjpeg_v1_4_sources_r697/Makefile.am.autoconf_DESTDIR openjpeg_v1_4_sources_r697/Makefile.am ---- openjpeg_v1_4_sources_r697/Makefile.am.autoconf_DESTDIR 2011-01-02 12:14:55.000000000 -0600 -+++ openjpeg_v1_4_sources_r697/Makefile.am 2011-01-12 12:15:37.006321242 -0600 -@@ -9,7 +9,7 @@ clean-local: - - distclean-local: clean-local - --pkgconf_dir = /usr/lib/pkgconfig -+pkgconf_dir = $(libdir)/pkgconfig - - install-data-hook: - @echo "" -@@ -17,12 +17,12 @@ install-data-hook: - cat $$f/.report.txt ; \ - done - @echo "" -- @echo "Installing: libopenjpeg1.pc $(pkgconf_dir)" -+ @echo "Installing: libopenjpeg1.pc $(DESTDIR)$(pkgconf_dir)" - @echo "" -- @$(INSTALL) -d $(pkgconf_dir) -- @cp libopenjpeg.pc $(pkgconf_dir)/libopenjpeg1.pc -- @(cd $(pkgconf_dir) && $(RM) libopenjpeg.pc && \ -+ @$(INSTALL) -d $(DESTDIR)$(pkgconf_dir) -+ @cp libopenjpeg.pc $(DESTDIR)$(pkgconf_dir)/libopenjpeg1.pc -+ @(cd $(DESTDIR)$(pkgconf_dir) && $(RM) libopenjpeg.pc && \ - $(LN_S) libopenjpeg1.pc libopenjpeg.pc) - - uninstall-hook: -- @(cd $(pkgconf_dir) && $(RM) libopenjpeg.pc libopenjpeg1.pc) -+ @(cd $(DESTDIR)$(pkgconf_dir) && $(RM) libopenjpeg.pc libopenjpeg1.pc) diff --git a/extra/openmpi/PKGBUILD b/extra/openmpi/PKGBUILD index 0f000c42c..4f5a2ca29 100644 --- a/extra/openmpi/PKGBUILD +++ b/extra/openmpi/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 155500 2012-04-04 11:28:36Z stephane $ +# $Id: PKGBUILD 158183 2012-05-03 13:22:34Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> pkgname=openmpi pkgver=1.5.5 -pkgrel=2 +pkgrel=3 pkgdesc="High performance message passing library (MPI)" arch=('i686' 'x86_64' 'mips64el') url="http://www.open-mpi.org" license=('custom') -depends=('gcc' 'gcc-fortran' 'openssh' 'libtool' 'hwloc') +depends=('gcc' 'gcc-fortran' 'openssh' 'libltdl' 'hwloc') [ "$CARCH" = "mips64el" ] || depends+=('valgrind') makedepends=('inetutils') options=(!libtool) @@ -27,6 +27,9 @@ build() { # Fix fakeroot problem (FS#28644) patch -Np1 -i ../openmpi-1.5.4-fix-fakeroot-execution.patch + + # Make sure we use the system ltdl librariry rather than the ones in the tarball + rm -r opal/libltdl ./configure --prefix=/usr \ --sysconfdir=/etc/${pkgname} \ @@ -41,7 +44,7 @@ build() { --enable-pretty-print-stacktrace \ --without-slurm \ --with-hwloc=/usr \ - --with-libltdl=/usr \ + --with-libltdl=/usr \ FC=/usr/bin/gfortran \ LDFLAGS="$LDFLAGS -Wl,-z,noexecstack" @@ -55,7 +58,7 @@ package() { # FS#28583 install -d -m 755 "${pkgdir}"/usr/lib/pkgconfig for i in ompi-c.pc ompi-cxx.pc ompi-f77.pc ompi-f90.pc ompi.pc; do - ln -sf /usr/lib/openmpi/pkgconfig/$i "${pkgdir}"/usr/lib/pkgconfig/ + ln -sf /usr/lib/openmpi/pkgconfig/${i} "${pkgdir}"/usr/lib/pkgconfig/ done # Openmpi's otfinfo conflicts with the one from texlive diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD index 3e1eb0d52..32068ea90 100644 --- a/extra/php/PKGBUILD +++ b/extra/php/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 157229 2012-04-26 10:12:29Z pierre $ +# $Id: PKGBUILD 158338 2012-05-03 18:28:53Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgbase=php @@ -21,7 +21,7 @@ pkgname=('php' 'php-sqlite' 'php-tidy' 'php-xsl') -pkgver=5.3.11 +pkgver=5.3.12 _suhosinver=5.3.9-0.9.10 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') @@ -36,7 +36,7 @@ source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2" "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz.sig" 'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch' 'logrotate.d.php-fpm' 'suhosin.patch') -md5sums=('94709f6e7c920cbe26e19fa991d9975d' +md5sums=('cf02c29be279c506cbd4ffc2819d7c82' 'c099b3d7eac95018ababd41ded7f3066' 'c15d18f846be1d69144a5d0056ee6506' 'ffc338e8ce2a990f6f2a486355bbab65' diff --git a/extra/php/pcre_info.patch b/extra/php/pcre_info.patch deleted file mode 100644 index e6d10df06..000000000 --- a/extra/php/pcre_info.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- php-5.3.10/ext/pcre/php_pcre.c 2012-01-01 14:15:04.000000000 +0100 -+++ php-5.3.10/ext/pcre/php_pcre.c 2012-02-06 13:31:36.198935107 +0100 -@@ -241,6 +241,7 @@ - char *pattern; - int do_study = 0; - int poptions = 0; -+ int count = 0; - unsigned const char *tables = NULL; - #if HAVE_SETLOCALE - char *locale = setlocale(LC_CTYPE, NULL); -@@ -252,10 +252,10 @@ - back the compiled pattern, otherwise go on and compile it. */ - if (zend_hash_find(&PCRE_G(pcre_cache), regex, regex_len+1, (void **)&pce) == SUCCESS) { - /* -- * We use a quick pcre_info() check to see whether cache is corrupted, and if it -+ * We use a quick pcre_fullinfo() check to see whether cache is corrupted, and if it - * is, we flush it and compile the pattern from scratch. - */ -- if (pcre_info(pce->re, NULL, NULL) == PCRE_ERROR_BADMAGIC) { -+ if (pcre_fullinfo(pce->re, NULL, PCRE_INFO_CAPTURECOUNT, &count) == PCRE_ERROR_BADMAGIC) { - zend_hash_clean(&PCRE_G(pcre_cache)); - } else { - #if HAVE_SETLOCALE ---- php-5.3.10/ext/pcre/php_pcre.def 2009-01-11 14:59:00.000000000 +0100 -+++ php-5.3.10/ext/pcre/php_pcre.def 2012-02-06 13:31:47.775299315 +0100 -@@ -4,7 +4,6 @@ - php_pcre_exec - php_pcre_get_substring - php_pcre_get_substring_list --php_pcre_info - php_pcre_maketables - php_pcre_study - php_pcre_version ---- php-5.3.10/main/php_compat.h 2012-01-01 14:15:04.000000000 +0100 -+++ php-5.3.10/main/php_compat.h 2012-02-06 13:26:59.272834580 +0100 -@@ -34,7 +34,6 @@ - #define pcre_exec php_pcre_exec - #define pcre_get_substring php_pcre_get_substring - #define pcre_get_substring_list php_pcre_get_substring_list --#define pcre_info php_pcre_info - #define pcre_maketables php_pcre_maketables - #define pcre_study php_pcre_study - #define pcre_version php_pcre_version diff --git a/extra/pidgin/port-to-farstream-v2.patch b/extra/pidgin/port-to-farstream-v2.patch deleted file mode 100644 index 49ae60906..000000000 --- a/extra/pidgin/port-to-farstream-v2.patch +++ /dev/null @@ -1,447 +0,0 @@ -diff -upr pidgin-2.10.1.orig/configure.ac pidgin-2.10.1/configure.ac ---- pidgin-2.10.1.orig/configure.ac 2011-12-06 10:44:32.000000000 +0200 -+++ pidgin-2.10.1/configure.ac 2012-03-10 18:21:12.000000000 +0200 -@@ -780,18 +780,18 @@ else - fi - - dnl ####################################################################### --dnl # Check for Farsight -+dnl # Check for Farstream - dnl ####################################################################### --AC_ARG_ENABLE(farsight, -- [AC_HELP_STRING([--disable-farsight], [compile without farsight support])], -- enable_farsight="$enableval", enable_farsight="yes") --if test "x$enable_farsight" != "xno"; then -- PKG_CHECK_MODULES(FARSIGHT, [farsight2-0.10 >= 0.0.9], [ -- AC_DEFINE(USE_FARSIGHT, 1, [Use Farsight for voice and video]) -- AC_SUBST(FARSIGHT_CFLAGS) -- AC_SUBST(FARSIGHT_LIBS) -+AC_ARG_ENABLE(farstream, -+ [AC_HELP_STRING([--disable-farstream], [compile without farstream support])], -+ enable_farstream="$enableval", enable_farstream="yes") -+if test "x$enable_farstream" != "xno"; then -+ PKG_CHECK_MODULES(FARSTREAM, [farstream-0.1], [ -+ AC_DEFINE(USE_FARSTREAM, 1, [Use Farstream for voice and video]) -+ AC_SUBST(FARSTREAM_CFLAGS) -+ AC_SUBST(FARSTREAM_LIBS) - ], [ -- enable_farsight="no" -+ enable_farstream="no" - ]) - fi - -@@ -802,20 +802,20 @@ AC_ARG_ENABLE(vv, - [AC_HELP_STRING([--disable-vv], [compile without voice and video support])], - enable_vv="$enableval", enable_vv="yes") - if test "x$enable_vv" != "xno"; then -- if test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farsight" != "xno"; then -+ if test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farstream" != "xno"; then - AC_DEFINE(USE_VV, 1, [Use voice and video]) - else - enable_vv="no" - if test "x$force_deps" = "xyes"; then - AC_MSG_ERROR([ - Dependencies for voice/video were not met. --Install the necessary gstreamer and farsight packages first. -+Install the necessary gstreamer and farstream packages first. - Or use --disable-vv if you do not need voice/video support. - ]) - fi - fi - fi --AM_CONDITIONAL(USE_VV, test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farsight" != "xno") -+AM_CONDITIONAL(USE_VV, test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farstream" != "xno") - - dnl ####################################################################### - dnl # Check for Internationalized Domain Name support -diff -upr pidgin-2.10.1.orig/libpurple/Makefile.am pidgin-2.10.1/libpurple/Makefile.am ---- pidgin-2.10.1.orig/libpurple/Makefile.am 2011-12-06 10:44:33.000000000 +0200 -+++ pidgin-2.10.1/libpurple/Makefile.am 2012-03-10 18:21:19.000000000 +0200 -@@ -306,7 +306,7 @@ libpurple_la_LIBADD = \ - $(LIBXML_LIBS) \ - $(NETWORKMANAGER_LIBS) \ - $(INTLLIBS) \ -- $(FARSIGHT_LIBS) \ -+ $(FARSTREAM_LIBS) \ - $(GSTREAMER_LIBS) \ - $(GSTINTERFACES_LIBS) \ - $(IDN_LIBS) \ -@@ -322,7 +322,7 @@ AM_CPPFLAGS = \ - $(DEBUG_CFLAGS) \ - $(DBUS_CFLAGS) \ - $(LIBXML_CFLAGS) \ -- $(FARSIGHT_CFLAGS) \ -+ $(FARSTREAM_CFLAGS) \ - $(GSTREAMER_CFLAGS) \ - $(GSTINTERFACES_CFLAGS) \ - $(IDN_CFLAGS) \ -diff -upr pidgin-2.10.1.orig/libpurple/media/backend-fs2.c pidgin-2.10.1/libpurple/media/backend-fs2.c ---- pidgin-2.10.1.orig/libpurple/media/backend-fs2.c 2011-12-06 10:44:33.000000000 +0200 -+++ pidgin-2.10.1/libpurple/media/backend-fs2.c 2012-03-10 18:21:19.000000000 +0200 -@@ -1,5 +1,5 @@ - /** -- * @file backend-fs2.c Farsight 2 backend for media API -+ * @file backend-fs2.c Farstream backend for media API - * @ingroup core - */ - -@@ -34,8 +34,9 @@ - #include "network.h" - #include "media-gst.h" - --#include <gst/farsight/fs-conference-iface.h> --#include <gst/farsight/fs-element-added-notifier.h> -+#include <farstream/fs-conference.h> -+#include <farstream/fs-element-added-notifier.h> -+#include <farstream/fs-utils.h> - - /** @copydoc _PurpleMediaBackendFs2Class */ - typedef struct _PurpleMediaBackendFs2Class PurpleMediaBackendFs2Class; -@@ -112,6 +113,8 @@ struct _PurpleMediaBackendFs2Stream - gchar *participant; - FsStream *stream; - -+ gboolean supports_add; -+ - GstElement *src; - GstElement *tee; - GstElement *volume; -@@ -147,6 +150,8 @@ struct _PurpleMediaBackendFs2Private - FsConference *conference; - gchar *conference_type; - -+ FsElementAddedNotifier *notifier; -+ - GHashTable *sessions; - GHashTable *participants; - -@@ -212,6 +217,11 @@ purple_media_backend_fs2_dispose(GObject - - purple_debug_info("backend-fs2", "purple_media_backend_fs2_dispose\n"); - -+ if (priv->notifier) { -+ g_object_unref(priv->notifier); -+ priv->notifier = NULL; -+ } -+ - if (priv->confbin) { - GstElement *pipeline; - -@@ -846,7 +856,7 @@ gst_handle_message_element(GstBus *bus, - priv->conference != FS_CONFERENCE(src)) - return; - -- if (gst_structure_has_name(msg->structure, "farsight-error")) { -+ if (gst_structure_has_name(msg->structure, "farstream-error")) { - FsError error_no; - gst_structure_get_enum(msg->structure, "error-no", - FS_TYPE_ERROR, (gint*)&error_no); -@@ -867,16 +877,9 @@ gst_handle_message_element(GstBus *bus, - " strict.")); - purple_media_end(priv->media, NULL, NULL); - break; -- case FS_ERROR_UNKNOWN_CNAME: -- /* -- * Unknown CName is only a problem for the -- * multicast transmitter which isn't used. -- * It is also deprecated. -- */ -- break; - default: - purple_debug_error("backend-fs2", -- "farsight-error: %i: %s\n", -+ "farstream-error: %i: %s\n", - error_no, - gst_structure_get_string( - msg->structure, "error-msg")); -@@ -885,11 +888,11 @@ gst_handle_message_element(GstBus *bus, - - if (FS_ERROR_IS_FATAL(error_no)) { - purple_media_error(priv->media, _("A non-recoverable " -- "Farsight2 error has occurred.")); -+ "Farstream error has occurred.")); - purple_media_end(priv->media, NULL, NULL); - } - } else if (gst_structure_has_name(msg->structure, -- "farsight-new-local-candidate")) { -+ "farstream-new-local-candidate")) { - const GValue *value; - FsStream *stream; - FsCandidate *local_candidate; -@@ -924,7 +927,7 @@ gst_handle_message_element(GstBus *bus, - session->id, name, candidate); - g_object_unref(candidate); - } else if (gst_structure_has_name(msg->structure, -- "farsight-local-candidates-prepared")) { -+ "farstream-local-candidates-prepared")) { - const GValue *value; - FsStream *stream; - FsParticipant *participant; -@@ -942,7 +945,7 @@ gst_handle_message_element(GstBus *bus, - g_signal_emit_by_name(self, "candidates-prepared", - session->id, name); - } else if (gst_structure_has_name(msg->structure, -- "farsight-new-active-candidate-pair")) { -+ "farstream-new-active-candidate-pair")) { - const GValue *value; - FsStream *stream; - FsCandidate *local_candidate; -@@ -976,7 +979,7 @@ gst_handle_message_element(GstBus *bus, - g_object_unref(lcandidate); - g_object_unref(rcandidate); - } else if (gst_structure_has_name(msg->structure, -- "farsight-recv-codecs-changed")) { -+ "farstream-recv-codecs-changed")) { - const GValue *value; - GList *codecs; - FsCodec *codec; -@@ -986,10 +989,10 @@ gst_handle_message_element(GstBus *bus, - codec = codecs->data; - - purple_debug_info("backend-fs2", -- "farsight-recv-codecs-changed: %s\n", -+ "farstream-recv-codecs-changed: %s\n", - codec->encoding_name); - } else if (gst_structure_has_name(msg->structure, -- "farsight-component-state-changed")) { -+ "farstream-component-state-changed")) { - const GValue *value; - FsStreamState fsstate; - guint component; -@@ -1025,11 +1028,11 @@ gst_handle_message_element(GstBus *bus, - } - - purple_debug_info("backend-fs2", -- "farsight-component-state-changed: " -+ "farstream-component-state-changed: " - "component: %u state: %s\n", - component, state); - } else if (gst_structure_has_name(msg->structure, -- "farsight-send-codec-changed")) { -+ "farstream-send-codec-changed")) { - const GValue *value; - FsCodec *codec; - gchar *codec_str; -@@ -1039,12 +1042,12 @@ gst_handle_message_element(GstBus *bus, - codec_str = fs_codec_to_string(codec); - - purple_debug_info("backend-fs2", -- "farsight-send-codec-changed: codec: %s\n", -+ "farstream-send-codec-changed: codec: %s\n", - codec_str); - - g_free(codec_str); - } else if (gst_structure_has_name(msg->structure, -- "farsight-codecs-changed")) { -+ "farstream-codecs-changed")) { - const GValue *value; - FsSession *fssession; - GList *sessions; -@@ -1220,8 +1223,12 @@ stream_info_cb(PurpleMedia *media, Purpl - purple_media_is_initiator(media, sid, name)) - return; - -- fs_stream_set_remote_candidates(stream->stream, -- stream->remote_candidates, &err); -+ if (stream->supports_add) -+ fs_stream_add_remote_candidates(stream->stream, -+ stream->remote_candidates, &err); -+ else -+ fs_stream_force_remote_candidates(stream->stream, -+ stream->remote_candidates, &err); - - if (err == NULL) - return; -@@ -1301,6 +1308,7 @@ init_conference(PurpleMediaBackendFs2 *s - GstElement *pipeline; - GstBus *bus; - gchar *name; -+ GKeyFile *default_props; - - priv->conference = FS_CONFERENCE( - gst_element_factory_make(priv->conference_type, NULL)); -@@ -1343,6 +1351,14 @@ init_conference(PurpleMediaBackendFs2 *s - return FALSE; - } - -+ default_props = fs_utils_get_default_element_properties(GST_ELEMENT(priv->conference)); -+ if (default_props != NULL) { -+ priv->notifier = fs_element_added_notifier_new(); -+ fs_element_added_notifier_add(priv->notifier, -+ GST_BIN(priv->confbin)); -+ fs_element_added_notifier_set_properties_from_keyfile(priv->notifier, default_props); -+ } -+ - g_signal_connect(G_OBJECT(bus), "message", - G_CALLBACK(gst_bus_cb), self); - gst_object_unref(bus); -@@ -1559,7 +1575,7 @@ create_session(PurpleMediaBackendFs2 *se - * receiving the src-pad-added signal. - * Only works for non-multicast FsRtpSessions. - */ -- if (is_nice || !strcmp(transmitter, "rawudp")) -+ if (!!strcmp(transmitter, "multicast")) - g_object_set(G_OBJECT(session->session), - "no-rtcp-timeout", 0, NULL); - -@@ -1612,7 +1628,7 @@ create_participant(PurpleMediaBackendFs2 - GError *err = NULL; - - participant = fs_conference_new_participant( -- priv->conference, name, &err); -+ priv->conference, &err); - - if (err) { - purple_debug_error("backend-fs2", -@@ -1622,6 +1638,12 @@ create_participant(PurpleMediaBackendFs2 - return FALSE; - } - -+ if (g_object_class_find_property(G_OBJECT_GET_CLASS(participant), -+ "cname")) { -+ g_object_set(participant, "cname", &name, NULL); -+ } -+ -+ - if (!priv->participants) { - purple_debug_info("backend-fs2", - "Creating hash table for participants\n"); -@@ -1786,6 +1808,40 @@ create_stream(PurpleMediaBackendFs2 *sel - } - } - -+ -+ session = get_session(self, sess_id); -+ -+ if (session == NULL) { -+ purple_debug_error("backend-fs2", -+ "Couldn't find session to create stream.\n"); -+ return FALSE; -+ } -+ -+ participant = get_participant(self, who); -+ -+ if (participant == NULL) { -+ purple_debug_error("backend-fs2", "Couldn't find " -+ "participant to create stream.\n"); -+ return FALSE; -+ } -+ -+ fsstream = fs_session_new_stream(session->session, participant, -+ initiator == TRUE ? type_direction : -+ (type_direction & FS_DIRECTION_RECV), &err); -+ -+ if (fsstream == NULL) { -+ if (err) { -+ purple_debug_error("backend-fs2", -+ "Error creating stream: %s\n", -+ err && err->message ? -+ err->message : "NULL"); -+ g_error_free(err); -+ } else -+ purple_debug_error("backend-fs2", -+ "Error creating stream\n"); -+ return FALSE; -+ } -+ - memcpy(_params, params, sizeof(GParameter) * num_params); - - /* set the controlling mode parameter */ -@@ -1840,45 +1896,22 @@ create_stream(PurpleMediaBackendFs2 *sel - _num_params++; - } - -- session = get_session(self, sess_id); - -- if (session == NULL) { -- purple_debug_error("backend-fs2", -- "Couldn't find session to create stream.\n"); -- return FALSE; -- } -- -- participant = get_participant(self, who); -- -- if (participant == NULL) { -- purple_debug_error("backend-fs2", "Couldn't find " -- "participant to create stream.\n"); -- return FALSE; -+ if(!fs_stream_set_transmitter(fsstream, transmitter, -+ _params, _num_params, &err)) { -+ purple_debug_error("backend-fs2", "Could not set transmitter %s: %s.\n", transmitter, err->message); -+ g_clear_error(&err); -+ g_free(_params); -+ return FALSE; - } -- -- fsstream = fs_session_new_stream(session->session, participant, -- initiator == TRUE ? type_direction : -- (type_direction & FS_DIRECTION_RECV), transmitter, -- _num_params, _params, &err); - g_free(_params); - -- if (fsstream == NULL) { -- if (err) { -- purple_debug_error("backend-fs2", -- "Error creating stream: %s\n", -- err && err->message ? -- err->message : "NULL"); -- g_error_free(err); -- } else -- purple_debug_error("backend-fs2", -- "Error creating stream\n"); -- return FALSE; -- } - - stream = g_new0(PurpleMediaBackendFs2Stream, 1); - stream->participant = g_strdup(who); - stream->session = session; - stream->stream = fsstream; -+ stream->supports_add = !strcmp(transmitter, "nice"); - - priv->streams = g_list_append(priv->streams, stream); - -@@ -1991,7 +2024,11 @@ purple_media_backend_fs2_add_remote_cand - if (purple_media_is_initiator(priv->media, sess_id, participant) || - purple_media_accepted( - priv->media, sess_id, participant)) { -- fs_stream_set_remote_candidates(stream->stream, -+ if (stream->supports_add) -+ fs_stream_add_remote_candidates(stream->stream, -+ stream->remote_candidates, &err); -+ else -+ fs_stream_force_remote_candidates(stream->stream, - stream->remote_candidates, &err); - - if (err) { -diff -upr pidgin-2.10.1.orig/libpurple/media.c pidgin-2.10.1/libpurple/media.c ---- pidgin-2.10.1.orig/libpurple/media.c 2011-12-06 10:44:33.000000000 +0200 -+++ pidgin-2.10.1/libpurple/media.c 2012-03-10 18:21:19.000000000 +0200 -@@ -1067,7 +1067,6 @@ purple_media_add_stream(PurpleMedia *med - { - #ifdef USE_VV - PurpleMediaSession *session; -- PurpleMediaStream *stream = NULL; - - g_return_val_if_fail(PURPLE_IS_MEDIA(media), FALSE); - -@@ -1103,7 +1102,7 @@ purple_media_add_stream(PurpleMedia *med - } - - if (purple_media_get_stream(media, sess_id, who) == NULL) { -- stream = purple_media_insert_stream(session, who, initiator); -+ purple_media_insert_stream(session, who, initiator); - - g_signal_emit(media, purple_media_signals[STATE_CHANGED], - 0, PURPLE_MEDIA_STATE_NEW, -diff -upr pidgin-2.10.1.orig/libpurple/mediamanager.c pidgin-2.10.1/libpurple/mediamanager.c ---- pidgin-2.10.1.orig/libpurple/mediamanager.c 2011-12-06 10:44:33.000000000 +0200 -+++ pidgin-2.10.1/libpurple/mediamanager.c 2012-03-10 18:27:05.000000000 +0200 -@@ -39,7 +39,7 @@ - #ifdef USE_VV - #include <media/backend-fs2.h> - --#include <gst/farsight/fs-element-added-notifier.h> -+#include <farstream/fs-element-added-notifier.h> - #include <gst/interfaces/xoverlay.h> - - /** @copydoc _PurpleMediaManagerPrivate */ diff --git a/extra/python/gdbm-magic-values.patch b/extra/python/gdbm-magic-values.patch deleted file mode 100644 index e8ce828cf..000000000 --- a/extra/python/gdbm-magic-values.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up Python-3.2.2/Lib/dbm/__init__.py.gdbm-1.9-magic Python-3.2.2/Lib/dbm/__init__.py ---- Python-3.2.2/Lib/dbm/__init__.py.gdbm-1.9-magic 2011-09-03 12:16:40.000000000 -0400 -+++ Python-3.2.2/Lib/dbm/__init__.py 2011-09-30 15:47:27.488863694 -0400 -@@ -166,7 +166,7 @@ def whichdb(filename): - return "" - - # Check for GNU dbm -- if magic == 0x13579ace: -+ if magic in (0x13579ace, 0x13579acd, 0x13579acf): - return "dbm.gnu" - - # Later versions of Berkeley db hash file have a 12-byte pad in -diff -up Python-3.2.2/Misc/NEWS.gdbm-1.9-magic Python-3.2.2/Misc/NEWS diff --git a/extra/qtscriptgenerator/gcc44.patch b/extra/qtscriptgenerator/gcc44.patch deleted file mode 100644 index dbb423e5d..000000000 --- a/extra/qtscriptgenerator/gcc44.patch +++ /dev/null @@ -1,15 +0,0 @@ -# Patch from upstream bug tracker: -# http://code.google.com/p/qtscriptgenerator/issues/detail?id=37 -# So far (2009-06-12) this has not been applied at upstream git repo - -diff -uNr generator.orig/parser/rpp/pp.h generator/parser/rpp/pp.h ---- generator.orig/parser/rpp/pp.h 2008-12-05 11:01:44.000000000 +0100 -+++ generator/parser/rpp/pp.h 2008-12-13 10:42:22.000000000 +0100 -@@ -30,6 +30,7 @@ - #include <cctype> - - #include <fcntl.h> -+#include <cstdio> - - #ifdef HAVE_MMAP - # include <sys/mman.h> diff --git a/extra/qtscriptgenerator/qt48.patch b/extra/qtscriptgenerator/qt48.patch deleted file mode 100644 index f397b5ab1..000000000 --- a/extra/qtscriptgenerator/qt48.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up qtscriptgenerator-src-0.1.0/generator/typesystem_gui-common.xml.no_QFileOpenEvent qtscriptgenerator-src-0.1.0/generator/typesystem_gui-common.xml ---- qtscriptgenerator-src-0.1.0/generator/typesystem_gui-common.xml.no_QFileOpenEvent 2011-12-22 11:34:52.615149619 -0600 -+++ qtscriptgenerator-src-0.1.0/generator/typesystem_gui-common.xml 2011-12-22 11:35:31.808659632 -0600 -@@ -2233,7 +2233,6 @@ - - - </object-type> -- <object-type name="QFileOpenEvent" polymorphic-id-expression="%1->type() == QEvent::FileOpen"/> - <object-type name="QFocusEvent" polymorphic-id-expression="%1->type() == QEvent::FocusIn || %1->type() == QEvent::FocusOut"> - <modify-function signature="reason()const"> - <remove/> -diff -up qtscriptgenerator-src-0.1.0/generator/typesystem_gui.xml.no_QFileOpenEvent qtscriptgenerator-src-0.1.0/generator/typesystem_gui.xml ---- qtscriptgenerator-src-0.1.0/generator/typesystem_gui.xml.no_QFileOpenEvent 2009-02-20 05:42:24.000000000 -0600 -+++ qtscriptgenerator-src-0.1.0/generator/typesystem_gui.xml 2011-12-22 11:33:43.058019203 -0600 -@@ -2555,7 +2555,6 @@ - - - </object-type> -- <object-type name="QFileOpenEvent" polymorphic-id-expression="%1->type() == QEvent::FileOpen"/> - <object-type name="QFocusEvent" polymorphic-id-expression="%1->type() == QEvent::FocusIn || %1->type() == QEvent::FocusOut"> - <modify-function signature="reason()const"> - <remove/> diff --git a/extra/sox/sox-14.3.2-ffmpeg.patch b/extra/sox/sox-14.3.2-ffmpeg.patch deleted file mode 100644 index 5289b9b47..000000000 --- a/extra/sox/sox-14.3.2-ffmpeg.patch +++ /dev/null @@ -1,40 +0,0 @@ -Index: sox-14.3.2/src/ffmpeg.c -=================================================================== ---- sox-14.3.2.orig/src/ffmpeg.c -+++ sox-14.3.2/src/ffmpeg.c -@@ -91,7 +91,7 @@ static int stream_component_open(priv_t - - if (!codec || avcodec_open(enc, codec) < 0) - return -1; -- if (enc->codec_type != CODEC_TYPE_AUDIO) { -+ if (enc->codec_type != AVMEDIA_TYPE_AUDIO) { - lsx_fail("ffmpeg CODEC %x is not an audio CODEC", enc->codec_type); - return -1; - } -@@ -182,7 +182,7 @@ static int startread(sox_format_t * ft) - /* Find audio stream (FIXME: allow different stream to be selected) */ - for (i = 0; (unsigned)i < ffmpeg->ctxt->nb_streams; i++) { - AVCodecContext *enc = ffmpeg->ctxt->streams[i]->codec; -- if (enc->codec_type == CODEC_TYPE_AUDIO && ffmpeg->audio_index < 0) { -+ if (enc->codec_type == AVMEDIA_TYPE_AUDIO && ffmpeg->audio_index < 0) { - ffmpeg->audio_index = i; - break; - } -@@ -273,7 +273,7 @@ static AVStream *add_audio_stream(sox_fo - - c = st->codec; - c->codec_id = codec_id; -- c->codec_type = CODEC_TYPE_AUDIO; -+ c->codec_type = AVMEDIA_TYPE_AUDIO; - - /* put sample parameters */ - c->bit_rate = 256000; /* FIXME: allow specification */ -@@ -423,7 +423,7 @@ static size_t write_samples(sox_format_t - av_init_packet(&pkt); - pkt.size = avcodec_encode_audio(c, ffmpeg->audio_buf_aligned, AVCODEC_MAX_AUDIO_FRAME_SIZE, ffmpeg->samples); - pkt.pts = av_rescale_q(c->coded_frame->pts, c->time_base, ffmpeg->audio_st->time_base); -- pkt.flags |= PKT_FLAG_KEY; -+ pkt.flags |= AV_PKT_FLAG_KEY; - pkt.stream_index = ffmpeg->audio_st->index; - pkt.data = ffmpeg->audio_buf_aligned; - diff --git a/extra/strace/PKGBUILD b/extra/strace/PKGBUILD index 3ccdc693e..094abadd2 100644 --- a/extra/strace/PKGBUILD +++ b/extra/strace/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 143986 2011-12-01 15:13:39Z giovanni $ +# $Id: PKGBUILD 158298 2012-05-03 15:18:30Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=strace -pkgver=4.6 -pkgrel=2 +pkgver=4.7 +pkgrel=1 pkgdesc="A useful diagnositic, instructional, and debugging tool" arch=('i686' 'x86_64' 'mips64el') url="http://sourceforge.net/projects/strace/" license=('custom') depends=('perl') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-$pkgver.tar.xz") -md5sums=('e537b2b1afeec70c0e6e27a0d0fd671e') +md5sums=('6054c3880a00c6703f83b57f15e04642') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/systemd/cpp-compat.patch b/extra/systemd/cpp-compat.patch deleted file mode 100644 index 346c353bc..000000000 --- a/extra/systemd/cpp-compat.patch +++ /dev/null @@ -1,19 +0,0 @@ -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/extra/telepathy-butterfly/0001-bugfix-remove-bad-import-from-im-module.patch b/extra/telepathy-butterfly/0001-bugfix-remove-bad-import-from-im-module.patch deleted file mode 100644 index 6580dcc7f..000000000 --- a/extra/telepathy-butterfly/0001-bugfix-remove-bad-import-from-im-module.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 501b46c364c5608d1b3b84dd48fe57abcabd4aea Mon Sep 17 00:00:00 2001 -From: Ionut Biru <ibiru@archlinux.org> -Date: Mon, 6 Dec 2010 04:22:45 -0800 -Subject: [PATCH] bugfix: remove bad import from im module - -Signed-off-by: Ionut Biru <ibiru@archlinux.org> ---- - butterfly/channel/im.py | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -diff --git a/butterfly/channel/im.py b/butterfly/channel/im.py -index 1781234..ac8dd44 100644 ---- a/butterfly/channel/im.py -+++ b/butterfly/channel/im.py -@@ -30,8 +30,6 @@ import papyon.event - - from butterfly.channel.text import ButterflyTextChannel - --from butterfly.Channel_Interface_Conference import CHANNEL_INTERFACE_CONFERENCE -- - __all__ = ['ButterflyImChannel'] - - logger = logging.getLogger('Butterfly.ImChannel') --- -1.7.3.2 - diff --git a/extra/telepathy-butterfly/PKGBUILD b/extra/telepathy-butterfly/PKGBUILD deleted file mode 100644 index 4285483d0..000000000 --- a/extra/telepathy-butterfly/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 150850 2012-02-23 12:45:25Z ibiru $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> -# Contributor: Daniel Balieiro <daniel@balieiro.com> -pkgname=telepathy-butterfly -pkgver=0.5.15 -pkgrel=2 -pkgdesc="A MSN connection manager for Telepathy" -arch=('i686' 'x86_64' 'mips64el') -url="http://telepathy.freedesktop.org" -groups=('telepathy') -license=('GPL') -depends=('papyon>=0.5.4' 'python-telepathy>=0.15.19') -source=(http://telepathy.freedesktop.org/releases/telepathy-butterfly/telepathy-butterfly-${pkgver}.tar.gz - 0001-bugfix-remove-bad-import-from-im-module.patch) -install=telepathy-butterfly.install -md5sums=('4baa6337822f01d817c4b9d8fd406e82' - '08417a06a0e4a1875f1baf4b910cdcf4') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/0001-bugfix-remove-bad-import-from-im-module.patch" - ./configure --prefix=/usr --libexecdir=/usr/lib/telepathy - make - make DESTDIR="${pkgdir}" install - - sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \ - "${pkgdir}/usr/lib/telepathy/telepathy-butterfly" -} diff --git a/extra/telepathy-butterfly/telepathy-butterfly.install b/extra/telepathy-butterfly/telepathy-butterfly.install deleted file mode 100644 index 87d7838b8..000000000 --- a/extra/telepathy-butterfly/telepathy-butterfly.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - killall -HUP dbus-daemon 2>&1 -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} - -# vim:set ts=2 sw=2 et: diff --git a/extra/telepathy-farsight/PKGBUILD b/extra/telepathy-farsight/PKGBUILD deleted file mode 100644 index b72920f75..000000000 --- a/extra/telepathy-farsight/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 128060 2011-06-21 14:52:50Z ibiru $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> -# Contributor: Ju Liu <liuju86 at gmail dot com> -# Contributor: Denis Zawada <deno@rootnode.net> -pkgname=telepathy-farsight -pkgver=0.0.19 -pkgrel=1 -pkgdesc="A telepathy-backend to use stream engine." -arch=('i686' 'x86_64' 'mips64el') -url="http://telepathy.freedesktop.org" -license=('GPL') -depends=('telepathy-glib' 'farsight2') -makedepends=('libxslt' 'python2') -options=('!libtool') -source=(http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('6bacc22aaec00823f3bbce8517600ec3') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr \ - --libexecdir=/usr/lib/telepathy \ - --enable-static=no - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/extra/telepathy-kde-presence-dataengine/PKGBUILD b/extra/telepathy-kde-presence-dataengine/PKGBUILD deleted file mode 100644 index 26fc89caa..000000000 --- a/extra/telepathy-kde-presence-dataengine/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 143571 2011-11-26 14:00:36Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Laurent Carlier <lordheavym@gmail.com> - -pkgname=telepathy-kde-presence-dataengine -pkgver=0.2.0 -pkgrel=1 -pkgdesc="Plasma dataengine for managing Telepathy account presence" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.kde.org" -license=('GPL') -depends=('kdebase-workspace' 'telepathy-qt4') -makedepends=('cmake' 'automoc4') -groups=('telepathy-kde') -source=("http://download.kde.org/unstable/telepathy-kde/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('87f8c65baf35410e65ca9b7cb016210f2b13f72d') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/extra/telepathy-qt4/PKGBUILD b/extra/telepathy-qt4/PKGBUILD deleted file mode 100644 index 047c970fd..000000000 --- a/extra/telepathy-qt4/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 142995 2011-11-20 09:11:34Z ibiru $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> -# Contributor: Andrea Scarpino <andrea@archlinux.org> - -pkgname=telepathy-qt4 -pkgver=0.8.0 -pkgrel=1 -pkgdesc="A library for Qt-based Telepathy clients" -arch=('i686' 'x86_64' 'mips64el') -url="http://telepathy.freedesktop.org/wiki/" -license=('LGPL') -options=('!libtool') -depends=('qt' 'telepathy-farsight') -makedepends=('libxslt' 'python2' 'cmake' 'doxygen') -source=("http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('b93f03f063d784855d83e1b3c79a1cc5') - -build() { - cd "$srcdir" - mkdir build - cd build - cmake ../$pkgname-$pkgver \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "$srcdir"/build - make DESTDIR="$pkgdir" install -} diff --git a/extra/thunar/fix-crash-8168.patch b/extra/thunar/fix-crash-8168.patch deleted file mode 100644 index 4300c81c6..000000000 --- a/extra/thunar/fix-crash-8168.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 71f6f207cfd0194a3f3db83cb5fab694a5036e22 Mon Sep 17 00:00:00 2001 -From: Jannis Pohlmann <jannis@xfce.org> -Date: Sun, 26 Feb 2012 17:38:50 +0000 -Subject: Fix crash when removing an ancestor of the current folder (bug #8168). - -Whenever we release the GFileMonitor of a ThunarFolder, we also need to -disconnect from its signals. Otherwise one of the signal handlers might -still be called, potentially with corrupted user data (which was the -case here). ---- -diff --git a/thunar/thunar-folder.c b/thunar/thunar-folder.c -index 62015fe..4076b8d 100644 ---- a/thunar/thunar-folder.c -+++ b/thunar/thunar-folder.c -@@ -236,6 +236,7 @@ thunar_folder_finalize (GObject *object) - /* disconnect from the file alteration monitor */ - if (G_LIKELY (folder->monitor != NULL)) - { -+ g_signal_handlers_disconnect_matched (folder->monitor, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, folder); - g_file_monitor_cancel (folder->monitor); - g_object_unref (folder->monitor); - } -@@ -705,6 +706,7 @@ thunar_folder_reload (ThunarFolder *folder) - /* disconnect from the file alteration monitor */ - if (G_UNLIKELY (folder->monitor != NULL)) - { -+ g_signal_handlers_disconnect_matched (folder->monitor, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, folder); - g_file_monitor_cancel (folder->monitor); - g_object_unref (folder->monitor); - folder->monitor = NULL; --- -cgit v0.9.0.2 diff --git a/extra/thunar/fix-launching-multiple-files-7456.patch b/extra/thunar/fix-launching-multiple-files-7456.patch deleted file mode 100644 index 40d581553..000000000 --- a/extra/thunar/fix-launching-multiple-files-7456.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 379b8b9f350cb362735eb0e2a0e9471a898f2664 Mon Sep 17 00:00:00 2001 -From: John Lindgren <john.lindgren@aol.com> -Date: Sun, 26 Feb 2012 18:52:24 +0000 -Subject: Fix handling %U when launching multiple files with an app (bug #7456). - -GIO returns a newly allocated GAppInfo every time -g_app_info_get_default_for_type() is called. This means that if we use a -GHashTable and g_direct_hash() to associate GAppInfos with files to be -launched with each of them, we will actually end up with multiple -GAppInfos that are the same, and each of them will only have a single -file associated. - -To fix this, we now use a fake hash function that causes GHashTable to -always search the GAppInfo in the collision list. ---- -diff --git a/thunar/thunar-launcher.c b/thunar/thunar-launcher.c -index f479cf9..9f96b87 100644 ---- a/thunar/thunar-launcher.c -+++ b/thunar/thunar-launcher.c -@@ -546,17 +546,28 @@ thunar_launcher_execute_files (ThunarLauncher *launcher, - - - -+static guint -+thunar_launcher_g_app_info_hash (gconstpointer app_info) -+{ -+ return 0; -+} -+ -+ -+ - static void - thunar_launcher_open_files (ThunarLauncher *launcher, - GList *files) - { -- GAppInfo *app_info; - GHashTable *applications; -+ GAppInfo *app_info; - GList *file_list; - GList *lp; - -- /* allocate a hash table to associate applications to URIs */ -- applications = g_hash_table_new_full (g_direct_hash, -+ /* allocate a hash table to associate applications to URIs. since GIO allocates -+ * new GAppInfo objects every time, g_direct_hash does not work. we therefor use -+ * a fake hash function to always hit the collision list of the hash table and -+ * avoid storing multiple equal GAppInfos by means of g_app_info_equal(). */ -+ applications = g_hash_table_new_full (thunar_launcher_g_app_info_hash, - (GEqualFunc) g_app_info_equal, - (GDestroyNotify) g_object_unref, - (GDestroyNotify) thunar_g_file_list_free); --- -cgit v0.9.0.2 diff --git a/extra/thunar/fix-segfault-on-rename.patch b/extra/thunar/fix-segfault-on-rename.patch deleted file mode 100644 index b64a91e08..000000000 --- a/extra/thunar/fix-segfault-on-rename.patch +++ /dev/null @@ -1,27 +0,0 @@ -From fb7e7a602473fe2f11c78baacacaad1aea8c9dc6 Mon Sep 17 00:00:00 2001 -From: Nick Schermer <nick@xfce.org> -Date: Wed, 30 Nov 2011 17:45:57 +0000 -Subject: Fix segfault when plugin returns a NULL suffix. - -(cherry picked from commit 6f813ba48553e5b95a83bfa8463b20b8ee4607c4) ---- -diff --git a/thunar/thunar-renamer-model.c b/thunar/thunar-renamer-model.c -index 1aa7b77..91a47e1 100644 ---- a/thunar/thunar-renamer-model.c -+++ b/thunar/thunar-renamer-model.c -@@ -823,10 +823,9 @@ thunar_renamer_model_process_item (ThunarRenamerModel *renamer_model, - /* determine the new suffix */ - suffix = thunarx_renamer_process (renamer_model->renamer, THUNARX_FILE_INFO (item->file), dot + 1, idx); - -- /* generate the new file name */ -- name = g_new (gchar, (dot - display_name) + 1 + strlen (suffix) + 1); -- memcpy (name, display_name, (dot - display_name) + 1); -- memcpy (name + (dot - display_name) + 1, suffix, strlen (suffix) + 1); -+ prefix = g_strndup (display_name, (dot - display_name) + 1); -+ name = g_strconcat (prefix, suffix, NULL); -+ g_free (prefix); - - /* release the suffix */ - g_free (suffix); --- -cgit v0.9.0.2 diff --git a/extra/thunar/fix-sorting-of-large-numbers-5356.patch b/extra/thunar/fix-sorting-of-large-numbers-5356.patch deleted file mode 100644 index 1105eea83..000000000 --- a/extra/thunar/fix-sorting-of-large-numbers-5356.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 493db02bdbc6ec667cd04e75a77dff8366ec1bc0 Mon Sep 17 00:00:00 2001 -From: Eric Koegel <eric.koegel@gmail.com> -Date: Sun, 06 Nov 2011 13:58:33 +0000 -Subject: Fix sorting of filenames with large numbers (bug #5356). - -Change compare_by_name_using_number() to use guint64. - -Signed-off-by: Jannis Pohlmann <jannis@xfce.org> ---- -diff --git a/thunar/thunar-file.c b/thunar/thunar-file.c -index 909da25..44cdb31 100644 ---- a/thunar/thunar-file.c -+++ b/thunar/thunar-file.c -@@ -3168,12 +3168,12 @@ static gint - compare_by_name_using_number (const gchar *ap, - const gchar *bp) - { -- guint anum; -- guint bnum; -+ guint64 anum; -+ guint64 bnum; - - /* determine the numbers in ap and bp */ -- anum = strtoul (ap, NULL, 10); -- bnum = strtoul (bp, NULL, 10); -+ anum = strtouq (ap, NULL, 10); -+ bnum = strtouq (bp, NULL, 10); - - /* compare the numbers */ - if (anum < bnum) --- -cgit v0.9.0.2 diff --git a/extra/transmission/0001-gtk-conf-set-correct-download-dir-default.patch b/extra/transmission/0001-gtk-conf-set-correct-download-dir-default.patch deleted file mode 100644 index 3b0a38400..000000000 --- a/extra/transmission/0001-gtk-conf-set-correct-download-dir-default.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 4028320ba2e8c181292e02171d83ebf6ce3aee5a Mon Sep 17 00:00:00 2001 -From: Felipe Contreras <felipe.contreras@gmail.com> -Date: Thu, 29 Dec 2011 03:28:27 +0200 -Subject: [PATCH] gtk: conf: set correct download dir default - -Otherwise people might get: -ERROR:open-dialog.c:285:gtr_torrent_options_dialog_new: code should not be reached - -It was fixed at some point in ticket #1873, but somebody broket it -again. - -Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> ---- - gtk/conf.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -diff --git a/gtk/conf.c b/gtk/conf.c -index 623b839..6ad6ca2 100644 ---- a/gtk/conf.c -+++ b/gtk/conf.c -@@ -108,7 +108,6 @@ tr_prefs_init_defaults( tr_benc * d ) - tr_bencDictAddInt( d, PREF_KEY_MAIN_WINDOW_X, 50 ); - tr_bencDictAddInt( d, PREF_KEY_MAIN_WINDOW_Y, 50 ); - -- str = g_get_user_special_dir( G_USER_DIRECTORY_DOWNLOAD ); - tr_bencDictAddStr( d, TR_PREFS_KEY_DOWNLOAD_DIR, str ); - - tr_bencDictAddStr( d, PREF_KEY_SORT_MODE, "sort-by-name" ); --- -1.7.8.1 - diff --git a/extra/xf86-video-s3virge/copyright.patch b/extra/xf86-video-s3virge/copyright.patch deleted file mode 100644 index ba988c6d6..000000000 --- a/extra/xf86-video-s3virge/copyright.patch +++ /dev/null @@ -1,82 +0,0 @@ -From c26da404906258951341c4c4ace793f2dfdc47f8 Mon Sep 17 00:00:00 2001 -From: Gaetan Nadon <memsize@videotron.ca> -Date: Sun, 13 Jun 2010 14:26:32 +0000 -Subject: COPYING: update file with Copyright notices from source code. - -Signed-off-by: Gaetan Nadon <memsize@videotron.ca> ---- -diff --git a/COPYING b/COPYING -index 7f33cbf..727ca51 100644 ---- a/COPYING -+++ b/COPYING -@@ -1,12 +1,60 @@ --This is a stub file. This package has not yet had its complete licensing --information compiled. Please see the individual source files for details on --your rights to use and modify this software. -+Copyright (C) 1994-2000 The XFree86 Project, Inc. All Rights Reserved. - --Please submit updated COPYING files to the Xorg bugzilla: -+Permission is hereby granted, free of charge, to any person obtaining a copy of -+this software and associated documentation files (the "Software"), to deal in -+the Software without restriction, including without limitation the rights to -+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies -+of the Software, and to permit persons to whom the Software is furnished to do -+so, subject to the following conditions: - --https://bugs.freedesktop.org/enter_bug.cgi?product=xorg -+The above copyright notice and this permission notice shall be included in all -+copies or substantial portions of the Software. - --All licensing questions regarding this software should be directed at the --Xorg mailing list: -+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT- -+NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+ -+Except as contained in this notice, the name of the XFree86 Project shall not -+be used in advertising or otherwise to promote the sale, use or other dealings -+in this Software without prior written authorization from the XFree86 Project. -+ -+Written by Jake Richter Copyright (c) 1989, 1990 Panacea Inc., Londonderry, -+NH - All Rights Reserved -+ -+This code may be freely incorporated in any program without royalty, as long -+as the copyright notice stays intact. -+ -+Additions by Kevin E. Martin (martin@cs.unc.edu) -+ -+KEVIN E. MARTIN DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -+EVENT SHALL KEVIN E. MARTIN BE LIABLE FOR ANY SPECIAL, INDIRECT OR -+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING 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 SOFTWARE. -+ -+Copyright 2007 George Sapountzis -+ -+Permission is hereby granted, free of charge, to any person obtaining a -+copy of this software and associated documentation files (the "Software"), -+to deal in the Software without restriction, including without limitation -+the rights to use, copy, modify, merge, publish, distribute, sublicense, -+and/or sell copies of the Software, and to permit persons to whom the -+Software is furnished to do so, subject to the following conditions: -+ -+The above copyright notice and this permission notice (including the next -+paragraph) shall be included in all copies or substantial portions of the -+Software. -+ -+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -+SOFTWARE. - --http://lists.freedesktop.org/mailman/listinfo/xorg --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/xf86-video-s3virge/s3virge-1.10.4-vga.patch b/extra/xf86-video-s3virge/s3virge-1.10.4-vga.patch deleted file mode 100644 index 3fb1fd6cf..000000000 --- a/extra/xf86-video-s3virge/s3virge-1.10.4-vga.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 92b4671ca75022a56ad9e85b347f81c12157c98f Mon Sep 17 00:00:00 2001 -From: Adam Jackson <ajax@redhat.com> -Date: Wed, 16 Nov 2011 19:58:29 +0000 -Subject: Adapt to missing PIOOffset in videoabi 12 - -Signed-off-by: Adam Jackson <ajax@redhat.com> ---- -diff --git a/src/s3v_driver.c b/src/s3v_driver.c -index 2ced9ac..0f754dd 100644 ---- a/src/s3v_driver.c -+++ b/src/s3v_driver.c -@@ -3516,11 +3516,17 @@ S3VEnableMmio(ScrnInfoPtr pScrn) - S3VPtr ps3v; - IOADDRESS vgaCRIndex, vgaCRReg; - unsigned char val; -- -+ unsigned int PIOOffset = 0; -+ - PVERB5(" S3VEnableMmio\n"); - - hwp = VGAHWPTR(pScrn); - ps3v = S3VPTR(pScrn); -+ -+#if ABI_VIDEODRV_VERSION < 12 -+ PIOOffset = hwp->PIOOffset; -+#endif -+ - /* - * enable chipset (seen on uninitialized secondary cards) - * might not be needed once we use the VGA softbooter -@@ -3533,17 +3539,17 @@ S3VEnableMmio(ScrnInfoPtr pScrn) - * to be set correctly already and MMIO _has_ to be - * enabled. - */ -- val = inb(hwp->PIOOffset + 0x3C3); /*@@@EE*/ -- outb(hwp->PIOOffset + 0x3C3, val | 0x01); -+ val = inb(PIOOffset + 0x3C3); /*@@@EE*/ -+ outb(PIOOffset + 0x3C3, val | 0x01); - /* - * set CR registers to color mode - * in mono mode extended CR registers - * are not accessible. (EE 05/04/99) - */ -- val = inb(hwp->PIOOffset + VGA_MISC_OUT_R); /*@@@EE*/ -- outb(hwp->PIOOffset + VGA_MISC_OUT_W, val | 0x01); -+ val = inb(PIOOffset + VGA_MISC_OUT_R); /*@@@EE*/ -+ outb(PIOOffset + VGA_MISC_OUT_W, val | 0x01); - vgaHWGetIOBase(hwp); /* Get VGA I/O base */ -- vgaCRIndex = hwp->PIOOffset + hwp->IOBase + 4; -+ vgaCRIndex = PIOOffset + hwp->IOBase + 4; - vgaCRReg = vgaCRIndex + 1; - #if 1 - /* -@@ -3562,7 +3568,7 @@ S3VEnableMmio(ScrnInfoPtr pScrn) - /* Enable new MMIO, if TRIO mmio is already */ - /* enabled, then it stays enabled. */ - outb(vgaCRReg, ps3v->EnableMmioCR53 | 0x08); -- outb(hwp->PIOOffset + VGA_MISC_OUT_W, val); -+ outb(PIOOffset + VGA_MISC_OUT_W, val); - if (S3_TRIO_3D_SERIES(ps3v->Chipset)) { - outb(vgaCRIndex, 0x40); - val = inb(vgaCRReg); -@@ -3584,7 +3590,10 @@ S3VDisableMmio(ScrnInfoPtr pScrn) - hwp = VGAHWPTR(pScrn); - ps3v = S3VPTR(pScrn); - -- vgaCRIndex = hwp->PIOOffset + hwp->IOBase + 4; -+ vgaCRIndex = hwp->IOBase + 4; -+#if ABI_VIDEODRV_VERSION < 12 -+ vgaCRIndex += hwp->PIOOffset; -+#endif - vgaCRReg = vgaCRIndex + 1; - outb(vgaCRIndex, 0x53); - /* Restore register's original state */ --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/xf86-video-xgi/PKGBUILD b/extra/xf86-video-xgi/PKGBUILD deleted file mode 100644 index 48f22a0b0..000000000 --- a/extra/xf86-video-xgi/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 140280 2011-10-11 21:28:09Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-xgi -pkgver=1.6.0 -pkgrel=4 -pkgdesc="X.org XGI video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel>=1.10.99.902' 'libdrm' 'xf86driproto' 'glproto' 'mesa' 'xf86dgaproto') -conflicts=('xorg-server<1.10.99.902') -options=('!libtool') -groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - git-fixes.patch) -sha1sums=('826f14d6ba799cd2aae9f0c818f84cf8b75f1ddb' - '61ce13325c69befaa710c3389a85a8aa9d1cf28d') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/git-fixes.patch" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/extra/xf86-video-xgi/git-fixes.patch b/extra/xf86-video-xgi/git-fixes.patch deleted file mode 100644 index f15fea88a..000000000 --- a/extra/xf86-video-xgi/git-fixes.patch +++ /dev/null @@ -1,451 +0,0 @@ -diff --git a/man/xgi.man b/man/xgi.man -index 19880f2..5699ae4 100644 ---- a/man/xgi.man -+++ b/man/xgi.man -@@ -1,4 +1,3 @@ --.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/xgi/xgi.man,v 1.14 2003/11/12 16:50:36 twini Exp $ - .\" shorthand for double quote that works everywhere. - .ds q \N'34' - .TH XGI __drivermansuffix__ __vendorversion__ -diff --git a/src/vb_init.c b/src/vb_init.c -index 8338410..50980c4 100755 ---- a/src/vb_init.c -+++ b/src/vb_init.c -@@ -131,6 +131,8 @@ static void XGINew_SetDRAMDefaultRegister340(PXGI_HW_DEVICE_INFO, USHORT, - static void XGINew_SetDRAMDefaultRegisterXG45(PXGI_HW_DEVICE_INFO, USHORT, - PVB_DEVICE_INFO); - static UCHAR XGINew_Get340DRAMType(PXGI_HW_DEVICE_INFO, PVB_DEVICE_INFO); -+/* horrible */ -+#define XGINew_GetXG20DRAMType XGINew_Get340DRAMType - - static int XGINew_SetDDRChannel(int index, UCHAR ChannelNo, - UCHAR XGINew_ChannelAB, const USHORT DRAMTYPE_TABLE[][5], -@@ -1451,7 +1453,7 @@ void XGINew_SetDRAMDefaultRegister340( PXGI_HW_DEVICE_INFO HwDeviceExtension , - } - - temp3 = 0 ; -- for( k = 0 ; k < 4 ; k++ ) -+ for( k = 1 ; k < 4 ; k++ ) - { - XGI_SetRegANDOR((XGIIOADDRESS) P3d4 , 0x6E , 0xFC , temp3 ) ; /* CR6E_D[1:0] select channel */ - temp2 = 0 ; -diff --git a/src/vgatypes.h b/src/vgatypes.h -index 8a60927..7484661 100755 ---- a/src/vgatypes.h -+++ b/src/vgatypes.h -@@ -1,5 +1,3 @@ --/* $XFree86$ */ --/* $XdotOrg$ */ - /* - * General type definitions for universal mode switching modules - * -diff --git a/src/xgi.h b/src/xgi.h -index 715502f..e818631 100755 ---- a/src/xgi.h -+++ b/src/xgi.h -@@ -981,6 +981,7 @@ int compute_vclk(int Clock, int *out_n, int *out_dn, int *out_div, - void XGI_WaitBeginRetrace(XGIIOADDRESS RelIO); - void XGI_WaitEndRetrace(XGIIOADDRESS RelIO); - -+#include <unistd.h> - /* 2005/11/21 added by jjtseng */ - #define DelayS(sec) usleep((sec)*1000000) - #define DelayMS(millisec) usleep((millisec)*1000) -diff --git a/src/xgi_accel.c b/src/xgi_accel.c -index c072691..4c298ed 100755 ---- a/src/xgi_accel.c -+++ b/src/xgi_accel.c -@@ -200,20 +200,7 @@ extern int FbDevExist; - #endif - - #if X_BYTE_ORDER == X_BIG_ENDIAN --static CARD32 BE_SWAP32 (CARD32 val) --{ -- PDEBUG(ErrorF("X_BIG_ENDIAN...\n")); -- if (CurrentColorDepth == 8) -- return ((((val) & 0x000000ff) << 24) | \ -- (((val) & 0x0000ff00) << 8) | \ -- (((val) & 0x00ff0000) >> 8) | \ -- (((val) & 0xff000000) >> 24)); -- if (CurrentColorDepth == 24) -- return val; -- if (CurrentColorDepth == 16) -- return ((((val) & 0x0000ffff) << 16) | \ -- (((val) & 0xffff0000) >> 16)); --} -+#define BE_SWAP32(x) lswapl(x) - #else - static CARD32 BE_SWAP32 (CARD32 val) - { -diff --git a/src/xgi_dga.c b/src/xgi_dga.c -index 04f90aa..8bd84bc 100755 ---- a/src/xgi_dga.c -+++ b/src/xgi_dga.c -@@ -103,18 +103,18 @@ XGISetupDGAMode( - - if(pMode->HDisplay != otherPitch) { - -- newmodes = xrealloc(modes, (*num + 2) * sizeof(DGAModeRec)); -+ newmodes = realloc(modes, (*num + 2) * sizeof(DGAModeRec)); - oneMore = TRUE; - - } else { - -- newmodes = xrealloc(modes, (*num + 1) * sizeof(DGAModeRec)); -+ newmodes = realloc(modes, (*num + 1) * sizeof(DGAModeRec)); - oneMore = FALSE; - - } - - if(!newmodes) { -- xfree(modes); -+ free(modes); - return NULL; - } - modes = newmodes; -diff --git a/src/xgi_dri.c b/src/xgi_dri.c -index 93687e1..e575c19 100755 ---- a/src/xgi_dri.c -+++ b/src/xgi_dri.c -@@ -46,7 +46,6 @@ - - #include "xf86.h" - #include "xf86_OSproc.h" --#include "xf86Priv.h" - - #include "xf86PciInfo.h" - #include "xf86Pci.h" -@@ -145,13 +144,13 @@ XGIInitVisualConfigs(ScreenPtr pScreen) - } - if (!(pXGIConfigs = (XGIConfigPrivPtr)xnfcalloc(sizeof(XGIConfigPrivRec), - numConfigs))) { -- xfree(pConfigs); -+ free(pConfigs); - return FALSE; - } - if (!(pXGIConfigPtrs = (XGIConfigPrivPtr*)xnfcalloc(sizeof(XGIConfigPrivPtr), - numConfigs))) { -- xfree(pConfigs); -- xfree(pXGIConfigs); -+ free(pConfigs); -+ free(pXGIConfigs); - return FALSE; - } - for (i=0; i<numConfigs; i++) -@@ -333,7 +332,7 @@ Bool XGIDRIScreenInit(ScreenPtr pScreen) - pDRIInfo->bufferRequests = DRI_ALL_WINDOWS; - - if (!DRIScreenInit(pScreen, pDRIInfo, &pXGI->drmSubFD)) { -- xfree(pDRIInfo->devPrivate); -+ free(pDRIInfo->devPrivate); - pDRIInfo->devPrivate=0; - DRIDestroyInfoRec(pXGI->pDRIInfo); - pXGI->pDRIInfo=0; -@@ -537,14 +536,14 @@ XGIDRICloseScreen(ScreenPtr pScreen) - - if (pXGI->pDRIInfo) { - if (pXGI->pDRIInfo->devPrivate) { -- xfree(pXGI->pDRIInfo->devPrivate); -+ free(pXGI->pDRIInfo->devPrivate); - pXGI->pDRIInfo->devPrivate=0; - } - DRIDestroyInfoRec(pXGI->pDRIInfo); - pXGI->pDRIInfo=0; - } -- if (pXGI->pVisualConfigs) xfree(pXGI->pVisualConfigs); -- if (pXGI->pVisualConfigsPriv) xfree(pXGI->pVisualConfigsPriv); -+ if (pXGI->pVisualConfigs) free(pXGI->pVisualConfigs); -+ if (pXGI->pVisualConfigsPriv) free(pXGI->pVisualConfigsPriv); - - if(pXGI->agpSize){ - /* ErrorF("Freeing agp memory\n"); */ -diff --git a/src/xgi_driver.c b/src/xgi_driver.c -index b4f83b8..b8b8679 100755 ---- a/src/xgi_driver.c -+++ b/src/xgi_driver.c -@@ -54,7 +54,7 @@ - #include "fb.h" - #include "micmap.h" - #include "xf86.h" --#include "xf86Priv.h" -+#include "xf86Module.h" - #include "xf86_OSproc.h" - #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 - #include "xf86Resources.h" -@@ -106,6 +106,10 @@ - #include <unistd.h> - #endif - -+#ifndef DEFAULT_DPI -+#define DEFAULT_DPI 96 -+#endif -+ - /* Jong 01/22/2009; compiler error; type conflict */ - /* - #include <fcntl.h> -@@ -556,13 +560,13 @@ XGIFreeRec(ScrnInfoPtr pScrn) - * head. - */ - if (pXGIEnt->BIOS) -- xfree(pXGIEnt->BIOS); -+ free(pXGIEnt->BIOS); - pXGIEnt->BIOS = pXGI->BIOS = NULL; - if (pXGIEnt->XGI_Pr) -- xfree(pXGIEnt->XGI_Pr); -+ free(pXGIEnt->XGI_Pr); - pXGIEnt->XGI_Pr = pXGI->XGI_Pr = NULL; - if (pXGIEnt->RenderAccelArray) -- xfree(pXGIEnt->RenderAccelArray); -+ free(pXGIEnt->RenderAccelArray); - pXGIEnt->RenderAccelArray = pXGI->RenderAccelArray = NULL; - } - else { -@@ -573,19 +577,19 @@ XGIFreeRec(ScrnInfoPtr pScrn) - } - else { - if (pXGI->BIOS) -- xfree(pXGI->BIOS); -+ free(pXGI->BIOS); - pXGI->BIOS = NULL; - if (pXGI->XGI_Pr) -- xfree(pXGI->XGI_Pr); -+ free(pXGI->XGI_Pr); - pXGI->XGI_Pr = NULL; - if (pXGI->RenderAccelArray) -- xfree(pXGI->RenderAccelArray); -+ free(pXGI->RenderAccelArray); - pXGI->RenderAccelArray = NULL; - } - - #ifdef XGIMERGED - if (pXGI->MetaModes) -- xfree(pXGI->MetaModes); -+ free(pXGI->MetaModes); - pXGI->MetaModes = NULL; - - if (pXGI->CRT1Modes) { -@@ -595,8 +599,8 @@ XGIFreeRec(ScrnInfoPtr pScrn) - do { - DisplayModePtr p = pScrn->currentMode->next; - if (pScrn->currentMode->Private) -- xfree(pScrn->currentMode->Private); -- xfree(pScrn->currentMode); -+ free(pScrn->currentMode->Private); -+ free(pScrn->currentMode); - pScrn->currentMode = p; - } while (pScrn->currentMode != pScrn->modes); - } -@@ -612,7 +616,7 @@ XGIFreeRec(ScrnInfoPtr pScrn) - pXGI->pVbe = NULL; - if (pScrn->driverPrivate == NULL) - return; -- xfree(pScrn->driverPrivate); -+ free(pScrn->driverPrivate); - pScrn->driverPrivate = NULL; - } - -@@ -975,7 +979,7 @@ XGIProbe(DriverPtr drv, int flags) - numDevSections, drv, &usedChips); - - /* Free it since we don't need that list after this */ -- xfree(devSections); -+ free(devSections); - if (numUsed <= 0) - return FALSE; - -@@ -1015,7 +1019,7 @@ XGIProbe(DriverPtr drv, int flags) - - #endif - } -- xfree(usedChips); -+ free(usedChips); - - return foundScreen; - } -@@ -1044,11 +1048,11 @@ XGICopyModeNLink(ScrnInfoPtr pScrn, DisplayModePtr dest, - - ErrorF("XGICopyModeNLink()...Use Virtual Size-1\n"); - -- if (!((mode = xalloc(sizeof(DisplayModeRec))))) -+ if (!((mode = malloc(sizeof(DisplayModeRec))))) - return dest; - memcpy(mode, i, sizeof(DisplayModeRec)); -- if (!((mode->Private = xalloc(sizeof(XGIMergedDisplayModeRec))))) { -- xfree(mode); -+ if (!((mode->Private = malloc(sizeof(XGIMergedDisplayModeRec))))) { -+ free(mode); - return dest; - } - ((XGIMergedDisplayModePtr) mode->Private)->CRT1 = i; -@@ -1125,8 +1129,8 @@ XGICopyModeNLink(ScrnInfoPtr pScrn, DisplayModePtr dest, - xf86DrvMsg(pScrn->scrnIndex, X_ERROR, - "Skipped %dx%d, not enough video RAM or beyond hardware specs\n", - mode->HDisplay, mode->VDisplay); -- xfree(mode->Private); -- xfree(mode); -+ free(mode->Private); -+ free(mode); - - return dest; - } -@@ -1559,10 +1563,10 @@ XGIFreeCRT2Structs(XGIPtr pXGI) - pXGI->CRT2pScrn->monitor->Modes); - } - if (pXGI->CRT2pScrn->monitor->DDC) -- xfree(pXGI->CRT2pScrn->monitor->DDC); -- xfree(pXGI->CRT2pScrn->monitor); -+ free(pXGI->CRT2pScrn->monitor->DDC); -+ free(pXGI->CRT2pScrn->monitor); - } -- xfree(pXGI->CRT2pScrn); -+ free(pXGI->CRT2pScrn); - pXGI->CRT2pScrn = NULL; - } - } -@@ -2438,7 +2442,7 @@ XGIDDCPreInit(ScrnInfoPtr pScrn) - - #ifdef XGIMERGED - if (pXGI->MergedFB) { -- pXGI->CRT2pScrn->monitor = xalloc(sizeof(MonRec)); -+ pXGI->CRT2pScrn->monitor = malloc(sizeof(MonRec)); - if (pXGI->CRT2pScrn->monitor) { - DisplayModePtr tempm = NULL, currentm = NULL, newm = NULL; - memcpy(pXGI->CRT2pScrn->monitor, pScrn->monitor, sizeof(MonRec)); -@@ -2446,11 +2450,11 @@ XGIDDCPreInit(ScrnInfoPtr pScrn) - pXGI->CRT2pScrn->monitor->Modes = NULL; - tempm = pScrn->monitor->Modes; - while (tempm) { -- if (!(newm = xalloc(sizeof(DisplayModeRec)))) -+ if (!(newm = malloc(sizeof(DisplayModeRec)))) - break; - memcpy(newm, tempm, sizeof(DisplayModeRec)); -- if (!(newm->name = xalloc(strlen(tempm->name) + 1))) { -- xfree(newm); -+ if (!(newm->name = malloc(strlen(tempm->name) + 1))) { -+ free(newm); - break; - } - strcpy(newm->name, tempm->name); -@@ -2490,7 +2494,7 @@ XGIDDCPreInit(ScrnInfoPtr pScrn) - "Failed to allocate memory for CRT2 monitor, %s.\n", - mergeddisstr); - if (pXGI->CRT2pScrn) -- xfree(pXGI->CRT2pScrn); -+ free(pXGI->CRT2pScrn); - pXGI->CRT2pScrn = NULL; - pXGI->MergedFB = FALSE; - } -@@ -3540,7 +3544,7 @@ XGIPreInit(ScrnInfoPtr pScrn, int flags) - /* Do some MergedFB mode initialisation */ - #ifdef XGIMERGED - if (pXGI->MergedFB) { -- pXGI->CRT2pScrn = xalloc(sizeof(ScrnInfoRec)); -+ pXGI->CRT2pScrn = malloc(sizeof(ScrnInfoRec)); - if (!pXGI->CRT2pScrn) { - XGIErrorLog(pScrn, - "Failed to allocate memory for 2nd pScrn, %s\n", -@@ -3586,7 +3590,7 @@ XGIPreInit(ScrnInfoPtr pScrn, int flags) - XGIErrorLog(pScrn, mergednocrt1, mergeddisstr); - } - if (pXGI->CRT2pScrn) -- xfree(pXGI->CRT2pScrn); -+ free(pXGI->CRT2pScrn); - pXGI->CRT2pScrn = NULL; - pXGI->MergedFB = FALSE; - } -@@ -3627,7 +3631,7 @@ XGIPreInit(ScrnInfoPtr pScrn, int flags) - XGIErrorLog(pScrn, mergednocrt2, mergeddisstr); - } - if (pXGI->CRT2pScrn) -- xfree(pXGI->CRT2pScrn); -+ free(pXGI->CRT2pScrn); - pXGI->CRT2pScrn = NULL; - pXGI->MergedFB = FALSE; - } -@@ -4901,7 +4905,7 @@ XGIScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - - if (pXGI->ShadowFB) { - pXGI->ShadowPitch = BitmapBytePad(pScrn->bitsPerPixel * width); -- pXGI->ShadowPtr = xalloc(pXGI->ShadowPitch * height); -+ pXGI->ShadowPtr = malloc(pXGI->ShadowPitch * height); - displayWidth = pXGI->ShadowPitch / (pScrn->bitsPerPixel >> 3); - FBStart = pXGI->ShadowPtr; - } -@@ -5777,17 +5781,17 @@ XGICloseScreen(int scrnIndex, ScreenPtr pScreen) - } - - if (pXGI->ShadowPtr) { -- xfree(pXGI->ShadowPtr); -+ free(pXGI->ShadowPtr); - pXGI->ShadowPtr = NULL; - } - - if (pXGI->DGAModes) { -- xfree(pXGI->DGAModes); -+ free(pXGI->DGAModes); - pXGI->DGAModes = NULL; - } - - if (pXGI->adaptor) { -- xfree(pXGI->adaptor); -+ free(pXGI->adaptor); - pXGI->adaptor = NULL; - pXGI->ResetXv = pXGI->ResetXvGamma = NULL; - } -diff --git a/src/xgi_opt.c b/src/xgi_opt.c -index 09346e4..c0608d5 100755 ---- a/src/xgi_opt.c -+++ b/src/xgi_opt.c -@@ -195,7 +195,7 @@ xgiOptions(ScrnInfoPtr pScrn) - xf86CollectOptions(pScrn, NULL); - - /* Process the options */ -- if(!(pXGI->Options = xalloc(sizeof(XGIOptions)))) return; -+ if(!(pXGI->Options = malloc(sizeof(XGIOptions)))) return; - - memcpy(pXGI->Options, XGIOptions, sizeof(XGIOptions)); - -diff --git a/src/xgi_setup.c b/src/xgi_setup.c -index c1d2cdc..6641b09 100755 ---- a/src/xgi_setup.c -+++ b/src/xgi_setup.c -@@ -678,7 +678,7 @@ bAccessVGAPCIInfo(PXGI_HW_DEVICE_INFO pHwDevInfo, ULONG ulOffset, ULONG ulSet, U - err = pci_device_cfg_write_u32(pXGI->PciInfo, *pulValue, - ulOffset & ~3); - } else { -- err = pci_device_cfg_write_u32(pXGI->PciInfo, pulValue, -+ err = pci_device_cfg_read_u32(pXGI->PciInfo, pulValue, - ulOffset & ~3); - } - -diff --git a/src/xgi_video.c b/src/xgi_video.c -index 31cffd5..df76d14 100755 ---- a/src/xgi_video.c -+++ b/src/xgi_video.c -@@ -142,7 +142,7 @@ void XGIInitVideo(ScreenPtr pScreen) - adaptors = &newAdaptor; - } else { - newAdaptors = /* need to free this someplace */ -- xalloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr*)); -+ malloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr*)); - if(newAdaptors) { - memcpy(newAdaptors, adaptors, num_adaptors * - sizeof(XF86VideoAdaptorPtr)); -@@ -157,7 +157,7 @@ void XGIInitVideo(ScreenPtr pScreen) - xf86XVScreenInit(pScreen, adaptors, num_adaptors); - - if(newAdaptors) -- xfree(newAdaptors); -+ free(newAdaptors); - - } - -@@ -395,7 +395,7 @@ XGISetupImageVideo(ScreenPtr pScreen) - struct v4l2_standard standard; - # endif//VC - -- if(!(adapt = xcalloc(1, sizeof(XF86VideoAdaptorRec) + -+ if(!(adapt = calloc(1, sizeof(XF86VideoAdaptorRec) + - sizeof(XGIPortPrivRec) + - sizeof(DevUnion)))) - return NULL; diff --git a/extra/xf86-video-xgixp/PKGBUILD b/extra/xf86-video-xgixp/PKGBUILD deleted file mode 100644 index c44223f1b..000000000 --- a/extra/xf86-video-xgixp/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 153388 2012-03-12 20:55:30Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-xgixp -pkgver=1.8.0 -pkgrel=5 -pkgdesc="X.org XGIXP video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel>=1.11.99.903' 'libdrm' 'xf86driproto' 'mesa') # 'glproto') -conflicts=('xorg-server<1.11.99.903') -options=('!libtool') -groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - api-compat-fix-for-DRAWABLE_BUFFER.patch) -sha1sums=('67caeaa4c746572160208fe23c7257f62cb442a3' - 'ea140a13963bbf33cdff1ad75789d765867ec53b') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/api-compat-fix-for-DRAWABLE_BUFFER.patch" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/extra/xf86-video-xgixp/api-compat-fix-for-DRAWABLE_BUFFER.patch b/extra/xf86-video-xgixp/api-compat-fix-for-DRAWABLE_BUFFER.patch deleted file mode 100644 index f8cb64673..000000000 --- a/extra/xf86-video-xgixp/api-compat-fix-for-DRAWABLE_BUFFER.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 86258a6fd8fc8bb09a52ee446b37abe6bd0843ef Mon Sep 17 00:00:00 2001 -From: Adam Jackson <ajax@redhat.com> -Date: Fri, 25 Mar 2011 22:46:55 +0000 -Subject: API compat fix for DRAWABLE_BUFFER - -Signed-off-by: Adam Jackson <ajax@redhat.com> ---- -diff --git a/src/xgi_driver.c b/src/xgi_driver.c -index e54d8c7..189b84a 100644 ---- a/src/xgi_driver.c -+++ b/src/xgi_driver.c -@@ -2708,7 +2708,9 @@ xg47_setup_fb_wrap(ReadMemoryProcPtr *read_ptr, - { - switch (pDraw->type) { - case DRAWABLE_WINDOW: -+#ifdef DRAWABLE_BUFFER - case DRAWABLE_BUFFER: -+#endif - *read_ptr = xg47_read_memory_swap_func; - *write_ptr = xg47_write_memory_swap_func; - break; --- -cgit v0.8.3-6-g21f6 diff --git a/extra/xfce-utils/PKGBUILD b/extra/xfce-utils/PKGBUILD deleted file mode 100644 index 0b9203407..000000000 --- a/extra/xfce-utils/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 138663 2011-09-27 14:33:37Z andyrtr $ -# Maintainer: AndyRTR <andyrtr@archlinux.org> -# Contributor: tobias <tobias funnychar archlinux.org> - -pkgname=xfce-utils -pkgver=4.8.3 -pkgrel=1 -pkgdesc="Utilities for Xfce" -arch=(i686 x86_64 'mips64el') -license=('GPL2') -url="http://www.xfce.org/" -groups=('xfce4') -depends=('libxfce4ui' 'xorg-xinit' 'hicolor-icon-theme') -makedepends=('intltool') -optdepends=('perl: for migration scripts' - 'xscreensaver: for locking screen with xflock4' - 'gnome-screensaver: for locking screen with xflock4' - 'xlockmore: for locking screen with xflock4') -options=('!libtool') -install=${pkgname}.install -source=(http://archive.xfce.org/src/xfce/${pkgname}/4.8/${pkgname}-${pkgver}.tar.bz2) -md5sums=('03b5fba5f63f4f1a31cc7d3728f3c87e') -sha1sums=('159d445b689ebbf73462a4b4baf5cce4e04afaab') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib \ - --localstatedir=/var \ - --disable-static \ - --enable-dbus \ - --disable-debug \ - --with-vendor-info=Parabola # --enable-gen-doc \ - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install -} diff --git a/extra/xfce-utils/xfce-utils.install b/extra/xfce-utils/xfce-utils.install deleted file mode 100644 index c58a305e0..000000000 --- a/extra/xfce-utils/xfce-utils.install +++ /dev/null @@ -1,21 +0,0 @@ -post_install() { - cat << EOF -NOTE ----- - ==> xfce can run on top of a framebuffer. However, for most users it is - ==> best to install xorg as an x-server. Please install either xorg-xinit - ==> as minimal environment or the xorg meta package. - pacman -S xorg-xinit - -- or -- - pacman -S xorg -EOF - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} diff --git a/extra/xfce4-battery-plugin/show-time-when-on-battery.patch b/extra/xfce4-battery-plugin/show-time-when-on-battery.patch deleted file mode 100644 index d5ed36460..000000000 --- a/extra/xfce4-battery-plugin/show-time-when-on-battery.patch +++ /dev/null @@ -1,21 +0,0 @@ -From f4a68f05e838291d1ddcb60f7c719873bfd57d27 Mon Sep 17 00:00:00 2001 -From: flo <florian.a.jung@web.de> -Date: Fri, 18 Feb 2011 17:21:12 +0000 -Subject: Show time when on battery power (bug #3736). - ---- -diff --git a/panel-plugin/libacpi.c b/panel-plugin/libacpi.c -index 87339b7..838a760 100644 ---- a/panel-plugin/libacpi.c -+++ b/panel-plugin/libacpi.c -@@ -787,7 +787,7 @@ int read_acpi_state_sysfs(int battery) - acpistate->rcapacity = read_sysfs_int(buf); - acpistate->percentage = (((float) acpistate->rcapacity)/acpiinfo->last_full_capacity) * 100; - } -- if (strcmp(name,"current_now") == 0) -+ if ((strcmp(name,"current_now") == 0) || (strcmp(name,"power_now") == 0)) - { - sprintf(buf,"%s/%s",batteries[battery], name); - acpistate->prate = read_sysfs_int(buf); --- -cgit v0.9.0.2 diff --git a/extra/xfce4-power-manager/fix-french-translation.patch b/extra/xfce4-power-manager/fix-french-translation.patch deleted file mode 100644 index 063e533bb..000000000 --- a/extra/xfce4-power-manager/fix-french-translation.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 634c5c016d3b6e152e20173263790a3bfbbe0640 Mon Sep 17 00:00:00 2001 -From: Mike Massonnet <mmassonnet@gmail.com> -Date: Sun, 08 Apr 2012 11:52:33 +0000 -Subject: l10n: Updated French (fr) translation to 100% - -New status: 211 messages complete with 0 fuzzies and 0 untranslated. - -Transmitted-via: Transifex (translations.xfce.org). ---- -diff --git a/po/fr.po b/po/fr.po -index 78dc6d3..285393f 100644 ---- a/po/fr.po -+++ b/po/fr.po -@@ -559,9 +559,8 @@ msgid "" - "%s (%i%%)\n" - "%s until is fully charged." - msgstr "" --"%s\n" --"Votre %s est en charge (%i%%)\n" --"%s jusqu'a ce qu'il soit complétement chargé." -+"%s (%i%%)\n" -+"%s jusqu'a ce qu'il soit complètement chargé." - - #: ../src/xfpm-battery.c:230 ../src/xfpm-battery.c:266 - #, c-format -@@ -579,8 +578,7 @@ msgid "" - "%s (%i%%)\n" - "Estimated time left is %s." - msgstr "" --"%s\n" --"Votre %s est en décharge (%i%%)\n" -+"%s (%i%%)\n" - "Temps restant estimé est de %s." - - #: ../src/xfpm-battery.c:248 ../src/xfpm-battery.c:269 -@@ -622,7 +620,7 @@ msgid "" - msgstr "" - "%s\n" - "Votre %s est en charge (%i%%)\n" --"%s jusqu'a ce qu'il soit complétement chargé." -+"%s jusqu'a ce qu'il soit complètement chargé." - - #: ../src/xfpm-battery.c:444 - #, c-format --- -cgit v0.9.0.3 diff --git a/extra/xfce4-screenshooter/fs-25873-segfault-in-awesome-wm.patch b/extra/xfce4-screenshooter/fs-25873-segfault-in-awesome-wm.patch deleted file mode 100644 index 47e067144..000000000 --- a/extra/xfce4-screenshooter/fs-25873-segfault-in-awesome-wm.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/lib/screenshooter-capture.c -+++ a/lib/screenshooter-capture.c -@@ -381,6 +381,18 @@ static GdkPixbuf - rec_height += rectangle.y; - } - -+ if (rec_x < 0) -+ { -+ rec_width = rec_width + rec_x; -+ rec_x = 0; -+ } -+ -+ if (rec_y < 0) -+ { -+ rec_height = rec_height + rec_y; -+ rec_y = 0; -+ } -+ - if (x_orig + rec_x + rec_width > gdk_screen_width ()) - rec_width = gdk_screen_width () - x_orig - rec_x; - diff --git a/extra/xfce4-screenshooter/xfce4-screenshooter-1.7.9-dsofix.patch b/extra/xfce4-screenshooter/xfce4-screenshooter-1.7.9-dsofix.patch deleted file mode 100644 index a142df822..000000000 --- a/extra/xfce4-screenshooter/xfce4-screenshooter-1.7.9-dsofix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- xfce4-screenshooter-1.7.9.orig/Makefile.in 2010-02-07 14:45:15.000000000 +0100 -+++ xfce4-screenshooter-1.7.9/Makefile.in 2010-02-16 23:57:31.000000000 +0100 -@@ -282,7 +282,7 @@ - INTLTOOL_PERL = @INTLTOOL_PERL@ - INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ - LD = @LD@ --LDFLAGS = @LDFLAGS@ -+LDFLAGS = @LDFLAGS@ -lm -lX11 - LIBOBJS = @LIBOBJS@ - LIBS = @LIBS@ - LIBTOOL = @LIBTOOL@ diff --git a/extra/xfce4-settings/xfce4-settings-4.6.0.patch b/extra/xfce4-settings/xfce4-settings-4.6.0.patch deleted file mode 100644 index 559e2f9e5..000000000 --- a/extra/xfce4-settings/xfce4-settings-4.6.0.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -Nur xfce4-settings-4.6.0.orig/xfsettingsd/xsettings.xml xfce4-settings-4.6.0/xfsettingsd/xsettings.xml ---- xfce4-settings-4.6.0.orig/xfsettingsd/xsettings.xml 2009-02-20 10:12:35.000000000 -0700 -+++ xfce4-settings-4.6.0/xfsettingsd/xsettings.xml 2009-04-16 15:25:44.000000000 -0600 -@@ -2,10 +2,12 @@ - - <channel name="xsettings" version="1.0"> - <property name="Net" type="empty"> -- <property name="ThemeName" type="string" value="Xfce"/> -- <property name="IconThemeName" type="string" value="Rodent"/> -+ <property name="ThemeName" type="string" value="Clearlooks"/> -+ <property name="IconThemeName" type="string" value="gnome"/> - </property> - <property name="Xft" type="empty"> - <property name="DPI" type="int" value="-1"/> -+ <property name="Antialias" type="int" value="1"/> -+ <property name="HintStyle" type="string" value="hintfull"/> - </property> - </channel> diff --git a/extra/xulrunner/PKGBUILD b/extra/xulrunner/PKGBUILD deleted file mode 100644 index c106f6f25..000000000 --- a/extra/xulrunner/PKGBUILD +++ /dev/null @@ -1,63 +0,0 @@ -# $Id: PKGBUILD 153514 2012-03-15 13:26:26Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Alexander Baldeck <alexander@archlinux.org> -pkgname=xulrunner -pkgver=11.0 -pkgrel=1 -pkgdesc="Mozilla Runtime Environment" -arch=('i686' 'x86_64' 'mips64el') -license=('MPL' 'GPL' 'LGPL') -depends=('gtk2' 'mozilla-common' 'nss>=3.13.1' 'libxt' 'libxrender' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent' 'sqlite3>=3.7.4' 'libnotify' 'libvpx' 'python2') -makedepends=('zip' 'unzip' 'pkg-config' 'diffutils' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13') -url="http://wiki.mozilla.org/XUL:Xul_Runner" -source=(ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.bz2 - mozconfig - mips.patch - mozilla-pkgconfig.patch - mozilla-pkgconfig.patch - libvpx.patch) -options=('!emptydirs') -replaces=('xulrunner-oss') -md5sums=('4b07acf47857aff72776d805409cdd1b' - '8dfb78c5bd0581c8cf4753813132bf0b' - '27271ce647a83906ef7a24605e840d61' - '5d418ecdbdb9f40597df6b978b0b5ee5') - -build() { - cd "$srcdir/mozilla-release" - cp "$srcdir/mozconfig" .mozconfig - - [[ "$CARCH" == "mips64el" ]] && { - echo "ac_add_options --disable-ipc" >> .mozconfig - patch -Np0 -i "${srcdir}/mips.patch" - } - - #fix libdir/sdkdir - fedora - patch -Np1 -i "$srcdir/mozilla-pkgconfig.patch" - patch -Np1 -i "$srcdir/libvpx.patch" - - - export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/xulrunner-$pkgver" - export PYTHON="/usr/bin/python2" - - make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS" -} - -package() { - cd "$srcdir/mozilla-release" - make -j1 -f client.mk DESTDIR="$pkgdir" install - - rm -rf "$pkgdir"/usr/lib/xulrunner-$pkgver/{dictionaries,hyphenation} - ln -sf /usr/share/hunspell "$pkgdir/usr/lib/xulrunner-$pkgver/dictionaries" - ln -sf /usr/share/hyphen "$pkgdir/usr/lib/xulrunner-$pkgver/hyphenation" - - # add xulrunner library path to ld.so.conf - install -d $pkgdir/etc/ld.so.conf.d - echo "/usr/lib/xulrunner-$pkgver" > $pkgdir/etc/ld.so.conf.d/xulrunner.conf - - chmod +x "${pkgdir}/usr/lib/xulrunner-devel-$pkgver/sdk/bin/xpt.py" - sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-$pkgver/sdk/bin/xpt.py" - sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-$pkgver/sdk/bin/header.py" - sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-$pkgver/sdk/bin/typelib.py" - sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-$pkgver/sdk/bin/xpidl.py" -} diff --git a/extra/xulrunner/libvpx.patch b/extra/xulrunner/libvpx.patch deleted file mode 100644 index f883b8e08..000000000 --- a/extra/xulrunner/libvpx.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur mozilla-release.orig/configure.in mozilla-release/configure.in ---- mozilla-release.orig/configure.in 2012-02-05 16:01:35.722024142 +0000 -+++ mozilla-release/configure.in 2012-02-05 16:03:34.871064547 +0000 -@@ -5629,7 +5629,7 @@ - dnl v0.9.6 one to check for. - AC_TRY_COMPILE([ - #include <vpx/vpx_decoder.h> -- #if !defined(VPX_CODEC_USE_INPUT_PARTITION) -+ #if !defined(VPX_CODEC_USE_INPUT_FRAGMENTS) - #error "test failed." - #endif - ], diff --git a/extra/xulrunner/mips.patch b/extra/xulrunner/mips.patch deleted file mode 100644 index f9de910b2..000000000 --- a/extra/xulrunner/mips.patch +++ /dev/null @@ -1,114 +0,0 @@ ---- ../../tmp.ne6Bz1oy72/xulrunner/src/mozilla-2.0/js/src/assembler/jit/ExecutableAllocator.h 2011-03-18 20:33:47.000000000 -0300 -+++ js/src/assembler/jit/ExecutableAllocator.h 2011-03-30 15:45:07.537247142 -0300 -@@ -44,9 +44,7 @@ - #include <e32std.h> - #endif - --#if WTF_CPU_MIPS && WTF_PLATFORM_LINUX - #include <sys/cachectl.h> --#endif - - #if WTF_PLATFORM_WINCE - // From pkfuncs.h (private header file from the Platform Builder) -@@ -311,89 +309,10 @@ - #endif - - --#if WTF_CPU_X86 || WTF_CPU_X86_64 -- static void cacheFlush(void*, size_t) -- { -- } --#elif WTF_CPU_MIPS - static void cacheFlush(void* code, size_t size) - { --#if WTF_COMPILER_GCC && (GCC_VERSION >= 40300) --#if WTF_MIPS_ISA_REV(2) && (GCC_VERSION < 40403) -- int lineSize; -- asm("rdhwr %0, $1" : "=r" (lineSize)); -- // -- // Modify "start" and "end" to avoid GCC 4.3.0-4.4.2 bug in -- // mips_expand_synci_loop that may execute synci one more time. -- // "start" points to the fisrt byte of the cache line. -- // "end" points to the last byte of the line before the last cache line. -- // Because size is always a multiple of 4, this is safe to set -- // "end" to the last byte. -- // -- intptr_t start = reinterpret_cast<intptr_t>(code) & (-lineSize); -- intptr_t end = ((reinterpret_cast<intptr_t>(code) + size - 1) & (-lineSize)) - 1; -- __builtin___clear_cache(reinterpret_cast<char*>(start), reinterpret_cast<char*>(end)); --#else -- intptr_t end = reinterpret_cast<intptr_t>(code) + size; -- __builtin___clear_cache(reinterpret_cast<char*>(code), reinterpret_cast<char*>(end)); --#endif --#else - _flush_cache(reinterpret_cast<char*>(code), size, BCACHE); --#endif -- } --#elif WTF_CPU_ARM_THUMB2 && WTF_PLATFORM_IPHONE -- static void cacheFlush(void* code, size_t size) -- { -- sys_dcache_flush(code, size); -- sys_icache_invalidate(code, size); -- } --#elif WTF_CPU_ARM_THUMB2 && WTF_PLATFORM_LINUX -- static void cacheFlush(void* code, size_t size) -- { -- asm volatile ( -- "push {r7}\n" -- "mov r0, %0\n" -- "mov r1, %1\n" -- "movw r7, #0x2\n" -- "movt r7, #0xf\n" -- "movs r2, #0x0\n" -- "svc 0x0\n" -- "pop {r7}\n" -- : -- : "r" (code), "r" (reinterpret_cast<char*>(code) + size) -- : "r0", "r1", "r2"); -- } --#elif WTF_PLATFORM_SYMBIAN -- static void cacheFlush(void* code, size_t size) -- { -- User::IMB_Range(code, static_cast<char*>(code) + size); -- } --#elif WTF_CPU_ARM_TRADITIONAL && WTF_PLATFORM_LINUX && WTF_COMPILER_RVCT -- static __asm void cacheFlush(void* code, size_t size); --#elif WTF_CPU_ARM_TRADITIONAL && (WTF_PLATFORM_LINUX || WTF_PLATFORM_ANDROID) && WTF_COMPILER_GCC -- static void cacheFlush(void* code, size_t size) -- { -- asm volatile ( -- "push {r7}\n" -- "mov r0, %0\n" -- "mov r1, %1\n" -- "mov r7, #0xf0000\n" -- "add r7, r7, #0x2\n" -- "mov r2, #0x0\n" -- "svc 0x0\n" -- "pop {r7}\n" -- : -- : "r" (code), "r" (reinterpret_cast<char*>(code) + size) -- : "r0", "r1", "r2"); -- } --#elif WTF_PLATFORM_WINCE -- static void cacheFlush(void* code, size_t size) -- { -- CacheRangeFlush(code, size, CACHE_SYNC_ALL); - } --#else -- #error "The cacheFlush support is missing on this platform." --#endif - - private: - ---- js/src/Makefile.in.orig 2011-03-30 22:02:39.725318514 -0300 -+++ js/src/Makefile.in 2011-03-30 22:02:51.689347820 -0300 -@@ -914,7 +914,7 @@ - # Needed to "configure" it correctly. Unfortunately these - # flags wind up being applied to all code in js/src, not just - # the code in js/src/assembler. --CXXFLAGS += -DUSE_SYSTEM_MALLOC=1 -DENABLE_ASSEMBLER=1 -DENABLE_JIT=1 -+CXXFLAGS += -DUSE_SYSTEM_MALLOC=1 -DENABLE_JIT=1 - - INCLUDES += -I$(srcdir)/assembler -I$(srcdir)/yarr - - diff --git a/extra/xulrunner/mozconfig b/extra/xulrunner/mozconfig deleted file mode 100644 index 82a6ae512..000000000 --- a/extra/xulrunner/mozconfig +++ /dev/null @@ -1,38 +0,0 @@ -. $topsrcdir/xulrunner/config/mozconfig - -ac_add_options --prefix=/usr -ac_add_options --libdir=/usr/lib - -# System libraries -ac_add_options --with-system-nspr -ac_add_options --with-system-nss -ac_add_options --with-system-jpeg -ac_add_options --with-system-zlib -ac_add_options --with-system-bz2 -ac_add_options --with-system-png -ac_add_options --with-system-libevent -ac_add_options --with-system-libvpx -ac_add_options --enable-system-hunspell -ac_add_options --enable-system-sqlite -ac_add_options --enable-system-ffi -ac_add_options --enable-system-cairo -ac_add_options --enable-system-pixman -ac_add_options --with-pthreads - -# Features -ac_add_options --enable-safe-browsing -ac_add_options --enable-startup-notification -ac_add_options --enable-gio - -ac_add_options --disable-gnomevfs -ac_add_options --disable-crashreporter -ac_add_options --disable-updater -ac_add_options --disable-tests -ac_add_options --disable-mochitest -ac_add_options --disable-installer - -# Optimization -ac_add_options --enable-optimize - -export MOZILLA_OFFICIAL=1 -mk_add_options MOZILLA_OFFICIAL=1 diff --git a/extra/xulrunner/mozilla-pkgconfig.patch b/extra/xulrunner/mozilla-pkgconfig.patch deleted file mode 100644 index 037d4aee0..000000000 --- a/extra/xulrunner/mozilla-pkgconfig.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff -Nur mozilla-release.orig/xulrunner/installer/libxul-embedding.pc.in mozilla-release/xulrunner/installer/libxul-embedding.pc.in ---- mozilla-release.orig/xulrunner/installer/libxul-embedding.pc.in 2011-12-19 22:11:38.100005674 +0000 -+++ mozilla-release/xulrunner/installer/libxul-embedding.pc.in 2011-12-19 22:14:35.095147521 +0000 -@@ -6,5 +6,6 @@ - Name: libxul-embedding - Description: Static library for version-independent embedding of the Mozilla runtime - Version: %MOZILLA_VERSION% -+Requires: %NSPR_NAME% >= %NSPR_VERSION% - Libs: -L${sdkdir}/lib -lxpcomglue -ldl - Cflags: -DXPCOM_GLUE -I${includedir} %WCHAR_CFLAGS% -diff -Nur mozilla-release.orig/xulrunner/installer/libxul.pc.in mozilla-release/xulrunner/installer/libxul.pc.in ---- mozilla-release.orig/xulrunner/installer/libxul.pc.in 2011-12-19 22:11:38.126672110 +0000 -+++ mozilla-release/xulrunner/installer/libxul.pc.in 2011-12-19 22:14:04.375412141 +0000 -@@ -1,5 +1,6 @@ - prefix=%prefix% - sdkdir=%sdkdir% -+libdir=%libdir% - includedir=%includedir% - idldir=%idldir% - -diff -Nur mozilla-release.orig/xulrunner/installer/Makefile.in mozilla-release/xulrunner/installer/Makefile.in ---- mozilla-release.orig/xulrunner/installer/Makefile.in 2011-12-19 22:11:38.126672110 +0000 -+++ mozilla-release/xulrunner/installer/Makefile.in 2011-12-19 22:18:28.743135321 +0000 -@@ -108,6 +108,7 @@ - -e "s|%includedir%|$(includedir)|" \ - -e "s|%idldir%|$(idldir)|" \ - -e "s|%sdkdir%|$(sdkdir)|" \ -+ -e "s|%libdir%|$(installdir)|" \ - -e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \ - -e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \ - -e "s|%WCHAR_CFLAGS%|$(WCHAR_CFLAGS)|" \ -diff -Nur mozilla-release.orig/xulrunner/installer/mozilla-js.pc.in mozilla-release/xulrunner/installer/mozilla-js.pc.in ---- mozilla-release.orig/xulrunner/installer/mozilla-js.pc.in 2011-12-19 22:11:38.126672110 +0000 -+++ mozilla-release/xulrunner/installer/mozilla-js.pc.in 2011-12-19 22:18:55.569571004 +0000 -@@ -7,4 +7,4 @@ - Version: %MOZILLA_VERSION% - Requires: %NSPR_NAME% >= %NSPR_VERSION% - Libs: -L${sdkdir}/lib %MOZ_JS_LINK% --Cflags: -I${includedir} -DXP_UNIX -DJS_THREADSAFE -+Cflags: -I${includedir} -I${includedir}/js -DXP_UNIX -DJS_THREADSAFE diff --git a/libre-testing/icedove-libre/PKGBUILD.bk b/libre-testing/icedove-libre/PKGBUILD.bk deleted file mode 100644 index 998e57d04..000000000 --- a/libre-testing/icedove-libre/PKGBUILD.bk +++ /dev/null @@ -1,77 +0,0 @@ -# Maintainer : Márcio Silva <coadde@adinet.com.uy> -# Maintainer : André Silva <andre.paulista@adinet.com.uy> - -# We're getting this from Debian Sid -_debname=icedove -_debver=10.0.3 -_debrel=3 -_debrepo=http://ftp.debian.org/debian/pool/main/ -debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } - -_pkgname=$_debname -pkgname=$_debname-libre -pkgver=$_debver.$_debrel -pkgrel=1 -pkgdesc="A libre version of Debian Icedove, the Standalone Mail/News reader based on Mozilla thunderbird." -arch=('i586' 'i686' 'x86_64' 'mips64el') -license=('GPL2' 'MPL' 'LGPL') -depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'nss' 'sqlite3' 'startup-notification') -makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt') -optdepends=('libcanberra: for sound support') -url="http://packages.debian.org/source/sid/$_pkgname" -install=$_pkgname.install -source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2" - "$_debrepo/`debfile $_debname`_$_debver-$_debrel.debian.tar.gz" - "$_debrepo/`debfile $_debname`_$_debver-$_debrel.dsc" - mozconfig - channel-prefs.js - vendor.js - makefile.patch - gcc47.patch) -md5sums=('3efe2ef4d5471aae3b79531ce8aee9dc' - 'cb3dba2916bdf2deb72248b0984c4302' - '57e21e997a75d85fcc0dcfe30b83f1ee' - 'fda2ff093ddbddf7f4cc3a1ed3bf9dcd' - '476ec205162340fb0679f522c9d31c3b' - '4eecc4fc5aafaf0da651a09eadc90bee' - '5a6282bb005d596aa4ab1884ac6b0517' - '66376a8e934013078f0e646e49614937') - -build() { - export QUILT_PATCHES=debian/patches - export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index' - export QUILT_DIFF_ARGS='--no-timestamps' - export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$_pkgname" - export PYTHON="/usr/bin/python2" - - mv comm-esr10 "$srcdir/mozilla-build" - mv debian "$srcdir/mozilla-build" - - cd "$srcdir/mozilla-build" - quilt push -a - - cp "$srcdir/mozconfig" .mozconfig - patch -Np1 -i "$srcdir/makefile.patch" - patch -Np1 -i "$srcdir/gcc47.patch" - rm "$srcdir"/mozilla-build/mail/locales/en-US/searchplugins/{amazondotcom,aol-web-search,bing,twitter,yahoo}.xml - - make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS" -} - -package() { - cd "$srcdir/mozilla-build" - make -j1 -f client.mk DESTDIR="$pkgdir" install - - install -m644 "$srcdir/vendor.js" "$pkgdir/usr/lib/$_pkgname/defaults/pref" - install -m644 "$srcdir/channel-prefs.js" "$pkgdir/usr/lib/$_pkgname/defaults/pref" # Recommend free addons - -# for i in 16x16 22x22 24x24 32x32 48x48 256x256; do -# install -Dm644 "$debian/app-icons/$_pkgname${i/x*/}.png" "/usr/share/icons/hicolor/$i/apps/$_pkgname.png" -# done -# install -Dm644 "$debian/app-icons/$_pkgname_icon.svg" "/usr/share/icons/hicolor/scalable/apps/$_pkgname.svg" - - rm -rf "$pkgdir"/usr/lib/$_pkgname/{dictionaries,hyphenation} - ln -sf /usr/share/hunspell "$pkgdir/usr/lib/$_pkgname/dictionaries" - ln -sf /usr/share/hyphen "$pkgdir/usr/lib/$_pkgname/hyphenation" - rm -r "$pkgdir"/usr/{include,lib/$_pkgname-devel,share/idl} # We don't want the development stuff -} diff --git a/libre-testing/icedove-libre/PKGBUILD.gcc46 b/libre-testing/icedove-libre/PKGBUILD.gcc46 deleted file mode 100644 index edae656d3..000000000 --- a/libre-testing/icedove-libre/PKGBUILD.gcc46 +++ /dev/null @@ -1,71 +0,0 @@ -# Maintainer : Márcio Silva <coadde@adinet.com.uy> -# Maintainer : André Silva <andre.paulista@adinet.com.uy> - -# We're getting this from Debian Sid -_debname=icedove -_debver=10.0.3 -_debrel=3 -_debrepo=http://ftp.debian.org/debian/pool/main/ -debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } - -_pkgname=$_debname -pkgname=$_debname-libre -pkgver=$_debver -pkgrel=1 -pkgdesc="A libre version of Debian Icedove, the Standalone Mail/News reader based on Mozilla thunderbird." -arch=('i586' 'i686' 'x86_64' 'mips64el') -license=('GPL2' 'MPL' 'LGPL') -depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'nss' 'sqlite3' 'startup-notification') -makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt') -optdepends=('libcanberra: for sound support') -url="http://packages.debian.org/source/sid/$_pkgname" -install=$_pkgname.install -source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2" - "$_debrepo/`debfile $_debname`_$_debver-$_debrel.debian.tar.gz" - "$_debrepo/`debfile $_debname`_$_debver-$_debrel.dsc" - mozconfig - channel-prefs.js - vendor.js) -md5sums=('3efe2ef4d5471aae3b79531ce8aee9dc' - 'cb3dba2916bdf2deb72248b0984c4302' - '57e21e997a75d85fcc0dcfe30b83f1ee' - '76e01cfd6de4d4289265882774d1ba7d' - '476ec205162340fb0679f522c9d31c3b' - '4eecc4fc5aafaf0da651a09eadc90bee') - -build() { - export QUILT_PATCHES=debian/patches - export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index' - export QUILT_DIFF_ARGS='--no-timestamps' - export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$_pkgname" - export PYTHON="/usr/bin/python2" - - mv comm-esr10 "$srcdir/mozilla-build" - mv debian "$srcdir/mozilla-build" - - cd "$srcdir/mozilla-build" - quilt push -a - - cp "$srcdir/mozconfig" .mozconfig - rm "$srcdir"/mozilla-build/mail/locales/en-US/searchplugins/{amazondotcom,aol-web-search,bing,twitter,yahoo}.xml - - make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS" -} - -package() { - cd "$srcdir/mozilla-build" - make -j1 -f client.mk DESTDIR="$pkgdir" install - - install -m644 "$srcdir/vendor.js" "$pkgdir/usr/lib/$_pkgname/defaults/pref" - install -m644 "$srcdir/channel-prefs.js" "$pkgdir/usr/lib/$_pkgname/defaults/pref" # Recommend free addons - - for i in 16x16 22x22 24x24 32x32 48x48 256x256; do - install -Dm644 "$debian/app-icons/$_pkgname${i/x*/}.png" "/usr/share/icons/hicolor/$i/apps/$_pkgname.png" - done - install -Dm644 "$debian/app-icons/$_pkgname_icon.svg" "/usr/share/icons/hicolor/scalable/apps/$_pkgname.svg" - - rm -rf "$pkgdir"/usr/lib/$_pkgname/{dictionaries,hyphenation} - ln -sf /usr/share/hunspell "$pkgdir/usr/lib/$_pkgname/dictionaries" - ln -sf /usr/share/hyphen "$pkgdir/usr/lib/$_pkgname/hyphenation" - rm -r "$pkgdir"/usr/{include,lib/$_pkgname-devel,share/idl} # We don't want the development stuff -} diff --git a/libre-testing/icedove-libre/gcc46.patch b/libre-testing/icedove-libre/gcc46.patch deleted file mode 100644 index 71a3686ea..000000000 --- a/libre-testing/icedove-libre/gcc46.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur comm-1.9.2.orig//mozilla/gfx/ots/src/os2.cc comm-1.9.2/mozilla/gfx/ots/src/os2.cc ---- comm-1.9.2.orig//mozilla/gfx/ots/src/os2.cc 2011-04-14 11:37:21.000000000 -0700 -+++ comm-1.9.2/mozilla/gfx/ots/src/os2.cc 2011-04-29 09:10:23.635807433 -0700 -@@ -2,6 +2,8 @@ - // Use of this source code is governed by a BSD-style license that can be - // found in the LICENSE file. - -+#include <cstddef> -+ - #include "os2.h" - - #include "head.h" diff --git a/libre-testing/icedove-libre/gnuzilla-addons.patch b/libre-testing/icedove-libre/gnuzilla-addons.patch deleted file mode 100644 index 11949c1f1..000000000 --- a/libre-testing/icedove-libre/gnuzilla-addons.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- usr/lib/icedove-3.1/defaults/pref/all-icedove.js 2011-03-04 17:28:11.000000000 -0300 -+++ all-icedove.js 2011-03-08 11:22:31.437207173 -0300 -@@ -144,9 +144,9 @@ - pref("extensions.update.interval", 86400); // Check for updates to Extensions and - // Themes every day - // Non-symmetric (not shared by extensions) extension-specific [update] preferences --pref("extensions.getMoreExtensionsURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/%APP%/%VERSION%/extensions/"); --pref("extensions.getMoreThemesURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/%APP%/%VERSION%/themes/"); --pref("extensions.getMorePluginsURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/%APP%/%VERSION%/plugins/"); -+pref("extensions.getMoreExtensionsURL", "http://www.gnu.org/software/gnuzilla/addons.html"); -+pref("extensions.getMoreThemesURL", "http://www.gnu.org/software/gnuzilla/addons.html"); -+pref("extensions.getMorePluginsURL", "http://www.gnu.org/software/gnuzilla/addons.html"); - pref("extensions.dss.enabled", false); // Dynamic Skin Switching - pref("extensions.dss.switchPending", false); // Non-dynamic switch pending after next - -@@ -155,14 +155,14 @@ - - // Preferences for the Get Add-ons pane - pref("extensions.getAddons.showPane", true); --pref("extensions.getAddons.browseAddons", "https://addons.mozilla.org/%LOCALE%/%APP%"); -+pref("extensions.getAddons.browseAddons", "http://www.gnu.org/software/gnuzilla/addons.html"); - pref("extensions.getAddons.maxResults", 5); --pref("extensions.getAddons.recommended.browseURL", "https://addons.mozilla.org/%LOCALE%/%APP%/recommended"); --pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/list/featured/all/10/%OS%/%VERSION%"); --pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/%APP%/search?q=%TERMS%"); --pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/%TERMS%/all/10/%OS%/%VERSION%"); -+pref("extensions.getAddons.recommended.browseURL", "http://www.gnu.org/software/gnuzilla/addons.html"); -+pref("extensions.getAddons.recommended.url", "http://www.gnu.org/software/gnuzilla/addons.html"); -+pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/software/gnuzilla/addons.html"); -+pref("extensions.getAddons.search.url", "http://www.gnu.org/software/gnuzilla/addons.html"); - --pref("xpinstall.whitelist.add", "addons.mozilla.org"); -+pref("xpinstall.whitelist.add", "www.gnu.org"); - pref("xpinstall.whitelist.add.36", "getpersonas.com"); - - pref("mail.shell.checkDefaultClient", true); diff --git a/libre-testing/icedove-libre/icedove-appversion.patch b/libre-testing/icedove-libre/icedove-appversion.patch deleted file mode 100644 index 3f7a54686..000000000 --- a/libre-testing/icedove-libre/icedove-appversion.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nru comm-1.9.2.orig/mail/installer/Makefile.in comm-1.9.2/mail/installer/Makefile.in ---- comm-1.9.2.orig/mail/installer/Makefile.in 2010-04-30 22:41:37.000000000 +0300 -+++ comm-1.9.2/mail/installer/Makefile.in 2010-05-05 20:20:29.551660469 +0300 -@@ -42,6 +42,8 @@ - - include $(DEPTH)/config/autoconf.mk - -+MOZ_APP_VERSION="3.1" -+ - include $(topsrcdir)/config/rules.mk - - MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in diff --git a/libre-testing/icedove-libre/icedove-install-dir.patch b/libre-testing/icedove-libre/icedove-install-dir.patch deleted file mode 100644 index 927ebb35d..000000000 --- a/libre-testing/icedove-libre/icedove-install-dir.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -Nur comm-esr10.orig/config/autoconf.mk.in comm-esr10/config/autoconf.mk.in ---- config/autoconf.mk.in 2011-11-06 14:39:51.064983780 +0000 -+++ config/autoconf.mk.in 2011-11-06 14:42:57.216735333 +0000 -@@ -66,8 +66,8 @@ - mandir = @mandir@ - idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) - --installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) --sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) -+installdir = $(libdir)/$(MOZ_APP_NAME) -+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel - - MOZDEPTH = $(DEPTH)/mozilla - DIST = $(MOZDEPTH)/dist -diff -Nur comm-esr10.orig/mozilla/config/autoconf.mk.in comm-esr10/mozilla/config/autoconf.mk.in ---- mozilla/config/autoconf.mk.in 2011-11-06 14:39:41.771562967 +0000 -+++ mozilla/config/autoconf.mk.in 2011-11-06 14:44:18.404165515 +0000 -@@ -68,8 +68,8 @@ - mandir = @mandir@ - idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) - --installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) --sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) -+installdir = $(libdir)/$(MOZ_APP_NAME) -+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel - - DIST = $(DEPTH)/dist - LIBXUL_SDK = @LIBXUL_SDK@ -diff -Nur comm-esr10.orig/mozilla/js/src/config/autoconf.mk.in comm-esr10/mozilla/js/src/config/autoconf.mk.in ---- mozilla/js/src/config/autoconf.mk.in 2011-11-06 14:39:48.014955070 +0000 -+++ mozilla/js/src/config/autoconf.mk.in 2011-11-06 14:44:32.977635875 +0000 -@@ -60,8 +60,8 @@ - datadir = @datadir@ - mandir = @mandir@ - --installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) --sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) -+installdir = $(libdir)/$(MOZ_APP_NAME) -+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel - - TOP_DIST = @TOP_DIST@ - ifneq (,$(filter /%,$(TOP_DIST))) diff --git a/libre-testing/icedove-libre/icedove-preferences.patch b/libre-testing/icedove-libre/icedove-preferences.patch deleted file mode 100644 index b6424a421..000000000 --- a/libre-testing/icedove-libre/icedove-preferences.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -Nur comm-1.9.2.orig/mail/app/profile/all-icedove.js comm-1.9.2/mail/app/profile/all-icedove.js ---- comm-1.9.2.orig/mail/app/profile/all-icedove.js 2010-06-23 20:43:08.000000000 +0300 -+++ comm-1.9.2/mail/app/profile/all-icedove.js 2010-06-25 00:37:36.518929684 +0300 -@@ -125,7 +125,7 @@ - pref("app.update.showInstalledUI", false); - - // Release notes URL --pref("app.releaseNotesURL", "http://live.mozillamessaging.com/%APP%/releasenotes?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%"); -+pref("app.releaseNotesURL", "http://www.mozillamessaging.com/%APP%/%VERSION%/releasenotes?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%"); - - // Base URL for web-based support pages. - pref("app.support.baseURL", "http://support.live.mozillamessaging.com/%LOCALE%/%APP%/%APPBUILDID%/"); -diff -Nur comm-1.9.2.orig/mail/branding/nightly/icedove-branding.js comm-1.9.2/mail/branding/nightly/icedove-branding.js ---- comm-1.9.2.orig/mail/branding/nightly/icedove-branding.js 2010-06-23 20:43:08.000000000 +0300 -+++ comm-1.9.2/mail/branding/nightly/icedove-branding.js 2010-06-25 00:36:10.605569121 +0300 -@@ -1,11 +1,11 @@ - // Default start page --pref("mailnews.start_page.url","https://live.mozillamessaging.com/%APP%/start?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%"); -+pref("mailnews.start_page.url","https://www.mozillamessaging.com/%APP%/%VERSION%/start?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%"); - - // first launch welcome page --pref("mailnews.start_page.welcome_url","https://live.mozillamessaging.com/%APP%/firstrun?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%"); -+pref("mailnews.start_page.welcome_url","https://www.mozillamessaging.com/%APP%/%VERSION%/firstrun?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%"); - - // start page override to load after an update --pref("mailnews.start_page.override_url","https://live.mozillamessaging.com/%APP%/whatsnew?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%"); -+pref("mailnews.start_page.override_url","https://www.mozillamessaging.com/%APP%/%VERSION%/whatsnew?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%"); - - // Interval: Time between checks for a new version (in seconds) - // nightly=8 hours, official=24 hours diff --git a/libre-testing/icedove-libre/icedove-shared-error.patch b/libre-testing/icedove-libre/icedove-shared-error.patch deleted file mode 100644 index ae41bbc1e..000000000 --- a/libre-testing/icedove-libre/icedove-shared-error.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up comm-central/mail/installer/Makefile.in.shared-error comm-central/mail/installer/Makefile.in ---- comm-central/mail/installer/Makefile.in.shared-error 2009-09-16 13:47:43.000000000 +0200 -+++ comm-central/mail/installer/Makefile.in 2009-09-16 13:48:25.000000000 +0200 -@@ -95,9 +95,11 @@ endif - # mozconfig instead. - ifndef MAIL_PKG_SHARED - ifndef BUILD_STATIC_LIBS -+ifeq (BUILD_STATIC_LIBS, 1) - $(error you need an "--enable-static" build to package a build) - endif - endif -+endif - - # On mozilla-central, packager.mk uses core_abspath to redefine DIST - # As the comm-central config.mk doesn't set it, do it ourselves instead diff --git a/libre-testing/icedove-libre/icedove.desktop b/libre-testing/icedove-libre/icedove.desktop deleted file mode 100644 index ef2cd76e9..000000000 --- a/libre-testing/icedove-libre/icedove.desktop +++ /dev/null @@ -1,13 +0,0 @@ -[Desktop Entry] -Version=1.0 -Name=Icedove -Comment=Mail & News Reader -GenericName=Mail Client & News Reader -Exec=icedove %u -TryExec=icedove -Icon=icedove -Terminal=false -Type=Application -Categories=Network;Email; -MimeType=message/rfc822;x-scheme-handler/mailto; -StartupNotify=true diff --git a/libre-testing/icedove-libre/libvpx.patch b/libre-testing/icedove-libre/libvpx.patch deleted file mode 100644 index d0f9a0f4c..000000000 --- a/libre-testing/icedove-libre/libvpx.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur comm-release.orig/mozilla/configure.in comm-release/mozilla/configure.in ---- comm-release.orig/mozilla/configure.in 2012-02-05 18:02:17.376830377 +0000 -+++ comm-release/mozilla/configure.in 2012-02-05 18:03:25.246274275 +0000 -@@ -5629,7 +5629,7 @@ - dnl v0.9.6 one to check for. - AC_TRY_COMPILE([ - #include <vpx/vpx_decoder.h> -- #if !defined(VPX_CODEC_USE_INPUT_PARTITION) -+ #if !defined(VPX_CODEC_USE_INPUT_FRAGMENTS) - #error "test failed." - #endif - ], diff --git a/libre-testing/icedove-libre/mozconfig.pgo b/libre-testing/icedove-libre/mozconfig.pgo deleted file mode 100644 index b0c249ebf..000000000 --- a/libre-testing/icedove-libre/mozconfig.pgo +++ /dev/null @@ -1,4 +0,0 @@ -# PGO -ac_add_options --enable-profile-guided-optimization -mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py' -mk_add_options PYTHONPATH='$(OBJDIR)/_profile/pgo' diff --git a/libre-testing/icedove-libre/mozilla-notify.patch b/libre-testing/icedove-libre/mozilla-notify.patch deleted file mode 100644 index 952567b0e..000000000 --- a/libre-testing/icedove-libre/mozilla-notify.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up comm-1.9.2/mozilla/toolkit/system/gnome/nsAlertsIconListener.cpp.libnotify comm-1.9.2/mozilla/toolkit/system/gnome/nsAlertsIconListener.cpp ---- comm-1.9.2/mozilla/toolkit/system/gnome/nsAlertsIconListener.cpp.libnotify 2010-10-27 09:05:36.000000000 +0200 -+++ comm-1.9.2/mozilla/toolkit/system/gnome/nsAlertsIconListener.cpp 2010-11-08 13:28:04.564002379 +0100 -@@ -204,7 +204,7 @@ nsAlertsIconListener::ShowAlert(GdkPixbu - { - NotifyNotification* notify = notify_notification_new(mAlertTitle.get(), - mAlertText.get(), -- NULL, NULL); -+ NULL); - if (!notify) - return NS_ERROR_OUT_OF_MEMORY; - diff --git a/libre-testing/icedove-libre/python2.7.patch b/libre-testing/icedove-libre/python2.7.patch deleted file mode 100644 index 2d159d479..000000000 --- a/libre-testing/icedove-libre/python2.7.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.in 2010-10-13 08:37:29.000000000 -0700 -+++ configure.in~ 2010-10-19 10:32:06.360019362 -0700 -@@ -878,7 +878,7 @@ - AC_MSG_RESULT([yes]) - fi - --MOZ_PATH_PROGS(PYTHON, $PYTHON python2.6 python2.5 python2.4 python) -+MOZ_PATH_PROGS(PYTHON, $PYTHON python2.7 python2.6 python2.5 python2.4 python) - if test -z "$PYTHON"; then - AC_MSG_ERROR([python was not found in \$PATH]) - fi diff --git a/libre-testing/icedove-libre/rePKGBUILD b/libre-testing/icedove-libre/rePKGBUILD deleted file mode 100644 index 771e93bc8..000000000 --- a/libre-testing/icedove-libre/rePKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# This is an example rePKGBUILD file. Use this as a start to creating your own, -# and remove these comments. For more information, see 'man PKGBUILD'. -# NOTE: Please fill out the license field for your package! If it is unknown, -# then please put 'unknown'. - -# Maintainer: Nicolas Reynolds <fauno@kiwwwi.com.ar> -# Maintainer: Márcio Silva <coadde@adinet.com.uy> -source PKGBUILD -unset build package md5sums source -_repo=extra -options=(!strip) -source=(PKGBUILD - http://mirrors.kernel.org/archlinux/${_repo}/os/$CARCH/${pkgname%-libre}-$pkgver-$pkgrel-$CARCH$PKGEXT - # files for pkg modifications - channel-prefs.js) - -build() { - cd "${srcdir}/" - rm -v .{INSTALL,PKGINFO} ${pkgname%-libre}-$pkgver-$pkgrel-$CARCH$PKGEXT - -# Recommend free addons - cp --remove-destination "${srcdir}/channel-prefs.js" \ - "${srcdir}/usr/lib/icedove/defaults/pref/channel-prefs.js" -} - -package() { - find ${srcdir} -type l -maxdepth 1 -delete - cd ${srcdir} - cp -a ./* ${pkgdir} -} diff --git a/libre-testing/icedove-libre/xulrunner-png14.patch b/libre-testing/icedove-libre/xulrunner-png14.patch deleted file mode 100644 index 1dc0ecda5..000000000 --- a/libre-testing/icedove-libre/xulrunner-png14.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- mozilla/modules/libpr0n/encoders/png/nsPNGEncoder.cpp.orig 2010-01-17 00:15:53.979744638 +0100 -+++ mozilla/modules/libpr0n/encoders/png/nsPNGEncoder.cpp 2010-01-17 00:16:07.855993411 +0100 -@@ -135,7 +135,7 @@ - - // initialize - mPNG = png_create_write_struct(PNG_LIBPNG_VER_STRING, -- png_voidp_NULL, -+ NULL, - ErrorCallback, - ErrorCallback); - if (! mPNG) diff --git a/libre/grub2/archlinux_grub2_mkconfig_fixes.patch b/libre/grub2/archlinux_grub2_mkconfig_fixes.patch deleted file mode 100644 index ef4b10ee6..000000000 --- a/libre/grub2/archlinux_grub2_mkconfig_fixes.patch +++ /dev/null @@ -1,130 +0,0 @@ -diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in -index 859c2e8..c754dd7 100644 ---- a/util/grub-mkconfig.in -+++ b/util/grub-mkconfig.in -@@ -242,6 +242,8 @@ export GRUB_DEFAULT \ - GRUB_THEME \ - GRUB_GFXPAYLOAD_LINUX \ - GRUB_DISABLE_OS_PROBER \ -+ GRUB_COLOR_NORMAL \ -+ GRUB_COLOR_HIGHLIGHT \ - GRUB_INIT_TUNE \ - GRUB_SAVEDEFAULT \ - GRUB_ENABLE_CRYPTODISK \ -diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in -index d9bcc15..a93dcb7 100644 ---- a/util/grub.d/00_header.in -+++ b/util/grub.d/00_header.in -@@ -100,6 +100,14 @@ cat <<EOF - - EOF - -+if [ x$GRUB_COLOR_NORMAL != x ] && [ x$GRUB_COLOR_HIGHLIGHT != x ] ; then -+ cat << EOF -+set menu_color_normal=$GRUB_COLOR_NORMAL -+set menu_color_highlight=$GRUB_COLOR_HIGHLIGHT -+ -+EOF -+fi -+ - serial=0; - gfxterm=0; - for x in ${GRUB_TERMINAL_INPUT} ${GRUB_TERMINAL_OUTPUT}; do -diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in -index bc738f2..a6ab326 100644 ---- a/util/grub.d/10_linux.in -+++ b/util/grub.d/10_linux.in -@@ -31,8 +31,8 @@ CLASS="--class gnu-linux --class gnu --class os" - if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then - OS=GNU/Linux - else -- OS="${GRUB_DISTRIBUTOR} GNU/Linux" -- CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1) ${CLASS}" -+ OS="${GRUB_DISTRIBUTOR}" -+ CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | tr -d ' ') ${CLASS}" - fi - - # loop-AES arranges things so that /dev/loop/X can be our root device, but -@@ -48,7 +48,7 @@ if [ "x${GRUB_DEVICE_UUID}" = "x" ] || [ "x${GRUB_DISABLE_LINUX_UUID}" = "xtrue" - || uses_abstraction "${GRUB_DEVICE}" lvm; then - LINUX_ROOT_DEVICE=${GRUB_DEVICE} - else -- LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID} -+ LINUX_ROOT_DEVICE="/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" - fi - - if [ "x`${grub_probe} --device ${GRUB_DEVICE} --target=fs 2>/dev/null || true`" = xbtrfs ]; then -@@ -65,7 +65,9 @@ linux_entry () - version="$2" - recovery="$3" - args="$4" -- if ${recovery} ; then -+ if [ -n "$5" ] ; then -+ title="$(gettext_quoted "%s, with Linux %s") $5" -+ elif ${recovery} ; then - title="$(gettext_quoted "%s, with Linux %s (recovery mode)")" - else - title="$(gettext_quoted "%s, with Linux %s")" -@@ -113,7 +115,9 @@ EOF - fi - printf '%s\n' "${prepare_boot_cache}" - fi -+ - message="$(gettext_printf "Loading Linux %s ..." ${version})" -+ - cat << EOF - echo '$message' - linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args} -@@ -132,11 +136,11 @@ EOF - - case x`uname -m` in - xi?86 | xx86_64) -- list=`for i in /boot/vmlinuz-* /vmlinuz-* /boot/kernel-* ; do -+ list=`for i in /boot/vmlinuz-* /vmlinuz-* /boot/kernel-* /boot/vmlinuz26-* ; do - if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi - done` ;; - *) -- list=`for i in /boot/vmlinuz-* /boot/vmlinux-* /vmlinuz-* /vmlinux-* /boot/kernel-* ; do -+ list=`for i in /boot/vmlinuz* /boot/vmlinux* /vmlinuz* /vmlinux* /boot/kernel-* ; do - if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi - done` ;; - esac -@@ -151,16 +155,19 @@ while [ "x$list" != "x" ] ; do - dirname=`dirname $linux` - rel_dirname=`make_system_path_relative_to_its_root $dirname` - version=`echo $basename | sed -e "s,^[^0-9]*-,,g"` -- alt_version=`echo $version | sed -e "s,\.old$,,g"` -+ base_init=`echo $basename | sed -e "s,vmlinuz,initramfs,g"` -+ alt_version="${base_init}-fallback" - linux_root_device_thisversion="${LINUX_ROOT_DEVICE}" - - initrd= -+ - for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \ - "initrd-${version}" "initramfs-${version}.img" \ - "initrd.img-${alt_version}" "initrd-${alt_version}.img" \ - "initrd-${alt_version}" "initramfs-${alt_version}.img" \ - "initramfs-genkernel-${version}" \ -- "initramfs-genkernel-${alt_version}"; do -+ "initramfs-genkernel-${alt_version}" \ -+ "${basename/vmlinuz/initramfs}.img" "${basename/vmlinuz/kernel}.img"; do - if test -e "${dirname}/${i}" ; then - initrd="$i" - break -@@ -190,6 +197,16 @@ while [ "x$list" != "x" ] ; do - - linux_entry "${OS}" "${version}" false \ - "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" -+ for i in "initramfs-${version}-fallback.img" \ -+ "${basename/vmlinuz/initramfs}-fallback.img" "${basename/vmlinuz/kernel}-fallback.img"; do -+ if test -e "${dirname}/${i}"; then -+ initrd="$i" -+ linux_entry "${OS}" "${version}" true \ -+ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" Fallback -+ break -+ fi -+ done -+ - if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then - linux_entry "${OS}" "${version}" true \ - "single ${GRUB_CMDLINE_LINUX}" diff --git a/libre/grub2/archlinux_grub_mkconfig_fixes.patch b/libre/grub2/archlinux_grub_mkconfig_fixes.patch deleted file mode 100644 index 4b4cba92a..000000000 --- a/libre/grub2/archlinux_grub_mkconfig_fixes.patch +++ /dev/null @@ -1,141 +0,0 @@ -diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in -index df3b733..65a7fff 100644 ---- a/util/grub-mkconfig.in -+++ b/util/grub-mkconfig.in -@@ -213,6 +213,8 @@ export GRUB_DEFAULT \ - GRUB_THEME \ - GRUB_GFXPAYLOAD_LINUX \ - GRUB_DISABLE_OS_PROBER \ -+ GRUB_COLOR_NORMAL \ -+ GRUB_COLOR_HIGHLIGHT \ - GRUB_INIT_TUNE \ - GRUB_SAVEDEFAULT \ - GRUB_ENABLE_CRYPTODISK \ -diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in -index 765bfdc..b148558 100644 ---- a/util/grub.d/00_header.in -+++ b/util/grub.d/00_header.in -@@ -115,6 +115,14 @@ cat <<EOF - - EOF - -+if [ x$GRUB_COLOR_NORMAL != x ] && [ x$GRUB_COLOR_HIGHLIGHT != x ] ; then -+ cat << EOF -+set menu_color_normal=$GRUB_COLOR_NORMAL -+set menu_color_highlight=$GRUB_COLOR_HIGHLIGHT -+ -+EOF -+fi -+ - serial=0; - gfxterm=0; - for x in ${GRUB_TERMINAL_INPUT} ${GRUB_TERMINAL_OUTPUT}; do -diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in -index 8c75fab..0d4a137 100644 ---- a/util/grub.d/10_linux.in -+++ b/util/grub.d/10_linux.in -@@ -87,6 +87,8 @@ linux_entry () - case $type in - recovery) - title="$(gettext_printf "%s, with Linux %s (recovery mode)" "${os}" "${version}")" ;; -+ fallback) -+ title="$(gettext_printf "%s, with Linux %s (Fallback initramfs)" "${os}" "${version}")" ;; - *) - title="$(gettext_printf "%s, with Linux %s" "${os}" "${version}")" ;; - esac -@@ -100,7 +102,7 @@ linux_entry () - else - echo "menuentry '$(echo "$os" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-simple-$boot_device_id' {" | sed "s/^/$submenu_indentation/" - fi -- if [ x$type != xrecovery ] ; then -+ if [ x$type != xrecovery ] && [ x$type != xfallback ] ; then - save_default_entry | sed -e "s/^/\t/" - fi - -@@ -132,7 +134,8 @@ linux_entry () - fi - printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/" - fi -- message="$(gettext_printf "Loading Linux %s ..." ${version})" -+ -+ message="$(gettext_printf "Loading Linux %s ..." "${version}")" - sed "s/^/$submenu_indentation/" << EOF - echo '$message' - linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args} -@@ -181,13 +184,29 @@ while [ "x$list" != "x" ] ; do - alt_version=`echo $version | sed -e "s,\.old$,,g"` - linux_root_device_thisversion="${LINUX_ROOT_DEVICE}" - -+ if test -e "/etc/arch-release" ; then -+ if echo "${basename}" | grep -q 'vmlinuz-linux' ; then -+ version="`echo "${basename}" | sed -e 's,vmlinuz-linux,,g'`" -+ -+ if [ "x${version}" = "x" ] ; then -+ version="core repo kernel" -+ else -+ version="`echo "${version}" | sed -e 's,-,,g'`" -+ version="${version} kernel" -+ fi -+ fi -+ fi -+ - initrd= -+ initrd_arch="`echo "${basename}" | sed -e 's,vmlinuz,initramfs,g'`" -+ - for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \ - "initrd-${version}" "initramfs-${version}.img" \ - "initrd.img-${alt_version}" "initrd-${alt_version}.img" \ - "initrd-${alt_version}" "initramfs-${alt_version}.img" \ - "initramfs-genkernel-${version}" \ -- "initramfs-genkernel-${alt_version}"; do -+ "initramfs-genkernel-${alt_version}" \ -+ "${initrd_arch}.img" ; do - if test -e "${dirname}/${i}" ; then - initrd="$i" - break -@@ -215,6 +234,22 @@ while [ "x$list" != "x" ] ; do - linux_root_device_thisversion=${GRUB_DEVICE} - fi - -+ if test -e "/etc/arch-release" ; then -+ is_first_entry="false" -+ -+ linux_entry "${OS}" "${version}" true \ -+ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" -+ -+ for i in "${initrd_arch}-fallback.img" "initramfs-${version}-fallback.img" ; do -+ if test -e "${dirname}/${i}" ; then -+ initrd="${i}" -+ linux_entry "${OS}" "${version}" fallback \ -+ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" -+ break -+ fi -+ done -+ fi -+ - if [ "x$is_first_entry" = xtrue ]; then - linux_entry "${OS}" "${version}" simple \ - "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" -@@ -228,8 +263,11 @@ while [ "x$list" != "x" ] ; do - echo "submenu '$(gettext_printf "Advanced options for %s" "${OS}" | grub_quote)' \$menuentry_id_option 'gnulinux-advanced-$boot_device_id' {" - fi - -+ if ! test -e "/etc/arch-release" ; then - linux_entry "${OS}" "${version}" advanced \ - "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" -+ fi -+ - if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then - linux_entry "${OS}" "${version}" recovery \ - "single ${GRUB_CMDLINE_LINUX}" -@@ -241,8 +279,10 @@ done - - # If at least one kernel was found, then we need to - # add a closing '}' for the submenu command. -+if ! test -e "/etc/arch-release" ; then - if [ x"$is_first_entry" != xtrue ]; then - echo '}' - fi -+fi - - echo "$title_correction_code" diff --git a/libre/virtualbox-modules/virtualbox-libre-modules.install b/libre/virtualbox-modules/virtualbox-libre-modules.install deleted file mode 100644 index b542db1ca..000000000 --- a/libre/virtualbox-modules/virtualbox-libre-modules.install +++ /dev/null @@ -1,17 +0,0 @@ -post_install() { -cat << EOF -===> You may want to load vboxguest, vboxsf and vboxvideo -EOF - EXTRAMODULES='extramodules-3.2-LIBRE' - depmod $(cat /lib/modules/$EXTRAMODULES/version) -} - -post_upgrade() { - EXTRAMODULES='extramodules-3.2-LIBRE' - depmod $(cat /lib/modules/$EXTRAMODULES/version) -} - -post_remove() { - EXTRAMODULES='extramodules-3.2-LIBRE' - depmod $(cat /lib/modules/$EXTRAMODULES/version) -} diff --git a/~emulatorman/jitsi-stable/PKGBUILD b/~emulatorman/jitsi-stable/PKGBUILD deleted file mode 100644 index 9cb7018a9..000000000 --- a/~emulatorman/jitsi-stable/PKGBUILD +++ /dev/null @@ -1,65 +0,0 @@ -# Contributor: Ananda Samaddar ananda@samaddar.co.uk -# Contributor: Xavion <Xavion (dot) 0 (at) Gmail (dot) com> -# Contributor: atommix aka Aleks Lifey <Aleks.Lifey@gmail.com> -# Contributor: Keshav P R <(skodabenz) (aatt) (rocketmail) (ddoott) (ccoomm)> -# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy> - -_pkgname=jitsi -pkgname=$_pkgname-stable -pkgver=1.0.beta1.3820 -pkgrel=1 -pkgdesc="An audio/video/chat communicator that supports protocols such as SIP and XMPP/Jabber" -arch=('i686' 'x86_64') -url="http://jitsi.org" -license=('LGPL') -depends=('openjdk6') -makedepends=('apache-ant' 'openjdk6') -provides=("$_pkgname=$pkver") -conflicts=("$_pkgname") -options=(!strip !emptydirs zipman !libtool docs) -source=("http://download.jitsi.org/jitsi/src/jitsi-src-1.0-beta1-nightly.build.${pkgver##*.}.zip" - $_pkgname.{desktop,sh}) -md5sums=('a5675da30e2e5fd801d2457ddddba0f9' - '5923eeca35823f8ef1e416a9a6fc0fac' - '55fe144bbf19283e7ec5d7bd3228cf5b') -sha256sums=('74d845b993cdd53856415a179ac72bbe9c6f5db37482874eab7be34490e7c0c2' - '770132b617d94ed468e9592b991ceac10eb3e03e7198b8f5f2f05918f7db4302' - '98027ddaa1ebfe948fa49f6e57ab0d2c866d5e7c37873e30638b86223a2a15e9') - -# uncomment to get the latest stable release; you have to adjust/skip checksums -#source[0]=http://download.jitsi.org/jitsi/src/$(curl -Ss 'http://download.jitsi.org/jitsi/src/' | grep -om1 'jitsi-src[^"<]\+.zip' | head -1) -#pkgver=$(sed -r 's/[^0-9]*([0-9.]+)(-(beta[0-9]+))?.*(.build.([0-9]+))\..*/\1.\3.\5/' <<<${source[0]}) - -build() { - cd "$srcdir/$_pkgname" - - # append the build revision to the jitsi version - sed -i "s/0\.build\.by\.SVN/build.${pkgver##*.}/" src/net/java/sip/communicator/impl/version/NightlyBuildID.java - - . /etc/profile.d/apache-ant.sh - ant rebuild -} - -package() { - cd "$srcdir/$_pkgname" - - find lib/ lib/bundle/ -maxdepth 1 -type f \ - -exec install -Dm644 {} "$pkgdir/usr/lib/$_pkgname/"{} \; - find lib/os-specific/linux/ -maxdepth 1 -type f \ - -execdir install -Dm644 {} "$pkgdir/usr/lib/$_pkgname/lib/"{} \; - - shopt -sq extglob - find lib/native/linux$(sed 's/_/-/g' <<<${CARCH/#*(i?86|x86)/})/ -maxdepth 1 -type f \ - -execdir install -Dm644 {} "$pkgdir/usr/lib/$_pkgname/lib/native/"{} \; - - find sc-bundles/{,os-specific/linux/} -maxdepth 1 -type f \ - -execdir install -Dm644 {} "$pkgdir/usr/lib/$_pkgname/sc-bundles/"{} \; - - install -Dm755 "$srcdir/$_pkgname.sh" "$pkgdir/usr/bin/$_pkgname" - install -Dm644 "$srcdir/$_pkgname.desktop" "$pkgdir/usr/share/applications/$_pkgname.desktop" - - local _file - for _file in resources/install/debian/*.{svg,xpm}; do - install -Dm644 "$_file" "$pkgdir/usr/share/pixmaps/$_pkgname${_file/*sip-communicator/}" - done -} diff --git a/~emulatorman/jitsi-stable/jitsi.desktop b/~emulatorman/jitsi-stable/jitsi.desktop deleted file mode 100644 index f0a7b5436..000000000 --- a/~emulatorman/jitsi-stable/jitsi.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=Jitsi -GenericName=jitsi -Comment=VoIP and Instant Messaging client -Icon=/usr/share/pixmaps/jitsi.svg -Type=Application -Categories=Network; -Exec=/usr/bin/jitsi -Terminal=false diff --git a/~emulatorman/jitsi-stable/jitsi.sh b/~emulatorman/jitsi-stable/jitsi.sh deleted file mode 100644 index 6ebd6131f..000000000 --- a/~emulatorman/jitsi-stable/jitsi.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -# Additionnal JVM arguments -CLIENTARGS="" -[[ $(uname -m) =~ i?86 ]] && CLIENTARGS="-client -Xmx256m" - -SCDIR=/usr/lib/jitsi -LIBPATH=$SCDIR/lib -CLASSPATH=$LIBPATH/jdic_stub.jar:$LIBPATH/jdic-all.jar:$LIBPATH/felix.jar:$LIBPATH/bcprovider.jar:$SCDIR/sc-bundles/sc-launcher.jar:$SCDIR/sc-bundles/util.jar -FELIX_CONFIG=$LIBPATH/felix.client.run.properties -LOG_CONFIG=$LIBPATH/logging.properties -COMMAND="$JAVA_HOME/bin/java $CLIENTARGS -classpath $CLASSPATH -Djna.library.path=$LIBPATH/native -Dfelix.config.properties=file:$FELIX_CONFIG -Djava.util.logging.config.file=$LOG_CONFIG net.java.sip.communicator.launcher.SIPCommunicator" - -# set add LIBPATH to LD_LIBRARY_PATH for any sc natives (e.g. jmf .so's) -export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$LIBPATH/native - -cd $SCDIR - -exec $COMMAND $* diff --git a/~emulatorman/mednafen-wip/build.patch b/~emulatorman/mednafen-wip/build.patch deleted file mode 100644 index 7985a19ed..000000000 --- a/~emulatorman/mednafen-wip/build.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/src/file.cpp b/src/file.cpp -index 57f4e13..ec1181c 100644 ---- a/src/file.cpp -+++ b/src/file.cpp -@@ -293,7 +293,7 @@ bool MDFNFILE::MakeMemWrapAndClose(void *tz, int type) - goto doret; - } - -- while((howmany = gzread(tz, f_data + cur_size, cur_alloced - cur_size)) > 0) -+ while((howmany = gzread((gzFile)tz, f_data + cur_size, cur_alloced - cur_size)) > 0) - { - cur_size += howmany; - cur_alloced <<= 1; -@@ -320,7 +320,7 @@ bool MDFNFILE::MakeMemWrapAndClose(void *tz, int type) - { - int gzerrnum = 0; - const char *gzerrstring; -- if((gzerrstring = gzerror(tz, &gzerrnum)) && gzerrnum != Z_OK && gzerrnum != Z_STREAM_END) -+ if((gzerrstring = gzerror((gzFile)tz, &gzerrnum)) && gzerrnum != Z_OK && gzerrnum != Z_STREAM_END) - { - if(gzerrnum != Z_ERRNO) - { -@@ -365,7 +365,7 @@ bool MDFNFILE::MakeMemWrapAndClose(void *tz, int type) - } - else if(type == MDFN_FILETYPE_GZIP) - { -- gzclose(tz); -+ gzclose((gzFile)tz); - } - else if(type == MDFN_FILETYPE_ZIP) - { diff --git a/~lukeshu/unar/PKGBUILD b/~lukeshu/unar/PKGBUILD deleted file mode 100644 index 4bb523a89..000000000 --- a/~lukeshu/unar/PKGBUILD +++ /dev/null @@ -1,96 +0,0 @@ -# Contributor: Cedric Girard <girard.cedric@gmail.com> -# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> - -pkgname=( - 'unar' - 'libuniversaldetector' - 'libxadmaster' - 'libxadmaster-libxad') -pkgver=0.99 -pkgrel=1 -arch=('x86_64' 'i686') -url="http://wakaba.c3.cx/s/apps/unarchiver.html" -license=('LGPL2.1') -depends=('gnustep-base-libre>=1.23.0' 'openssl' 'bzip2' 'icu' 'gcc-libs' 'zlib') -conflicts=('gnustep-base>=1.24') -makedepends=('gcc-objc') -source=("https://theunarchiver.googlecode.com/files/unar${pkgver}_src.zip") - -build() { - cd "$srcdir/XADMaster" - - # remove some OS X object files that were accidentally included in the dist - # (we've all done it) - find "$srcdir" -name '*.o' -delete - - # build everything - . /usr/share/GNUstep/Makefiles/GNUstep.sh - make -f Makefile.linux - - # make libxad into a lib file - cd libxad - rm -f libxad.a - ar rcs libxad.a all.o clients.o unix/emulation.o unix/init.o - - # compress man pages - cd "$srcdir/Extra" - gzip -c unar.1 > unar.1.gz - gzip -c lsar.1 > lsar.1.gz -} - -package_unar() { - pkgdesc="The unar/lsar command line wrappers around libXADMaster" - - cd "$srcdir/XADMaster" - install -d "$pkgdir/usr/bin" - install -m755 unar lsar "$pkgdir/usr/bin" - - cd "$srcdir/Extra" - install -d "$pkgdir/usr/share/man/man1" - install unar.1.gz lsar.1.gz "$pkgdir/usr/share/man/man1" -} - -package_libuniversaldetector() { - pkgdesc="Some fancy-schmancy Objective-C library that detects things?" - - cd "$srcdir/UniversalDetector" - install -d "$pkgdir/usr/lib/" - install libUniversalDetector.a "$pkgdir/usr/lib/" - install -d "$pkgdir/usr/include/" - install UniversalDetector.h "$pkgdir/usr/include/" -} - -package_libxadmaster() { - pkgdesc="An Objective-C library built around libxad adding support for other formats" - depends+=('libuniversaldetector') - - header_files=' - CommandLineCommon.h - NSStringPrinting.h - XADArchive.h - XADRegex.h - XADSimpleUnarchiver.h - XADUnarchiver.h - ' - - cd "$srcdir/XADMaster" - install -d "$pkgdir/usr/lib" - install libXADMaster.a "$pkgdir/usr/lib" - install -d "$pkgdir/usr/include/XADMaster" - install $header_files "$pkgdir/usr/include/XADMaster" -} - -package_libxadmaster-libxad() { - pkgdesc="A fork of libxad, the port of the Amiga 'xadmaster.library' to *NIX" - depends=('glibc') - provides=('libxad') - conflicts=('libxad') - - cd "$srcdir/XADMaster/libxad" - install -d "$pkgdir/usr/lib" - install libxad.a "$pkgdir/usr/lib" - install -d "$pkgdir/usr/include/libxad" - install include/* "$pkgdir/usr/include/libxad" -} - -md5sums=('2169b920cf62956e495cfd5e0780a41e') diff --git a/~lukeshu/unarchiver/PKGBUILD b/~lukeshu/unarchiver/PKGBUILD deleted file mode 100644 index 0df133a6c..000000000 --- a/~lukeshu/unarchiver/PKGBUILD +++ /dev/null @@ -1,93 +0,0 @@ -# Contributor: Cedric Girard <girard.cedric@gmail.com> -# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> - -pkgname=( - 'unarchiver' - 'unar' - 'libuniversaldetector' - 'libxadmaster' - 'libxadmaster-libxad') -pkgver=2.7.1 -pkgrel=4 -arch=('x86_64' 'i686') -url="http://wakaba.c3.cx/s/apps/unarchiver.html" -license=('LGPL2.1') -depends=('gnustep-base-libre>=1.23.0' 'openssl' 'bzip2' 'icu' 'gcc-libs' 'zlib') -conflicts=('gnustep-base>=1.24') -makedepends=('gcc-objc') -source=("http://theunarchiver.googlecode.com/files/TheUnarchiver${pkgver}_src.zip") - -build() { - cd "$srcdir/The Unarchiver/XADMaster" - - # build everything - . /usr/share/GNUstep/Makefiles/GNUstep.sh - make -f Makefile.linux - - # make libxad into a lib file - cd libxad - rm -f libxad.a - ar rcs libxad.a all.o clients.o unix/emulation.o unix/init.o -} - -package_unarchiver() { - pkgdesc="An Objective-C application for uncompressing archive files" - arch=('any') - depends=(${depends[@]} 'unar>=0.4') -} - -package_unar() { - pkgver=0.4 - pkgdesc="The unar/lsar command line wrappers around libXADMaster" - - cd "$srcdir/The Unarchiver/XADMaster" - install -d "$pkgdir/usr/bin" - install -m755 unar lsar "$pkgdir/usr/bin" -} - -package_libuniversaldetector() { - pkgver=0.4 - pkgdesc="Some fancy-schmancy Objective-C library that detects things?" - - cd "$srcdir/The Unarchiver/UniversalDetector" - install -d "$pkgdir/usr/lib" - install libUniversalDetector.a "$pkgdir/usr/lib" - install -d "$pkgdir/usr/include" - install UniversalDetector.h "$pkgdir/usr/include" -} - -package_libxadmaster() { - pkgver=0.4 - pkgdesc="An Objective-C library built around libxad adding support for other formats" - depends+=('libuniversaldetector') - - header_files=' - CommandLineCommon.h - NSStringPrinting.h - XADArchive.h - XADRegex.h - XADUnarchiver.h - ' - - cd "$srcdir/The Unarchiver/XADMaster" - install -d "$pkgdir/usr/lib" - install libXADMaster.a "$pkgdir/usr/lib" - install -d "$pkgdir/usr/include/XADMaster" - install $header_files "$pkgdir/usr/include/XADMaster" -} - -package_libxadmaster-libxad() { - pkgver=0.4 # forked from 13.0.2005.06.23 (commit 1.24) - pkgdesc="A fork of libxad, the port of the Amiga 'xadmaster.library' to *NIX" - depends=('glibc') - provides=('libxad') - conflicts=('libxad') - - cd "$srcdir/The Unarchiver/XADMaster/libxad" - install -d "$pkgdir/usr/lib" - install libxad.a "$pkgdir/usr/lib" - install -d "$pkgdir/usr/include/libxad" - install include/* "$pkgdir/usr/include/libxad" -} - -md5sums=('498ea1c984d5783322e070a71922b422') diff --git a/~lukeshu/xadmaster/PKGBUILD b/~lukeshu/xadmaster/PKGBUILD deleted file mode 100644 index 8f358aae6..000000000 --- a/~lukeshu/xadmaster/PKGBUILD +++ /dev/null @@ -1,56 +0,0 @@ -# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> -# NOTE: This currently does not build. - -pkgname=xadmaster -pkgver=13.0.2006.06.21 -pkgrel=1 -pkgdesc="The port of the Amiga 'xadmaster.library' to *NIX" -arch=('i686' 'x86_64') -url="http://www.dstoecker.eu/xadmaster.html" -license=('LGPL2.1') -groups=() -depends=('glibc') -makedepends=('cvs') -provides=('libxad') -conflicts=('libxad') -replaces=() -backup=() -options=() -install= -source=() -noextract=() -md5sums=() - -_cvsroot=:pserver:anonymous@libxad.cvs.sourceforge.net:/cvsroot/libxad -_cvsmod=libxad - -build() { - cd "$srcdir" - msg "Connecting to $_cvsmod.sourceforge.net CVS server...." - - if [[ -d "$_cvsmod/CVS" ]]; then - cd "$_cvsmod" - cvs -z3 update -d - else - cvs -z3 -d "$_cvsroot" co -D "$pkgver" -f "$_cvsmod" - cd "$_cvsmod" - fi - - msg "CVS checkout done or server timeout" - msg "Starting build..." - - rm -rf "$srcdir/$_cvsmod-build" - cp -r "$srcdir/$_cvsmod" "$srcdir/$_cvsmod-build" - cd "$srcdir/$_cvsmod-build" - - # BUILD - cd portable - autoconf # FIXME: On my system this fails, I don't know what to do - ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/$_cvsmod-build" - make DESTDIR="$pkgdir/" install -} |
