From a3108a9a809c496e1f6a0e9caf0acebac3889bfb Mon Sep 17 00:00:00 2001 From: root Date: Wed, 21 Mar 2012 00:01:20 +0000 Subject: Wed Mar 21 00:01:20 UTC 2012 --- community/allegro/PKGBUILD | 20 +- community/coq/PKGBUILD | 12 +- community/coq/camlp5-latest-fix.diff | 354 +++++++++++++++++++++ community/gnome-packagekit/PKGBUILD | 8 +- community/ircii-pana/PKGBUILD | 62 ++-- .../ircii-pana/bitchx-1.1-open_missing_mode.patch | 22 ++ community/libmemcached/PKGBUILD | 8 +- community/linux-tools/PKGBUILD | 10 +- community/lrzip/PKGBUILD | 44 +++ community/oolite/PKGBUILD | 7 +- community/spectrwm/PKGBUILD | 6 +- 11 files changed, 497 insertions(+), 56 deletions(-) create mode 100644 community/coq/camlp5-latest-fix.diff create mode 100644 community/ircii-pana/bitchx-1.1-open_missing_mode.patch create mode 100644 community/lrzip/PKGBUILD (limited to 'community') diff --git a/community/allegro/PKGBUILD b/community/allegro/PKGBUILD index 8e5a88a8b..7ab054c75 100644 --- a/community/allegro/PKGBUILD +++ b/community/allegro/PKGBUILD @@ -1,27 +1,31 @@ -# $Id: PKGBUILD 146876 2012-01-19 02:37:24Z eric $ -# Maintainer: Ionut Biru +# $Id: PKGBUILD 68209 2012-03-19 09:36:12Z arodseth $ +# Maintainer: Alexander Rødseth +# Contributor: Ionut Biru # Contributor: Tom Newsom # Contributor: arjan pkgname=allegro pkgver=5.0.6 -pkgrel=1 +pkgrel=2 pkgdesc="Portable library mainly aimed at video game and multimedia programming" arch=('x86_64' 'i686') url="http://alleg.sourceforge.net/" license=('custom') -depends=('jack' 'libxpm' 'libxxf86vm' 'libxxf86dga' 'libxcursor' 'libpng' 'libgl' 'libjpeg') -makedepends=('cmake' 'mesa' 'freetype2') +depends=('jack' 'libxpm' 'freetype2' 'libxxf86dga' 'libxcursor' 'libpng' 'libgl' 'libjpeg' 'physfs') +makedepends=('cmake' 'mesa') source=("http://downloads.sourceforge.net/alleg/$pkgname-$pkgver.tar.gz") sha256sums=('d981a1cac937085e6636e597c492ddb743066516c1d215c2a39e4049bd70dc24') build() { + cd "$srcdir" + mkdir build cd build cmake "../$pkgname-$pkgver" \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DWANT_DOCS=OFF + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DWANT_DOCS=OFF \ + -DWANT_PHYSFS=ON make } diff --git a/community/coq/PKGBUILD b/community/coq/PKGBUILD index 15223d9d4..1054b6853 100644 --- a/community/coq/PKGBUILD +++ b/community/coq/PKGBUILD @@ -3,7 +3,7 @@ pkgname=coq pkgver=8.3pl3 -pkgrel=2 +pkgrel=3 pkgdesc='Formal proof management system.' arch=('i686' 'x86_64') url='http://coq.inria.fr/' @@ -11,12 +11,18 @@ 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=('37e9a52110a025128667c03fed75f9c2') +source=("http://coq.inria.fr/distrib/V${pkgver}/files/coq-${pkgver}.tar.gz" + 'camlp5-latest-fix.diff') +md5sums=('37e9a52110a025128667c03fed75f9c2' + '76c55f67f86a3f4b782bbba02ba8893f') build() { cd coq-${pkgver} + # fix compilation bug, remove next bump + # https://coq.inria.fr/bugs/show_bug.cgi?id=2728 + patch -Np0 -i ${srcdir}/camlp5-latest-fix.diff + ./configure \ -prefix '/usr' \ -mandir '/usr/share/man' \ diff --git a/community/coq/camlp5-latest-fix.diff b/community/coq/camlp5-latest-fix.diff new file mode 100644 index 000000000..80af1c924 --- /dev/null +++ b/community/coq/camlp5-latest-fix.diff @@ -0,0 +1,354 @@ +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/gnome-packagekit/PKGBUILD b/community/gnome-packagekit/PKGBUILD index e931a5402..0031681b5 100644 --- a/community/gnome-packagekit/PKGBUILD +++ b/community/gnome-packagekit/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 58924 2011-11-20 11:38:58Z jconder $ +# $Id: PKGBUILD 68215 2012-03-19 12:02:37Z lfleischer $ # Maintainer: Jonathan Conder pkgname=gnome-packagekit pkgver=3.2.1 -pkgrel=1 +pkgrel=2 pkgdesc='Collection of graphical tools for PackageKit to be used in the GNOME desktop' arch=('i686' 'x86_64') url='http://www.packagekit.org/' @@ -23,8 +23,8 @@ build() { cd "$srcdir/$pkgname-$pkgver" patch -Np1 -i "$srcdir/arch.patch" - sed -i 's@python@python2@' 'python/enum-convertor.py' - sed -i 's@python @python2 @' 'python/packagekit/Makefile.in' + sed -i 's/python/python2/' python/enum-convertor.py + sed -i 's/python enum-convertor.py/python2 enum-convertor.py/' python/packagekit/Makefile.{am,in} export PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ diff --git a/community/ircii-pana/PKGBUILD b/community/ircii-pana/PKGBUILD index ebbd841a0..376391591 100644 --- a/community/ircii-pana/PKGBUILD +++ b/community/ircii-pana/PKGBUILD @@ -1,52 +1,60 @@ -# $Id: PKGBUILD 22406 2010-07-21 18:30:48Z jlichtblau $ +# $Id: PKGBUILD 68217 2012-03-19 12:39:02Z lfleischer $ # Maintainer: Jaroslav Lichtblau # Contributor: Jaroslav Lichtblau # inspired by Gentoo: http://kambing.ui.edu/gentoo-portage/net-irc/bitchx/files/ pkgname=ircii-pana pkgver=1.1 -pkgrel=4 -pkgdesc="A console-based IRC client - AKA BitchX." +pkgrel=5 +pkgdesc='A console-based IRC client - AKA BitchX.' arch=('i686' 'x86_64') -url="http://www.bitchx.org" +url='http://www.bitchx.org' license=('GPL2') depends=('ncurses') makedepends=('patch') -source=(http://downloads.sourceforge.net/bitchx/${pkgname}-${pkgver}-final.tar.gz \ - bitchx-${pkgver}-gcc43.diff \ - bitchx-${pkgver}-inline.diff \ - bitchx-${pkgver}-freenode.diff \ - bitchx-${pkgver}-latin1.diff \ - bitchx-${pkgver}-64bit.diff) +source=("http://downloads.sourceforge.net/bitchx/${pkgname}-${pkgver}-final.tar.gz" \ + "bitchx-${pkgver}-gcc43.diff" \ + "bitchx-${pkgver}-inline.diff" \ + "bitchx-${pkgver}-freenode.diff" \ + "bitchx-${pkgver}-latin1.diff" \ + "bitchx-${pkgver}-64bit.diff" + "bitchx-${pkgver}-open_missing_mode.patch") md5sums=('611d2dda222f00c10140236f4c331572' 'e1efc5e52658e6651918e07a116bce18' '4824ffd55d51099dd9ee035f4b78d6bf' '741e91dd6267d3436c43756429342217' '9316105f23a67a9bb7ecfc7485dcd098' - 'c86f7758db7f438d726fd447dd4a83b0') + 'c86f7758db7f438d726fd447dd4a83b0' + 'a80f431488bf3e0e9f0d650d23a08aba') build() { - cd ${srcdir}/BitchX + cd "${srcdir}/BitchX" - patch -Np1 -i ${srcdir}/bitchx-${pkgver}-gcc43.diff || return 1 - patch -Np1 -i ${srcdir}/bitchx-${pkgver}-inline.diff || return 1 - patch -Np1 -i ${srcdir}/bitchx-${pkgver}-freenode.diff || return 1 - patch -Np1 -i ${srcdir}/bitchx-${pkgver}-latin1.diff || return 1 + patch -Np1 -i "${srcdir}/bitchx-${pkgver}-gcc43.diff" + patch -Np1 -i "${srcdir}/bitchx-${pkgver}-inline.diff" + patch -Np1 -i "${srcdir}/bitchx-${pkgver}-freenode.diff" + patch -Np1 -i "${srcdir}/bitchx-${pkgver}-latin1.diff" - if [ "$CARCH" == "x86_64" ] ; then - patch -Np1 -i ${srcdir}/bitchx-${pkgver}-64bit.diff || return 1 - fi + # add build fix (needed when building with "-D_FORTIFY_SOURCE=2") + patch -Np0 -i "${srcdir}/bitchx-${pkgver}-open_missing_mode.patch" + + [ "$CARCH" == "x86_64" ] && patch -Np1 -i "${srcdir}/bitchx-${pkgver}-64bit.diff" ./configure --prefix=/usr - make || return 1 - make prefix=${pkgdir}/usr install + make +} + +package() { + cd "${srcdir}/BitchX" + + make prefix="${pkgdir}/usr" install -#we don't want to link to ${pkgdir}, correcting it then - cd ${pkgdir}/usr/bin || return 1 - rm -f BitchX && ln -s BitchX-${pkgver}-final BitchX || return 1 + # we don't want to link to ${pkgdir}, correcting it then + cd "${pkgdir}/usr/bin" + rm -f BitchX && ln -s "BitchX-${pkgver}-final" BitchX -#correcting man page - rm -rf ${pkgdir}/usr/man || return 1 - install -D -m644 ${srcdir}/BitchX/doc/BitchX.1 ${pkgdir}/usr/share/man/man1/BitchX.1 || return 1 + # correcting man page + rm -rf "${pkgdir}/usr/man" + install -Dm644 "${srcdir}/BitchX/doc/BitchX.1" "${pkgdir}/usr/share/man/man1/BitchX.1" } diff --git a/community/ircii-pana/bitchx-1.1-open_missing_mode.patch b/community/ircii-pana/bitchx-1.1-open_missing_mode.patch new file mode 100644 index 000000000..3ae432979 --- /dev/null +++ b/community/ircii-pana/bitchx-1.1-open_missing_mode.patch @@ -0,0 +1,22 @@ +--- source/commands2.c.orig 2012-03-19 13:10:06.802575691 +0100 ++++ source/commands2.c 2012-03-19 13:10:26.401100927 +0100 +@@ -2575,7 +2575,7 @@ unsigned short port = 0; + { + char buf[BIG_BUFFER_SIZE+1]; + sprintf(buf, socket_path, port); +- if ((u = open(buf, O_CREAT|O_WRONLY)) != -1) ++ if ((u = open(buf, O_CREAT|O_WRONLY, 0644)) != -1) + { + chmod(buf, SOCKMODE); + chown(buf, getuid(), getgid()); +--- source/dcc.c.orig 2012-03-19 13:18:43.390562273 +0100 ++++ source/dcc.c 2012-03-19 13:17:23.729859849 +0100 +@@ -2273,7 +2273,7 @@ char *nick; + tmp = m_strdup(new->filename); + if (!(fullname = expand_twiddle(tmp))) + malloc_strcpy(&fullname, tmp); +- if ((new->file = open(fullname, O_WRONLY | O_CREAT | O_BINARY)) != -1) ++ if ((new->file = open(fullname, O_WRONLY | O_CREAT | O_BINARY, 0644)) != -1) + { + if ((new = dcc_create(nick, new->filename, passwd, 0, port? atol(port) : 0, DCC_REFILEREAD, (tdcc?DCC_TDCC:0) | DCC_TWOCLIENTS|DCC_OFFER, start_dcc_get))) + new->blocksize = blocksize; diff --git a/community/libmemcached/PKGBUILD b/community/libmemcached/PKGBUILD index 6e4f4f315..f408e7b08 100644 --- a/community/libmemcached/PKGBUILD +++ b/community/libmemcached/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 62973 2012-01-29 19:01:45Z foutrelis $ +# $Id: PKGBUILD 68226 2012-03-19 18:14:05Z foutrelis $ # Maintainer: Evangelos Foutras pkgname=libmemcached -pkgver=1.0.4 +pkgver=1.0.5 pkgrel=1 pkgdesc="C and C++ client library to the memcached server" arch=('i686' 'x86_64') url="http://libmemcached.org/" license=('GPL') -depends=('glibc' 'libsasl') +depends=('glibc' 'libsasl' 'libevent') makedepends=('perl') options=('!libtool') source=(http://launchpad.net/$pkgname/1.0/$pkgver/+download/$pkgname-$pkgver.tar.gz) -sha256sums=('1dd0a9fb5823aa6f8337a3beaeb287bb92041005c136622b4d82622a9428e20c') +sha256sums=('a1bae7f8ce0e36133bd36b0fc72ad37d985e4e476b0949efeadf7e94c2d00ea0') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/linux-tools/PKGBUILD b/community/linux-tools/PKGBUILD index ff010adb3..bbf7b14d2 100644 --- a/community/linux-tools/PKGBUILD +++ b/community/linux-tools/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 68094 2012-03-17 19:58:42Z seblu $ +# $Id: PKGBUILD 68213 2012-03-19 11:50:40Z seblu $ # Maintainer: Sébastien Luttringer pkgbase=linux-tools pkgname=('perf' 'cpupower') -pkgver=3.2 -kernver=${pkgver}.11 +pkgver=3.3 +kernver=${pkgver} [[ ${kernver##*rc} != $kernver ]] && testing='testing' -pkgrel=4 +pkgrel=1 license=('GPL2') arch=('i686' 'x86_64') url='http://www.kernel.org' @@ -18,7 +18,7 @@ source=("http://ftp.kernel.org/pub/linux/kernel/v3.0/$testing/linux-$kernver.tar 'cpupower.rc' 'cpupower.conf' 'cpupower.service') -md5sums=('0e3d5a3dab51b3c36940461582bc06df' +md5sums=('7133f5a2086a7d7ef97abac610c094f5' '26af384ca282bc0dc38ff65acc7bb4b9' '857ccdd0598511e3bf4b63522754dc48' '20870541e88109d2f153be3c58a277f1') diff --git a/community/lrzip/PKGBUILD b/community/lrzip/PKGBUILD new file mode 100644 index 000000000..b6674b0e1 --- /dev/null +++ b/community/lrzip/PKGBUILD @@ -0,0 +1,44 @@ +# $Id: PKGBUILD 68229 2012-03-19 18:33:11Z arodseth $ +# Maintainer: Alexander Rødseth +# Contributor: graysky +# Contributor: kastor@fobos.org.ar + +pkgname=lrzip +pkgver=0.612 +pkgrel=2 +pkgdesc="Multi-threaded compression using the rzip/lzma, lzo, and zpaq algorithms" +url="http://lrzip.kolivas.org/" +license=('GPL') +arch=('i686' 'x86_64') +depends=('lzo2' 'bzip2' 'zlib' 'bash' 'gcc-libs') +if [ "$CARCH" != "x86_64" ] +then + depends+=('nasm') + _flag="--enable-asm" +fi +options=('!libtool') +source=("http://ck.kolivas.org/apps/$pkgname/$pkgname-$pkgver.tar.bz2") +sha256sums=('2c309fb40766207f1deeb09e2431ae34db7e6d7a22d713c25efcc84ed8c52e97') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + CFLAGS="$CFLAGS -fomit-frame-pointer" + CXXFLAGS="$CXXFLAGS -fomit-frame-pointer" + ./autogen.sh --prefix=/usr "$_flag" + make +} + +check() { + cd "$srcdir/$pkgname-$pkgver" + + make -k check +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir/" install-strip +} + +# vim:set ts=2 sw=2 et: diff --git a/community/oolite/PKGBUILD b/community/oolite/PKGBUILD index fb67399be..af964fd01 100644 --- a/community/oolite/PKGBUILD +++ b/community/oolite/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 66069 2012-02-22 19:31:51Z svenstaro $ +# $Id: PKGBUILD 68211 2012-03-19 11:26:32Z svenstaro $ # Maintainer: Sven-Hendrik Haase # Contributor: Lone_Wolf pkgname=oolite pkgver=1.76 -pkgrel=2 +pkgrel=3 pkgdesc="A space-sim based on the classic Elite" arch=('i686' 'x86_64') url="http://oolite-linux.berlios.de" @@ -11,7 +11,8 @@ license=('GPL2') depends=('gnustep-gui' 'sdl_mixer' 'mesa' 'espeak' 'nspr' 'python2' 'icu') makedepends=('gcc-objc' 'gnustep-make' 'curl' 'zip') options=(!makeflags) -source=(oolite http://download2.berlios.de/oolite-linux/oolite-source-${pkgver}.tar.bz2) +source=(oolite + http://downloads.sourceforge.net/oolite-linux.berlios/oolite-source-$pkgver.tar.bz2) md5sums=('b182976fade9b64a3b3702e2a8c72bf0' 'd540486facd8275dc6bceebae8428dce') diff --git a/community/spectrwm/PKGBUILD b/community/spectrwm/PKGBUILD index 8a45faf45..b97b60386 100644 --- a/community/spectrwm/PKGBUILD +++ b/community/spectrwm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 66738 2012-02-27 21:56:37Z kkeen $ +# $Id: PKGBUILD 68224 2012-03-19 15:53:19Z kkeen $ # Maintainer: Kyle Keen # Contributor: Christoph Zeiler pkgname=spectrwm pkgver=1.0.0 -pkgrel=2 +pkgrel=3 pkgdesc="A minimalistic dynamic tiling window manager that tries to stay out of the way." arch=('i686' 'x86_64') url="http://www.spectrwm.org" @@ -41,6 +41,8 @@ package() { cd .. install -Dm644 spectrwm.conf "$pkgdir/etc/spectrwm.conf" install -Dm755 screenshot.sh "$pkgdir/usr/share/spectrwm/screenshot.sh" + mkdir -p "$pkgdir/etc/spectrwm" + cp spectrwm_*.conf "$pkgdir/etc/spectrwm/" cd "$srcdir" install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" install -Dm755 baraction.sh "$pkgdir/usr/share/spectrwm/baraction.sh" -- cgit v1.2.3-54-g00ecf