diff options
| author | root <root@rshg054.dnsready.net> | 2013-01-15 00:06:27 -0800 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-01-15 00:06:27 -0800 |
| commit | 733e4f771063834ef4d8f31af1dcac95d55e3c3e (patch) | |
| tree | 578fc3d3adaff80532f1f0a5a0eced16ebf08e8a | |
| parent | a69d072f5cde4b5a6bac62e6022a69d337925e45 (diff) | |
Tue Jan 15 00:06:26 PST 2013
32 files changed, 1250 insertions, 117 deletions
diff --git a/community/darktable/PKGBUILD b/community/darktable/PKGBUILD index c574a3cec..1fe51519c 100644 --- a/community/darktable/PKGBUILD +++ b/community/darktable/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 82166 2013-01-10 09:21:45Z spupykin $ +# $Id: PKGBUILD 82292 2013-01-14 13:51:46Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Christian Himpel <chressie at gmail dot com> # Contributor: Johannes Hanika <hanatos at gmail dot com> pkgname=darktable -pkgver=1.1.1 +pkgver=1.1.2 _pkgver=1.1 -pkgrel=2 +pkgrel=1 pkgdesc="Utility to organize and develop raw images" arch=('i686' 'x86_64') url=http://darktable.sf.net/ @@ -19,7 +19,7 @@ optdepends=('librsvg') install=darktable.install options=(!libtool) source=(http://downloads.sourceforge.net/project/darktable/darktable/${_pkgver}/darktable-$pkgver.tar.gz) -md5sums=('735b9c42f4a4c93a482a195800002b10') +md5sums=('cdc27dc2d9d53df3ec2c6aa908a3eb3c') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/fpc/PKGBUILD b/community/fpc/PKGBUILD index 554fedb39..33e3ceb53 100644 --- a/community/fpc/PKGBUILD +++ b/community/fpc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 70842 2012-05-17 18:20:47Z idevolder $ +# $Id: PKGBUILD 82304 2013-01-14 17:20:39Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Valeriy Lyasotskiy <onestep@ukr.net> # Contributor: Jan Willemson <janwil@hot.ee> @@ -9,24 +9,38 @@ pkgname=fpc pkgver=2.6.0 -pkgrel=2 +_gdbver=7.5.1 +pkgrel=4 pkgdesc="The Free Pascal Compiler is a Turbo Pascal 7.0 and Delphi compatible 32bit Pascal Compiler. It comes with fully TP 7.0 compatible run-time library." arch=('i686' 'x86_64') url="http://www.freepascal.org/" license=('GPL' 'LGPL' 'custom') backup=("etc/fpc.cfg") -depends=(ncurses) +depends=(ncurses zlib expat) makedepends=(fpc) options=(zipman) -source=(ftp://ftp.freepascal.org/pub/fpc/dist/$pkgver/source/fpcbuild-$pkgver.tar.gz) -md5sums=('17375e665a4e1311f85812fe2754f609') +source=(ftp://ftp.freepascal.org/pub/fpc/dist/$pkgver/source/fpcbuild-$pkgver.tar.gz + http://ftp.gnu.org/gnu/gdb/gdb-${_gdbver}.tar.bz2 + fpc-gdb.patch) +md5sums=('17375e665a4e1311f85812fe2754f609' + '3f48f468b24447cf24820054ff6e85b1' + '1e45ece6b5d4ee60b860e75926b4122d') build() { + cd ${srcdir}/gdb-${_gdbver} + ./configure --prefix=/usr --disable-nls --without-python --disable-werror --disable-tui + make + make -C gdb libgdb.a + cp libdecnumber/libdecnumber.a gdb/ + cd ${srcdir}/fpcbuild-$pkgver + patch -p1 <$srcdir/fpc-gdb.patch + export GDBLIBDIR=${srcdir}/gdb-${_gdbver}/gdb + export LIBGDBFILE=$GDBLIBDIR/libgdb.a pushd fpcsrc/compiler fpcmake -Tall popd - make NOGDB=1 build + make build } package() { @@ -34,7 +48,7 @@ package() { export HOME=$srcdir - make -j1 NOGDB=1 PREFIX=${pkgdir}/usr install + make -j1 PREFIX=${pkgdir}/usr install export PATH=$pkgdir/usr/bin:$PATH diff --git a/community/fpc/fpc-gdb.patch b/community/fpc/fpc-gdb.patch new file mode 100644 index 000000000..f46b556bb --- /dev/null +++ b/community/fpc/fpc-gdb.patch @@ -0,0 +1,737 @@ +diff -wbBur fpcbuild-2.6.0/fpcsrc/ide/fp.pas fpcbuild-2.6.0.my/fpcsrc/ide/fp.pas +--- fpcbuild-2.6.0/fpcsrc/ide/fp.pas 2010-08-20 15:04:44.000000000 +0400 ++++ fpcbuild-2.6.0.my/fpcsrc/ide/fp.pas 2013-01-14 20:55:58.472376421 +0400 +@@ -14,6 +14,9 @@ + **********************************************************************} + program FP; + ++{$LINKLIB libz.so} ++ ++ + {$ifdef Windows} + { some windows versions, namely at least XP x64 don't like if the IDE stack + is too big } +diff -wbBur fpcbuild-2.6.0/fpcsrc/packages/gdbint/Makefile fpcbuild-2.6.0.my/fpcsrc/packages/gdbint/Makefile +--- fpcbuild-2.6.0/fpcsrc/packages/gdbint/Makefile 2011-12-11 00:19:00.000000000 +0400 ++++ fpcbuild-2.6.0.my/fpcsrc/packages/gdbint/Makefile 2013-01-14 20:32:15.545303270 +0400 +@@ -2337,10 +2337,12 @@ + endif + ifeq ($(OS_SOURCE),openbsd) + override FPCOPT+=-FD$(NEW_BINUTILS_PATH) ++override FPCMAKEOPT+=-FD$(NEW_BINUTILS_PATH) + endif + ifndef CROSSBOOTSTRAP + ifneq ($(BINUTILSPREFIX),) + override FPCOPT+=-XP$(BINUTILSPREFIX) ++override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) + endif + ifneq ($(BINUTILSPREFIX),) + override FPCOPT+=-Xr$(RLINKPATH) +diff -wbBur fpcbuild-2.6.0/fpcsrc/packages/gdbint/src/gdbint.pp fpcbuild-2.6.0.my/fpcsrc/packages/gdbint/src/gdbint.pp +--- fpcbuild-2.6.0/fpcsrc/packages/gdbint/src/gdbint.pp 2011-12-10 20:50:23.000000000 +0400 ++++ fpcbuild-2.6.0.my/fpcsrc/packages/gdbint/src/gdbint.pp 2013-01-14 20:53:27.332331458 +0400 +@@ -17,6 +17,7 @@ + + {$define NotImplemented} + ++{$define GDB_DISABLE_PYTHON} + {$define COMPILING_GDBINT_UNIT} + {$ifdef USE_GDBLIBINC} + {$i gdblib.inc} +@@ -50,7 +51,6 @@ + {$ifdef GDB_V601} + {$info using gdb 6.1.x} + {$define GDB_V6} +- {$define GDB_HAS_DB_COMMANDS} + {$undef GDB_HAS_DEPRECATED_CBPH} + {$endif def GDB_V601} + +@@ -58,14 +58,12 @@ + {$ifdef GDB_V602} + {$info using gdb 6.2.x} + {$define GDB_V6} +- {$define GDB_HAS_DB_COMMANDS} + {$endif def GDB_V602} + + { 6.3.x } + {$ifdef GDB_V603} + {$info using gdb 6.3.x} + {$define GDB_V6} +- {$define GDB_HAS_DB_COMMANDS} + {$endif def GDB_V603} + + { 6.4.x } +@@ -73,7 +71,6 @@ + {$info using gdb 6.4.x} + {$define GDB_V6} + {$define GDB_NEEDS_NO_ERROR_INIT} +- {$define GDB_HAS_DB_COMMANDS} + {$endif def GDB_V604} + + { 6.5.x } +@@ -87,7 +84,6 @@ + {$ifdef GDB_V606} + {$info using gdb 6.6.x} + {$define GDB_V6} +- {$define GDB_HAS_DB_COMMANDS} + {$define GDB_USES_BP_LOCATION} + {$define GDB_NEEDS_NO_ERROR_INIT} + {$define GDB_USES_EXPAT_LIB} +@@ -98,7 +94,6 @@ + {$ifdef GDB_V607} + {$info using gdb 6.7.x} + {$define GDB_V6} +- {$define GDB_HAS_DB_COMMANDS} + {$define GDB_USES_BP_LOCATION} + {$define GDB_NEEDS_NO_ERROR_INIT} + {$define GDB_USES_EXPAT_LIB} +@@ -109,7 +104,6 @@ + {$ifdef GDB_V608} + {$info using gdb 6.8.x} + {$define GDB_V6} +- {$define GDB_HAS_DB_COMMANDS} + {$define GDB_USES_BP_LOCATION} + {$define GDB_BP_LOCATION_HAS_GLOBAL_NEXT} + {$define GDB_NEEDS_NO_ERROR_INIT} +@@ -120,13 +114,64 @@ + {$define GDB_HAS_BP_NONE} + {$endif def GDB_V608} + ++{ 7.5.x } ++{$ifdef GDB_V705} ++ {$info using gdb 7.5.x} ++ {$define GDB_V7} ++ {$define GDB_BP_LOCATION_HAS_GDBARCH} ++ {$define GDB_HAS_PROGRAM_SPACE} ++ {$define GDB_NO_UIOUT} ++ {$define GDB_NEEDS_INTERPRETER_SETUP} ++ {$define GDB_NEEDS_SET_INSTREAM} ++ {$define GDB_NOTIFY_BREAKPOINT_ARG_IS_BREAKPOINT_PTR} ++ {$define GDB_USES_BP_OPS} ++ {$define GDB_BP_TI_HAS_LENGTH} ++ {$define GDB_BP_LOCATION_HAS_REFCOUNT} ++ {$define GDB_BP_LOCATION_HAS_OPS} ++ {$define GDB_UI_FILE_HAS_WRITE_ASYNC} ++ {$ifdef win32} ++ {$define GDB_USES_LIBADVAPI32} ++ {$endif win32} ++{$endif def GDB_V705} ++ ++{ 7.4.x } ++{$ifdef GDB_V704} ++ {$info using gdb 7.4.x} ++ {$define GDB_V7} ++ {$define GDB_BP_LOCATION_HAS_GDBARCH} ++ {$define GDB_HAS_PROGRAM_SPACE} ++ {$define GDB_NO_UIOUT} ++ {$define GDB_NEEDS_INTERPRETER_SETUP} ++ {$define GDB_NEEDS_SET_INSTREAM} ++ {$define GDB_NOTIFY_BREAKPOINT_ARG_IS_BREAKPOINT_PTR} ++ {$define GDB_USES_BP_OPS} ++ {$define GDB_BP_TI_HAS_LENGTH} ++ {$define GDB_BP_LOCATION_HAS_REFCOUNT} ++ {$define GDB_BP_LOCATION_HAS_OPS} ++ {$define GDB_UI_FILE_HAS_WRITE_ASYNC} ++ {$ifdef win32} ++ {$define GDB_USES_LIBADVAPI32} ++ {$endif win32} ++{$endif def GDB_V704} ++ + { 7.3.x } + {$ifdef GDB_V703} + {$info using gdb 7.3.x} + {$define GDB_V7} + {$define GDB_BP_LOCATION_HAS_GDBARCH} + {$define GDB_HAS_PROGRAM_SPACE} +-{$endif def GDB_V702} ++ {$define GDB_BP_TI_HAS_LENGTH} ++ {$define GDB_BP_LOCATION_HAS_REFCOUNT} ++ {$ifdef GDB_CVS} ++ {$define GDB_NO_UIOUT} ++ {$define GDB_NEEDS_INTERPRETER_SETUP} ++ {$define GDB_NEEDS_SET_INSTREAM} ++ {$define GDB_NOTIFY_BREAKPOINT_ARG_IS_BREAKPOINT_PTR} ++ {$define GDB_USES_BP_OPS} ++ {$define GDB_BP_LOCATION_HAS_OPS} ++ {$define GDB_UI_FILE_HAS_WRITE_ASYNC} ++ {$endif GDB_CVS} ++{$endif def GDB_V703} + + { 7.2.x } + {$ifdef GDB_V702} +@@ -448,8 +493,11 @@ + {$LINKLIB libintl.a} + {$LINKLIB imagehlp} + {$endif not USE_MINGW_GDB} +- {$LINKLIB kernel32} ++ {$ifdef GDB_USES_LIBADVAPI32} ++ {$LINKLIB advapi32} ++ {$endif GDB_USES_LIBADVAPI32} + {$LINKLIB user32} ++ {$LINKLIB kernel32} + {$endif win32} + + {$ifdef win64} +@@ -588,9 +636,11 @@ + type + + pui_file = ^ui_file; ++ pstdio_file = ^stdio_file; + + ui_file_flush_ftype = procedure(stream : pui_file);cdecl; + ui_file_write_ftype = procedure(stream : pui_file;buf : pchar;len : longint);cdecl; ++ ui_file_write_async_save_ftype = procedure(stream : pui_file;buf : pchar;len : longint);cdecl; + ui_file_fputs_ftype = procedure(buf : pchar; stream : pui_file);cdecl; + ui_file_delete_ftype = procedure(stream : pui_file);cdecl; + ui_file_isatty_ftype = function(stream : pui_file) : longbool;cdecl; +@@ -605,6 +655,9 @@ + magic : plongint; + to_flush : ui_file_flush_ftype; + to_write : ui_file_write_ftype; ++ {$ifdef GDB_UI_FILE_HAS_WRITE_ASYNC} ++ to_write_async_safe : ui_file_write_async_save_ftype; ++ {$endif} + to_fputs : ui_file_fputs_ftype; + {$ifdef GDB_V6} + to_read : ui_file_read_ftype; +@@ -616,6 +669,13 @@ + to_data : pointer; + end; + ++ stdio_file = record ++ magic : plongint; ++ _file : P_C_FILE; ++ df : longint; ++ close_p : longint; ++ end; ++ + { used to delete stdio_ui_file gdb_stdout and gdb_stderr } + procedure ui_file_delete(stream : pui_file);cdecl;external; + +@@ -774,10 +834,16 @@ + {$ifdef GDB_V6} + type + ui_out = pointer; ++{$ifndef GDB_NO_UIOUT} + var + uiout : ui_out;cvar;external; ++{$else GDB_NO_UIOUT} ++var ++ cli_uiout : ui_out;cvar;external; ++ current_uiout : ui_out;cvar;external; ++{$endif GDB_NO_UIOUT} + function cli_out_new (stream : pui_file):ui_out;cdecl;external; +-{$endif} ++{$endif GDB_V6} + + {$ifdef go32v2} + { needed to be sure %fs contains the DOS memory selector +@@ -815,8 +881,11 @@ + jmp_buf = dpmi_jmp_buf; + pjmp_buf = pdpmi_jmp_buf; + ++ + function setjmp(var rec : jmp_buf) : longint;cdecl;external; + ++ function malloc(size : longint) : pointer;cdecl;external; ++ + procedure longjmp(var rec : jmp_buf;return_value : longint);cdecl;external; + + procedure reload_fs;assembler; +@@ -869,6 +938,13 @@ + pCORE_ADDR = ^CORE_ADDR; + pblock = ^block; + ++ tframe_id = record ++ stack_addr, code_addr, special_addr : CORE_ADDR; ++ addr_p_flags : byte;{ for three 1 bit flags ++ stack_addr_p, code_addr_p, special_addr_p : cint : 1; } ++ inline_depth : longint; ++ end; ++ + tlanguage = (language_unknown,language_auto,language_c, + language_cplus,language_java,language_chill, + language_fortran,language_m2,language_asm, +@@ -897,9 +973,18 @@ + + target_hw_bp_type = (hw_write, hw_read, hw_access, hw_execute); + ++ { pointer to structures that we don't need } ++ pbp_ops = pointer; ++ pbp_location_ops = pointer; ++ pprogram_space = pointer; ++ pgdbarch = pointer; ++ + {$PACKRECORDS 4} + pbreakpoint = ^breakpoint; + breakpoint = record ++{$ifdef GDB_USES_BP_OPS} ++ ops : pbp_ops; ++{$endif GDB_USES_BP_OPS} + next : pbreakpoint; + typ : bptype; + enable : tenable; +@@ -910,9 +995,15 @@ + {$else not GDB_USES_BP_LOCATION} + address : CORE_ADDR; + {$endif not GDB_USES_BP_LOCATION} ++{$ifndef GDB_USES_BP_OPS} + line_number : longint; + source_file : pchar; ++{$endif not GDB_USES_BP_OPS} + silent : byte; ++{$ifdef GDB_USES_BP_OPS} ++ display_canonical: byte; ++{$endif GDB_USES_BP_OPS} ++ + ignore_count : longint; + {$ifndef GDB_USES_BP_LOCATION} + shadow_contents : array[0..15] of char; +@@ -919,10 +1010,21 @@ + inserted : char; + duplicate : char; + {$endif not GDB_USES_BP_LOCATION} ++ + commands : pointer; {^command_line} ++{$ifdef GDB_USES_BP_OPS} ++ frame_id : tframe_id; ++ pspace : pprogram_space; ++{$else not GDB_USES_BP_OPS} + frame : CORE_ADDR; + cond : pointer; {^expression} +- addr_string : ^char; ++{$endif GDB_USES_BP_OPS} ++ addr_string : pchar; ++{$ifdef GDB_USES_BP_OPS} ++ filter : pchar; ++ addr_string_range_end : pchar; ++ gdbarch : pgdbarch; ++{$endif GDB_USES_BP_OPS} + language : tlanguage; + input_radix : longint; + cond_string : ^char; +@@ -941,6 +1043,9 @@ + bp_target_info = record + placed_address_space : pointer;{paddress_space;} + placed_address : CORE_ADDR; ++{$ifdef GDB_BP_TI_HAS_LENGTH} ++ length : longint; ++{$endif GDB_BP_TI_HAS_LENGTH} + shadow_contents : array[0..15] of char; + shadow_len : longint; + placed_size : longint; +@@ -948,9 +1053,17 @@ + + bp_location = record + next : pbp_location; ++{$ifdef GDB_BP_LOCATION_HAS_OPS} ++ ops : pbp_location_ops; ++{$endif GDB_BP_LOCATION_HAS_OPS} ++ ++{$ifdef GDB_BP_LOCATION_HAS_REFCOUNT} ++ refc : longint; ++{$else} + {$ifdef GDB_BP_LOCATION_HAS_GLOBAL_NEXT} + global_next : pbp_location; + {$endif GDB_BP_LOCATION_HAS_GLOBAL_NEXT} ++{$endif} + loc_type : bp_loc_type; + owner : pbreakpoint; + {$ifdef GDB_BP_LOCATION_HAS_GLOBAL_NEXT} +@@ -961,10 +1074,10 @@ + inserted : byte; + duplicate : byte; + {$ifdef GDB_BP_LOCATION_HAS_GDBARCH} +- gdbarch : pointer;{pgdbarch;} ++ gdbarch : pgdbarch; + {$endif GDB_BP_LOCATION_HAS_GDBARCH} + {$ifdef GDB_HAS_PROGRAM_SPACE} +- pspace : pointer;{pprogram_space;} ++ pspace : pprogram_space; + {$endif GDB_HAS_PROGRAM_SPACE} + address : CORE_ADDR; + {$ifdef GDB_BP_LOCATION_HAS_GLOBAL_NEXT} +@@ -979,6 +1092,11 @@ + target_info : bp_target_info; + overlay_target_info : bp_target_info; + events_till_retirement : longint; ++{$ifdef GDB_USES_BP_OPS} ++ { line and source file are in location } ++ line_number : longint; ++ source_file : pchar; ++{$endif not GDB_USES_BP_OPS} + end; + + tfreecode=(free_nothing,free_contents,free_linetable); +@@ -1488,7 +1606,9 @@ + {$endif ndef GDB_HAS_OBSERVER_NOTIFY_BREAKPOINT_CREATED} + current_target : target_ops;cvar;external; + stop_pc : CORE_ADDR;cvar;external; +- { Only used from GDB 5.01 but doesn't hurst otherwise } ++ { Only used from GDB 5.0 but doesn't hurst otherwise } ++ { This global variable is declared in defs.h as external ++ and instanciated in main.c since version 5.0. } + interpreter_p : pchar;cvar;public; + + { we need also to declare some vars } +@@ -1502,13 +1622,22 @@ + + { Whether xdb commands will be handled } + {$ifdef GDB_HAS_DB_COMMANDS} ++ { These two global variables are declared in defs.h ++ since version 4.18 } + xdb_commands : longint;cvar;public; + + { Whether dbx commands will be handled } + dbx_commands : longint;cvar;public; + {$endif GDB_HAS_DB_COMMANDS} + ++{$ifdef GDB_NEEDS_SET_INSTREAM} + var ++ instream : P_C_FILE;cvar;external; ++ function gdb_fopen (filename : pchar; mode : pchar) : pui_file;cdecl;external; ++{$endif GDB_NEEDS_SET_INSTREAM} ++var ++ { The four following variables are defined in defs.h ++ and instanciated in main.c since version 5.0 } + gdb_stdout : pui_file;cvar;public; + gdb_stderr : pui_file;cvar;public; + gdb_stdlog : pui_file;cvar;public; +@@ -1516,6 +1645,9 @@ + event_loop_p : longint;cvar;public; + {$ifdef GDB_V6} + (* target IO streams *) ++ { The three following variables are declared in defs.h ++ and instanciated in main.c since version 6.0 } ++ gdb_stdin : pui_file;cvar;public; + gdb_stdtargin : pui_file;cvar;public; + gdb_stdtargerr : pui_file;cvar;public; + {$endif} +@@ -1523,7 +1655,10 @@ + { used for gdb_stdout and gdb_stderr } + function xmalloc(size : longint) : pointer;cdecl;external; + { used for QueryHook } +-function xstrvprintf(msg : pchar) : pchar; varargs; cdecl; external; ++{ xvasprintf is present at least from GDB 5.3 ++ while xstrvprintf only appears in version 6.2, ++ so only use xvasprintf function } ++function xvasprintf(ret : ppchar; msg : pchar) : pchar; varargs; cdecl; external; + procedure xfree(p : pointer); cdecl; external; + function find_pc_line(i:CORE_ADDR;l:longint):symtab_and_line;cdecl;external; + function find_pc_function(i:CORE_ADDR):psymbol;cdecl;external; +@@ -2406,11 +2541,15 @@ + QueryHook:=0 + else + begin +- if curr_gdb^.reset_command and (pos('Kill',question)>0) then ++ if curr_gdb^.reset_command and ((pos('Kill',question)>0) or ++ (pos('Discard symbol table',question)>0)) then + QueryHook:=1 + else if pos('%',question)>0 then + begin +- local:=xstrvprintf(question,arg); ++ xvasprintf(@local,question,arg); ++ { xvasprintf can failed, in that case local is set to nil } ++ if not assigned(local) then ++ local:=question; + QueryHook:=curr_gdb^.Query(local, nil); + xfree(local); + end +@@ -2451,7 +2590,12 @@ + last_breakpoint_number:=b.number; + { function breakpoints have zero as file and as line !! + but they are valid !! } ++{$ifndef GDB_USES_BP_OPS} + invalid_breakpoint_line:=(b.line_number<>sym.line) and (b.line_number<>0); ++{$else GDB_USES_BP_OPS} ++ invalid_breakpoint_line:=(b.loc=nil) or ++ ((b.loc^.line_number<>sym.line) and (b.loc^.line_number<>0)); ++{$endif GDB_USES_BP_OPS} + {$ifdef GDB_USES_BP_LOCATION} + if assigned (b.loc) then + last_breakpoint_address:=b.loc^.address +@@ -2471,7 +2615,11 @@ + {$ifdef GDB_HAS_OBSERVER_NOTIFY_BREAKPOINT_CREATED} + + type ++{$ifdef GDB_NOTIFY_BREAKPOINT_ARG_IS_BREAKPOINT_PTR} ++ breakpoint_created_function_type = procedure (bpp : pbreakpoint); cdecl; ++{$else not GDB_NOTIFY_BREAKPOINT_ARG_IS_BREAKPOINT_PTR} + breakpoint_created_function_type = procedure (bpnum : longint); cdecl; ++{$endif not GDB_NOTIFY_BREAKPOINT_ARG_IS_BREAKPOINT_PTR} + pobserver = pointer; + var + breakpoint_created_observer : pobserver = nil; +@@ -2479,8 +2627,14 @@ + function observer_attach_breakpoint_created(create_func : breakpoint_created_function_type) : pobserver;cdecl;external; + procedure observer_detach_breakpoint_created(pob : pobserver);cdecl;external; + +-var breakpoint_chain : pbreakpoint ;cvar;external; + ++{$ifdef GDB_NOTIFY_BREAKPOINT_ARG_IS_BREAKPOINT_PTR} ++procedure notify_breakpoint_created(bpp : pbreakpoint); cdecl; ++begin ++ CreateBreakpointHook(bpp^); ++end; ++{$else not GDB_NOTIFY_BREAKPOINT_ARG_IS_BREAKPOINT_PTR} ++var breakpoint_chain : pbreakpoint ;cvar;external; + + procedure notify_breakpoint_created(bpnum : longint);cdecl; + var +@@ -2498,8 +2652,16 @@ + pb:=pb^.next; + end; + end; ++{$endif not GDB_NOTIFY_BREAKPOINT_ARG_IS_BREAKPOINT_PTR} + {$endif def GDB_HAS_OBSERVER_NOTIFY_BREAKPOINT_CREATED} + ++{ Avoid loading of main.o object by providing a ++ stripped down version of relocate_gdb_directory function } ++function relocate_gdb_directory(path : pchar) : pchar; cdecl; public; ++begin ++ relocate_gdb_directory:=path; ++end; ++ + {***************************************************************************** + tgdbinterface + *****************************************************************************} +@@ -2528,7 +2690,7 @@ + gdb_command('set print object on'); + gdb_command('set print null-stop'); + {$ifdef USE_MINGW_GDB} // maybe this also should be done for newer cygwin gdbs. +- gdb_command('set confirm off'); ++ //gdb_command('set confirm off'); + {$endif} + end; + +@@ -2609,9 +2771,9 @@ + var + top_level_val : longint; + +-function catch_errors(func : pointer; command : pchar; from_tty,mask : longint) : longint;cdecl;external; ++function catch_command_errors(func : pointer; command : pchar; from_tty,mask : longint) : longint;cdecl;external; + +-function gdbint_execute_command(command : pchar; from_tty,mask : longint) : longint;cdecl; ++function gdbint_execute_command(command : pchar; from_tty : longint) : longint;cdecl; + begin + gdbint_execute_command:=1; + execute_command(command,from_tty); +@@ -2658,6 +2820,8 @@ + begin + {$ifdef cpui386} + MaskAllFPUExceptions := control or MaskAllExceptions; ++{$else} ++ MaskAllFPUExceptions:=0; + {$endif} + end; + +@@ -2716,7 +2880,8 @@ + begin + quit_return:=error_return; + mask:=longint($ffffffff); +- catch_errors(@gdbint_execute_command,@command,0,mask); ++ catch_command_errors(@gdbint_execute_command,@command, ++ 1,mask); + {$ifdef go32v2} + reload_fs; + {$endif go32v2} +@@ -2973,11 +3138,43 @@ + c_environ : ppchar;external name '_environ'; + c_argc : longint;external name '___crt0_argc'; + c_argv : ppchar;external name '___crt0_argv'; ++ ++ procedure ReallocateEnvironUsingCMalloc; ++ ++ var ++ neededsize , count : longint; ++ penv : pchar; ++ newenv : ppchar; ++ begin ++ if not assigned(c_environ) then ++ neededsize:=0 ++ else ++ begin ++ count:=0; ++ penv:=c_environ^; ++ while assigned(penv) do ++ begin ++ inc(count); ++ inc(penv,sizeof(pchar)); ++ end; ++ neededsize:=count*sizeof(pchar); ++ end; ++ newenv:=malloc(neededsize); ++ system.move(c_environ,newenv,neededsize); ++ c_environ:=newenv; ++ end; ++ + {$endif def go32v2} + var + current_directory : pchar; cvar; external; + gdb_dirbuf : array[0..0] of char; cvar; external; + CurrentDir : AnsiString; ++{$ifdef GDB_NEEDS_INTERPRETER_SETUP} ++ type ++ interpreter_struct_p = pointer; { to opaque type } ++ function interp_lookup (name : pchar) : interpreter_struct_p;cdecl; external; ++ function interp_set (interp : interpreter_struct_p) : longbool;cdecl; external; ++{$endif GDB_NEEDS_INTERPRETER_SETUP} + const + DIRBUF_SIZE = 1024; + +@@ -2986,13 +3183,28 @@ + var + OldSigInt : SignalHandler; + {$endif supportexceptions} ++{$ifdef GDB_NEEDS_SET_INSTREAM} ++var ++ dummy_file : pui_file; ++{$endif GDB_NEEDS_SET_INSTREAM} ++ + {$ifdef GDB_INIT_HAS_ARGV0} + var + argv0 : pchar; + {$endif not GDB_INIT_HAS_ARGV0} ++{$ifdef GDB_NEEDS_INTERPRETER_SETUP} ++var ++ interp : interpreter_struct_p; ++{$endif GDB_NEEDS_INTERPRETER_SETUP} ++var ++ save_gdb_stdin, ++ save_gdb_stdout, ++ save_gdb_stderr : pui_file; + begin + {$ifdef go32v2} +- c_environ:=system.envp; ++ { c_environ:=system.envp; } ++ { DJGPP libC presupposes the c_enivron was malloc'ated } ++ ReallocateEnvironUsingCMalloc; + c_argc:=system.argc; + c_argv:=system.argv; + {$endif def go32v2} +@@ -3012,8 +3224,25 @@ + ui_file_delete(gdb_stderr); + if assigned(gdb_stdout) then + ui_file_delete(gdb_stdout); ++{$ifdef GDB_NEEDS_SET_INSTREAM} ++ if assigned(gdb_stdin) then ++ ui_file_delete(gdb_stdin); ++ gdb_stdin:=mem_fileopen; ++ save_gdb_stdin:=gdb_stdin; ++ dummy_file :=gdb_fopen('dummy.$$$','a'); ++ {in captured_main code, this is simply ++ instream:=stdin; but stdin is a highly system dependent macro ++ so that we try to avoid it here } ++ if assigned(dummy_file) then ++ instream:=pstdio_file(dummy_file^.to_data)^._file ++ else ++ instream:=nil; ++{$endif GDB_NEEDS_SET_INSTREAM} ++ + gdb_stderr:=mem_fileopen; + gdb_stdout:=mem_fileopen; ++ save_gdb_stderr:=gdb_stderr; ++ save_gdb_stdout:=gdb_stdout; + gdb_stdlog:=gdb_stderr; + gdb_stdtarg:=gdb_stderr; + set_ui_file_write(gdb_stdout,@gdbint_ui_file_write); +@@ -3022,7 +3251,9 @@ + error_init; + {$endif GDB_NEEDS_NO_ERROR_INIT} + {$ifdef GDB_V6} +-// gdb_stdtargin := gdb_stdin; ++{$ifdef GDB_NEEDS_SET_INSTREAM} ++ gdb_stdtargin := gdb_stdin; ++{$endif GDB_NEEDS_SET_INSTREAM} + gdb_stdtargerr := gdb_stderr; + {$endif} + GetDir(0, CurrentDir); +@@ -3034,8 +3265,10 @@ + next_exit:=exitproc; + exitproc:=@DoneLibGDB; + {$ifdef GDB_V6} ++{$ifndef GDB_NO_UIOUT} + uiout := cli_out_new (gdb_stdout); +-{$endif} ++{$endif not GDB_NO_UIOUT} ++{$endif GDB_V6} + {$ifdef GDB_INIT_HAS_ARGV0} + getmem(argv0,length(paramstr(0))+1); + strpcopy(argv0,paramstr(0)); +@@ -3044,6 +3277,31 @@ + {$else not GDB_INIT_HAS_ARGV0} + gdb_init; + {$endif not GDB_INIT_HAS_ARGV0} ++{$ifdef GDB_NEEDS_INTERPRETER_SETUP} ++ { interpreter can only be set after all files are ++ initialized, which is done in gdb_init function. } ++ interp := interp_lookup ('console'); ++ interp_set (interp); ++ ++ { We need to re-set gdb_stdXX ui_files } ++ if assigned(gdb_stderr) then ++ ui_file_delete(gdb_stderr); ++ if assigned(gdb_stdout) then ++ ui_file_delete(gdb_stdout); ++ if assigned(gdb_stdin) then ++ ui_file_delete(gdb_stdin); ++ gdb_stdin:=save_gdb_stdin; ++ gdb_stderr:=save_gdb_stderr; ++ gdb_stdout:=save_gdb_stdout; ++ gdb_stdlog:=gdb_stderr; ++ gdb_stdtarg:=gdb_stderr; ++ set_ui_file_write(gdb_stdout,@gdbint_ui_file_write); ++ set_ui_file_write(gdb_stderr,@gdbint_ui_file_write); ++{$ifdef GDB_NO_UIOUT} ++ cli_uiout := cli_out_new (gdb_stdout); ++ current_uiout:=cli_uiout; ++{$endif GDB_NO_UIOUT} ++{$endif GDB_NEEDS_INTERPRETER_SETUP} + {$ifdef supportexceptions} + {$ifdef unix} + fpsignal(SIGINT,OldSigInt); +@@ -3069,14 +3327,34 @@ + end; + + {$ifdef GDB_HAS_SYSROOT} +-var gdb_sysroot : pchar; cvar;public; ++ { Here we declare as cvar;public; a bunch of global ++ variables that are defined in main.c source. ++ We must not load main.o otherwise, we will get ++ into multiply defined symbols troubles. } ++var ++ gdb_sysrootc : char; ++ { used locally only to provide a pchar pointing to '\0' } ++ gdb_sysroot : pchar; cvar;public; ++ { gdb_sysroot global variable is declared in defs.h and ++ instanciated in main.c since version 6.0 } + gdb_datadir : pchar; cvar;public; ++ { gdb_datadir global variable is declared in defs.h and ++ instanciated in main.c since version 7.0 } + python_libdir : pchar;cvar;public; +- gdb_sysrootc : char; ++ { python_libdir global variable is declared in defs.h and instanciated ++ in main.c since version 7.2 } + return_child_result : longbool;cvar;public; ++ { return_chlid_result global variable is declared in main.h and ++ instanciated in main.c since version 6.4 } + return_child_result_value : longint;cvar;public; ++ { return_child_result_value global variable is declared in main.h and ++ instanciated in main.c since version 6.4 with a startup value of -1 } + batch_silent : longbool;cvar;public; ++ { batch_silent global variable is declared in main.h since 7.0, but ++ instanciated in main.c since version 6.4 } + batch_flag : longbool;cvar;public; ++ { batch_flag global variable is declared in main.h and ++ instanciated in main.c since version 7.2 } + {$endif} + {$ifdef GDB_HAS_DEBUG_FILE_DIRECTORY} + var +@@ -3086,6 +3364,7 @@ + begin + {$ifdef GDB_HAS_SYSROOT} + gdb_sysrootc := #0; ++ return_child_result_value := -1; + gdb_sysroot := @gdb_sysrootc; + gdb_datadir := @gdb_sysrootc; + python_libdir := @gdb_sysrootc; diff --git a/community/hostapd/PKGBUILD b/community/hostapd/PKGBUILD index 047355d08..e030c1e09 100644 --- a/community/hostapd/PKGBUILD +++ b/community/hostapd/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 80758 2012-12-03 10:07:15Z spupykin $ +# $Id: PKGBUILD 82275 2013-01-14 09:20:19Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=hostapd -pkgver=1.1 +pkgver=2.0 pkgrel=1 pkgdesc="IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator" arch=('i686' 'x86_64') @@ -26,7 +26,7 @@ source=(http://w1.fi/releases/$pkgname-$pkgver.tar.gz hostapd hostapd.conf.d hostapd.service) -md5sums=('e3ace8306d066ab2d24b4c9f668e2dd7' +md5sums=('ba22e639bc57aa4035d2ea8ffa9bbbee' '5d7ee10b04e33f22c37be56a4c33dddb' 'd570327c385f34a4af24d3a0d61cea19' 'f169534b0f59b341f6df1a21e0344511' diff --git a/community/libgit2/PKGBUILD b/community/libgit2/PKGBUILD new file mode 100644 index 000000000..3a093b9af --- /dev/null +++ b/community/libgit2/PKGBUILD @@ -0,0 +1,27 @@ +# $Id$ +# Maintainer: Daniel Micay <danielmicay@gmail.com> +# Contributor: Hilton Medeiros <medeiros.hilton@gmail.com> +# Contributor: Dave Reisner <d@falconindy.com> + +pkgname=libgit2 +pkgver=0.17.0 +pkgrel=2 +pkgdesc="A linkable library for Git" +arch=('i686' 'x86_64') +url="http://libgit2.github.com/" +depends=('zlib') +makedepends=(cmake python) +license=('GPL2') +source=("src-$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/tarball/v$pkgver") +md5sums=('5a09dd1118d1354375407119d19e0f2c') + +build() { + cd "$srcdir"/$pkgname-* + cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "$srcdir"/$pkgname-* + make DESTDIR="$pkgdir" install +} diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD index 033aa3ad5..b03cd36c6 100644 --- a/community/libvirt/PKGBUILD +++ b/community/libvirt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 81314 2012-12-17 10:10:51Z spupykin $ +# $Id: PKGBUILD 82286 2013-01-14 10:03:34Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jonathan Wiersma <archaur at jonw dot org> pkgname=libvirt pkgver=1.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" arch=('i686' 'x86_64') url="http://libvirt.org/" @@ -34,15 +34,13 @@ source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz" libvirtd.conf.d libvirtd-guests.rc.d libvirtd-guests.conf.d - libvirt.tmpfiles.d - openbsd-netcat-default.patch) + libvirt.tmpfiles.d) md5sums=('86a8c0acabb01e11ac84fe00624dc54e' 'c43244c40a0437038c82089618e7beaa' '3ed0e24f5b5e25bf553f5427d64915e6' '0ee5b6c58590ff392a266f20f7928d1f' '0a96ed876ffb1fcb9dff5a9b3a609c1e' - '8d98e62915785686b0b6c8c070628392' - '456723b41903d3aaa7ec948c1feea265') + '8d98e62915785686b0b6c8c070628392') build() { cd "$srcdir/$pkgname-$pkgver" @@ -54,8 +52,6 @@ build() { sed -i 's_#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file done -# patch -Np1 -i "$srcdir"/openbsd-netcat-default.patch - export LDFLAGS=-lX11 export RADVD=/usr/sbin/radvd [ -f Makefile ] || ./configure --prefix=/usr --libexec=/usr/lib/"$pkgname" \ @@ -65,6 +61,7 @@ build() { sed -i 's|/etc/sysconfig/libvirtd|/etc/conf.d/libvirtd|' daemon/libvirtd.service sed -i 's|/etc/sysconfig/libvirt-guests|/etc/conf.d/libvirtd-guests|' tools/libvirt-guests.service sed -i 's|/etc/init.d/libvirt-g|/etc/rc.d/libvirtd-g|g' tools/libvirt-guests.service + sed -i 's|@sbindir@|/usr/sbin|g' src/virtlockd.service } package() { diff --git a/community/lilypond/PKGBUILD b/community/lilypond/PKGBUILD index 9ef7f5192..2a2529111 100644 --- a/community/lilypond/PKGBUILD +++ b/community/lilypond/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 79775 2012-11-12 09:26:01Z spupykin $ +# $Id: PKGBUILD 82279 2013-01-14 09:20:59Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Geoffroy Carrier <geoffroy@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> # Contributor: Robert Emil Berge <filoktetes@linuxophic.org> pkgname=lilypond -pkgver=2.16.1 +pkgver=2.16.2 pkgrel=1 pkgdesc="An automated music engraving system" arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ makedepends=('flex' 'bison' 'gettext' 'mftrace' 'texinfo' 'fontforge' 't1utils' options=('emptydirs') install=lilypond.install source=(http://download.linuxaudio.org/lilypond/sources/v2.16/$pkgname-$pkgver.tar.gz) -md5sums=('3a87363ba287d2958ee9414c3c16bbb2') +md5sums=('6db27f17d47e4f66a3b0716c65db3041') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/qmc2/PKGBUILD b/community/qmc2/PKGBUILD index 3ce4c767c..7760f385c 100644 --- a/community/qmc2/PKGBUILD +++ b/community/qmc2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 76435 2012-09-18 12:56:49Z spupykin $ +# $Id: PKGBUILD 82281 2013-01-14 09:21:45Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: JJDaNiMoTh <jjdanimoth@gmail.com> pkgname=qmc2 -pkgver=0.37 +pkgver=0.38 pkgrel=1 pkgdesc="Qt 4 based UNIX MAME frontend supporting SDLMAME" url="http://qmc2.arcadehits.net" @@ -12,7 +12,7 @@ arch=('i686' 'x86_64') depends=('qtwebkit' 'phonon' 'sdl') makedepends=('rsync' 'mesa') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-$pkgver.tar.bz2") -md5sums=('0f36197cb1a7ab6f54af43f4f67d7150') +md5sums=('075cd54c3f4eb306c4f8304dd08900c6') build() { cd "$srcdir/$pkgname" diff --git a/community/rekonq/PKGBUILD b/community/rekonq/PKGBUILD index 5657eed00..3e7c73c4d 100644 --- a/community/rekonq/PKGBUILD +++ b/community/rekonq/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 81783 2012-12-29 12:37:02Z andrea $ +# $Id: PKGBUILD 82318 2013-01-14 22:03:09Z andrea $ # Maintainer: Peter Lewis <plewis@aur.archlinux.org> # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Panagiotis Papadopoulos <pano_90 AT gmx DOT net> pkgname=rekonq pkgver=2.0 -pkgrel=1 +pkgrel=2 pkgdesc='A WebKit based web browser for KDE' arch=('i686' 'x86_64') url='http://rekonq.kde.org/' @@ -14,10 +14,16 @@ depends=('kdebase-keditbookmarks' 'qoauth') makedepends=('cmake' 'automoc4') optdepends=('qca-ossl: to use the sync handler') install=${pkgname}.install -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -sha256sums=('380aa337b561ee0c5eb1aa8401f7bd8d98a2b18e645e92f3387baae06d501d84') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2" + 'fix-google-sync.patch') +sha256sums=('380aa337b561ee0c5eb1aa8401f7bd8d98a2b18e645e92f3387baae06d501d84' + '7360746d3668c1353e0b30351d33014c41d3171d64a43fed5178207883291001') build(){ + cd ${pkgname}-${pkgver} + patch -p1 -i "${srcdir}"/fix-google-sync.patch + cd ../ + mkdir build cd build cmake ../${pkgname}-${pkgver} \ diff --git a/community/rekonq/fix-google-sync.patch b/community/rekonq/fix-google-sync.patch new file mode 100644 index 000000000..aa2aecc13 --- /dev/null +++ b/community/rekonq/fix-google-sync.patch @@ -0,0 +1,155 @@ +From: Andrea Diamantini <adjam7@gmail.com> +Date: Tue, 08 Jan 2013 16:09:03 +0000 +Subject: Workaround to fix Google Bookmarks sync + minor speed improvement +X-Git-Url: http://quickgit.kde.org/?p=rekonq.git&a=commitdiff&h=58bd0c195b60c3cf597a8d9296e5725dc4be7c9b +--- +Workaround to fix Google Bookmarks sync + minor speed improvement + +Courtesy patch by "Francesco". Thanks :) + +BUG: 312824 +--- + + +--- a/src/sync/googlesynchandler.cpp ++++ b/src/sync/googlesynchandler.cpp +@@ -3,7 +3,7 @@ + * This file is a part of the rekonq project + * + * Copyright (C) 2012 by Siteshwar Vashisht <siteshwar at gmail dot com> +-* Copyright (C) 2011 by Andrea Diamantini <adjam7 at gmail dot com> ++* Copyright (C) 2011-2013 by Andrea Diamantini <adjam7 at gmail dot com> + * + * + * This program is free software; you can redistribute it and/or +@@ -172,24 +172,24 @@ + + QString path = _webPage.mainFrame()->url().path(); + +- if (path == "/ServiceLogin" && _doLogin == true) ++ if ( (path == QL1S("/ServiceLogin") || path == QL1S("/Login")) && _doLogin == true) + { + // Let's login to our Google account + QWebFrame *frame = _webPage.mainFrame(); + +- QWebElement email = frame->findFirstElement("#Email"); +- QWebElement passwd = frame->findFirstElement("#Passwd"); +- QWebElement form = frame->findFirstElement("#gaia_loginform"); +- +- email.setAttribute("value", ReKonfig::syncUser()); +- passwd.setAttribute("value", ReKonfig::syncPass()); +- form.evaluateJavaScript("this.submit();"); ++ QWebElement email = frame->findFirstElement( QL1S("#Email") ); ++ QWebElement passwd = frame->findFirstElement( QL1S("#Passwd") ); ++ QWebElement form = frame->findFirstElement( QL1S("#gaia_loginform") ); ++ ++ email.setAttribute( QL1S("value"), ReKonfig::syncUser()); ++ passwd.setAttribute( QL1S("value"), ReKonfig::syncPass()); ++ form.evaluateJavaScript( QL1S("this.submit();") ); + emit syncStatus(Rekonq::Bookmarks, true, i18n("Signing in...")); + + // Login only once + _doLogin = false; + } +- else if (path == "/bookmarks/") ++ else if (path == QL1S("/bookmarks/") ) + { + // We get to this page after successful login, let's fetch the bookmark list in Xml format. + QNetworkAccessManager *qnam = _webPage.networkAccessManager(); +@@ -199,16 +199,16 @@ + emit syncStatus(Rekonq::Bookmarks, true, i18n("Fetching bookmarks from server...")); + connect(_reply, SIGNAL(finished()), this, SLOT(fetchingBookmarksFinished())); + } +- else if (path == "/ServiceLoginAuth") ++ else if (path == QL1S("/ServiceLoginAuth") ) + { + emit syncStatus(Rekonq::Bookmarks, false, i18n("Login failed!")); + _isSyncing = false; + } +- else if (path == "/bookmarks/mark") ++ else if (path == QL1S("/bookmarks/mark") ) + { + QWebFrame *frame = _webPage.mainFrame(); + +- QString sigKey = frame->findFirstElement("input[name=sig]").attribute("value"); ++ QString sigKey = frame->findFirstElement( QL1S("input[name=sig]") ).attribute( QL1S("value") ); + kDebug() << "Signature Key is : " << sigKey; + + QNetworkAccessManager *qnam = _webPage.networkAccessManager(); +@@ -219,7 +219,7 @@ + for (QSet<QString>::const_iterator iter = _bookmarksToDelete.constBegin(); iter != _bookmarksToDelete.end(); ++iter) + { + QNetworkRequest request; +- request.setUrl(QUrl("https://www.google.com/bookmarks/mark?dlq=" + *iter + "&sig=" + sigKey)); ++ request.setUrl(QUrl( QL1S("https://www.google.com/bookmarks/mark?dlq=") + *iter + QL1S("&sig=") + sigKey)); + + kDebug() << "Delete url is : " << request.url(); + QNetworkReply *r = qnam->get(request); +@@ -243,7 +243,7 @@ + postData.append("&sig=" + sigKey.toUtf8()); + + QNetworkRequest request; +- request.setUrl(QUrl("https://www.google.com/bookmarks/mark?sig=" + sigKey + "&btnA")); ++ request.setUrl(QUrl("https://www.google.com/bookmarks/mark?sig=" + sigKey + QL1S("&btnA") )); + request.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded"); + kDebug() << "Url: " << request.url(); + kDebug() << "Post data is :" << postData; +@@ -257,7 +257,7 @@ + _bookmarksToAdd.clear(); + + } +- else if (path == "/Logout") ++ else if (path == QL1S("/Logout") ) + { + //Session finished + emit syncStatus(Rekonq::Bookmarks, true, i18n("Done!")); +@@ -277,10 +277,10 @@ + { + QString data = _reply->readAll(); + +- QDomDocument doc("bookmarks"); ++ QDomDocument doc( QL1S("bookmarks") ); + doc.setContent(data); + +- QDomNodeList bookmarksOnServer = doc.elementsByTagName("bookmark"); ++ QDomNodeList bookmarksOnServer = doc.elementsByTagName( QL1S("bookmark") ); + emit syncStatus(Rekonq::Bookmarks, true, i18n("Reading bookmarks...")); + + BookmarkManager *manager = BookmarkManager::self(); +@@ -291,8 +291,8 @@ + + for (int i = 0; i < bookmarksOnServer.size(); ++i) + { +- QString title = getChildElement(bookmarksOnServer.at(i), "title"); +- QString url = getChildElement(bookmarksOnServer.at(i), "url"); ++ QString title = getChildElement(bookmarksOnServer.at(i), QL1S("title") ); ++ QString url = getChildElement(bookmarksOnServer.at(i), QL1S("url") ); + + KBookmark bookmark = manager->bookmarkForUrl(KUrl(url)); + if (bookmark.isNull()) +@@ -377,7 +377,7 @@ + found = true; + break; + } +- else if (current.url().url() == getChildElement(bookmarksOnServer.at(i), "url")) ++ else if (current.url().url() == getChildElement(bookmarksOnServer.at(i), QL1S("url")) ) + { + found = true; + } +@@ -398,13 +398,13 @@ + + for (int i = 0; i < bookmarksOnServer.count(); ++i) + { +- QString url = getChildElement(bookmarksOnServer.at(i), "url"); ++ QString url = getChildElement(bookmarksOnServer.at(i), QL1S("url") ); + + KBookmark result = manager->bookmarkForUrl(KUrl(url)); + if (result.isNull()) + { + kDebug() << "Deleting from Google Bookmarks: " << url; +- _bookmarksToDelete.insert(getChildElement(bookmarksOnServer.at(i), "id")); ++ _bookmarksToDelete.insert(getChildElement(bookmarksOnServer.at(i), QL1S("id") )); + } + } + + diff --git a/community/the_silver_searcher/PKGBUILD b/community/the_silver_searcher/PKGBUILD new file mode 100644 index 000000000..df57c5d07 --- /dev/null +++ b/community/the_silver_searcher/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 82290 2013-01-14 11:59:53Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Jeff Horelick <jdhore1@gmail.com> +# Contributor: skydrome <skydrome@i2pmail.org> + +pkgname=the_silver_searcher +pkgver=0.13.1 +pkgrel=1 +pkgdesc='Code searching tool similar to Ack, but faster' +url='http://github.com/ggreer/the_silver_searcher' +license=('Apache') +depends=('pcre') +arch=('x86_64' 'i686') +source=("https://github.com/downloads/ggreer/$pkgname/$pkgname-$pkgver.tar.gz") +sha256sums=('140ded2207259f670e4b866a68cc2577495b63844c7dae101f89078c6b37b6fc') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + sed -i 's:configure:configure --prefix=/usr:' build.sh + ./build.sh +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/core/dialog/PKGBUILD b/core/dialog/PKGBUILD index d615e0577..0cc30e82a 100644 --- a/core/dialog/PKGBUILD +++ b/core/dialog/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 163201 2012-07-09 14:42:05Z stephane $ +# $Id: PKGBUILD 175124 2013-01-14 12:47:12Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> pkgname=dialog -pkgver=1.1_20120706 +pkgver=1.2_20121230 pkgrel=1 pkgdesc="A tool to display dialog boxes from shell scripts" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ url="http://invisible-island.net/dialog/" license=('LGPL2.1') depends=('ncurses') source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver/_/-}.tgz) -sha1sums=('fa033f0fb166da86e29d70e68159a92a9b9cdb84') +sha1sums=('f6ba16481e04c707c7cbfc3c3c1340040bdb0aa3') build() { cd "${srcdir}/$pkgname-${pkgver/_/-}" diff --git a/core/iputils/PKGBUILD b/core/iputils/PKGBUILD index 7ad2b8048..6eac3bafa 100644 --- a/core/iputils/PKGBUILD +++ b/core/iputils/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 172113 2012-11-29 11:07:07Z stephane $ +# $Id: PKGBUILD 175125 2013-01-14 12:47:14Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=iputils -pkgver=20121126 +pkgver=20121221 pkgrel=1 pkgdesc="Network monitoring tools, including ping" arch=('i686' 'x86_64') @@ -20,16 +20,13 @@ backup=(etc/xinetd.d/tftp) install=${pkgname}.install source=(http://www.skbuff.net/${pkgname}/${pkgname}-s${pkgver}.tar.bz2 tftp.xinetd) -sha1sums=('3e46391f53381080d5e1961f1b2b0ccd9a158ab2' +sha1sums=('4d56d8c75d6a5d58f052e4056e975f01ebab9ba9' 'fc2ae26f5609725e3f4aeaf4ab82dfa6d2e378fd') build() { cd "${srcdir}/${pkgname}-s${pkgver}" - # Use our CFLAGS - sed -i -e "/^CCOPT=/s|-O2|${CFLAGS}|" Makefile - - make + make USE_GNUTLS=no CCOPTOPT="$CFLAGS" cd doc for file in *.sgml; do diff --git a/core/kbd/PKGBUILD b/core/kbd/PKGBUILD index cfb6b3dbf..fc1389df9 100644 --- a/core/kbd/PKGBUILD +++ b/core/kbd/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 163716 2012-07-18 02:17:05Z dreisner $ +# $Id: PKGBUILD 175117 2013-01-14 07:36:39Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=kbd -pkgver=1.15.3 -pkgrel=3 +pkgver=1.15.5 +pkgrel=2 pkgdesc="Keytable files and keyboard utilities" arch=('i686' 'x86_64') -url="ftp://ftp.altlinux.org/pub/people/legion/kbd/" +url="http://www.kbd-project.org" license=('GPL') -depends=('glibc') -source=(ftp://ftp.altlinux.org/pub/people/legion/kbd/${pkgname}-${pkgver}.tar.gz - fix-es.po.patch) -md5sums=('8143e179a0f3c25646ce5085e8777200' - '4ded3edb50fb7a3277bae6a870cee812') +depends=('glibc' 'pam') +source=(ftp://ftp.altlinux.org/pub/people/legion/kbd/${pkgname}-${pkgver}.tar.gz) +provides=('vlock') +conflicts=('vlock') +replaces=('vlock') +md5sums=('34c71feead8ab9c01ec638acea8cd877') build() { cd ${srcdir}/${pkgname}-${pkgver} - patch -Np1 -i ../fix-es.po.patch # rename keymap files with the same names # this is needed because when only name of keymap is specified # loadkeys loads the first keymap it can find, which is bad (see FS#13837) diff --git a/core/nfs-utils/PKGBUILD b/core/nfs-utils/PKGBUILD index 309597247..079afece1 100644 --- a/core/nfs-utils/PKGBUILD +++ b/core/nfs-utils/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 170826 2012-11-12 09:13:11Z tpowa $ +# $Id: PKGBUILD 175118 2013-01-14 07:37:11Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> # Contributor: dibblethewrecker <dibblethewrecker.at.jiwe.org> @@ -7,7 +7,7 @@ pkgname=nfs-utils pkgver=1.2.6 -pkgrel=3 +pkgrel=4 pkgdesc="Support programs for Network File Systems" arch=('i686' 'x86_64') url='http://nfs.sourceforge.net' @@ -55,7 +55,7 @@ md5sums=('8be543ca270c2234ff18f8c8d35e0d37' 'beff8a426b3b14c46e3e78a2a283e2ab' '5d33d2e754fd37280365b287603bac90' '1cd65909fa0983047f3f06a3ab352401' - '02a34835aa077146a90eb7d191e612d0' + '8f1b5282795895c9b8ce8430d20cdda6' '8ffc2ebe932d29efe17d6f3f23d5b975' '8ac484023d786766d287ccbe878ae4ba') diff --git a/core/nfs-utils/proc-fs-nfsd.mount b/core/nfs-utils/proc-fs-nfsd.mount index f8664a8be..e5ee6fbf6 100644 --- a/core/nfs-utils/proc-fs-nfsd.mount +++ b/core/nfs-utils/proc-fs-nfsd.mount @@ -5,4 +5,4 @@ DefaultDependencies=no [Mount] What=sunrpc Where=/proc/fs/nfsd -Type=rpc_pipefs +Type=nfsd diff --git a/core/traceroute/PKGBUILD b/core/traceroute/PKGBUILD index cb8c6351e..b0bff2380 100644 --- a/core/traceroute/PKGBUILD +++ b/core/traceroute/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 162362 2012-06-25 20:10:12Z stephane $ +# $Id: PKGBUILD 175126 2013-01-14 12:47:17Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> pkgname=traceroute -pkgver=2.0.18 +pkgver=2.0.19 pkgrel=1 pkgdesc="Tracks the route taken by packets over an IP network" arch=('i686' 'x86_64') @@ -10,11 +10,11 @@ url="http://traceroute.sourceforge.net/" license=('GPL2') depends=('glibc') source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) -sha1sums=('6bdccfd12f93b89aea53728b3c365db5a4362b6d') +sha1sums=('44c109cfe4950f1617d0d796b432356b9acf4bd4') build() { cd "${srcdir}/${pkgname}-${pkgver}" - make + make CFLAGS="$CFLAGS" } package() { diff --git a/core/xfsprogs/PKGBUILD b/core/xfsprogs/PKGBUILD index 0f28ad90d..213b16a3d 100644 --- a/core/xfsprogs/PKGBUILD +++ b/core/xfsprogs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 158617 2012-05-05 03:17:20Z dreisner $ +# $Id: PKGBUILD 175120 2013-01-14 07:38:18Z tpowa $ # pkgname=xfsprogs -pkgver=3.1.8 -pkgrel=2 +pkgver=3.1.10 +pkgrel=1 pkgdesc="XFS filesystem utilities" arch=('i686' 'x86_64') license=('LGPL') @@ -12,7 +12,7 @@ depends=('util-linux') options=('!makeflags' '!libtool') # We mirror the sources as upstream tends to move them once a new release is out source=("ftp://ftp.archlinux.org/other/xfsprogs/${pkgname}-${pkgver}.tar.gz") -md5sums=('f70b2e7200d4c29f0af1cf70e7be1db6') +md5sums=('d6159f7a664d95b4c150d580399d4400') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/appmenu-qt/PKGBUILD b/extra/appmenu-qt/PKGBUILD index 27e1208bf..64deb879b 100644 --- a/extra/appmenu-qt/PKGBUILD +++ b/extra/appmenu-qt/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 174631 2013-01-05 12:47:25Z andrea $ +# $Id: PKGBUILD 175130 2013-01-14 17:12:42Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=appmenu-qt pkgver=0.2.6 -pkgrel=2 +pkgrel=3 pkgdesc="Allows Qt applications to export menus over DBus to a menu applet" arch=('i686' 'x86_64') url='https://launchpad.net/appmenu-qt' @@ -14,7 +14,7 @@ source=("http://launchpad.net/${pkgname}/trunk/${pkgver}/+download/${pkgname}-${ 'appmenu-async.diff') md5sums=('90cce750e5412d43ce075b0a9bdb6782' 'de499d01369fc85040f5bbfc53ae1700' - '82947207881702d88403c149406b502a') + '5db00ca92274c8b1797c204321961189') build() { # FS#33286 diff --git a/extra/appmenu-qt/appmenu-async.diff b/extra/appmenu-qt/appmenu-async.diff index c4bc509d7..59e3ce791 100644 --- a/extra/appmenu-qt/appmenu-async.diff +++ b/extra/appmenu-qt/appmenu-async.diff @@ -119,3 +119,31 @@ + </interface> +</node> +=== modified file 'src/appmenuplatformmenubar.cpp' +--- src/appmenuplatformmenubar.cpp 2013-01-11 15:05:38 +0000 ++++ src/appmenuplatformmenubar.cpp 2013-01-14 16:01:25 +0000 +@@ -410,6 +410,10 @@ + registrar = new com::canonical::AppMenu::Registrar(REGISTRAR_SERVICE, REGISTRAR_PATH, QDBusConnection::sessionBus(), 0); + } + ++ if (!registrar || !registrar->isValid()) { ++ return false; ++ } ++ + Q_FOREACH(QAction *action, m_menuBar->actions()) { + if (!action->isSeparator()) { + m_rootMenu->addAction(action); +@@ -430,9 +434,9 @@ + } + + m_registeredWinId = winId; +- if (registrar) { +- registrar->RegisterWindow(winId, QDBusObjectPath(m_objectPath)); +- } ++ ++ registrar->RegisterWindow(winId, QDBusObjectPath(m_objectPath)); ++ + return true; + } + + diff --git a/extra/dmapi/PKGBUILD b/extra/dmapi/PKGBUILD index ada627216..3e47d8053 100644 --- a/extra/dmapi/PKGBUILD +++ b/extra/dmapi/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 137722 2011-09-10 14:14:07Z pierre $ +# $Id: PKGBUILD 175121 2013-01-14 07:38:26Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=dmapi -pkgver=2.2.10 -pkgrel=3 +pkgver=2.2.12 +pkgrel=1 pkgdesc="Data migration API" arch=('i686' 'x86_64') url="http://oss.sgi.com/projects/xfs/" @@ -15,7 +15,6 @@ conflicts=('xfsdmapi') replaces=('xfsdmapi') options=('!libtool') source=("ftp://oss.sgi.com/projects/xfs/cmd_tars/$pkgname-$pkgver.tar.gz") -md5sums=('c6e4ace10c446bbb92576e5dd19aec24') build() { cd $srcdir/dmapi-$pkgver @@ -38,3 +37,4 @@ package() { # kill libexec dir rm -rf $pkgdir/usr/libexec } +md5sums=('cd825d4e141c16011367e0a0dd98c9c5') diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD index e8de55002..8ea4c7e09 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 174135 2013-01-02 14:21:11Z dan $ +# $Id: PKGBUILD 175132 2013-01-14 22:24:03Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=git -pkgver=1.8.1 +pkgver=1.8.1.1 pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64) @@ -28,13 +28,11 @@ source=("http://git-core.googlecode.com/files/git-$pkgver.tar.gz" git-daemon git-daemon.conf git-daemon@.service - git-daemon.socket - fix-git-build-python.patch) + git-daemon.socket) build() { export PYTHON_PATH='/usr/bin/python2' cd "$srcdir/$pkgname-$pkgver" - patch -Np1 < ../fix-git-build-python.patch make prefix=/usr gitexecdir=/usr/lib/git-core \ CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \ USE_LIBPCRE=1 \ @@ -111,10 +109,9 @@ package() { install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket } -md5sums=('a2c6f4404c5e432b47474d246ca83c7e' - '8da825142aed9f37f80ad67164990373' +md5sums=('2bf7fd005ecf2e0a311b849e6add7994' + '4ac4ea5a72ec96ac24b7d6fba9ad1277' '8e2648910fd5dd4f1c41d3c7fa9e9156' '2e42bf97779a1c6411d89043334c9e78' '042524f942785772d7bd52a1f02fe5ae' - 'f67869315c2cc112e076f0c73f248002' - '7fd505fdcd0cd0223e5b8ad641090de8') + 'f67869315c2cc112e076f0c73f248002') diff --git a/extra/gtkpod/PKGBUILD b/extra/gtkpod/PKGBUILD index 717c6c763..8ff8d4cf6 100644 --- a/extra/gtkpod/PKGBUILD +++ b/extra/gtkpod/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 170131 2012-11-03 12:34:41Z ibiru $ +# $Id: PKGBUILD 175123 2013-01-14 08:37:19Z eric $ # Contributor: Kevin Piche <kevin@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=gtkpod -pkgver=2.1.2 -pkgrel=4 +pkgver=2.1.3 +pkgrel=1 pkgdesc="A platform independent GUI for Apple's iPod using GTK3" arch=('i686' 'x86_64') url="http://gtkpod.sourceforge.net" @@ -19,13 +19,13 @@ optdepends=('libmp4v2: MP4/h264 support' install=gtkpod.install options=('!libtool') source=("http://downloads.sourceforge.net/gtkpod/${pkgname}-${pkgver}.tar.gz" - "gtkpod-2.1.2-anjuta.patch") -md5sums=('88fef3f947cbb7ae6b714080733a3b6b' - '0a5f4ce0c9ef3d4d8db57290df43db27') + gtkpod-2.1.3-gdl-3.6.patch) +md5sums=('57f04578de6e3262a436ec574422b144' + '8d725015081bd89bc8f9a4521d170aef') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np0 -i "${srcdir}/gtkpod-2.1.2-anjuta.patch" + patch -p1 -i "${srcdir}/gtkpod-2.1.3-gdl-3.6.patch" sed -i 's#python#python2#' scripts/sync-palm-jppy.py ./configure --prefix=/usr make diff --git a/extra/gtkpod/gtkpod-2.1.3-gdl-3.6.patch b/extra/gtkpod/gtkpod-2.1.3-gdl-3.6.patch new file mode 100644 index 000000000..b794fa11b --- /dev/null +++ b/extra/gtkpod/gtkpod-2.1.3-gdl-3.6.patch @@ -0,0 +1,44 @@ +Index: gtkpod-2.1.2/src/anjuta-action-callbacks.c +=================================================================== +--- gtkpod-2.1.2.orig/src/anjuta-action-callbacks.c ++++ gtkpod-2.1.2/src/anjuta-action-callbacks.c +@@ -65,7 +65,7 @@ void + on_layout_lock_toggle (GtkAction *action, AnjutaApp *app) + { + if (app->layout_manager) +- g_object_set (app->layout_manager->master, "locked", ++ g_object_set (gdl_dock_layout_get_master (app->layout_manager), "locked", + gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)), + NULL); + } +Index: gtkpod-2.1.2/src/anjuta-app.c +=================================================================== +--- gtkpod-2.1.2.orig/src/anjuta-app.c ++++ gtkpod-2.1.2/src/anjuta-app.c +@@ -252,7 +252,7 @@ static void on_gdl_style_changed(GSettin + else if (g_strcmp0(pr_style, "Tabs") == 0) + style = GDL_SWITCHER_STYLE_TABS; + +- g_object_set(G_OBJECT(app->layout_manager->master), "switcher-style", style, NULL); ++ g_object_set(G_OBJECT(gdl_dock_layout_get_master (app->layout_manager)), "switcher-style", style, NULL); + g_free(pr_style); + } + +@@ -478,14 +478,14 @@ static void anjuta_app_instance_init(Anj + gtk_widget_show(app->dock); + gtk_box_pack_end(GTK_BOX (hbox), app->dock, TRUE, TRUE, 0); + +- dockbar = gdl_dock_bar_new(GDL_DOCK(app->dock)); ++ dockbar = gdl_dock_bar_new(G_OBJECT(app->dock)); + gtk_widget_show(dockbar); + gtk_box_pack_start(GTK_BOX (hbox), dockbar, FALSE, FALSE, 0); + +- app->layout_manager = gdl_dock_layout_new(GDL_DOCK (app->dock)); ++ app->layout_manager = gdl_dock_layout_new(G_OBJECT (app->dock)); + g_signal_connect (app->layout_manager, "notify::dirty", + G_CALLBACK (on_layout_dirty_notify), app); +- g_signal_connect (app->layout_manager->master, "notify::locked", ++ g_signal_connect (gdl_dock_layout_get_master (app->layout_manager), "notify::locked", + G_CALLBACK (on_layout_locked_notify), app); + + /* UI engine */ diff --git a/extra/llvm/PKGBUILD b/extra/llvm/PKGBUILD index dee9a46c5..f4be669a3 100644 --- a/extra/llvm/PKGBUILD +++ b/extra/llvm/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 173988 2012-12-31 11:59:46Z foutrelis $ +# $Id: PKGBUILD 175116 2013-01-14 06:46:10Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Sebastian Nowicki <sebnow@gmail.com> @@ -11,7 +11,7 @@ pkgname=('llvm' 'llvm-ocaml' 'clang' 'clang-analyzer') pkgver=3.2 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') url="http://llvm.org/" license=('custom:University of Illinois/NCSA Open Source License') @@ -26,7 +26,7 @@ source=(http://llvm.org/releases/$pkgver/$pkgname-$pkgver.src.tar.gz enable-lto.patch llvm-3.1-fix-debug-line-info.patch clang-3.1-fix-libprofile_rt.a-location.patch) -sha256sums=('125090c4d26740f1d5e9838477c931ed7d9ad70d599ba265f46f3a42cb066343' +sha256sums=('378f9ed7126409785aa399bf367762753dbda563b60612dae1a92d5263ab8130' '2aaaf03f7c0f6b16fe97ecc81247dc2bf2d4bec7620a77cc74670b7e07ff5658' 'a9a6b73a1bd5fc763f3b3826a6ce796cb150042d37d319e06e72d3d9778aaac1' '312574e655f9a87784ca416949c505c452b819fad3061f2cde8aced6540a19a3' @@ -228,6 +228,9 @@ package_clang-analyzer() { ln -s /usr/lib/clang-analyzer/$_tool/$_tool "$pkgdir/usr/bin/" done + # scan-build looks for clang within the same directory + ln -s /usr/bin/clang "$pkgdir/usr/lib/clang-analyzer/scan-build/" + # Relocate man page install -d "$pkgdir/usr/share/man/man1" mv "$pkgdir/usr/lib/clang-analyzer/scan-build/scan-build.1" \ diff --git a/extra/tumbler/PKGBUILD b/extra/tumbler/PKGBUILD index 85d5c6323..2a2d91938 100644 --- a/extra/tumbler/PKGBUILD +++ b/extra/tumbler/PKGBUILD @@ -1,21 +1,20 @@ -# $Id: PKGBUILD 175094 2013-01-13 14:57:05Z foutrelis $ +# $Id: PKGBUILD 175134 2013-01-15 01:39:25Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Andreas Radke <andyrtr@archlinux.org> # Contributor: Jan Jezek <honzin.jezek@gmail.com> pkgname=tumbler pkgver=0.1.27 -pkgrel=1 +pkgrel=2 pkgdesc="D-Bus service for applications to request thumbnails" arch=('i686' 'x86_64') url="http://www.xfce.org/" license=('GPL2' 'LGPL') groups=('xfce4') depends=('dbus-glib' 'gdk-pixbuf2') -makedepends=('intltool' 'ffmpegthumbnailer' 'gst-plugins-base-libs' - 'poppler-glib' 'libgsf' 'libopenraw' 'freetype2') +makedepends=('intltool' 'ffmpegthumbnailer' 'poppler-glib' 'libgsf' + 'libopenraw' 'freetype2') optdepends=('ffmpegthumbnailer: for video thumbnails' - 'gst-libav: for video thumbnails' 'poppler-glib: for PDF thumbnails' 'libgsf: for ODF thumbnails' 'libopenraw: for RAW thumbnails' @@ -32,7 +31,8 @@ build() { --sysconfdir=/etc \ --libexecdir=/usr/lib/xfce4 \ --disable-static \ - --disable-debug + --disable-debug \ + --disable-gstreamer-thumbnailer make } diff --git a/extra/w3m/PKGBUILD b/extra/w3m/PKGBUILD index 438d25c4f..407b696dc 100644 --- a/extra/w3m/PKGBUILD +++ b/extra/w3m/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 149346 2012-02-07 01:25:49Z bisson $ +# $Id: PKGBUILD 175136 2013-01-15 01:58:54Z bisson $ # Contributor: dorphell <dorphell@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=w3m pkgver=0.5.3 -pkgrel=3 +pkgrel=4 pkgdesc='Text-based Web browser, as well as pager' url='http://w3m.sourceforge.net/' license=('custom') @@ -13,15 +13,20 @@ makedepends=('imlib2') optdepends=('imlib2: for graphics support') depends=('openssl' 'gc' 'ncurses') source=("http://downloads.sourceforge.net/sourceforge/w3m/${pkgname}-${pkgver}.tar.gz" - 'https-segfault.patch') + 'file_handle.patch' + 'https.patch' + 'gc72.patch') sha1sums=('444b6c8cf7094ee95f8e9de96b37f814b9d83237' - '66affb2f695fe0bdde25cf774642bfd6a9404e88') + '457de43be7eabc652614461a7ab25e3ba76b2aff' + '66affb2f695fe0bdde25cf774642bfd6a9404e88' + '7baa06ca684fd140503a2adc65e2d606970c4662') build() { cd "${srcdir}/${pkgname}-${pkgver}" - sed 's/file_handle/file_handle_rofl/g' -i istream.* - patch -p1 -i ../https-segfault.patch + patch -p1 -i ../file_handle.patch + patch -p1 -i ../https.patch + patch -p1 -i ../gc72.patch ./configure \ --prefix=/usr \ @@ -40,6 +45,6 @@ package() { make DESTDIR="${pkgdir}" install install -d "${pkgdir}"/usr/share/{doc,licenses}/"${pkgname}" - find doc/* | grep -v CVS | xargs -i install "{}" "${pkgdir}/usr/share/doc/${pkgname}" + find doc/* | grep -v CVS | xargs -i install -m644 "{}" "${pkgdir}/usr/share/doc/${pkgname}" ln -s ../../doc/"${pkgname}"/README "${pkgdir}/usr/share/licenses/${pkgname}" } diff --git a/extra/w3m/file_handle.patch b/extra/w3m/file_handle.patch new file mode 100644 index 000000000..15422294f --- /dev/null +++ b/extra/w3m/file_handle.patch @@ -0,0 +1,60 @@ +diff -Naur old/istream.c new/istream.c +--- old/istream.c 2011-01-04 20:22:22.000000000 +1100 ++++ new/istream.c 2012-07-04 21:50:51.529661517 +1000 +@@ -22,8 +22,8 @@ + static void basic_close(int *handle); + static int basic_read(int *handle, char *buf, int len); + +-static void file_close(struct file_handle *handle); +-static int file_read(struct file_handle *handle, char *buf, int len); ++static void file_close(struct file_handle_rofl *handle); ++static int file_read(struct file_handle_rofl *handle, char *buf, int len); + + static int str_read(Str handle, char *buf, int len); + +@@ -114,7 +114,7 @@ + stream = New(union input_stream); + init_base_stream(&stream->base, STREAM_BUF_SIZE); + stream->file.type = IST_FILE; +- stream->file.handle = New(struct file_handle); ++ stream->file.handle = New(struct file_handle_rofl); + stream->file.handle->f = f; + if (closep) + stream->file.handle->close = closep; +@@ -658,13 +658,13 @@ + } + + static void +-file_close(struct file_handle *handle) ++file_close(struct file_handle_rofl *handle) + { + handle->close(handle->f); + } + + static int +-file_read(struct file_handle *handle, char *buf, int len) ++file_read(struct file_handle_rofl *handle, char *buf, int len) + { + return fread(buf, 1, len, handle->f); + } +diff -Naur old/istream.h new/istream.h +--- old/istream.h 2003-10-21 02:41:56.000000000 +1000 ++++ new/istream.h 2012-07-04 21:50:51.529661517 +1000 +@@ -20,7 +20,7 @@ + + typedef struct stream_buffer *StreamBuffer; + +-struct file_handle { ++struct file_handle_rofl { + FILE *f; + void (*close) (); + }; +@@ -53,7 +53,7 @@ + + struct file_stream { + struct stream_buffer stream; +- struct file_handle *handle; ++ struct file_handle_rofl *handle; + char type; + char iseos; + int (*read) (); diff --git a/extra/w3m/gc72.patch b/extra/w3m/gc72.patch new file mode 100644 index 000000000..47bd4c85c --- /dev/null +++ b/extra/w3m/gc72.patch @@ -0,0 +1,13 @@ +diff -Naur old/main.c new/main.c +--- old/main.c 2011-01-04 20:42:19.000000000 +1100 ++++ new/main.c 2012-07-04 21:49:10.136212236 +1000 +@@ -833,7 +833,8 @@ + mySignal(SIGPIPE, SigPipe); + #endif + +- orig_GC_warn_proc = GC_set_warn_proc(wrap_GC_warn_proc); ++ orig_GC_warn_proc = GC_get_warn_proc(); ++ GC_set_warn_proc(wrap_GC_warn_proc); + err_msg = Strnew(); + if (load_argc == 0) { + /* no URL specified */ diff --git a/extra/w3m/https.patch b/extra/w3m/https.patch new file mode 100644 index 000000000..31286a70d --- /dev/null +++ b/extra/w3m/https.patch @@ -0,0 +1,19 @@ +Fedora patch; see https://bugzilla.redhat.com/show_bug.cgi?id=707994 + +--- old/url.c 2011-01-04 14:52:24.000000000 +0530 ++++ new/url.c 2011-09-02 18:25:43.305652690 +0530 +@@ -82,11 +82,11 @@ + {"ftp", SCM_FTP}, + {"local", SCM_LOCAL}, + {"file", SCM_LOCAL}, +- /* {"exec", SCM_EXEC}, */ ++ {"exec", SCM_EXEC}, + {"nntp", SCM_NNTP}, +- /* {"nntp", SCM_NNTP_GROUP}, */ ++ {"nntp", SCM_NNTP_GROUP}, + {"news", SCM_NEWS}, +- /* {"news", SCM_NEWS_GROUP}, */ ++ {"news", SCM_NEWS_GROUP}, + {"data", SCM_DATA}, + #ifndef USE_W3MMAILER + {"mailto", SCM_MAILTO}, diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD index d61b756f5..5ea3ff98f 100644 --- a/libre/icedove-libre/PKGBUILD +++ b/libre/icedove-libre/PKGBUILD @@ -3,7 +3,7 @@ # We're getting this from Debian Experimental _debname=icedove -_debver=17.0 +_debver=17.0.2 _debrel=1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -33,8 +33,8 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" ${_pkgname}.desktop Icedove-branding.patch) options=(!emptydirs) -md5sums=('f011e0308a0758df772638836fb03709' - '8534a19b46ce21d80fce16b50f1f37bd' +md5sums=('3f7679bb98ae99be5adf73fd0025b00e' + '7440def324766bcc61b91185226f8824' 'd6d58d3104a44624e0a3d227cdf1c211' '476ec205162340fb0679f522c9d31c3b' '4eecc4fc5aafaf0da651a09eadc90bee' diff --git a/libre/unzip-libre/PKGBUILD b/libre/unzip-libre/PKGBUILD index 20c3885f9..020740313 100644 --- a/libre/unzip-libre/PKGBUILD +++ b/libre/unzip-libre/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 70615 2010-02-27 15:46:11Z thayer $ -# Maintainer: Thayer Williams <thayer@archlinux.org> +# $Id: PKGBUILD 150452 2012-02-17 23:21:23Z allan $ +# Maintainer: # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Contributor: Robson Peixoto _pkgname=unzip pkgname=unzip-libre pkgver=6.0 -pkgrel=5 +pkgrel=6 pkgdesc="Unpacks .zip archives such as those made by PKZIP" arch=('i686' 'x86_64') url="http://www.info-zip.org/" @@ -15,22 +15,28 @@ depends=('bzip2' 'bash') provides=("${_pkgname}=${pkgver}") conflicts=("${_pkgname}") replaces=("${_pkgname}") -source=("https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-${pkgrel}-any.src.tar.xz") - +source=('http://downloads.sourceforge.net/infozip/unzip60.tar.gz' + 'match.patch') +md5sums=('62b490407489521db863b523a7f86375' + 'e6d9f0c204c2abe6a57dc5e1637d5140') build() { cd ${srcdir}/${_pkgname}${pkgver/./} + # from http://bzr.trisquel.info/package-helpers/trunk/annotate/head%3A/helpers/natty/DATA/unzip/match.patch + patch -Np0 -i ${srcdir}/match.patch + # set CFLAGS -- from Debian export CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -DACORN_FTYPE_NFS \ -DWILD_STOP_AT_DIR -DLARGE_FILE_SUPPORT -DUNICODE_SUPPORT \ -DUNICODE_WCHAR -DUTF8_MAYBE_NATIVE -DNO_LCHMOD -DDATE_FORMAT=DF_YMD \ -DUSE_BZIP2 -DNATIVE" + sed -i "/MANDIR =/s#)/#)/share/#" unix/Makefile + # make -- from Debian make -f unix/Makefile LOCAL_UNZIP="$CFLAGS" prefix=/usr LF2="" \ D_USE_BZ2=-DUSE_BZIP2 L_BZ2=-lbz2 unzips - } package(){ @@ -41,10 +47,5 @@ package(){ # install the license file install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/unzip/LICENSE - - # fix manpage location - mkdir -p ${pkgdir}/usr/share - mv ${pkgdir}/usr/man ${pkgdir}/usr/share/ } -md5sums=('8e8a774e2006617d8787d095bb78c78a') |