From iron at frugalware.org Thu Jan 1 00:29:31 2009 From: iron at frugalware.org (Krisztian VASAS) Date: Thu Jan 1 00:29:33 2009 Subject: [Frugalware-git] xorg74: xf86-input-mouse-1.3.0-1-i686 Message-ID: <20081231232931.93F9611B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=3b8226ec89b2985e10620387a3c43adcbe3a943d commit 3b8226ec89b2985e10620387a3c43adcbe3a943d Author: Krisztian VASAS Date: Thu Jan 1 00:28:59 2009 +0100 xf86-input-mouse-1.3.0-1-i686 - added missing header file diff --git a/source/x11/xf86-input-mouse/xf86OSmouse.h b/source/x11/xf86-input-mouse/xf86OSmouse.h new file mode 100644 index 0000000..09b8525 --- /dev/null +++ b/source/x11/xf86-input-mouse/xf86OSmouse.h @@ -0,0 +1,277 @@ +/* + * Copyright (c) 1999-2003 by The XFree86 Project, Inc. + * + * 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 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 COPYRIGHT HOLDER(S) OR AUTHOR(S) 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 copyright holder(s) + * and author(s) 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 copyright holder(s) and author(s). + */ + +/* Public interface to OS-specific mouse support. */ + +#ifndef _XF86OSMOUSE_H_ +#define _XF86OSMOUSE_H_ + +#include "xf86Xinput.h" + +/* Mouse interface classes */ +#define MSE_NONE 0x00 +#define MSE_SERIAL 0x01 /* serial port */ +#define MSE_BUS 0x02 /* old bus mouse */ +#define MSE_PS2 0x04 /* standard read-only PS/2 */ +#define MSE_XPS2 0x08 /* extended PS/2 */ +#define MSE_AUTO 0x10 /* auto-detect (PnP) */ +#define MSE_MISC 0x20 /* The OS layer will identify the + * specific protocol names that are + * supported for this class. */ + +/* Mouse Protocol IDs. */ +typedef enum { + PROT_UNKNOWN = -2, + PROT_UNSUP = -1, /* protocol is not supported */ + PROT_MS = 0, + PROT_MSC, + PROT_MM, + PROT_LOGI, + PROT_LOGIMAN, + PROT_MMHIT, + PROT_GLIDE, + PROT_IMSERIAL, + PROT_THINKING, + PROT_ACECAD, + PROT_VALUMOUSESCROLL, + PROT_PS2, + PROT_GENPS2, + PROT_IMPS2, + PROT_EXPPS2, + PROT_THINKPS2, + PROT_MMPS2, + PROT_GLIDEPS2, + PROT_NETPS2, + PROT_NETSCPS2, + PROT_BM, + PROT_AUTO, + PROT_SYSMOUSE, + PROT_NUMPROTOS /* This must always be last. */ +} MouseProtocolID; + +struct _MouseDevRec; + +typedef int (*GetInterfaceTypesProc)(void); +typedef const char **(*BuiltinNamesProc)(void); +typedef Bool (*CheckProtocolProc)(const char *protocol); +typedef Bool (*BuiltinPreInitProc)(InputInfoPtr pInfo, const char *protocol, + int flags); +typedef const char *(*DefaultProtocolProc)(void); +typedef const char *(*SetupAutoProc)(InputInfoPtr pInfo, int *protoPara); +typedef void (*SetResProc)(InputInfoPtr pInfo, const char* protocol, int rate, + int res); +typedef const char *(*FindDeviceProc)(InputInfoPtr pInfo, const char *protocol, + int flags); +typedef const char *(*GuessProtocolProc)(InputInfoPtr pInfo, int flags); + +/* + * OSMouseInfoRec is used to pass information from the OSMouse layer to the + * OS-independent mouse driver. + */ +typedef struct { + GetInterfaceTypesProc SupportedInterfaces; + BuiltinNamesProc BuiltinNames; + CheckProtocolProc CheckProtocol; + BuiltinPreInitProc PreInit; + DefaultProtocolProc DefaultProtocol; + SetupAutoProc SetupAuto; + SetResProc SetPS2Res; + SetResProc SetBMRes; + SetResProc SetMiscRes; + FindDeviceProc FindDevice; + GuessProtocolProc GuessProtocol; +} OSMouseInfoRec, *OSMouseInfoPtr; + +/* + * SupportedInterfaces: Returns the mouse interface types that the OS support. + * If MSE_MISC is returned, then the BuiltinNames and + * CheckProtocol should be set. + * + * BuiltinNames: Returns the names of the protocols that are fully handled + * in the OS-specific code. These are names that don't appear + * directly in the main "mouse" driver. + * + * CheckProtocol: Checks if the protocol name given is supported by the + * OS. It should return TRUE for both "builtin" protocols and + * protocols of type MSE_MISC that are supported by the OS. + * + * PreInit: The PreInit function for protocols that are builtin. This + * function is passed the protocol name. + * + * DefaultProtocol: Returns the name of a default protocol that should be used + * for the OS when none has been supplied in the config file. + * This should only be set when there is a reasonable default. + * + * SetupAuto: This function can be used to do OS-specific protocol + * auto-detection. It returns the name of the detected protocol, + * or NULL when detection fails. It may also adjust one or more + * of the "protoPara" values for the detected protocol by setting + * then to something other than -1. SetupAuto gets called in two + * ways. The first is before any devices have been opened. This + * can be used when the protocol "Auto" always maps to a single + * protocol type. The second is with the device open, allowing + * OS-specific probing to be done. + * + * SetPS2Res: Set the resolution and sample rate for MSE_PS2 and MSE_XPS2 + * protocol types. + * + * SetBMRes: Set the resolution and sample rate for MSE_BM protocol types. + * + * SetMiscRes: Set the resolution and sample rate for MSE_MISC protocol types. + * + * FindDevice: This function gets called when no Device has been specified + * in the config file. OS-specific methods may be used to guess + * which input device to use. This function is called after the + * pre-open attempts at protocol discovery are done, but before + * the device is open. I.e., after the first SetupAuto() call, + * after the DefaultProtocol() call, but before the PreInit() + * call. Available protocol information may be used in locating + * the default input device. + * + * GuessProtocol: A last resort attempt at guessing the mouse protocol by + * whatever OS-specific means might be available. OS-independent + * things should be in the mouse driver. This function gets + * called after the mouse driver's OS-independent methods have + * failed. + */ + +extern OSMouseInfoPtr xf86OSMouseInit(int flags); + +/* Adjust this when the mouse interface changes. */ + +/* + * History: + * + * 1.0.0 - Everything up to when versioning was started. + * 1.1.0 - FindDevice and GuessProtocol added to OSMouseInfoRec + * 1.2.0 - xisbscale added to MouseDevRec + * + */ + +/* Z axis mapping */ +#define MSE_NOZMAP 0 +#define MSE_MAPTOX -1 +#define MSE_MAPTOY -2 +#define MSE_MAPTOZ -3 +#define MSE_MAPTOW -4 + +/* Generalize for other axes. */ +#define MSE_NOAXISMAP MSE_NOZMAP + +#define MSE_MAXBUTTONS 24 +#define MSE_DFLTBUTTONS 3 + +/* + * Mouse device record. This is shared by the mouse driver and the OSMouse + * layer. + */ + +typedef void (*checkMovementsProc)(InputInfoPtr,int, int); +typedef void (*autoProbeProc)(InputInfoPtr, Bool, Bool); +typedef Bool (*collectDataProc)(struct _MouseDevRec *, unsigned char); +typedef Bool (*dataGoodProc)(struct _MouseDevRec *); + +typedef void (*PostMseEventProc)(InputInfoPtr pInfo, int buttons, + int dx, int dy, int dz, int dw); +typedef void (*MouseCommonOptProc)(InputInfoPtr pInfo); + +typedef struct _MouseDevRec { + PtrCtrlProcPtr Ctrl; + PostMseEventProc PostEvent; + MouseCommonOptProc CommonOptions; + DeviceIntPtr device; + const char * mseDevice; + const char * protocol; + MouseProtocolID protocolID; + MouseProtocolID oldProtocolID; /* hack */ + int class; + int mseModel; + int baudRate; + int oldBaudRate; + int sampleRate; + int lastButtons; + int threshold; /* acceleration */ + int num; + int den; + int buttons; /* # of buttons */ + int emulateState; /* automata state for 2 button mode */ + Bool emulate3Buttons; + Bool emulate3ButtonsSoft; + int emulate3Timeout;/* Timeout for 3 button emulation */ + Bool chordMiddle; + Bool flipXY; + int invX; + int invY; + int mouseFlags; /* Flags to Clear after opening + * mouse dev */ + int truebuttons; /* (not used) + * Arg to maintain before + * emulate3buttons timer callback */ + int resolution; + int negativeZ; /* button mask */ + int positiveZ; /* button mask */ + int negativeW; /* button mask */ + int positiveW; /* button mask */ + pointer buffer; /* usually an XISBuffer* */ + int protoBufTail; + unsigned char protoBuf[8]; + unsigned char protoPara[8]; + unsigned char inSync; /* driver in sync with datastream */ + pointer mousePriv; /* private area */ + InputInfoPtr pInfo; + int origProtocolID; + const char * origProtocol; + Bool emulate3Pending;/* timer waiting */ + CARD32 emulate3Expires;/* time to fire emulation code */ + Bool emulateWheel; + int wheelInertia; + int wheelButton; + int negativeX; /* Button values. Unlike the Z and */ + int positiveX; /* W equivalents, these are button */ + int negativeY; /* values rather than button masks. */ + int positiveY; + int wheelYDistance; + int wheelXDistance; + Bool autoProbe; + checkMovementsProc checkMovements; + autoProbeProc autoProbeMouse; + collectDataProc collectData; + dataGoodProc dataGood; + int angleOffset; + pointer pDragLock; /* drag lock area */ + int xisbscale; /* buffer size for 1 event */ + int wheelButtonTimeout;/* Timeout for the wheel button emulation */ + CARD32 wheelButtonExpires; + int doubleClickSourceButtonMask; + int doubleClickTargetButton; + int doubleClickTargetButtonMask; + int doubleClickOldSourceState; + int lastMappedButtons; + int buttonMap[MSE_MAXBUTTONS]; +} MouseDevRec, *MouseDevPtr; + +#endif /* _XF86OSMOUSE_H_ */ From iron at frugalware.org Thu Jan 1 00:42:57 2009 From: iron at frugalware.org (Krisztian VASAS) Date: Thu Jan 1 00:42:59 2009 Subject: [Frugalware-git] xorg74: xf86-input-mouse-1.3.0-1-i686 Message-ID: <20081231234257.8E84F11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=b252d378f2160020cc01e8ff029ca05c81a802ed commit b252d378f2160020cc01e8ff029ca05c81a802ed Author: Krisztian VASAS Date: Thu Jan 1 00:42:39 2009 +0100 xf86-input-mouse-1.3.0-1-i686 - added some compile fixes diff --git a/source/x11/xf86-input-mouse/mouse.c.patch1 b/source/x11/xf86-input-mouse/mouse.c.patch1 new file mode 100644 index 0000000..890af35 --- /dev/null +++ b/source/x11/xf86-input-mouse/mouse.c.patch1 @@ -0,0 +1,88 @@ +--- xserver-xorg-input-mouse-1.3.0.orig/src/mouse.c ++++ xserver-xorg-input-mouse-1.3.0/src/mouse.c +@@ -1,5 +1,3 @@ +-/* $XdotOrg: driver/xf86-input-mouse/src/mouse.c,v 1.29 2006/04/21 11:15:23 mhopf Exp $ */ +-/* $XFree86: xc/programs/Xserver/hw/xfree86/input/mouse/mouse.c,v 1.79 2003/11/03 05:11:48 tsi Exp $ */ + /* + * + * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany. +@@ -802,8 +800,8 @@ + pMse->resolution); + } + +- if (mPriv->sensitivity +- = xf86SetRealOption(pInfo->options, "Sensitivity", 1.0)) { ++ if ((mPriv->sensitivity ++ = xf86SetRealOption(pInfo->options, "Sensitivity", 1.0))) { + xf86Msg(X_CONFIG, "%s: Sensitivity: %g\n", pInfo->name, + mPriv->sensitivity); + } +@@ -874,7 +872,7 @@ + } + } + +-const char * ++_X_EXPORT const char * + xf86MouseProtocolIDToName(MouseProtocolID id) + { + return ProtocolIDToName(id); +@@ -1062,7 +1060,7 @@ + if (osInfo->CheckProtocol + && osInfo->CheckProtocol(protocol)) { + if (!xf86CheckStrOption(dev->commonOptions, "Device", NULL) && +- HAVE_FIND_DEVICE && osInfo->FindDevice) { ++ osInfo->FindDevice) { + xf86Msg(X_WARNING, "%s: No Device specified, " + "looking for one...\n", pInfo->name); + if (!osInfo->FindDevice(pInfo, protocol, 0)) { +@@ -1093,7 +1091,7 @@ + } while (!detected); + + if (!xf86CheckStrOption(dev->commonOptions, "Device", NULL) && +- HAVE_FIND_DEVICE && osInfo->FindDevice) { ++ osInfo->FindDevice) { + xf86Msg(X_WARNING, "%s: No Device specified, looking for one...\n", + pInfo->name); + if (!osInfo->FindDevice(pInfo, protocol, 0)) { +@@ -1728,7 +1726,7 @@ + min(pMse->buttons, MSE_MAXBUTTONS), + #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0 + miPointerGetMotionEvents, +-#else ++#elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 + GetMotionHistory, + #endif + pMse->Ctrl, +@@ -1860,8 +1858,6 @@ + static void + FlushButtons(MouseDevPtr pMse) + { +- int i, blocked; +- + pMse->lastButtons = 0; + pMse->lastMappedButtons = 0; + } +@@ -3217,7 +3213,7 @@ + pInfo->name, name); + } + } +- if (!name && HAVE_GUESS_PROTOCOL && osInfo->GuessProtocol) { ++ if (!name && osInfo->GuessProtocol) { + name = osInfo->GuessProtocol(pInfo, 0); + if (name) + protocolID = ProtocolNameToID(name); +@@ -3781,13 +3777,8 @@ + { + static Bool Initialised = FALSE; + +- if (!Initialised) { ++ if (!Initialised) + Initialised = TRUE; +-#ifndef REMOVE_LOADER_CHECK_MODULE_INFO +- if (xf86LoaderCheckSymbol("xf86AddModuleInfo")) +-#endif +- xf86AddModuleInfo(&MouseInfo, module); +- } + + xf86AddInputDriver(&MOUSE, module, 0); + diff --git a/source/x11/xf86-input-mouse/mouse.h.patch1 b/source/x11/xf86-input-mouse/mouse.h.patch1 new file mode 100644 index 0000000..e5fe04d --- /dev/null +++ b/source/x11/xf86-input-mouse/mouse.h.patch1 @@ -0,0 +1,17 @@ +--- xserver-xorg-input-mouse-1.3.0.orig/src/mouse.h ++++ xserver-xorg-input-mouse-1.3.0/src/mouse.h +@@ -1,5 +1,3 @@ +-/* $XFree86: xc/programs/Xserver/hw/xfree86/input/mouse/mouse.h,v 1.13 2003/11/03 05:11:49 tsi Exp $ */ +- + /* + * Copyright (c) 1997-1999 by The XFree86 Project, Inc. + */ +@@ -9,7 +7,7 @@ + + #include "xf86OSmouse.h" + +-const char * xf86MouseProtocolIDToName(MouseProtocolID id); ++_X_EXPORT const char * xf86MouseProtocolIDToName(MouseProtocolID id); + MouseProtocolID xf86MouseProtocolNameToID(const char *name); + + #endif From iron at frugalware.org Thu Jan 1 00:48:57 2009 From: iron at frugalware.org (Krisztian VASAS) Date: Thu Jan 1 00:48:59 2009 Subject: [Frugalware-git] xorg74: xf86-input-mouse-1.3.0-1-i686 Message-ID: <20081231234857.A4EC911B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=292bd16e66c5a659b7d6d049453f160cc084cfdd commit 292bd16e66c5a659b7d6d049453f160cc084cfdd Author: Krisztian VASAS Date: Thu Jan 1 00:48:45 2009 +0100 xf86-input-mouse-1.3.0-1-i686 - version bump diff --git a/source/x11/xf86-input-mouse/FrugalBuild b/source/x11/xf86-input-mouse/FrugalBuild index 17e34d8..753b8bc 100644 --- a/source/x11/xf86-input-mouse/FrugalBuild +++ b/source/x11/xf86-input-mouse/FrugalBuild @@ -2,10 +2,20 @@ # Maintainer: Christian Hamar alias krix pkgname=xf86-input-mouse -pkgver=1.2.3 +pkgver=1.3.0 pkgdesc="X.org Mouse input driver" Finclude xorg archs=(${archs[@]} 'ppc') -sha1sums=('d8b5233f3296ab16d1fa06f3a366dbd137d31afd') +source=(${source[@]} 'xf86OSmouse.h' 'mouse.c.patch1' 'mouse.h.patch1') +sha1sums=('79ecd994b2820d24a00d4c4af9aa9189bdd9db93' \ + 'b96edcffd61f071d3a178bd01f2682f7431087f6' \ + '4095d960b8e43a8128a03318cc79d983dbde7315' \ + '65b769b64122555ca74a82782b05eca773ebe137') + +build() { + Fcd + cp ../xf86OSmouse.h src/ + Fbuild +} # optimization OK From priyank at frugalware.org Thu Jan 1 07:48:21 2009 From: priyank at frugalware.org (Priyank) Date: Thu Jan 1 07:48:23 2009 Subject: [Frugalware-git] fw-control-center: gnetconfig: update year in copyright notice Message-ID: <20090101064821.6B51C11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fw-control-center.git;a=commitdiff;h=7f826110e8fa64448949b8030481773ef64e9c54 commit 7f826110e8fa64448949b8030481773ef64e9c54 Author: Priyank Date: Thu Jan 1 12:17:55 2009 +0530 gnetconfig: update year in copyright notice diff --git a/gnetconfig/src/gnetconfig-about.c b/gnetconfig/src/gnetconfig-about.c index 55b771a..5c73403 100644 --- a/gnetconfig/src/gnetconfig-about.c +++ b/gnetconfig/src/gnetconfig-about.c @@ -1,7 +1,7 @@ /* * gnetconfig-about.c for gnetconfig * - * Copyright (C) 2007-2008 by Priyank Gosalia + * Copyright (C) 2007-2009 by Priyank Gosalia * * 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 @@ -65,7 +65,7 @@ gnetconfig_about (void) gtk_show_about_dialog (GTK_WINDOW(gn_main_window), "name", PACKAGE, "version", VERSION, - "copyright", _("(C) 2007-2008 Frugalware Developer Team (GPL)"), + "copyright", _("(C) 2007-2009 Frugalware Developer Team (GPL)"), "comments", _("A graphical network configuration tool for Frugalware Linux."), "license", license, "authors", authors, diff --git a/gnetconfig/src/gnetconfig-interface.c b/gnetconfig/src/gnetconfig-interface.c index 3db9fb3..a155ca8 100644 --- a/gnetconfig/src/gnetconfig-interface.c +++ b/gnetconfig/src/gnetconfig-interface.c @@ -1,7 +1,7 @@ /* * gnetconfig-interface.c for gnetconfig * - * Copyright (C) 2007-2008 by Priyank Gosalia + * Copyright (C) 2007-2009 by Priyank Gosalia * * 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 diff --git a/gnetconfig/src/gnetconfig-interface_detect.c b/gnetconfig/src/gnetconfig-interface_detect.c index 2a4d264..fa2551f 100644 --- a/gnetconfig/src/gnetconfig-interface_detect.c +++ b/gnetconfig/src/gnetconfig-interface_detect.c @@ -1,7 +1,7 @@ /* * gnetconfig-interface_detect.c for gnetconfig * - * Copyright (C) 2007-2008 by Priyank Gosalia + * Copyright (C) 2007-2009 by Priyank Gosalia * * 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 diff --git a/gnetconfig/src/gnetconfig-interface_opts.c b/gnetconfig/src/gnetconfig-interface_opts.c index 1bd6b68..29c017d 100644 --- a/gnetconfig/src/gnetconfig-interface_opts.c +++ b/gnetconfig/src/gnetconfig-interface_opts.c @@ -1,7 +1,7 @@ /* * gnetconfig-interface_opts.c for gnetconfig * - * Copyright (C) 2007-2008 by Priyank Gosalia + * Copyright (C) 2007-2009 by Priyank Gosalia * * 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 diff --git a/gnetconfig/src/gnetconfig-messages.c b/gnetconfig/src/gnetconfig-messages.c index 83dfe5c..b04a5ab 100644 --- a/gnetconfig/src/gnetconfig-messages.c +++ b/gnetconfig/src/gnetconfig-messages.c @@ -1,7 +1,7 @@ /* * gnetconfig-messages.c for gnetconfig * - * Copyright (C) 2007-2008 by Priyank Gosalia + * Copyright (C) 2007-2009 by Priyank Gosalia * * 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 diff --git a/gnetconfig/src/gnetconfig-misc.c b/gnetconfig/src/gnetconfig-misc.c index cb1ab2d..3d6ed2f 100644 --- a/gnetconfig/src/gnetconfig-misc.c +++ b/gnetconfig/src/gnetconfig-misc.c @@ -1,7 +1,7 @@ /* * gnetconfig-misc.c for gnetconfig * - * Copyright (C) 2007-2008 by Priyank Gosalia + * Copyright (C) 2007-2009 by Priyank Gosalia * * 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 diff --git a/gnetconfig/src/gnetconfig-new_interface.c b/gnetconfig/src/gnetconfig-new_interface.c index 769a28f..d7a9743 100644 --- a/gnetconfig/src/gnetconfig-new_interface.c +++ b/gnetconfig/src/gnetconfig-new_interface.c @@ -1,7 +1,7 @@ /* * gnetconfig-new_interface.c for gnetconfig * - * Copyright (C) 2007-2008 by Priyank Gosalia + * Copyright (C) 2007-2009 by Priyank Gosalia * * 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 diff --git a/gnetconfig/src/gnetconfig-new_profile.c b/gnetconfig/src/gnetconfig-new_profile.c index 9adbfe5..6ba70a1 100644 --- a/gnetconfig/src/gnetconfig-new_profile.c +++ b/gnetconfig/src/gnetconfig-new_profile.c @@ -1,7 +1,7 @@ /* * gnetconfig-new_profile.c for gnetconfig * - * Copyright (C) 2007-2008 by Priyank Gosalia + * Copyright (C) 2007-2009 by Priyank Gosalia * * 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 diff --git a/gnetconfig/src/gnetconfig.c b/gnetconfig/src/gnetconfig.c index e6b3098..c5b356e 100644 --- a/gnetconfig/src/gnetconfig.c +++ b/gnetconfig/src/gnetconfig.c @@ -1,7 +1,7 @@ /* * gnetconfig.c for gnetconfig * - * Copyright (C) 2007-2008 by Priyank Gosalia + * Copyright (C) 2007-2009 by Priyank Gosalia * * 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 From priyank at frugalware.org Thu Jan 1 07:52:50 2009 From: priyank at frugalware.org (Priyank) Date: Thu Jan 1 07:52:51 2009 Subject: [Frugalware-git] fun: update year in copyright notice Message-ID: <20090101065250.1E78F11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fun.git;a=commitdiff;h=e7530662693c9ce37eaca4dd9da756ad65621286 commit e7530662693c9ce37eaca4dd9da756ad65621286 Author: Priyank Date: Thu Jan 1 12:21:52 2009 +0530 update year in copyright notice diff --git a/src/fun-config.c b/src/fun-config.c index c00a3bf..363ad3f 100644 --- a/src/fun-config.c +++ b/src/fun-config.c @@ -1,7 +1,7 @@ /* * fun-config.c for fun * - * Copyright (C) 2007-2008 by Priyank Gosalia + * Copyright (C) 2007-2009 by Priyank Gosalia * Portions of this code are borrowed from gimmix * gimmix is Copyright (C) 2006-2007 Priyank Gosalia * diff --git a/src/fun-dbus.c b/src/fun-dbus.c index bad1fc6..725e384 100644 --- a/src/fun-dbus.c +++ b/src/fun-dbus.c @@ -1,7 +1,7 @@ /* * fun-dbus.c for fun * - * Copyright (C) 2007-2008 by Priyank Gosalia + * Copyright (C) 2007-2009 by Priyank Gosalia * * 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 diff --git a/src/fun-news_backend.c b/src/fun-news_backend.c index 2d3bdb7..8fc506b 100644 --- a/src/fun-news_backend.c +++ b/src/fun-news_backend.c @@ -1,7 +1,7 @@ /* * fun-news_backend.c for fun * - * Copyright (C) 2008 by Priyank Gosalia + * Copyright (C) 2009 by Priyank Gosalia * * 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 diff --git a/src/fun-news_interface.c b/src/fun-news_interface.c index f39e2cc..745b6c9 100644 --- a/src/fun-news_interface.c +++ b/src/fun-news_interface.c @@ -1,7 +1,7 @@ /* * fun-news_interface.c for fun * - * Copyright (C) 2008 by Priyank Gosalia + * Copyright (C) 2009 by Priyank Gosalia * * 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 diff --git a/src/fun-tooltip.c b/src/fun-tooltip.c index fea5097..322c6f7 100644 --- a/src/fun-tooltip.c +++ b/src/fun-tooltip.c @@ -1,7 +1,7 @@ /* * fun-tooltip.c for fun * - * Copyright (C) 2007-2008 by Priyank Gosalia + * Copyright (C) 2007-2009 by Priyank Gosalia * * 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 diff --git a/src/fun-ui.c b/src/fun-ui.c index 432bccf..7b5068e 100644 --- a/src/fun-ui.c +++ b/src/fun-ui.c @@ -1,7 +1,7 @@ /* * fun-ui.c for fun * - * Copyright (C) 2007-2008 by Priyank Gosalia + * Copyright (C) 2007-2009 by Priyank Gosalia * * 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 @@ -607,7 +607,7 @@ fun_about_show (void) fun_about_dlg = gtk_about_dialog_new (); gtk_about_dialog_set_name (GTK_ABOUT_DIALOG(fun_about_dlg), PACKAGE); gtk_about_dialog_set_version (GTK_ABOUT_DIALOG(fun_about_dlg), ver); - gtk_about_dialog_set_copyright (GTK_ABOUT_DIALOG(fun_about_dlg), _("(C) 2007-2008 Frugalware Developer Team (GPL)")); + gtk_about_dialog_set_copyright (GTK_ABOUT_DIALOG(fun_about_dlg), _("(C) 2007-2009 Frugalware Developer Team (GPL)")); gtk_about_dialog_set_comments (GTK_ABOUT_DIALOG(fun_about_dlg), _("Frugalware Update Notifier")); gtk_about_dialog_set_license (GTK_ABOUT_DIALOG(fun_about_dlg), license); gtk_about_dialog_set_website (GTK_ABOUT_DIALOG(fun_about_dlg), "http://www.frugalware.org/"); From priyank at frugalware.org Thu Jan 1 08:28:06 2009 From: priyank at frugalware.org (Priyank) Date: Thu Jan 1 08:28:07 2009 Subject: [Frugalware-git] gservice: update year in copyright notice Message-ID: <20090101072806.6FBE811B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gservice.git;a=commitdiff;h=81a2845b3a7b5b74073bef0de1446e5eee88b44a commit 81a2845b3a7b5b74073bef0de1446e5eee88b44a Author: Priyank Date: Thu Jan 1 12:56:25 2009 +0530 update year in copyright notice diff --git a/src/gservice-about.c b/src/gservice-about.c index 055b367..13e2181 100644 --- a/src/gservice-about.c +++ b/src/gservice-about.c @@ -1,7 +1,7 @@ /* * gservice-about.c for gservice * - * Copyright (C) 2008 by Priyank Gosalia + * Copyright (C) 2008-2009 by Priyank Gosalia * * 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 @@ -72,7 +72,7 @@ gservice_about_dlg_create (void) about_dlg = gtk_about_dialog_new (); gtk_about_dialog_set_name (GTK_ABOUT_DIALOG(about_dlg), PACKAGE); gtk_about_dialog_set_version (GTK_ABOUT_DIALOG(about_dlg), VERSION); - gtk_about_dialog_set_copyright (GTK_ABOUT_DIALOG(about_dlg), _("(C) 2008 Frugalware Developer Team (GPL)")); + gtk_about_dialog_set_copyright (GTK_ABOUT_DIALOG(about_dlg), _("(C) 2008-2009 Frugalware Developer Team (GPL)")); gtk_about_dialog_set_comments (GTK_ABOUT_DIALOG(about_dlg), _("A graphical runlevel editor for Frugalware Linux")); gtk_about_dialog_set_license (GTK_ABOUT_DIALOG(about_dlg), license); gtk_about_dialog_set_website (GTK_ABOUT_DIALOG(about_dlg), "http://www.frugalware.org/"); diff --git a/src/gservice-backend.c b/src/gservice-backend.c index 582b6f7..c3ccfcf 100644 --- a/src/gservice-backend.c +++ b/src/gservice-backend.c @@ -1,7 +1,7 @@ /* * gservice-backend.c for gService * - * Copyright (C) 2008 by Priyank Gosalia + * Copyright (C) 2008-2009 by Priyank Gosalia * * 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 diff --git a/src/gservice-interface.c b/src/gservice-interface.c index 7c3fc4a..71acd89 100644 --- a/src/gservice-interface.c +++ b/src/gservice-interface.c @@ -1,7 +1,7 @@ /* * gservice-interface.c for gService * - * Copyright (C) 2008 by Priyank Gosalia + * Copyright (C) 2008-2009 by Priyank Gosalia * * 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 diff --git a/src/gservice-messages.c b/src/gservice-messages.c index e4e5dba..f219167 100644 --- a/src/gservice-messages.c +++ b/src/gservice-messages.c @@ -2,7 +2,7 @@ * gservice-messages.c for gService * * This code is borrowed from gnetconfig - * gnetconfig is Copyright (C) 2006-2008 by Priyank Gosalia + * gnetconfig is Copyright (C) 2006-2009 by Priyank Gosalia * * 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 diff --git a/src/gservice.c b/src/gservice.c index 796c34f..2cb305b 100644 --- a/src/gservice.c +++ b/src/gservice.c @@ -1,7 +1,7 @@ /* * gservice.c for gService * - * Copyright (C) 2008 by Priyank Gosalia + * Copyright (C) 2008-2009 by Priyank Gosalia * * 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 From priyank at frugalware.org Thu Jan 1 08:55:49 2009 From: priyank at frugalware.org (Priyank) Date: Thu Jan 1 08:55:51 2009 Subject: [Frugalware-git] frugalware-current: gimmix-0.5.4-1-i686 Message-ID: <20090101075549.4DAD611B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0de030067205731beb975346d0f33f2ad6ec3ee1 commit 0de030067205731beb975346d0f33f2ad6ec3ee1 Author: Priyank Date: Thu Jan 1 13:25:30 2009 +0530 gimmix-0.5.4-1-i686 * Version bump diff --git a/source/xapps-extra/gimmix/FrugalBuild b/source/xapps-extra/gimmix/FrugalBuild index 7ca777d..0793aac 100644 --- a/source/xapps-extra/gimmix/FrugalBuild +++ b/source/xapps-extra/gimmix/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Priyank Gosalia pkgname=gimmix -pkgver=0.5.3 +pkgver=0.5.4 pkgrel=1 pkgdesc="Gimmix is a graphical music player daemon (MPD) client." _F_berlios_ext=".tar.bz2" @@ -13,6 +13,6 @@ depends=('gtk+2' 'libglade' 'libmpd>=0.16.1' 'libnxml' 'taglib') makedepends=('intltool') groups=('xapps-extra') archs=('i686' 'x86_64') -sha1sums=('6c80d75cb420c40fca83239f53a3441107154979') +sha1sums=('492fba0f3bcf5c36f76384d228d277a35cb249ad') # optimization OK From priyank at frugalware.org Thu Jan 1 09:28:59 2009 From: priyank at frugalware.org (Priyank) Date: Thu Jan 1 09:29:01 2009 Subject: [Frugalware-git] frugalware-current: nicotine-plus-1.2.10-1-i686 Message-ID: <20090101082859.4F18911B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c89fdbbf7c97a5de004de07a3d2354f32b65434f commit c89fdbbf7c97a5de004de07a3d2354f32b65434f Author: Priyank Date: Thu Jan 1 13:55:19 2009 +0530 nicotine-plus-1.2.10-1-i686 * Version bump diff --git a/source/xapps-extra/nicotine-plus/FrugalBuild b/source/xapps-extra/nicotine-plus/FrugalBuild index f43117b..90299ed 100644 --- a/source/xapps-extra/nicotine-plus/FrugalBuild +++ b/source/xapps-extra/nicotine-plus/FrugalBuild @@ -2,10 +2,10 @@ # Maintainer: Priyank Gosalia pkgname=nicotine-plus -pkgver=1.2.9 -pkgrel=2 +pkgver=1.2.10 +pkgrel=1 pkgdesc="Nicotine-Plus is a fork of original Nicotine Soulseek client." -depends=('pygtk' 'pyvorbis') +depends=('pygtk>=2.12.1-4' 'pyvorbis') conflicts=('nicotine') replaces=('nicotine') groups=('xapps-extra') @@ -16,7 +16,7 @@ Finclude sourceforge url="http://nicotine-plus.sourceforge.net/" source=(${source/nicotine-plus-$pkgver/nicotine+-$pkgver}) _F_cd_path="nicotine+-$pkgver" -sha1sums=('f4c67a0361e8ab08328d49e664b08aa6040a3dfd') +sha1sums=('f7015caf020a3b42ba45549f7074453bd35bb19f') build() { @@ -24,3 +24,4 @@ build() Fmv /usr/bin/nicotine /usr/bin/nicotine.py Fwrapper "LC_ALL=C /usr/bin/nicotine.py" nicotine } + From priyank at frugalware.org Thu Jan 1 09:35:10 2009 From: priyank at frugalware.org (Priyank) Date: Thu Jan 1 09:35:10 2009 Subject: [Frugalware-git] frugalware-current: brasero-0.8.4-1-i686 Message-ID: <20090101083510.6CEC811B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c85b7ceedabe1eda67b3acd1ba1e6f5edad24017 commit c85b7ceedabe1eda67b3acd1ba1e6f5edad24017 Author: Priyank Date: Thu Jan 1 14:00:40 2009 +0530 brasero-0.8.4-1-i686 * Version bump diff --git a/source/gnome-extra/brasero/FrugalBuild b/source/gnome-extra/brasero/FrugalBuild index d6e7be8..a31d821 100644 --- a/source/gnome-extra/brasero/FrugalBuild +++ b/source/gnome-extra/brasero/FrugalBuild @@ -1,8 +1,8 @@ -# Compiling Time: 0.38 SBU +# Compiling Time: 1.39 SBU # Maintainer: Priyank Gosalia pkgname=brasero -pkgver=0.8.3 +pkgver=0.8.4 pkgrel=1 pkgdesc="A CD/DVD Burning application for the GNOME desktop." url="http://www.gnome.org/projects/brasero/" @@ -22,7 +22,7 @@ _F_gnome_iconcache="y" _F_gnome_devel="y" Finclude gnome gnome-scriptlet Fconfopts="$Fconfopts --enable-search --enable-playlist --enable-preview --enable-inotify --enable-libnotify --disable-schemas-install --enable-caches=no" -sha1sums=('2b1214dace988f344468967b3910212ad6af7cb0') +sha1sums=('f22308786c2ad66bfcdafa074a5d4a42a944982c') # optimization OK From devil505linux at gmail.com Thu Jan 1 10:43:52 2009 From: devil505linux at gmail.com (Devil505) Date: Thu Jan 1 10:43:54 2009 Subject: [Frugalware-git] frugalware-current: Revert "deluge-1.1.0_RC2-2-i686" Message-ID: <20090101094352.B154C11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=69418851160ca30b18be63c595bdee37c526bd9f commit 69418851160ca30b18be63c595bdee37c526bd9f Author: Devil505 Date: Thu Jan 1 10:43:23 2009 +0100 Revert "deluge-1.1.0_RC2-2-i686" * go back to a normal release This reverts commit e7c7eace6b144fa3778c854a0cb54dada17042e6. diff --git a/source/gnome-extra/deluge/FrugalBuild b/source/gnome-extra/deluge/FrugalBuild index a8468db..8098c1d 100644 --- a/source/gnome-extra/deluge/FrugalBuild +++ b/source/gnome-extra/deluge/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: Artur Grunau pkgname=deluge -pkgver=1.1.0_RC2 +pkgver=1.0.7 pkgrel=2 pkgdesc="BitTorrent client written in Python and GTK+." url="http://deluge-torrent.org/" @@ -16,6 +16,6 @@ up2date="lynx -dump http://deluge-torrent.org/|grep 'Released'|sed -e 's/.*ge \( source=(http://download.deluge-torrent.org/source/$pkgver/$pkgname-$pkgver.tar.gz) _F_gnome_iconcache=y Finclude gnome-scriptlet -sha1sums=('6a9ffb1ee89b0a5eb526d88fcd4f1f02d914f099') +sha1sums=('c601a0af4fd5c2fdf7b50eb6af2ddafcff58bfaa') # optimization OK From vmiklos at frugalware.org Thu Jan 1 15:28:19 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Jan 1 15:28:20 2009 Subject: [Frugalware-git] frugalware-current: weechat-0.2.6-4-i686 Message-ID: <20090101142819.8CDAB11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5b9e49f152b9a649c489b8bc41d9f190e1d80da2 commit 5b9e49f152b9a649c489b8bc41d9f190e1d80da2 Author: Miklos Vajna Date: Thu Jan 1 15:27:46 2009 +0100 weechat-0.2.6-4-i686 - rebuild with python-2.6 - closes #3543 diff --git a/source/network-extra/weechat/FrugalBuild b/source/network-extra/weechat/FrugalBuild index 872653c..27e1029 100644 --- a/source/network-extra/weechat/FrugalBuild +++ b/source/network-extra/weechat/FrugalBuild @@ -4,10 +4,10 @@ pkgname=weechat pkgver=0.2.6 -pkgrel=3 +pkgrel=4 pkgdesc="Fast, light & extensible IRC client." url="http://weechat.flashtux.org/" -depends=('aspell' 'gnutls>=2.4' 'libgcrypt>=1.4') +depends=('aspell' 'gnutls>=2.4' 'libgcrypt>=1.4' 'python>=2.6') makedepends=('ruby') groups=('network-extra') archs=('i686' 'x86_64') From vmiklos at frugalware.org Thu Jan 1 16:01:17 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Jan 1 16:01:20 2009 Subject: [Frugalware-git] pacman-g2: Let _pacman_unpack() not re-extract existing directories. Message-ID: <20090101150117.A84EC11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=87f094e078f5a7eb2ed22ecd8fe27b30c930590e commit 87f094e078f5a7eb2ed22ecd8fe27b30c930590e Author: Miklos Vajna Date: Tue Dec 30 20:22:02 2008 +0100 Let _pacman_unpack() not re-extract existing directories. Given that we increment the pkgrel after modifications, and the pkgrel is part of the directory name in the fdb, we can just skip already extracted dirs. >From the user's point of view, -Sy will be faster, and -Syy still re-extracts everything. Idea-by: Csaba Henk diff --git a/lib/libpacman/pacman.c b/lib/libpacman/pacman.c index f4040c3..aec34dd 100644 --- a/lib/libpacman/pacman.c +++ b/lib/libpacman/pacman.c @@ -369,6 +369,7 @@ int pacman_db_update(int force, PM_DB *db) snprintf(path, PATH_MAX, "%s%s/%s" PM_EXT_DB, handle->root, handle->dbpath, db->treename); /* remove the old dir */ + if (force) { _pacman_log(PM_LOG_FLOW2, _("flushing database %s/%s"), handle->dbpath, db->treename); for(lp = _pacman_db_get_pkgcache(db); lp; lp = lp->next) { if(_pacman_db_remove(db, lp->data) == -1) { @@ -379,6 +380,7 @@ int pacman_db_update(int force, PM_DB *db) RET_ERR(PM_ERR_DB_REMOVE, -1); } } + } /* Cache needs to be rebuild */ _pacman_db_free_pkgcache(db); diff --git a/lib/libpacman/util.c b/lib/libpacman/util.c index 90637fa..5954a2c 100644 --- a/lib/libpacman/util.c +++ b/lib/libpacman/util.c @@ -260,12 +260,66 @@ int _pacman_lckrm(char *file) /* Compression functions */ +/* + * 1) scan the old dir + * 2) scan the compressed archive, extract new entries and mark the + * skipped entries in the list + * 3) delete the entries which are still in the list + */ + +typedef struct __cache_t { + char *str; + int hit; +} cache_t; + +static int list_startswith(char *needle, pmlist_t *haystack) +{ + pmlist_t *i; + + for (i = haystack; i; i = i->next) { + cache_t *c = i->data; + if (!strncmp(c->str, needle, strlen(c->str))) { + c->hit = 1; + return(1); + } + } + return(0); +} + int _pacman_unpack(const char *archive, const char *prefix, const char *fn) { register struct archive *_archive; struct archive_entry *entry; char expath[PATH_MAX]; + pmlist_t *cache = NULL, *i; + DIR *handle; + struct dirent *ent; + struct stat buf; + + /* first scan though the old dir to see what package entries do we have */ + handle = opendir(prefix); + if (handle != NULL) { + while((ent = readdir(handle)) != NULL) { + cache_t *c; + if(!strcmp(ent->d_name, ".") || !strcmp(ent->d_name, "..")) { + continue; + } + /* we cache only dirs */ + snprintf(expath, PATH_MAX, "%s/%s", prefix, ent->d_name); + if(stat(expath, &buf) || !S_ISDIR(buf.st_mode)) { + continue; + } + c = (cache_t *)malloc(sizeof(cache_t)); + if (!c) + RET_ERR(PM_ERR_MEMORY, -1); + memset(c, 0, sizeof(cache_t)); + c->str = strdup(ent->d_name); + cache = _pacman_list_add(cache, c); + } + } + closedir(handle); + /* now extract the new entries */ if ((_archive = archive_read_new ()) == NULL) RET_ERR(PM_ERR_LIBARCHIVE_ERROR, -1); @@ -281,6 +335,9 @@ int _pacman_unpack(const char *archive, const char *prefix, const char *fn) return(1); continue; } + if (list_startswith((char*)archive_entry_pathname(entry), cache)) { + continue; + } snprintf(expath, PATH_MAX, "%s/%s", prefix, archive_entry_pathname (entry)); archive_entry_set_pathname (entry, expath); if (archive_read_extract (_archive, entry, ARCHIVE_EXTRACT_FLAGS) != ARCHIVE_OK) { @@ -293,6 +350,16 @@ int _pacman_unpack(const char *archive, const char *prefix, const char *fn) } archive_read_finish (_archive); + + /* finally delete the old ones */ + for (i = cache; i; i = i->next) { + cache_t *c = i->data; + if (!c->hit) { + snprintf(expath, PATH_MAX, "%s/%s", prefix, c->str); + _pacman_rmrf(expath); + } + } + FREELIST(cache); return(0); } From iron at frugalware.org Thu Jan 1 16:53:27 2009 From: iron at frugalware.org (Krisztian VASAS) Date: Thu Jan 1 16:53:28 2009 Subject: [Frugalware-git] xorg74: xf86-input-acecad-1.2.2-1-i686 Message-ID: <20090101155327.5F4C411B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=bfc2bd471cc817f861120c850f7b87dd840dea1e commit bfc2bd471cc817f861120c850f7b87dd840dea1e Author: Krisztian VASAS Date: Thu Jan 1 16:53:11 2009 +0100 xf86-input-acecad-1.2.2-1-i686 - version bump - added a compile fix diff --git a/source/x11/xf86-input-acecad/01-fix_xinput_abi_version_problem.patch0 b/source/x11/xf86-input-acecad/01-fix_xinput_abi_version_problem.patch0 new file mode 100644 index 0000000..109f1e0 --- /dev/null +++ b/source/x11/xf86-input-acecad/01-fix_xinput_abi_version_problem.patch0 @@ -0,0 +1,15 @@ +diff -Naur xf86-input-acecad-1.2.2.orig/src/acecad.c xf86-input-acecad-1.2.2/src/acecad.c +--- xf86-input-acecad-1.2.2.orig/src/acecad.c 2008-02-09 22:30:01.000000000 +0100 ++++ xf86-input-acecad-1.2.2/src/acecad.c 2009-01-01 16:46:22.000000000 +0100 +@@ -658,7 +658,10 @@ + + + /* 3 axes */ +- if (InitValuatorClassDeviceStruct (dev, 3, xf86GetMotionEvents, ++ if (InitValuatorClassDeviceStruct (dev, 3, ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 ++ xf86GetMotionEvents, ++#endif + local->history_size, + ((priv->flags & ABSOLUTE_FLAG)? Absolute: Relative)|OutOfProximity) + == FALSE) diff --git a/source/x11/xf86-input-acecad/FrugalBuild b/source/x11/xf86-input-acecad/FrugalBuild index db3a184..43d9be2 100644 --- a/source/x11/xf86-input-acecad/FrugalBuild +++ b/source/x11/xf86-input-acecad/FrugalBuild @@ -2,8 +2,10 @@ # Maintainer: Christian Hamar alias krix pkgname=xf86-input-acecad -pkgver=1.2.1 -pkgrel=2 +pkgver=1.2.2 +pkgrel=1 Finclude xorg -sha1sums=('0a997d6243a7b159b10b5174ccfd5809f21b46ad') +source=(${source[@]} '01-fix_xinput_abi_version_problem.patch0') +sha1sums=('edab9a197902cf2652414091742b8c4e60a96ac6' \ + '432dbc1a9a53d28fb8d64cc8933602d27afcd8b8') # optimization OK From iron at frugalware.org Thu Jan 1 17:10:48 2009 From: iron at frugalware.org (Krisztian VASAS) Date: Thu Jan 1 17:10:50 2009 Subject: [Frugalware-git] xorg74: xf86-input-aiptek-1.1.1-1-i686 Message-ID: <20090101161048.AC30711B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=a8e002d2dec946d7e3b6c99652d45f24cb73bfe7 commit a8e002d2dec946d7e3b6c99652d45f24cb73bfe7 Author: Krisztian VASAS Date: Thu Jan 1 17:10:28 2009 +0100 xf86-input-aiptek-1.1.1-1-i686 - version bump - added 2 compile fixes diff --git a/source/x11/xf86-input-aiptek/01-change_xf86Version.h_to_xorgVersion.h.patch1 b/source/x11/xf86-input-aiptek/01-change_xf86Version.h_to_xorgVersion.h.patch1 new file mode 100644 index 0000000..b6c9ae2 --- /dev/null +++ b/source/x11/xf86-input-aiptek/01-change_xf86Version.h_to_xorgVersion.h.patch1 @@ -0,0 +1,13 @@ +diff --git a/src/xf86Aiptek.h b/src/xf86Aiptek.h +index 0e6daa8..2842775 100644 +--- a/src/xf86Aiptek.h ++++ b/src/xf86Aiptek.h +@@ -56,7 +56,7 @@ + # endif + #endif + +-#include ++#include + + #ifndef XFree86LOADER + # include diff --git a/source/x11/xf86-input-aiptek/02-fix_xinput_abi_version.patch1 b/source/x11/xf86-input-aiptek/02-fix_xinput_abi_version.patch1 new file mode 100644 index 0000000..e336241 --- /dev/null +++ b/source/x11/xf86-input-aiptek/02-fix_xinput_abi_version.patch1 @@ -0,0 +1,14 @@ +diff --git a/src/xf86Aiptek.c b/src/xf86Aiptek.c +index d57d451..a26ca60 100644 +--- a/src/xf86Aiptek.c ++++ b/src/xf86Aiptek.c +@@ -1611,7 +1611,9 @@ xf86AiptekProc(DeviceIntPtr pAiptek, int requestCode) + + if (InitValuatorClassDeviceStruct(pAiptek, + numAxes, ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 + xf86GetMotionEvents, ++#endif + local->history_size, + ((device->flags & ABSOLUTE_FLAG) + ? Absolute : Relative) | OutOfProximity ) == FALSE) diff --git a/source/x11/xf86-input-aiptek/FrugalBuild b/source/x11/xf86-input-aiptek/FrugalBuild index 9358299..2362811 100644 --- a/source/x11/xf86-input-aiptek/FrugalBuild +++ b/source/x11/xf86-input-aiptek/FrugalBuild @@ -2,8 +2,12 @@ # Maintainer: Christian Hamar alias krix pkgname=xf86-input-aiptek -pkgver=1.0.1 -pkgrel=3 +pkgver=1.1.1 +pkgrel=1 Finclude xorg -sha1sums=('cbe73ae471a11101b348f37ef9c9f5e38abacade') +source=(${source[@]} '01-change_xf86Version.h_to_xorgVersion.h.patch1' \ + '02-fix_xinput_abi_version.patch1') +sha1sums=('893f70d2b3628e55f83bc760ab85ec6f3286f82b' \ + '611a6a9c1b58d37aa238d8e80577bc37450bd3c0' \ + '07785415b3dd8dcdaba1fe009e04052b63818e4d') # optimization OK From iron at frugalware.org Thu Jan 1 17:16:04 2009 From: iron at frugalware.org (Krisztian VASAS) Date: Thu Jan 1 17:16:06 2009 Subject: [Frugalware-git] xorg74: xf86-input-calcomp-1.1.2-1-i686 Message-ID: <20090101161604.C855C11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=32bf8a5b0e863e618fa6f25184be1eccae4160ea commit 32bf8a5b0e863e618fa6f25184be1eccae4160ea Author: Krisztian VASAS Date: Thu Jan 1 17:15:47 2009 +0100 xf86-input-calcomp-1.1.2-1-i686 - version bump - added a compile fix diff --git a/source/x11/xf86-input-calcomp/01-fix_xinput_abi_version.patch1 b/source/x11/xf86-input-calcomp/01-fix_xinput_abi_version.patch1 new file mode 100644 index 0000000..e4965b4 --- /dev/null +++ b/source/x11/xf86-input-calcomp/01-fix_xinput_abi_version.patch1 @@ -0,0 +1,26 @@ +diff --git a/src/xf86Calcomp.c b/src/xf86Calcomp.c +index f834eea..46de9be 100644 +--- a/src/xf86Calcomp.c ++++ b/src/xf86Calcomp.c +@@ -132,7 +132,9 @@ static const char *reqSymbols[] = { + "xf86CollectInputOptions", + "xf86ErrorFVerb", + "xf86FindOptionValue", ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 + "xf86GetMotionEvents", ++#endif + "xf86GetVerbosity", + "xf86MotionHistoryAllocate", + "xf86NameCmp", +@@ -308,7 +310,10 @@ DeviceInit (DeviceIntPtr dev) + * this example device reports motions on 2 axes in absolute coordinates. + * Device may reports touch pressure on the 3rd axis. + */ +- if (InitValuatorClassDeviceStruct (dev, 3, xf86GetMotionEvents, ++ if (InitValuatorClassDeviceStruct (dev, 3, ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 ++ xf86GetMotionEvents, ++#endif + local->history_size, Absolute) == FALSE) + { + ErrorF ("Unable to allocate CALCOMP ValuatorClassDeviceStruct\n"); diff --git a/source/x11/xf86-input-calcomp/FrugalBuild b/source/x11/xf86-input-calcomp/FrugalBuild index 92783c5..7ae434a 100644 --- a/source/x11/xf86-input-calcomp/FrugalBuild +++ b/source/x11/xf86-input-calcomp/FrugalBuild @@ -2,8 +2,10 @@ # Maintainer: Christian Hamar alias krix pkgname=xf86-input-calcomp -pkgver=1.1.1 +pkgver=1.1.2 Finclude xorg -sha1sums=('b3a1bbe7ed02964ce3b9928444e4d70751404095') +source=(${source[@]} '01-fix_xinput_abi_version.patch1') +sha1sums=('6a6d33af370ae4416a20977d170b30a4ff8f9375' \ + '7caa5de64127a20560371ff98375c8350f8d2981') # optimization OK From iron at frugalware.org Thu Jan 1 17:39:19 2009 From: iron at frugalware.org (Krisztian VASAS) Date: Thu Jan 1 17:39:20 2009 Subject: [Frugalware-git] xorg74: xf86-input-citron-2.2.1-2-i686 Message-ID: <20090101163919.B946311B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=1f087a55eabe381cc6adba8640a500b1deb75058 commit 1f087a55eabe381cc6adba8640a500b1deb75058 Author: Krisztian VASAS Date: Thu Jan 1 17:38:57 2009 +0100 xf86-input-citron-2.2.1-2-i686 - rebuilt with new xorg-server - added 2 compile fixes diff --git a/source/x11/xf86-input-citron/01-fix_xinput_abi_version.patch1 b/source/x11/xf86-input-citron/01-fix_xinput_abi_version.patch1 new file mode 100644 index 0000000..5a52ffd --- /dev/null +++ b/source/x11/xf86-input-citron/01-fix_xinput_abi_version.patch1 @@ -0,0 +1,15 @@ +diff -Naur xf86-input-citron-2.2.1.orig/src/citron.c xf86-input-citron-2.2.1/src/citron.c +--- xf86-input-citron-2.2.1.orig/src/citron.c 2009-01-01 17:33:54.000000000 +0100 ++++ xf86-input-citron-2.2.1/src/citron.c 2009-01-01 17:34:58.000000000 +0100 +@@ -1368,7 +1368,10 @@ + * screen to fit one meter. + * Device may reports touch pressure on the 3rd axis. + */ +- if (InitValuatorClassDeviceStruct (dev, 2, xf86GetMotionEvents, ++ if (InitValuatorClassDeviceStruct (dev, 2, ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 ++ xf86GetMotionEvents, ++#endif + local->history_size, Absolute) == FALSE) + { + ErrorF ("%sUnable to allocate Citron touchscreen ValuatorClassDeviceStruct\n", CI_ERROR); diff --git a/source/x11/xf86-input-citron/02-fix_xf86version_to_xorgversion.patch1 b/source/x11/xf86-input-citron/02-fix_xf86version_to_xorgversion.patch1 new file mode 100644 index 0000000..23f1471 --- /dev/null +++ b/source/x11/xf86-input-citron/02-fix_xf86version_to_xorgversion.patch1 @@ -0,0 +1,13 @@ +diff --git a/src/citron.c b/src/citron.c +index c7f6c3c..eb83cf8 100644 +--- a/src/citron.c ++++ b/src/citron.c +@@ -305,7 +305,7 @@ static XF86ModuleVersionInfo VersionRec = + MODULEVENDORSTRING, /* vendor specific string */ + MODINFOSTRING1, + MODINFOSTRING2, +- XF86_VERSION_CURRENT, /* Current XFree version */ ++ XORG_VERSION_CURRENT, /* Current Xorg version */ + CITOUCH_VERSION_MAJOR, /* Module-specific major version */ + CITOUCH_VERSION_MINOR, /* Module-specific minor version */ + CITOUCH_VERSION_PATCH, /* Module-specific patch level */ diff --git a/source/x11/xf86-input-citron/FrugalBuild b/source/x11/xf86-input-citron/FrugalBuild index 8c5fa06..f6f8aeb 100644 --- a/source/x11/xf86-input-citron/FrugalBuild +++ b/source/x11/xf86-input-citron/FrugalBuild @@ -3,7 +3,12 @@ pkgname=xf86-input-citron pkgver=2.2.1 +pkgrel=2 Finclude xorg -sha1sums=('c0a219676b73bcd28b37d41ac1e5369e9fc5de0f') +source=(${source[@]} '01-fix_xinput_abi_version.patch1' \ + '02-fix_xf86version_to_xorgversion.patch1') +sha1sums=('c0a219676b73bcd28b37d41ac1e5369e9fc5de0f' \ + '23f245f9c2eebbbce0782fb93f70aa2a8c6d0249' \ + '5bf8fc4e7c9000672ac7b9dc8d6e0ee15b85263b') # optimization OK From iron at frugalware.org Thu Jan 1 17:46:19 2009 From: iron at frugalware.org (Krisztian VASAS) Date: Thu Jan 1 17:46:20 2009 Subject: [Frugalware-git] xorg74: xf86-input-digitaledge-1.1.1-1-i686 Message-ID: <20090101164619.4CB2E11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=15d10b108ee4ecb0c857534a78cdb84d5deb540c commit 15d10b108ee4ecb0c857534a78cdb84d5deb540c Author: Krisztian VASAS Date: Thu Jan 1 17:46:00 2009 +0100 xf86-input-digitaledge-1.1.1-1-i686 - version bump - added 2 compile fixes diff --git a/source/x11/xf86-input-digitaledge/01-fix_xinput_abi_version.patch1 b/source/x11/xf86-input-digitaledge/01-fix_xinput_abi_version.patch1 new file mode 100644 index 0000000..70c8355 --- /dev/null +++ b/source/x11/xf86-input-digitaledge/01-fix_xinput_abi_version.patch1 @@ -0,0 +1,14 @@ +diff --git a/src/DigitalEdge.c b/src/DigitalEdge.c +index 5dee41b..639f570 100644 +--- a/src/DigitalEdge.c ++++ b/src/DigitalEdge.c +@@ -972,7 +972,9 @@ static int xf86SumProc(DeviceIntPtr pSum, int what) + + if (InitValuatorClassDeviceStruct(pSum, + nbaxes, ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 + xf86GetMotionEvents, ++#endif + local->history_size, + (priv->flags & ABSOLUTE_FLAG) ? + Absolute : Relative) == FALSE) { diff --git a/source/x11/xf86-input-digitaledge/02-remove_xfree86_v4.patch1 b/source/x11/xf86-input-digitaledge/02-remove_xfree86_v4.patch1 new file mode 100644 index 0000000..9b3f9f4 --- /dev/null +++ b/source/x11/xf86-input-digitaledge/02-remove_xfree86_v4.patch1 @@ -0,0 +1,527 @@ +diff --git a/src/DigitalEdge.c b/src/DigitalEdge.c +index 639f570..45b4d80 100644 +--- a/src/DigitalEdge.c ++++ b/src/DigitalEdge.c +@@ -36,13 +36,7 @@ + #include "config.h" + #endif + +-#include "xf86Version.h" +- +-#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(3,9,0,0,0) +-#define XFREE86_V4 1 +-#endif +- +-/* post 3.9 headers */ ++#include "xorgVersion.h" + + #include + #include +@@ -150,61 +144,6 @@ typedef struct { + */ + #define DEDGE_SECTION_NAME "DigitalEdge" + +-#ifndef XFREE86_V4 +- +-#define PORT 1 +-#define DEVICENAME 2 +-#define THE_MODE 3 +-#define CURSOR 4 +-#define INCREMENT 5 +-#define BORDER 6 +-#define DEBUG_LEVEL 7 +-#define HISTORY_SIZE 8 +-#define ALWAYS_CORE 9 +-#define ACTIVE_AREA 10 +-#define ACTIVE_OFFSET 11 +-#define COMPATIBLE 12 +-#define CLICK_THRESHOLD 13 +- +-#if !defined(sun) || defined(i386) +-static SymTabRec SumTab[] = { +- {ENDSUBSECTION, "endsubsection"}, +- {PORT, "port"}, +- {DEVICENAME, "devicename"}, +- {THE_MODE, "mode"}, +- {CURSOR, "cursor"}, +- {INCREMENT, "increment"}, +- {BORDER, "border"}, +- {DEBUG_LEVEL, "debuglevel"}, +- {HISTORY_SIZE, "historysize"}, +- {ALWAYS_CORE, "alwayscore"}, +- {ACTIVE_AREA, "activearea"}, +- {ACTIVE_OFFSET, "activeoffset"}, +- {COMPATIBLE, "compatible"}, +- {CLICK_THRESHOLD, "clickthreshold"}, +- {-1, ""} +-}; +- +-#define RELATIVE 1 +-#define ABSOLUTE 2 +- +-static SymTabRec SumModeTabRec[] = { +- {RELATIVE, "relative"}, +- {ABSOLUTE, "absolute"}, +- {-1, ""} +-}; +- +-#define PUCK 1 +-#define STYLUS 2 +- +-static SymTabRec SumPointTabRec[] = { +- {PUCK, "puck"}, +- {STYLUS, "stylus"}, +- {-1, ""} +-}; +- +-#endif +-#endif /* Pre 3.9 headers */ + + /* + ** Contants and macro +@@ -246,203 +185,6 @@ static const char *ss_initstr = + ** External declarations + */ + +-#ifndef XFREE86_V4 +- +-#if defined(sun) && !defined(i386) +-#define ENQUEUE suneqEnqueue +-#else +-#define ENQUEUE xf86eqEnqueue +- +-extern void xf86eqEnqueue( +- xEventPtr /*e */ +- ); +-#endif +- +-extern void miPointerDeltaCursor( +- int /*dx */ , +- int /*dy */ , +- unsigned long /*time */ +- ); +- +-#if !defined(sun) || defined(i386) +-/* +-** xf86SumConfig +-** Reads the DigitalEdge section from the XF86Config file +-*/ +-static Bool +-xf86SumConfig(LocalDevicePtr * array, int inx, int max, LexPtr val) +-{ +- LocalDevicePtr dev = array[inx]; +- DigitalEdgeDevicePtr priv = (DigitalEdgeDevicePtr) (dev->private); +- int token; +- int mtoken; +- +- DBG(1, ErrorF("xf86SumConfig\n")); +- +- while ((token = xf86GetToken(SumTab)) != ENDSUBSECTION) { +- switch (token) { +- case DEVICENAME: +- if (xf86GetToken(NULL) != STRING) +- xf86ConfigError("Option string expected"); +- else { +- dev->name = strdup(val->str); +- if (xf86Verbose) +- ErrorF("%s DigitalEdge X device name is %s\n", +- XCONFIG_GIVEN, dev->name); +- } +- break; +- +- case PORT: +- if (xf86GetToken(NULL) != STRING) +- xf86ConfigError("Option string expected"); +- else { +- priv->dedgeDevice = strdup(val->str); +- if (xf86Verbose) +- ErrorF("%s DigitalEdge port is %s\n", XCONFIG_GIVEN, +- priv->dedgeDevice); +- } +- break; +- +- case THE_MODE: +- mtoken = xf86GetToken(SumModeTabRec); +- if ((mtoken == EOF) || (mtoken == STRING) +- || (mtoken == +- NUMBER)) xf86ConfigError("Mode type token expected"); +- else { +- switch (mtoken) { +- case ABSOLUTE: +- priv->flags |= ABSOLUTE_FLAG; +- break; +- case RELATIVE: +- priv->flags &= ~ABSOLUTE_FLAG; +- break; +- default: +- xf86ConfigError("Illegal Mode type"); +- break; +- } +- } +- break; +- +- case CURSOR: +- mtoken = xf86GetToken(SumPointTabRec); +- if ((mtoken == EOF) || (mtoken == STRING) +- || (mtoken == +- NUMBER)) xf86ConfigError("Cursor token expected"); +- else { +- switch (mtoken) { +- case STYLUS: +- priv->flags |= STYLUS_FLAG; +- break; +- case PUCK: +- priv->flags &= ~STYLUS_FLAG; +- break; +- default: +- xf86ConfigError("Illegal cursor type"); +- break; +- } +- } +- break; +- +- case INCREMENT: +- if (xf86GetToken(NULL) != NUMBER) +- xf86ConfigError("Option number expected"); +- priv->dedgeInc = val->num; +- if (xf86Verbose) +- ErrorF("%s DigitalEdge increment value is %d\n", +- XCONFIG_GIVEN, priv->dedgeInc); +- break; +- +- case CLICK_THRESHOLD: +- if (xf86GetToken(NULL) != NUMBER) +- xf86ConfigError("Option number expected"); +- priv->dedgeClickThresh = val->num; +- if (xf86Verbose) +- ErrorF("%s DigitalEdge click threshold is %d\n", +- XCONFIG_GIVEN, priv->dedgeClickThresh); +- break; +- +- case DEBUG_LEVEL: +- if (xf86GetToken(NULL) != NUMBER) +- xf86ConfigError("Option number expected"); +- debug_level = val->num; +- if (xf86Verbose) { +-#if DEBUG +- ErrorF("%s DigitalEdge debug level sets to %d\n", +- XCONFIG_GIVEN, debug_level); +-#else +- ErrorF("%s DigitalEdge debug level not sets to %d because" +- " debugging is not compiled\n", XCONFIG_GIVEN, +- debug_level); +-#endif +- } +- break; +- +- case HISTORY_SIZE: +- if (xf86GetToken(NULL) != NUMBER) +- xf86ConfigError("Option number expected"); +- dev->history_size = val->num; +- if (xf86Verbose) +- ErrorF("%s DigitalEdge Motion history size is %d\n", +- XCONFIG_GIVEN, dev->history_size); +- break; +- case COMPATIBLE: +- priv->flags |= COMPATIBLE_FLAG; +- if (xf86Verbose) +- ErrorF +- ("DigitalEdge compatible - will not query firmware ID\n"); +- break; +- +- case ALWAYS_CORE: +- xf86AlwaysCore(dev, TRUE); +- if (xf86Verbose) +- ErrorF("%s DigitalEdge device always stays core pointer\n", +- XCONFIG_GIVEN); +- break; +- +- case ACTIVE_AREA: +- if (xf86GetToken(NULL) != NUMBER) +- xf86ConfigError("Option number expected"); +- priv->dedgeXSize = val->num; +- if (xf86GetToken(NULL) != NUMBER) +- xf86ConfigError("Option number expected"); +- priv->dedgeYSize = val->num; +- ErrorF("%s DigitalEdge active area set to %d.%1dx%d.%1d" +- " inches\n", XCONFIG_GIVEN, priv->dedgeXSize / 10, +- priv->dedgeXSize % 10, priv->dedgeYSize / 10, +- priv->dedgeYSize % 10); +- break; +- +- case ACTIVE_OFFSET: +- if (xf86GetToken(NULL) != NUMBER) +- xf86ConfigError("Option number expected"); +- priv->dedgeXOffset = val->num; +- if (xf86GetToken(NULL) != NUMBER) +- xf86ConfigError("Option number expected"); +- priv->dedgeYOffset = val->num; +- if (xf86Verbose) +- ErrorF +- ("%s DigitalEdge active area offset set to %d.%1dx%d.%1d" +- " inches\n", XCONFIG_GIVEN, priv->dedgeXOffset / 10, +- priv->dedgeXOffset % 10, priv->dedgeYOffset / 10, +- priv->dedgeYOffset % 10); +- break; +- +- case EOF: +- FatalError("Unexpected EOF (missing EndSubSection)"); +- break; +- +- default: +- xf86ConfigError("DigitalEdge subsection keyword expected"); +- break; +- } +- } +- +- DBG(1, ErrorF("xf86SumConfig name=%s\n", priv->dedgeDevice)); +- +- return Success; +-} +-#endif +-#endif /* pre 3.9 headers */ + + /* + ** xf86SumConvert +@@ -661,29 +403,14 @@ static char *xf86SumWriteAndRead(int fd, char *data, char *buffer, int len, + int cr_term) + { + int err, numread = 0; +-#ifndef XFREE86_V4 +- fd_set readfds; +- struct timeval timeout; +-#endif + + SYSCALL(err = write(fd, data, strlen(data))); + if (err == -1) { + Error("DigitalEdge write"); + return NULL; + } +-#ifndef XFREE86_V4 +- FD_ZERO(&readfds); +- FD_SET(fd, &readfds); +-#endif + while (numread < len) { +-#ifndef XFREE86_V4 +- timeout.tv_sec = 0; +- timeout.tv_usec = 200000; +- +- SYSCALL(err = select(FD_SETSIZE, &readfds, NULL, NULL, &timeout)); +-#else + err = xf86WaitForInput(fd, 1000); +-#endif + if (err == -1) { + Error("DigitalEdge select"); + return NULL; +@@ -719,77 +446,19 @@ static char *xf86SumWriteAndRead(int fd, char *data, char *buffer, int len, + */ + static Bool xf86SumOpen(LocalDevicePtr local) + { +-#ifndef XFREE86_V4 +- struct termios termios_tty; +- struct timeval timeout; +-#endif + char buffer[256]; + int err, idx; + DigitalEdgeDevicePtr priv = (DigitalEdgeDevicePtr) local->private; + + DBG(1, ErrorF("opening %s\n", priv->dedgeDevice)); + +-#ifdef XFREE86_V4 + local->fd = xf86OpenSerial(local->options); +-#else +- SYSCALL(local->fd = open(priv->dedgeDevice, O_RDWR | O_NDELAY, 0)); +-#endif + if (local->fd == -1) { + Error(priv->dedgeDevice); + return !Success; + } + DBG(2, ErrorF("%s opened as fd %d\n", priv->dedgeDevice, local->fd)); + +-#ifndef XFREE86_V4 +-#ifdef POSIX_TTY +- err = tcgetattr(local->fd, &termios_tty); +- if (err == -1) { +- Error("DigitalEdge tcgetattr"); +- return !Success; +- } +- termios_tty.c_iflag = IXOFF; +- termios_tty.c_cflag = +- B9600 | CS8 | CREAD | CLOCAL | HUPCL | PARENB | PARODD; +- termios_tty.c_lflag = 0; +- +-/* I wonder what these all do, anyway */ +- termios_tty.c_cc[VINTR] = 0; +- termios_tty.c_cc[VQUIT] = 0; +- termios_tty.c_cc[VERASE] = 0; +-#ifdef VWERASE +- termios_tty.c_cc[VWERASE] = 0; +-#endif +-#ifdef VREPRINT +- termios_tty.c_cc[VREPRINT] = 0; +-#endif +- termios_tty.c_cc[VKILL] = 0; +- termios_tty.c_cc[VEOF] = 0; +- termios_tty.c_cc[VEOL] = 0; +-#ifdef VEOL2 +- termios_tty.c_cc[VEOL2] = 0; +-#endif +- termios_tty.c_cc[VSUSP] = 0; +-#ifdef VDISCARD +- termios_tty.c_cc[VDISCARD] = 0; +-#endif +-#ifdef VLNEXT +- termios_tty.c_cc[VLNEXT] = 0; +-#endif +- +- termios_tty.c_cc[VMIN] = 1; +- termios_tty.c_cc[VTIME] = 10; +- +- err = tcsetattr(local->fd, TCSANOW, &termios_tty); +- if (err == -1) { +- Error("DigitalEdge tcsetattr TCSANOW"); +- return !Success; +- } +-#else +- Code for someone +- else +- to write to handle OSs without POSIX tty functions +-#endif +-#endif + DBG(1, ErrorF("initializing DigitalEdge tablet\n")); + + /* Send reset (NULL) to the tablet */ +@@ -800,13 +469,7 @@ static Bool xf86SumOpen(LocalDevicePtr local) + } + + /* wait 200 mSecs, just in case */ +-#ifndef XFREE86_V4 +- timeout.tv_sec = 0; +- timeout.tv_usec = 200000; +- SYSCALL(err = select(0, NULL, NULL, NULL, &timeout)); +-#else + err = xf86WaitForInput(-1, 200); +-#endif + if (err == -1) { + Error("DigitalEdge select"); + return !Success; +@@ -820,11 +483,7 @@ static Bool xf86SumOpen(LocalDevicePtr local) + return !Success; + } + /* Clear any pending input */ +-#ifndef XFREE86_V4 +- tcflush(local->fd, TCIFLUSH); +-#else + xf86FlushInput(local->fd); +-#endif + + if (priv->dedgeXOffset > 0 && priv->dedgeYOffset > 0) { + if (priv->dedgeXSize * 50 < priv->dedgeMaxX - priv->dedgeXOffset && +@@ -983,9 +642,6 @@ static int xf86SumProc(DeviceIntPtr pSum, int what) + } + /* allocate the motion history buffer if needed */ + xf86MotionHistoryAllocate(local); +-#ifndef XFREE86_V4 +- AssignTypeAndName(pSum, local->atom, local->name); +-#endif + + /* open the device to gather informations */ + xf86SumOpenDevice(pSum); +@@ -998,11 +654,7 @@ static int xf86SumProc(DeviceIntPtr pSum, int what) + return !Success; + } + SYSCALL(write(local->fd, SS_PROMPT, strlen(SS_PROMPT))); +-#ifdef XFREE86_V4 + xf86AddEnabledDevice(local); +-#else +- AddEnabledDevice(local->fd); +-#endif + pSum->public.on = TRUE; + break; + +@@ -1010,11 +662,7 @@ static int xf86SumProc(DeviceIntPtr pSum, int what) + DBG(1, ErrorF("xf86SumProc pSum=%p what=%s\n", (void *)pSum, + (what == DEVICE_CLOSE) ? "CLOSE" : "OFF")); + if (local->fd >= 0) +-#ifdef XFREE86_V4 + xf86RemoveEnabledDevice(local); +-#else +- RemoveEnabledDevice(local->fd); +-#endif + pSum->public.on = FALSE; + break; + +@@ -1102,11 +750,7 @@ static int xf86SumSwitchMode(ClientPtr client, DeviceIntPtr dev, int mode) + */ + static LocalDevicePtr xf86SumAllocate(void) + { +-#ifdef XFREE86_V4 + LocalDevicePtr local = xf86AllocateInput(dedgeDrv, 0); +-#else +- LocalDevicePtr local = (LocalDevicePtr) xalloc(sizeof(LocalDeviceRec)); +-#endif + DigitalEdgeDevicePtr priv = (DigitalEdgeDevicePtr) xalloc(sizeof(DigitalEdgeDeviceRec)); + #if defined (sun) && !defined(i386) + char *dev_name = getenv("DEDGESKETCH_DEV"); +@@ -1115,11 +759,6 @@ static LocalDevicePtr xf86SumAllocate(void) + local->name = XI_NAME; + local->type_name = "DigitalEdge Tablet"; + local->flags = 0; /*XI86_NO_OPEN_ON_INIT; */ +-#ifndef XFREE86_V4 +-#if !defined(sun) || defined(i386) +- local->device_config = xf86SumConfig; +-#endif +-#endif + local->device_control = xf86SumProc; + local->read_input = xf86SumReadInput; + local->control_proc = xf86SumChangeControl; +@@ -1163,42 +802,6 @@ static LocalDevicePtr xf86SumAllocate(void) + return local; + } + +-#ifndef XFREE86_V4 +- +-/* +-** DigitalEdge device association +-** Device section name and allocation function. +-*/ +-DeviceAssocRec dedgemasketch_assoc = { +- DEDGE_SECTION_NAME, /* config_section_name */ +- xf86SumAllocate /* device_allocate */ +-}; +- +-#ifdef DYNAMIC_MODULE +-/* +-** init_module +-** Entry point for dynamic module. +-*/ +-int +-#ifndef DLSYM_BUG +-init_module(unsigned long server_version) +-#else +-init_xf86DigitalEdge(unsigned long server_version) +-#endif +-{ +- xf86AddDeviceAssoc(&dedgemasketch_assoc); +- +- if (server_version != XF86_VERSION_CURRENT) { +- ErrorF("Warning: DigitalEdgeKetch module compiled for version%s\n", +- XF86_VERSION); +- return 0; +- } else { +- return 1; +- } +-} +-#endif +- +-#else + + /* + * xf86SumUninit -- +@@ -1424,6 +1027,5 @@ _X_EXPORT XF86ModuleData digitaledgeModuleData = { + }; + + #endif /* XFree86LOADER */ +-#endif /* XFREE86_V4 */ + + /* end of xf86DigitalEdge.c */ diff --git a/source/x11/xf86-input-digitaledge/FrugalBuild b/source/x11/xf86-input-digitaledge/FrugalBuild index 4129060..73ce3ba 100644 --- a/source/x11/xf86-input-digitaledge/FrugalBuild +++ b/source/x11/xf86-input-digitaledge/FrugalBuild @@ -2,8 +2,13 @@ # Maintainer: Christian Hamar alias krix pkgname=xf86-input-digitaledge -pkgver=1.1.0 -pkgrel=3 +pkgver=1.1.1 +pkgrel=1 Finclude xorg -sha1sums=('3389b112b1e7fb0423d7547cc6b346045a61b352') +source=(${source[@]} \ + '01-fix_xinput_abi_version.patch1' \ + '02-remove_xfree86_v4.patch1') +sha1sums=('c8dcb950d54312b49427705d56be797f59f35bee' \ + '9e0a4ba6fe697cb3d36ee3159b5b224280cbe0c0' \ + 'dd605765492ddaea588c571141114c3278e12970') # optimization OK From iron at frugalware.org Thu Jan 1 18:02:41 2009 From: iron at frugalware.org (Krisztian VASAS) Date: Thu Jan 1 18:02:42 2009 Subject: [Frugalware-git] xorg74: xf86-input-dmc-1.1.2-1-i686 Message-ID: <20090101170241.ADA7711B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=578da4124296e3a1cd261ef2a5ea2a61d0854b86 commit 578da4124296e3a1cd261ef2a5ea2a61d0854b86 Author: Krisztian VASAS Date: Thu Jan 1 18:02:21 2009 +0100 xf86-input-dmc-1.1.2-1-i686 - version bump - added a compile fix diff --git a/source/x11/xf86-input-dmc/01-fix_xinput_abi_version.patch1 b/source/x11/xf86-input-dmc/01-fix_xinput_abi_version.patch1 new file mode 100644 index 0000000..6e446af --- /dev/null +++ b/source/x11/xf86-input-dmc/01-fix_xinput_abi_version.patch1 @@ -0,0 +1,26 @@ +diff --git a/src/xf86DMC.c b/src/xf86DMC.c +index e6797d8..daa0f20 100644 +--- a/src/xf86DMC.c ++++ b/src/xf86DMC.c +@@ -106,7 +106,9 @@ static const char *reqSymbols[] = { + "xf86CollectInputOptions", + "xf86ErrorFVerb", + "xf86FindOptionValue", ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 + "xf86GetMotionEvents", ++#endif + "xf86GetVerbosity", + "xf86MotionHistoryAllocate", + "xf86NameCmp", +@@ -301,7 +303,10 @@ DeviceControl (DeviceIntPtr dev, int mode) + * Device reports motions on 2 axes in absolute coordinates. + * Axes min and max values are reported in raw coordinates. + */ +- if (InitValuatorClassDeviceStruct (dev, 2, xf86GetMotionEvents, ++ if (InitValuatorClassDeviceStruct (dev, 2, ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 ++ xf86GetMotionEvents, ++#endif + pInfo->history_size, Absolute) == FALSE) + { + ErrorF ("Unable to allocate DMC ValuatorClassDeviceStruct\n"); diff --git a/source/x11/xf86-input-dmc/FrugalBuild b/source/x11/xf86-input-dmc/FrugalBuild index b6935f5..2ab54c7 100644 --- a/source/x11/xf86-input-dmc/FrugalBuild +++ b/source/x11/xf86-input-dmc/FrugalBuild @@ -2,8 +2,11 @@ # Maintainer: Christian Hamar alias krix pkgname=xf86-input-dmc -pkgver=1.1.1 -pkgrel=2 +pkgver=1.1.2 +pkgrel=1 Finclude xorg -sha1sums=('e483905ad017bb088f2d873be9185a25e04c9f6e') +source=(${source[@]} \ + '01-fix_xinput_abi_version.patch1') +sha1sums=('650a4a70817ec4ed81fe29273def7dda10a848c6' \ + 'd5f34f1f5875932eadeeda27786daafb65b7b4c8') # optimization OK From iron at frugalware.org Thu Jan 1 18:13:37 2009 From: iron at frugalware.org (Krisztian VASAS) Date: Thu Jan 1 18:13:39 2009 Subject: [Frugalware-git] xorg74: xf86-input-dynapro-1.1.2-1-i686 Message-ID: <20090101171337.44EB511B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=66d8a688889688be90d1b851d5e37ab6ed26f8fa commit 66d8a688889688be90d1b851d5e37ab6ed26f8fa Author: Krisztian VASAS Date: Thu Jan 1 18:13:14 2009 +0100 xf86-input-dynapro-1.1.2-1-i686 - version bump - added a compile fix diff --git a/source/x11/xf86-input-dynapro/FrugalBuild b/source/x11/xf86-input-dynapro/FrugalBuild index b62482b..caac5a3 100644 --- a/source/x11/xf86-input-dynapro/FrugalBuild +++ b/source/x11/xf86-input-dynapro/FrugalBuild @@ -2,8 +2,11 @@ # Maintainer: Christian Hamar alias krix pkgname=xf86-input-dynapro -pkgver=1.1.1 +pkgver=1.1.2 Finclude xorg -sha1sums=('496f10b2f151f2253514b4440ab92b7a9ad3638d') +source=(${source[@]} \ + '01-fix_xinput_abi_version.patch1') +sha1sums=('266778c3d3b6051c07d676814c1fb6436d91135e' \ + '5374031316b49fe7295dd32d3ebf6f8e6d82fa41') # optimization OK From iron at frugalware.org Thu Jan 1 18:15:24 2009 From: iron at frugalware.org (Krisztian VASAS) Date: Thu Jan 1 18:15:25 2009 Subject: [Frugalware-git] xorg74: xf86-input-dynapro-1.1.2-1-i686 Message-ID: <20090101171524.5B78011B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=a86d94e722ef03d8f52d654a8fb417bd1719d6c4 commit a86d94e722ef03d8f52d654a8fb417bd1719d6c4 Author: Krisztian VASAS Date: Thu Jan 1 18:14:59 2009 +0100 xf86-input-dynapro-1.1.2-1-i686 - adding previously forgot patch diff --git a/source/x11/xf86-input-dynapro/01-fix_xinput_abi_version.patch1 b/source/x11/xf86-input-dynapro/01-fix_xinput_abi_version.patch1 new file mode 100644 index 0000000..39df39a --- /dev/null +++ b/source/x11/xf86-input-dynapro/01-fix_xinput_abi_version.patch1 @@ -0,0 +1,26 @@ +diff --git a/src/xf86Dyna.c b/src/xf86Dyna.c +index 0a899f0..a728f0f 100644 +--- a/src/xf86Dyna.c ++++ b/src/xf86Dyna.c +@@ -98,7 +98,9 @@ static const char *reqSymbols[] = { + "xf86CollectInputOptions", + "xf86ErrorFVerb", + "xf86FindOptionValue", ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 + "xf86GetMotionEvents", ++#endif + "xf86GetVerbosity", + "xf86MotionHistoryAllocate", + "xf86NameCmp", +@@ -296,7 +298,10 @@ DeviceControl (DeviceIntPtr dev, int mode) + * Device reports motions on 2 axes in absolute coordinates. + * Axes min and max values are reported in raw coordinates. + */ +- if (InitValuatorClassDeviceStruct (dev, 2, xf86GetMotionEvents, ++ if (InitValuatorClassDeviceStruct (dev, 2, ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 ++ xf86GetMotionEvents, ++#endif + pInfo->history_size, Absolute) == FALSE) + { + ErrorF ("Unable to allocate Dynapro ValuatorClassDeviceStruct\n"); From iron at frugalware.org Thu Jan 1 18:19:35 2009 From: iron at frugalware.org (Krisztian VASAS) Date: Thu Jan 1 18:19:36 2009 Subject: [Frugalware-git] xorg74: xf86-input-elo2300-1.1.2-1-i686 Message-ID: <20090101171935.C133B11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=393e67e73f51b824bbe3f0d8ce3f36f07533d0bb commit 393e67e73f51b824bbe3f0d8ce3f36f07533d0bb Author: Krisztian VASAS Date: Thu Jan 1 18:19:22 2009 +0100 xf86-input-elo2300-1.1.2-1-i686 - version bump - added compile fix diff --git a/source/x11/xf86-input-elo2300/01-fix_xinput_abi_version.patch1 b/source/x11/xf86-input-elo2300/01-fix_xinput_abi_version.patch1 new file mode 100644 index 0000000..65311a1 --- /dev/null +++ b/source/x11/xf86-input-elo2300/01-fix_xinput_abi_version.patch1 @@ -0,0 +1,16 @@ +diff --git a/src/elo.c b/src/elo.c +index 5ed67f0..8382313 100644 +--- a/src/elo.c ++++ b/src/elo.c +@@ -309,7 +309,10 @@ DeviceInit( DeviceIntPtr dev ) + * Device reports motions on 2 axes in absolute coordinates. + * Device may reports touch pressure on the 3rd axis. + */ +- if (InitValuatorClassDeviceStruct (dev, priv->axes, xf86GetMotionEvents, ++ if (InitValuatorClassDeviceStruct (dev, priv->axes, ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 ++ xf86GetMotionEvents, ++#endif + local->history_size, Absolute) == FALSE) + { + ErrorF ("Unable to allocate Elographics touchscreen ValuatorClassDeviceStruct\n"); diff --git a/source/x11/xf86-input-elo2300/FrugalBuild b/source/x11/xf86-input-elo2300/FrugalBuild index 4071d3b..e1380ff 100644 --- a/source/x11/xf86-input-elo2300/FrugalBuild +++ b/source/x11/xf86-input-elo2300/FrugalBuild @@ -2,8 +2,11 @@ # Maintainer: Christian Hamar alias krix pkgname=xf86-input-elo2300 -pkgver=1.1.1 +pkgver=1.1.2 Finclude xorg -sha1sums=('bfabcfd6a61f8e83ca9ea3b3b070012fc25f81bb') +source=(${source[@]} \ + '01-fix_xinput_abi_version.patch1') +sha1sums=('835487c688578ed8ef63d0660afcfafd38cd0276' \ + '077f34677a8255b3beb36c28d69a82ea4a205ba4') # optimization OK From iron at frugalware.org Thu Jan 1 18:23:39 2009 From: iron at frugalware.org (Krisztian VASAS) Date: Thu Jan 1 18:23:40 2009 Subject: [Frugalware-git] xorg74: xf86-input-elographics-1.2.3-1-i686 Message-ID: <20090101172339.0C11811B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=28e00c00e7d2b997cfe4fc69dbe844e08a7c55ab commit 28e00c00e7d2b997cfe4fc69dbe844e08a7c55ab Author: Krisztian VASAS Date: Thu Jan 1 18:23:30 2009 +0100 xf86-input-elographics-1.2.3-1-i686 - version bump diff --git a/source/x11/xf86-input-elographics/FrugalBuild b/source/x11/xf86-input-elographics/FrugalBuild index b33d6d8..2b916fe 100644 --- a/source/x11/xf86-input-elographics/FrugalBuild +++ b/source/x11/xf86-input-elographics/FrugalBuild @@ -2,9 +2,9 @@ # Maintainer: Christian Hamar alias krix pkgname=xf86-input-elographics -pkgver=1.1.0 -pkgrel=3 +pkgver=1.2.3 +pkgrel=1 Finclude xorg _F_cd_path="$pkgname-$pkgver" -sha1sums=('9bd0d4dcfa7fcbec3b30dd8d9028f9f0a3862b53') +sha1sums=('9485c42a79e91035447e72a3a2d1ba9a2ecbe8af') # optimization OK From iron at frugalware.org Thu Jan 1 18:39:33 2009 From: iron at frugalware.org (Krisztian VASAS) Date: Thu Jan 1 18:39:35 2009 Subject: [Frugalware-git] xorg74: xf86-input-fpit-1.2.0-1-i686 Message-ID: <20090101173933.8D49D11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=7c409f311f07b0fcc936bf23db989f66603ca9b4 commit 7c409f311f07b0fcc936bf23db989f66603ca9b4 Author: Krisztian VASAS Date: Thu Jan 1 18:39:17 2009 +0100 xf86-input-fpit-1.2.0-1-i686 - version bump - added 2 compile fixes diff --git a/source/x11/xf86-input-fpit/01-fix_xinput_abi_version.patch1 b/source/x11/xf86-input-fpit/01-fix_xinput_abi_version.patch1 new file mode 100644 index 0000000..a5bf088 --- /dev/null +++ b/source/x11/xf86-input-fpit/01-fix_xinput_abi_version.patch1 @@ -0,0 +1,17 @@ +diff --git a/src/xf86Fpit.c b/src/xf86Fpit.c +index 5b1d060..20be86a 100644 +--- a/src/xf86Fpit.c ++++ b/src/xf86Fpit.c +@@ -434,7 +434,11 @@ static Bool xf86FpitControl(DeviceIntPtr dev, int mode) + ErrorF("Unable to allocate PtrFeedBackClassDeviceStruct\n"); + } + +- if (InitValuatorClassDeviceStruct(dev, 2, xf86GetMotionEvents, local->history_size, Absolute) == FALSE) { ++ if (InitValuatorClassDeviceStruct(dev, 2, ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 ++ xf86GetMotionEvents, ++#endif ++ local->history_size, Absolute) == FALSE) { + ErrorF("Unable to allocate Fpit touchscreen ValuatorClassDeviceStruct\n"); + return !Success; + } diff --git a/source/x11/xf86-input-fpit/02-fix_xf86version_to_xorgversion.patch1 b/source/x11/xf86-input-fpit/02-fix_xf86version_to_xorgversion.patch1 new file mode 100644 index 0000000..83caf09 --- /dev/null +++ b/source/x11/xf86-input-fpit/02-fix_xf86version_to_xorgversion.patch1 @@ -0,0 +1,13 @@ +diff --git a/src/xf86Fpit.c b/src/xf86Fpit.c +index 20be86a..528ebb9 100644 +--- a/src/xf86Fpit.c ++++ b/src/xf86Fpit.c +@@ -55,7 +55,7 @@ + #include "config.h" + #endif + +-#include ++#include + + #include + #include diff --git a/source/x11/xf86-input-fpit/FrugalBuild b/source/x11/xf86-input-fpit/FrugalBuild index 3ebe97c..49035a4 100644 --- a/source/x11/xf86-input-fpit/FrugalBuild +++ b/source/x11/xf86-input-fpit/FrugalBuild @@ -2,8 +2,13 @@ # Maintainer: Christian Hamar alias krix pkgname=xf86-input-fpit -pkgver=1.1.0 -pkgrel=3 +pkgver=1.2.0 +pkgrel=1 Finclude xorg -sha1sums=('988f689f64dcbf721154267c8f4844d8f3dae6ce') +source=(${source[@]} \ + '01-fix_xinput_abi_version.patch1' \ + '02-fix_xf86version_to_xorgversion.patch1') +sha1sums=('9b52aa91d97dd4d64e494090bee5c29cd57048d5' \ + '8747b6e6156b756be43b3a685754cfcc0987faf5' \ + 'e77f1fac970ccc67a089aa0d8edbe37f2edd0bc1') # optimization OK From devil505linux at gmail.com Thu Jan 1 18:41:00 2009 From: devil505linux at gmail.com (Devil505) Date: Thu Jan 1 18:41:01 2009 Subject: [Frugalware-git] frugalware-current: pygtranslator-0.2-1-i686 Message-ID: <20090101174100.0FC2211B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=dd3fd5c9871b41231f39696e7d761e21d2486447 commit dd3fd5c9871b41231f39696e7d761e21d2486447 Author: Devil505 Date: Thu Jan 1 18:40:21 2009 +0100 pygtranslator-0.2-1-i686 * version bump diff --git a/source/xapps-extra/pygtranslator/FrugalBuild b/source/xapps-extra/pygtranslator/FrugalBuild index 2104485..79fe439 100644 --- a/source/xapps-extra/pygtranslator/FrugalBuild +++ b/source/xapps-extra/pygtranslator/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Devil505 pkgname=pygtranslator -pkgver=0.1 +pkgver=0.2 pkgrel=1 pkgdesc="Small GUI tool that brings Google translate to your desktop." url="http://xrado.hopto.org/post/pygtranslator-gui-tool-for-google-translate" @@ -11,5 +11,5 @@ options=('scriptlet') groups=('xapps-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://xrado.hopto.org/tag/python | grep tar.gz | Flasttar" -source=(http://xrado.hopto.org/file/open/16_e76de1db3f5d0/$pkgname-$pkgver.tar.gz) -sha1sums=('95125a5d92d3bc79d818bb64fa0cfc9d00d853f3') +source=(http://xrado.hopto.org/file/open/19_9e323102dd8b8//$pkgname-$pkgver.tar.gz) +sha1sums=('7786b5fd9083c0bde3abfeaffbb08b4ddd3b8c5d') From priyank at frugalware.org Thu Jan 1 19:01:30 2009 From: priyank at frugalware.org (Priyank) Date: Thu Jan 1 19:01:32 2009 Subject: [Frugalware-git] frugalware-current: pidgin-libnotify-0.14-1-i686 Message-ID: <20090101180130.7CAA311B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f56108fa608563ea06501369a0697ee5d1e2f136 commit f56108fa608563ea06501369a0697ee5d1e2f136 Author: Priyank Date: Thu Jan 1 23:30:39 2009 +0530 pidgin-libnotify-0.14-1-i686 * Version bump diff --git a/source/gnome-extra/pidgin-libnotify/FrugalBuild b/source/gnome-extra/pidgin-libnotify/FrugalBuild index 09e0a9f..394ef8b 100644 --- a/source/gnome-extra/pidgin-libnotify/FrugalBuild +++ b/source/gnome-extra/pidgin-libnotify/FrugalBuild @@ -2,17 +2,17 @@ # Maintainer: Priyank Gosalia pkgname=pidgin-libnotify -pkgver=0.13 +pkgver=0.14 pkgrel=1 pkgdesc="A guifications like notification plugin for Pidgin." _F_sourceforge_dirname="gaim-libnotify" Finclude sourceforge url="http://gaim-libnotify.sourceforge.net/" makedepends=('intltool') -depends=('pidgin>=2.0.2-1' 'libnotify' 'notification-daemon') +depends=('pidgin>=2.5.3' 'libnotify' 'notification-daemon') groups=('gnome-extra') archs=('i686' 'x86_64') options=('scriptlet') -sha1sums=('d3fb0363bef48aa9dd5cd3396125408836f7ad59') +sha1sums=('005e9663c7a36f68b9572341654818720a1e571a') # optimization OK From priyank at frugalware.org Thu Jan 1 19:15:18 2009 From: priyank at frugalware.org (Priyank) Date: Thu Jan 1 19:15:20 2009 Subject: [Frugalware-git] frugalware-current: transmission-1.42-1-i686 Message-ID: <20090101181518.A2B1B11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8a43ee2d86df32e340bbbac98085f886e0223ef4 commit 8a43ee2d86df32e340bbbac98085f886e0223ef4 Author: Priyank Date: Thu Jan 1 23:44:13 2009 +0530 transmission-1.42-1-i686 * Version bump diff --git a/source/xapps-extra/transmission/FrugalBuild b/source/xapps-extra/transmission/FrugalBuild index 1d8f792..e5ed961 100644 --- a/source/xapps-extra/transmission/FrugalBuild +++ b/source/xapps-extra/transmission/FrugalBuild @@ -2,10 +2,11 @@ # Maintainer: Priyank Gosalia pkgname=transmission -pkgver=1.34 -pkgrel=2 +pkgver=1.42 +pkgrel=1 pkgdesc="A free, lightweight BitTorrent Client." url="http://transmission.m0k.org/" +makedepends=('intltool') depends=('glibc' 'gtk+2' 'libxml2' 'freetype2' 'libxau' 'libxdmcp' 'curl>=7.19.0' 'libxdamage' 'libxext' 'gettext') options=('scriptlet') groups=('xapps-extra') @@ -13,7 +14,7 @@ archs=('i686' 'x86_64') options=('scriptlet') up2date="lynx -dump -nolist http://download.m0k.org/transmission/files/ | Flasttarbz2" source=(http://download.m0k.org/transmission/files/$pkgname-$pkgver.tar.bz2) -sha1sums=('122cd096725225a5e41d79628f341ae8c2051b5c') +sha1sums=('109ef121bc4d032c78b14d7d3934f20a5ed98035') build() { From iron at frugalware.org Thu Jan 1 19:17:34 2009 From: iron at frugalware.org (Krisztian VASAS) Date: Thu Jan 1 19:17:36 2009 Subject: [Frugalware-git] xorg74: xf86-input-hyperpen-1.2.0-1-i686 Message-ID: <20090101181734.E691611B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=c875fa03bc0b871b2bcb8052f02ff9897656ac28 commit c875fa03bc0b871b2bcb8052f02ff9897656ac28 Author: Krisztian VASAS Date: Thu Jan 1 19:17:18 2009 +0100 xf86-input-hyperpen-1.2.0-1-i686 - version bump - added compile fixes diff --git a/source/x11/xf86-input-hyperpen/01-fix_xinput_abi_version.patch1 b/source/x11/xf86-input-hyperpen/01-fix_xinput_abi_version.patch1 new file mode 100644 index 0000000..a5cad52 --- /dev/null +++ b/source/x11/xf86-input-hyperpen/01-fix_xinput_abi_version.patch1 @@ -0,0 +1,14 @@ +diff --git a/src/xf86HyperPen.c b/src/xf86HyperPen.c +index f27899a..c80f2e1 100644 +--- a/src/xf86HyperPen.c ++++ b/src/xf86HyperPen.c +@@ -1242,7 +1242,9 @@ xf86HypProc(DeviceIntPtr pHyp, int what) + + if (InitValuatorClassDeviceStruct(pHyp, + nbaxes, ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 + xf86GetMotionEvents, ++#endif + local->history_size, + (priv->flags & ABSOLUTE_FLAG)? Absolute: Relative) + == FALSE) { diff --git a/source/x11/xf86-input-hyperpen/02-remove_xfree86_v4.patch1 b/source/x11/xf86-input-hyperpen/02-remove_xfree86_v4.patch1 new file mode 100644 index 0000000..4b4e9ec --- /dev/null +++ b/source/x11/xf86-input-hyperpen/02-remove_xfree86_v4.patch1 @@ -0,0 +1,684 @@ +diff --git a/src/xf86HyperPen.c b/src/xf86HyperPen.c +index c80f2e1..bd630a5 100644 +--- a/src/xf86HyperPen.c ++++ b/src/xf86HyperPen.c +@@ -41,14 +41,7 @@ + #include "config.h" + #endif + +-#include +- +-#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(3,9,0,0,0) +-#define XFREE86_V4 1 +-#endif +- +-#ifdef XFREE86_V4 +-/* post 3.9 headers */ ++#include + + #include + #include +@@ -104,56 +97,6 @@ static const char *default_options[] = + static InputDriverPtr hypDrv; + + +-#else /* pre 3.9 headers */ +- +-#include +-#include +-#include +- +-#define NEED_EVENTS +-#include +-#include +-#include "misc.h" +-#include "inputstr.h" +-#include "scrnintstr.h" +-#include +-#include +- +-#if defined(sun) && !defined(i386) +-#define POSIX_TTY +-#include +-#include +-#include +-#include +- +-#include "extio.h" +-#else +-#include "compiler.h" +- +-#ifdef XFree86LOADER +-#include "xf86_libc.h" +-#endif +-#include "xf86.h" +-#include "xf86Procs.h" +-#include "xf86_OSlib.h" +-#include "xf86_Config.h" +-#include "xf86Xinput.h" +-#include "atKeynames.h" +-#include "xf86Version.h" +-#endif +- +-#if !defined(sun) || defined(i386) +-#include "osdep.h" +-#include "exevents.h" +- +-#include "extnsionst.h" +-#include "extinit.h" +-#endif +- +-#if defined(__QNX__) || defined(__QNXNTO__) +-#define POSIX_TTY +-#endif +-#endif /* pre 3.9 headers */ + + /* + ** Debugging macros +@@ -237,65 +180,6 @@ static struct MODEL_ID { + */ + #define HYPERPEN_SECTION_NAME "HyperPen" + +-#ifndef XFREE86_V4 +- +-#define PORT 1 +-#define DEVICENAME 2 +-#define THE_MODE 3 +-#define CURSOR 4 +-#define BORDER 5 +-#define DEBUG_LEVEL 6 +-#define HISTORY_SIZE 7 +-#define ALWAYS_CORE 8 +-#define ACTIVE_AREA 9 +-#define ACTIVE_OFFSET 10 +-#define INVX 11 +-#define INVY 12 +-#define BAUD_RATE 13 +-#define PMIN 14 +-#define PMAX 15 +- +-#if !defined(sun) || defined(i386) +-static SymTabRec HypTab[] = { +- {ENDSUBSECTION, "endsubsection"}, +- {PORT, "port"}, +- {DEVICENAME, "devicename"}, +- {THE_MODE, "mode"}, +- {CURSOR, "cursor"}, +- {BORDER, "border"}, +- {DEBUG_LEVEL, "debuglevel"}, +- {HISTORY_SIZE, "historysize"}, +- {ALWAYS_CORE, "alwayscore"}, +- {ACTIVE_AREA, "activearea"}, +- {ACTIVE_OFFSET, "activeoffset"}, +- {INVX, "invx"}, +- {INVY, "invy"}, +- {BAUD_RATE, "baudrate"}, +- {PMIN, "pmin"}, +- {PMAX, "pmax"}, +- {-1, ""} +-}; +- +-#define RELATIVE 1 +-#define ABSOLUTE 2 +- +-static SymTabRec HypModeTabRec[] = { +- {RELATIVE, "relative"}, +- {ABSOLUTE, "absolute"}, +- {-1, ""} +-}; +- +-#define PUCK 1 +-#define STYLUS 2 +- +-static SymTabRec HypPointTabRec[] = { +- {PUCK, "puck"}, +- {STYLUS, "stylus"}, +- {-1, ""} +-}; +- +-#endif +-#endif /* Pre 3.9 headers */ + + /* + ** Contants and macro +@@ -339,286 +223,6 @@ static const char * ss_initstr = SS_STREAM_MODE; + ** External declarations + */ + +-#ifndef XFREE86_V4 +- +-#if defined(sun) && !defined(i386) +-#define ENQUEUE suneqEnqueue +-#else +-#define ENQUEUE xf86eqEnqueue +- +-extern void xf86eqEnqueue( +- xEventPtr /*e */ +- ); +-#endif +- +-extern void miPointerDeltaCursor( +- int /*dx */ , +- int /*dy */ , +- unsigned long /*time */ +- ); +- +- +-#ifndef XFREE86_V4 +-/* +- *************************************************************************** +- * +- * set_serial_speed -- +- * +- * Set speed of the serial port. +- * +- *************************************************************************** +- */ +-static int +-set_serial_speed(int fd, int speed_code) +-{ +- struct termios termios_tty; +- int err; +-#ifdef POSIX_TTY +- SYSCALL(err = tcgetattr(fd, &termios_tty)); +- if (err == -1) { +- ErrorF("HyperPen tcgetattr error : %s\n", strerror(errno)); +- return !Success; +- } +- termios_tty.c_iflag = IXOFF; +- termios_tty.c_oflag = 0; +- termios_tty.c_cflag = speed_code|CS8|CREAD|CLOCAL|HUPCL|PARENB|PARODD; +- termios_tty.c_lflag = 0; +- termios_tty.c_cc[VINTR] = 0; +- termios_tty.c_cc[VQUIT] = 0; +- termios_tty.c_cc[VERASE] = 0; +- termios_tty.c_cc[VEOF] = 0; +-#ifdef VWERASE +- termios_tty.c_cc[VWERASE] = 0; +-#endif +-#ifdef VREPRINT +- termios_tty.c_cc[VREPRINT] = 0; +-#endif +- termios_tty.c_cc[VKILL] = 0; +- termios_tty.c_cc[VEOF] = 0; +- termios_tty.c_cc[VEOL] = 0; +-#ifdef VEOL2 +- termios_tty.c_cc[VEOL2] = 0; +-#endif +- termios_tty.c_cc[VSUSP] = 0; +-#ifdef VDSUSP +- termios_tty.c_cc[VDSUSP] = 0; +-#endif +-#ifdef VDISCARD +- termios_tty.c_cc[VDISCARD] = 0; +-#endif +-#ifdef VLNEXT +- termios_tty.c_cc[VLNEXT] = 0; +-#endif +- /* minimum 1 character in one read call and timeout to 100 ms */ +- termios_tty.c_cc[VMIN] = 1; +- termios_tty.c_cc[VTIME] = 10; +- SYSCALL(err = tcsetattr(fd, TCSANOW, &termios_tty)); +- if (err == -1) { +- ErrorF("HyperPen tcsetattr TCSANOW error : %s\n", strerror(errno)); +- return !Success; +- } +-#else +- Code for OSs without POSIX tty functions +-#endif +- return Success; +-} +-#endif /* Pre 3.9 stuff */ +- +-#if !defined(sun) || defined(i386) +-/* +-** xf86HypConfig +-** Reads the HyperPen section from the XF86Config file +-*/ +-static Bool +-xf86HypConfig(LocalDevicePtr *array, int inx, int max, LexPtr val) +-{ +- LocalDevicePtr dev = array[inx]; +- HyperPenDevicePtr priv = (HyperPenDevicePtr)(dev->private); +- int token; +- int mtoken; +- +- DBG(1, ErrorF("xf86HypConfig\n")); +- +- priv->AutoPT=1; +- priv->PMax=1000; +- +- while ((token = xf86GetToken(HypTab)) != ENDSUBSECTION) { +- switch(token) { +- case DEVICENAME: +- if (xf86GetToken(NULL) != STRING) +- xf86ConfigError("Option string expected"); +- else { +- dev->name = strdup(val->str); +- if (xf86Verbose) +- ErrorF("%s HyperPen X device name is %s\n", XCONFIG_GIVEN, +- dev->name); +- } +- break; +- +- case PORT: +- if (xf86GetToken(NULL) != STRING) +- xf86ConfigError("Option string expected"); +- else { +- priv->hypDevice = strdup(val->str); +- if (xf86Verbose) +- ErrorF("%s HyperPen port is %s\n", XCONFIG_GIVEN, +- priv->hypDevice); +- } +- break; +- +- case THE_MODE: +- mtoken = xf86GetToken(HypModeTabRec); +- if ((mtoken == EOF) || (mtoken == STRING) || (mtoken == NUMBER)) +- xf86ConfigError("Mode type token expected"); +- else { +- switch (mtoken) { +- case ABSOLUTE: +- priv->flags |= ABSOLUTE_FLAG; +- break; +- case RELATIVE: +- priv->flags &= ~ABSOLUTE_FLAG; +- break; +- default: +- xf86ConfigError("Illegal Mode type"); +- break; +- } +- } +- break; +- +- case CURSOR: +- mtoken = xf86GetToken(HypPointTabRec); +- if ((mtoken == EOF) || (mtoken == STRING) || (mtoken == NUMBER)) +- xf86ConfigError("Cursor token expected"); +- else { +- switch (mtoken) { +- case STYLUS: +- priv->flags |= STYLUS_FLAG; +- break; +- case PUCK: +- priv->flags &= ~STYLUS_FLAG; +- break; +- default: +- xf86ConfigError("Illegal cursor type"); +- break; +- } +- } +- break; +- +- case DEBUG_LEVEL: +- if (xf86GetToken(NULL) != NUMBER) +- xf86ConfigError("Option number expected"); +- debug_level = val->num; +- if (xf86Verbose) { +-#if DEBUG +- ErrorF("%s HyperPen debug level set to %d\n", XCONFIG_GIVEN, +- debug_level); +-#else +- ErrorF("%s HyperPen debug level not set to %d because" +- " debugging is not compiled with the xf86HyperPen driver\n", XCONFIG_GIVEN, +- debug_level); +-#endif +- } +- break; +- +- case HISTORY_SIZE: +- if (xf86GetToken(NULL) != NUMBER) +- xf86ConfigError("Option number expected"); +- dev->history_size = val->num; +- if (xf86Verbose) +- ErrorF("%s HyperPen Motion history size is %d\n", XCONFIG_GIVEN, +- dev->history_size); +- break; +- +- case ALWAYS_CORE: +- xf86AlwaysCore(dev, TRUE); +- if (xf86Verbose) +- ErrorF("%s HyperPen device always stays core pointer\n", +- XCONFIG_GIVEN); +- break; +- +- case ACTIVE_AREA: +- if (xf86GetToken(NULL) != NUMBER) +- xf86ConfigError("Option number expected"); +- priv->hypXSize = val->realnum * 100; +- if (xf86GetToken(NULL) != NUMBER) +- xf86ConfigError("Option number expected"); +- priv->hypYSize = val->realnum * 100; +- if (xf86Verbose) +- ErrorF("%s HyperPen active area: %d.%02dx%d.%02d" +- " inches\n", XCONFIG_GIVEN, priv->hypXSize / 100, +- priv->hypXSize % 100, priv->hypYSize / 100, +- priv->hypYSize % 100); +- break; +- +- case ACTIVE_OFFSET: +- if (xf86GetToken(NULL) != NUMBER) +- xf86ConfigError("Option number expected"); +- priv->hypXOffset = val->realnum * 100; +- if (xf86GetToken(NULL) != NUMBER) +- xf86ConfigError("Option number expected"); +- priv->hypYOffset = val->realnum * 100; +- if (xf86Verbose) +- ErrorF("%s HyperPen active area offsets: %d.%02d %d.%02d" +- " inches\n", XCONFIG_GIVEN, priv->hypXOffset / 100, +- priv->hypXOffset % 100, priv->hypYOffset / 100, +- priv->hypYOffset % 100); +- break; +- case INVX: +- priv->flags |= INVX_FLAG; +- break; +- case INVY: +- priv->flags |= INVY_FLAG; +- break; +- case BAUD_RATE: +- if (xf86GetToken(NULL) != NUMBER) +- xf86ConfigError("Option number expected"); +- switch (val->num) { +- case 19200: +- priv->flags |= BAUD_19200_FLAG; +- break; +- case 9600: +- priv->flags &= ~BAUD_19200_FLAG; +- break; +- default: +- xf86ConfigError("Illegal speed value"); +- break; +- } +- break; +- case PMIN: +- if (xf86GetToken(NULL) != NUMBER) +- xf86ConfigError("Option number expected"); +- if (val->num < 2) +- xf86ConfigError("Illegal minimum pressure"); +- else +- { +- priv->AutoPT = 0; /* desactivate auto threshold adjustment*/ +- priv->PT = val->num; +- }; +- break; +- case PMAX: +- if (xf86GetToken(NULL) != NUMBER) +- xf86ConfigError("Option number expected"); +- if (val->num < 3) +- xf86ConfigError("Illegal maximum pressure"); +- else +- priv->PMax = val->num; +- break; +- case EOF: +- FatalError("Unexpected EOF (missing EndSubSection)"); +- break; +- +- default: +- xf86ConfigError("HyperPen subsection keyword expected"); +- break; +- } +- } +- +- DBG(1, ErrorF("xf86HypConfig name=%s\n", priv->hypDevice)); +- +- return Success; +-} +-#endif +-#endif /* pre 3.9 headers */ + + /* + ** xf86HypConvert +@@ -876,10 +480,6 @@ static char * + xf86HypWriteAndRead(int fd, char *data, char *buffer, int len, int cr_term) + { + int err, numread = 0; +-#ifndef XFREE86_V4 +- fd_set readfds; +- struct timeval timeout; +-#endif + + SYSCALL(err = write(fd, data, strlen(data))); + if (err == -1) { +@@ -887,19 +487,8 @@ xf86HypWriteAndRead(int fd, char *data, char *buffer, int len, int cr_term) + return NULL; + } + +-#ifndef XFREE86_V4 +- FD_ZERO(&readfds); +- FD_SET(fd, &readfds); +-#endif + while (numread < len) { +-#ifndef XFREE86_V4 +- timeout.tv_sec = 0; +- timeout.tv_usec = 100000; +- +- SYSCALL(err = select(FD_SETSIZE, &readfds, NULL, NULL, &timeout)); +-#else + err = xf86WaitForInput(fd, 100000); +-#endif + if (err == -1) { + Error("HyperPen select"); + return NULL; +@@ -932,31 +521,16 @@ xf86HypWriteAndRead(int fd, char *data, char *buffer, int len, int cr_term) + ** Open and initialize the tablet, as well as probe for any needed data. + */ + +-#ifdef XFREE86_V4 + #define WAIT(t) \ + err = xf86WaitForInput(-1, ((t) * 1000)); \ + if (err == -1) { \ + ErrorF("HyperPen select error : %s\n", strerror(errno)); \ + return !Success; \ + } +-#else +-#define WAIT(t) \ +- timeout.tv_sec = 0; \ +- timeout.tv_usec = (t) * 1000; \ +- SYSCALL(err = select(0, NULL, NULL, NULL, &timeout)); \ +- if (err == -1) { \ +- ErrorF("HyperPen select error : %s\n", strerror(errno)); \ +- return !Success; \ +- } +-#endif + + static Bool + xf86HypOpen(LocalDevicePtr local) + { +-#ifndef XFREE86_V4 +- struct termios termios_tty; +- struct timeval timeout; +-#endif + char buffer[256]; + int err, idx; + int i, n; +@@ -966,24 +540,15 @@ xf86HypOpen(LocalDevicePtr local) + + DBG(1, ErrorF("opening %s\n", priv->hypDevice)); + +-#ifdef XFREE86_V4 + local->fd = xf86OpenSerial(local->options); +-#else +- SYSCALL(local->fd = open(priv->hypDevice, O_RDWR | O_NDELAY, 0)); +-#endif + if (local->fd == -1) { + Error(priv->hypDevice); + return !Success; + } + DBG(2, ErrorF("%s opened as fd %d\n", priv->hypDevice, local->fd)); + +-#ifdef XFREE86_V4 + if (xf86SetSerialSpeed(local->fd, 9600) < 0) + return !Success; +-#else +- if (set_serial_speed(local->fd, B9600) == !Success) +- return !Success; +-#endif + + DBG(1, ErrorF("initializing HyperPen tablet\n")); + +@@ -1113,14 +678,9 @@ if (xf86Verbose) + WAIT(10); + + /* Set the speed of the serial link to 19200 */ +-#ifdef XFREE86_V4 + if (xf86SetSerialSpeed(local->fd, 19200) < 0) { + return !Success; + } +-#else +- if (set_serial_speed(local->fd, B19200) == !Success) +- return !Success; +-#endif + + DBG(6, ErrorF("set serial speed to 19200\n")); + } +@@ -1253,9 +813,6 @@ xf86HypProc(DeviceIntPtr pHyp, int what) + } + /* allocate the motion history buffer if needed */ + xf86MotionHistoryAllocate(local); +-#ifndef XFREE86_V4 +- AssignTypeAndName(pHyp, local->atom, local->name); +-#endif + /* open the device to gather informations */ + xf86HypOpenDevice(pHyp); + break; +@@ -1266,11 +823,7 @@ xf86HypProc(DeviceIntPtr pHyp, int what) + if ((local->fd < 0) && (!xf86HypOpenDevice(pHyp))) { + return !Success; + } +-#ifdef XFREE86_V4 + xf86AddEnabledDevice(local); +-#else +- AddEnabledDevice(local->fd); +-#endif + pHyp->public.on = TRUE; + break; + +@@ -1278,11 +831,7 @@ xf86HypProc(DeviceIntPtr pHyp, int what) + DBG(1, ErrorF("xf86HypProc pHyp=%p what=%s\n", (void *)pHyp, + (what == DEVICE_CLOSE) ? "CLOSE" : "OFF")); + if (local->fd >= 0) +-#ifdef XFREE86_V4 + xf86RemoveEnabledDevice(local); +-#else +- RemoveEnabledDevice(local->fd); +-#endif + pHyp->public.on = FALSE; + break; + +@@ -1375,11 +924,7 @@ xf86HypSwitchMode(ClientPtr client, DeviceIntPtr dev, int mode) + static LocalDevicePtr + xf86HypAllocate(void) + { +-#ifdef XFREE86_V4 + LocalDevicePtr local = xf86AllocateInput(hypDrv, 0); +-#else +- LocalDevicePtr local = (LocalDevicePtr)xalloc(sizeof(LocalDeviceRec)); +-#endif + HyperPenDevicePtr priv = (HyperPenDevicePtr)xalloc(sizeof(HyperPenDeviceRec)); + #if defined (sun) && !defined(i386) + char *dev_name = getenv("HYPERPEN_DEV"); +@@ -1388,11 +933,6 @@ xf86HypAllocate(void) + local->name = XI_NAME; + local->type_name = "HyperPen Tablet"; + local->flags = 0; /*XI86_NO_OPEN_ON_INIT;*/ +-#ifndef XFREE86_V4 +-#if !defined(sun) || defined(i386) +- local->device_config = xf86HypConfig; +-#endif +-#endif + local->device_control = xf86HypProc; + local->read_input = xf86HypReadInput; + local->control_proc = xf86HypChangeControl; +@@ -1436,85 +976,6 @@ xf86HypAllocate(void) + return local; + } + +-#ifndef XFREE86_V4 +- +-/* +-** HyperPen device association +-** Device section name and allocation function. +-*/ +-DeviceAssocRec hypmasketch_assoc = +-{ +- HYPERPEN_SECTION_NAME, /* config_section_name */ +- xf86HypAllocate /* device_allocate */ +-}; +- +-#ifdef DYNAMIC_MODULE +-/* +-** init_module +-** Entry point for dynamic module. +-*/ +-int +-#ifndef DLSYM_BUG +-init_module(unsigned long server_version) +-#else +-init_xf86HyperPen(unsigned long server_version) +-#endif +-{ +- xf86AddDeviceAssoc(&hypmasketch_assoc); +- +- if (server_version != XF86_VERSION_CURRENT) { +- ErrorF("Warning: HyperPen module compiled for version %s\n", +- XF86_VERSION); +- return 0; +- } else { +- return 1; +- } +-} +-#endif +- +-#ifdef XFree86LOADER +-/* +- * Entry point for the loader code +- */ +-XF86ModuleVersionInfo xf86HyperPenVersion = { +- "hyperpen", +- MODULEVENDORSTRING, +- MODINFOSTRING1, +- MODINFOSTRING2, +- XORG_VERSION_CURRENT, +- 0x00010000, +- {0,0,0,0} +-}; +- +-void +-xf86HyperPenModuleInit(data, magic) +- pointer *data; +- INT32 *magic; +-{ +- static int cnt = 0; +- +- switch (cnt) { +- case 0: +- *magic = MAGIC_VERSION; +- *data = &xf86HyperPenVersion; +- cnt++; +- break; +- +- case 1: +- *magic = MAGIC_ADD_XINPUT_DEVICE; +- *data = &hypmasketch_assoc; +- cnt++; +- break; +- +- default: +- *magic = MAGIC_DONE; +- *data = NULL; +- break; +- } +-} +-#endif +- +-#else + + /* + * xf86HypUninit -- +@@ -1778,6 +1239,5 @@ _X_EXPORT XF86ModuleData hyperpenModuleData = { + }; + + #endif /* XFree86LOADER */ +-#endif /* XFREE86_V4 */ + + /* end of xf86HyperPen.c */ diff --git a/source/x11/xf86-input-hyperpen/FrugalBuild b/source/x11/xf86-input-hyperpen/FrugalBuild index 2514f88..0b05804 100644 --- a/source/x11/xf86-input-hyperpen/FrugalBuild +++ b/source/x11/xf86-input-hyperpen/FrugalBuild @@ -2,8 +2,13 @@ # Maintainer: Christian Hamar alias krix pkgname=xf86-input-hyperpen -pkgver=1.1.0 -pkgrel=3 +pkgver=1.2.0 +pkgrel=1 Finclude xorg -sha1sums=('de89f5020a1ad2630663d5f3b78402698766b304') +source=(${source[@]} \ + '01-fix_xinput_abi_version.patch1' \ + '02-remove_xfree86_v4.patch1') +sha1sums=('79dfd930c253c01714535c4c86cce76ea33776bb' \ + '0d6b25472620fa2bd14aa11bf5684fd8e618a274' \ + 'efaa1d80a1f15cf1cd52992d2cae7da1047859b5') # optimization OK From priyank at frugalware.org Thu Jan 1 19:23:09 2009 From: priyank at frugalware.org (Priyank) Date: Thu Jan 1 19:23:11 2009 Subject: [Frugalware-git] frugalware-current: sakura-2.3.2-1-i686 Message-ID: <20090101182309.49D4411B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2f0edb432d65db815d9f397c3d2fd683c2fce7c4 commit 2f0edb432d65db815d9f397c3d2fd683c2fce7c4 Author: Priyank Date: Thu Jan 1 23:52:19 2009 +0530 sakura-2.3.2-1-i686 * Version bump diff --git a/source/xapps-extra/sakura/FrugalBuild b/source/xapps-extra/sakura/FrugalBuild index 5f4aedc..ade55a0 100644 --- a/source/xapps-extra/sakura/FrugalBuild +++ b/source/xapps-extra/sakura/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Priyank Gosalia pkgname=sakura -pkgver=2.3.1 +pkgver=2.3.2 pkgrel=1 pkgdesc="Sakura is a terminal emulator based on GTK and VTE." url="http://pleyades.net/david/sakura.php" @@ -13,7 +13,7 @@ groups=('xapps-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url | grep -m1 tar.bz2 | sed 's/.*-\(.*\).ta.*/\1/'" source=(http://pleyades.net/david/projects/$pkgname/$pkgname-$pkgver.tar.bz2) -sha1sums=('b07a8cda80a9bc9f58a6a1f12f741dd0f8a66ca3') +sha1sums=('780d7f5cdcbf382c46818d85702f801c738bd50a') build() { From iron at frugalware.org Thu Jan 1 19:34:39 2009 From: iron at frugalware.org (Krisztian VASAS) Date: Thu Jan 1 19:34:40 2009 Subject: [Frugalware-git] xorg74: xf86-input-jamstudio-1.2.0-1-i686 Message-ID: <20090101183439.3867211B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=52ed6088a409d4d5bbd8d80e87329ecfc18d968e commit 52ed6088a409d4d5bbd8d80e87329ecfc18d968e Author: Krisztian VASAS Date: Thu Jan 1 19:34:21 2009 +0100 xf86-input-jamstudio-1.2.0-1-i686 - version bump - added compile fixes diff --git a/source/x11/xf86-input-jamstudio/01-fix_xinput_abi_version.patch1 b/source/x11/xf86-input-jamstudio/01-fix_xinput_abi_version.patch1 new file mode 100644 index 0000000..7915655 --- /dev/null +++ b/source/x11/xf86-input-jamstudio/01-fix_xinput_abi_version.patch1 @@ -0,0 +1,16 @@ +diff --git a/src/js_x.c b/src/js_x.c +index be6b6fa..623f35a 100644 +--- a/src/js_x.c ++++ b/src/js_x.c +@@ -192,7 +192,10 @@ xf86JS_XProc(DeviceIntPtr pJS_X, int operation) + return !Success; + if (InitProximityClassDeviceStruct(pJS_X) == FALSE) + return !Success; +- if (InitValuatorClassDeviceStruct(pJS_X, nbaxes, xf86GetMotionEvents, ++ if (InitValuatorClassDeviceStruct(pJS_X, nbaxes, ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 ++ xf86GetMotionEvents, ++#endif + local->history_size, + Absolute | OutOfProximity) == FALSE) + return !Success; diff --git a/source/x11/xf86-input-jamstudio/02-remove_xfree86_v4.patch1 b/source/x11/xf86-input-jamstudio/02-remove_xfree86_v4.patch1 new file mode 100644 index 0000000..90f8ea2 --- /dev/null +++ b/source/x11/xf86-input-jamstudio/02-remove_xfree86_v4.patch1 @@ -0,0 +1,51 @@ +diff --git a/src/js_x.c b/src/js_x.c +index 623f35a..3b6997f 100644 +--- a/src/js_x.c ++++ b/src/js_x.c +@@ -28,9 +28,6 @@ + + #include + #include "xf86Version.h" +-#if XORG_VERSION_CURRENT >= XF86_VERSION_NUMERIC(3,9,0,0,0) +-#define XFREE86_V4 1 +-#endif + #include "misc.h" + #include "xf86.h" + #include "xf86_OSproc.h" +@@ -38,11 +35,10 @@ + #include "exevents.h" /* Needed for InitValuator/Proximity stuff */ + #include "mipointer.h" + +-#ifdef XFree86LOADER + #include "xf86Module.h" +-#endif + #include + #include ++#include + + #define JSX_XCOORD 65584 + #define JSX_YCOORD 65585 +@@ -51,8 +47,6 @@ + + #define SYSCALL(call) while(((call) == -1) && (errno == EINTR)) + +-#ifdef XFREE86_V4 +- + struct hiddev_event + { + unsigned hid; +@@ -333,8 +327,6 @@ xf86JS_XInit(InputDriverPtr drv, IDevPtr dev, int flags) + _X_EXPORT InputDriverRec JAMSTUDIO = + { 1, "js_x", NULL, xf86JS_XInit, xf86JS_XUnInit, NULL, 0 }; + +-#ifdef XFree86LOADER +- + static void + xf86JS_XUnplug(pointer p) + { +@@ -366,5 +358,3 @@ _X_EXPORT XF86ModuleData js_xModuleData = { + xf86JS_XPlug, + xf86JS_XUnplug + }; +-#endif +-#endif diff --git a/source/x11/xf86-input-jamstudio/03-fix_xf86version_to_xorgversion.patch1 b/source/x11/xf86-input-jamstudio/03-fix_xf86version_to_xorgversion.patch1 new file mode 100644 index 0000000..3897a4a --- /dev/null +++ b/source/x11/xf86-input-jamstudio/03-fix_xf86version_to_xorgversion.patch1 @@ -0,0 +1,13 @@ +diff --git a/src/js_x.c b/src/js_x.c +index c27a0da..b203d11 100644 +--- a/src/js_x.c ++++ b/src/js_x.c +@@ -27,7 +27,7 @@ + #endif + + #include +-#include "xf86Version.h" ++#include "xorgVersion.h" + #include "misc.h" + #include "xf86.h" + #include "xf86_OSproc.h" diff --git a/source/x11/xf86-input-jamstudio/04-dont_use_deprecated_calls_for_newer_xinput_abi.patch1 b/source/x11/xf86-input-jamstudio/04-dont_use_deprecated_calls_for_newer_xinput_abi.patch1 new file mode 100644 index 0000000..c391b31 --- /dev/null +++ b/source/x11/xf86-input-jamstudio/04-dont_use_deprecated_calls_for_newer_xinput_abi.patch1 @@ -0,0 +1,18 @@ +diff --git a/src/js_x.c b/src/js_x.c +index 3b6997f..c27a0da 100644 +--- a/src/js_x.c ++++ b/src/js_x.c +@@ -148,8 +148,13 @@ xf86JS_XConvert(LocalDevicePtr local, int first, int num, int v0, int v1, + int width, height; + int deltaX, deltaY; + ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0 + width = miPointerCurrentScreen()->width; + height = miPointerCurrentScreen()->height; ++#else ++ width = miPointerGetScreen(local->dev)->width; ++ height = miPointerGetScreen(local->dev)->height; ++#endif + /* + deltaX=(float)width/priv->jsxMaxX; deltaY=(float)height/priv->jsxMaxY; + */ diff --git a/source/x11/xf86-input-jamstudio/FrugalBuild b/source/x11/xf86-input-jamstudio/FrugalBuild index 82b2303..c0c2e3f 100644 --- a/source/x11/xf86-input-jamstudio/FrugalBuild +++ b/source/x11/xf86-input-jamstudio/FrugalBuild @@ -2,8 +2,17 @@ # Maintainer: Christian Hamar alias krix pkgname=xf86-input-jamstudio -pkgver=1.1.0 -pkgrel=3 +pkgver=1.2.0 +pkgrel=1 Finclude xorg -sha1sums=('db7c48994d25974060047321df3b86eb9cead2f0') +source=(${source[@]} \ + '01-fix_xinput_abi_version.patch1' \ + '02-remove_xfree86_v4.patch1' \ + '03-fix_xf86version_to_xorgversion.patch1' \ + '04-dont_use_deprecated_calls_for_newer_xinput_abi.patch1') +sha1sums=('612fe414130068ce098b19cdea9639645f013a27' \ + '6a3dcb2aa0c5c10feaa54c052b964190f77286c3' \ + '973466200e6dea6fb78afa3c5582b75553d9aabd' \ + '945616c8ff757dbf9094227c3c949fb63ba4a6e2' \ + 'a208b8ca812883cf1928f60d9d0666b12bc497c0') # optimization OK From iron at frugalware.org Thu Jan 1 19:44:50 2009 From: iron at frugalware.org (Krisztian VASAS) Date: Thu Jan 1 19:44:52 2009 Subject: [Frugalware-git] xorg74: xf86-input-joystick-1.4.0-1-i686 Message-ID: <20090101184450.B7DDA11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=ef228cd28303088be8c4a6124d8bc26bd21f4bbe commit ef228cd28303088be8c4a6124d8bc26bd21f4bbe Author: Krisztian VASAS Date: Thu Jan 1 19:44:37 2009 +0100 xf86-input-joystick-1.4.0-1-i686 - version bump diff --git a/source/x11/xf86-input-joystick/FrugalBuild b/source/x11/xf86-input-joystick/FrugalBuild index cce8d29..df0d083 100644 --- a/source/x11/xf86-input-joystick/FrugalBuild +++ b/source/x11/xf86-input-joystick/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=xf86-input-joystick -pkgver=1.3.1 +pkgver=1.4.0 Finclude xorg -sha1sums=('e28590951aaebee5089a0d9abd8d22b900e9ee22') +sha1sums=('7857ba16275bafde47eb62f826ae21cc9ac79eeb') # optimization OK From iron at frugalware.org Thu Jan 1 19:53:02 2009 From: iron at frugalware.org (Krisztian VASAS) Date: Thu Jan 1 19:53:03 2009 Subject: [Frugalware-git] xorg74: xf86-input-magellan-1.2.0-1-i686 Message-ID: <20090101185302.2277B11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=d2097425e26272ae6669bbf1cc6cf63bcc2d6297 commit d2097425e26272ae6669bbf1cc6cf63bcc2d6297 Author: Krisztian VASAS Date: Thu Jan 1 19:52:43 2009 +0100 xf86-input-magellan-1.2.0-1-i686 - version bump - added compile fixes diff --git a/source/x11/xf86-input-magellan/01-fix_xinput_abi_version.patch1 b/source/x11/xf86-input-magellan/01-fix_xinput_abi_version.patch1 new file mode 100644 index 0000000..f881397 --- /dev/null +++ b/source/x11/xf86-input-magellan/01-fix_xinput_abi_version.patch1 @@ -0,0 +1,26 @@ +diff --git a/src/magellan.c b/src/magellan.c +index fedb01b..0a84ea7 100644 +--- a/src/magellan.c ++++ b/src/magellan.c +@@ -122,7 +122,9 @@ static const char *reqSymbols[] = { + "xf86CollectInputOptions", + "xf86ErrorFVerb", + "xf86FindOptionValue", ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 + "xf86GetMotionEvents", ++#endif + "xf86GetVerbosity", + "xf86MotionHistoryAllocate", + "xf86NameCmp", +@@ -366,7 +368,10 @@ DeviceInit (DeviceIntPtr dev) + return !Success; + } + +- if (InitValuatorClassDeviceStruct (dev, 6, xf86GetMotionEvents, ++ if (InitValuatorClassDeviceStruct (dev, 6, ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 ++ xf86GetMotionEvents, ++#endif + pInfo->history_size, Absolute) == FALSE) + { + ErrorF ("Unable to allocate MAGELLAN ValuatorClassDeviceStruct\n"); diff --git a/source/x11/xf86-input-magellan/02-dont_redefine_need_xf86_types.patch1 b/source/x11/xf86-input-magellan/02-dont_redefine_need_xf86_types.patch1 new file mode 100644 index 0000000..984ed63 --- /dev/null +++ b/source/x11/xf86-input-magellan/02-dont_redefine_need_xf86_types.patch1 @@ -0,0 +1,15 @@ +diff --git a/src/magellan.c b/src/magellan.c +index b27d595..fedb01b 100644 +--- a/src/magellan.c ++++ b/src/magellan.c +@@ -45,7 +45,9 @@ + + #include + #include +-#define NEED_XF86_TYPES ++#ifndef NEED_XF86_TYPES ++#define NEED_XF86_TYPES 1 ++#endif + #include + #include + #include diff --git a/source/x11/xf86-input-magellan/FrugalBuild b/source/x11/xf86-input-magellan/FrugalBuild index 0d71eff..8564d7e 100644 --- a/source/x11/xf86-input-magellan/FrugalBuild +++ b/source/x11/xf86-input-magellan/FrugalBuild @@ -2,8 +2,13 @@ # Maintainer: Christian Hamar alias krix pkgname=xf86-input-magellan -pkgver=1.1.1 +pkgver=1.2.0 Finclude xorg -sha1sums=('07ae701187b21798eca2198677a217ae3e8b6489') +source=(${source[@]} \ + '01-fix_xinput_abi_version.patch1' \ + '02-dont_redefine_need_xf86_types.patch1') +sha1sums=('fa5eb4e02991b7052026ad715452f9f4e374d291' \ + '7157fd661084b832bcb244c0455a793c1ad887ae' \ + '3eb62ef66db43c52ba09bcfa79a6a3046c461d22') # optimization OK From priyank at frugalware.org Thu Jan 1 19:56:59 2009 From: priyank at frugalware.org (Priyank) Date: Thu Jan 1 19:57:01 2009 Subject: [Frugalware-git] frugalware-current: jpilot-1.6.1-1-i686 Message-ID: <20090101185659.D1B5A11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=eb6a4d61014893aadf252a7489046c0660fc177c commit eb6a4d61014893aadf252a7489046c0660fc177c Author: Priyank Date: Fri Jan 2 00:25:06 2009 +0530 jpilot-1.6.1-1-i686 * Version bump diff --git a/source/xapps-extra/jpilot/FrugalBuild b/source/xapps-extra/jpilot/FrugalBuild index 4493df1..d912af2 100644 --- a/source/xapps-extra/jpilot/FrugalBuild +++ b/source/xapps-extra/jpilot/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Priyank Gosalia pkgname=jpilot -pkgver=1.6.0 +pkgver=1.6.1 pkgrel=1 pkgdesc="JPilot is a desktop organizer for PalmOS devices." url="http://www.jpilot.org/" @@ -12,7 +12,7 @@ groups=('xapps-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url/download.html | grep tar.gz | Flasttar" source=($url/$pkgname-$pkgver.tar.gz) -sha1sums=('d48963c34b7f27b11111da966e54fd555477a19a') +sha1sums=('93e5a420121916d6d20a4a665f82897cf5b47e8f') build() { From vmiklos at frugalware.org Thu Jan 1 19:57:41 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Jan 1 19:57:42 2009 Subject: [Frugalware-git] frugalware-current: mercurial-1.1.2-1-i686 Message-ID: <20090101185741.68EBB11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=09f3d88e6c143bbca63b538b7d8b1d435334f295 commit 09f3d88e6c143bbca63b538b7d8b1d435334f295 Author: Miklos Vajna Date: Thu Jan 1 19:16:51 2009 +0100 mercurial-1.1.2-1-i686 - version bump diff --git a/source/devel-extra/mercurial/FrugalBuild b/source/devel-extra/mercurial/FrugalBuild index d450816..9c02b32 100644 --- a/source/devel-extra/mercurial/FrugalBuild +++ b/source/devel-extra/mercurial/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Miklos Vajna pkgname=mercurial -pkgver=1.1.1 -pkgrel=2 +pkgver=1.1.2 +pkgrel=1 pkgdesc="A fast, lightweight source control management system." url="http://www.selenic.com/mercurial/" Finclude python @@ -13,7 +13,7 @@ groups=('devel-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url/release/ |grep tar.gz$ |Fsort |Flasttar" source=($url/release/$pkgname-$pkgver.tar.gz) -sha1sums=('42a26a29414dee2c8eb7ce32e4fc6fe447bccc0a') +sha1sums=('b0f77198a96474fc72d38904ce60b007e4c7cc1a') subpkgs=('mercurial-hgk') subdescs=('Graphical repository and history browser based on gitk.') From vmiklos at frugalware.org Thu Jan 1 19:57:41 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Jan 1 19:57:43 2009 Subject: [Frugalware-git] frugalware-current: include/util.sh: introduce _F_archive_grep and _F_archive_grepv Message-ID: <20090101185741.A57A711B8630@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7b0778ab4665afe3703f0dc6282e1d8b96cb64a9 commit 7b0778ab4665afe3703f0dc6282e1d8b96cb64a9 Author: Miklos Vajna Date: Thu Jan 1 19:26:10 2009 +0100 include/util.sh: introduce _F_archive_grep and _F_archive_grepv diff --git a/source/include/util.sh b/source/include/util.sh index a3c1ee7..a7f2dd2 100644 --- a/source/include/util.sh +++ b/source/include/util.sh @@ -25,6 +25,10 @@ # == OPTIONS # * _F_archive_name (defaults to $pkgname) # * _F_archive_nosort (defaults to no, so sorting is enabled by default) +# * _F_archive_grep (defaults to empty): grep for a regexp before +# searching for the version +# * _F_archive_grepv (defaults to empty): grep -v for a regexp before +# searching for the version # * _F_cd_path (defaults to $_F_archive_name$Fpkgversep$pkgver$pkgextraver) # * _F_conf_configure (defaults to ./configure) # * _F_conf_perl_pipefrom: if set, pipe the output of this command in Fconf() @@ -871,12 +875,21 @@ Fautoreconf() { # for the archive type ### Flastarchive() { + local lynx="lynx -dump" if [ -z "$_F_archive_name" ]; then _F_archive_name="$pkgname" fi if [ $# -gt 1 ]; then - lynx -dump $1 | Flastarchive $2 + if [ -n "$_F_archive_grep" ]; then + $lynx $1 | grep -- "$_F_archive_grep" | Flastarchive $2 + return + fi + if [ -n "$_F_archive_grepv" ]; then + $lynx $1 | grep -v -- "$_F_archive_grepv" | Flastarchive $2 + return + fi + $lynx $1 | Flastarchive $2 else if [ -z "$_F_archive_nosort" ]; then sed -n "s/.*$_F_archive_name$Fpkgversep\(.*\)\($1\).*/\1/p" | Fsort | tail -n1 From vmiklos at frugalware.org Thu Jan 1 19:57:41 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Jan 1 19:57:45 2009 Subject: [Frugalware-git] frugalware-current: valgrind-3.3.1-1-i686 Message-ID: <20090101185741.B9DDC11B8631@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=01af7a0aff8c9592bd1bc8f53f73a5a542f967c9 commit 01af7a0aff8c9592bd1bc8f53f73a5a542f967c9 Author: Miklos Vajna Date: Thu Jan 1 19:26:25 2009 +0100 valgrind-3.3.1-1-i686 - add _F_archive_grepv="RC" diff --git a/source/devel-extra/valgrind/FrugalBuild b/source/devel-extra/valgrind/FrugalBuild index ac9b9b6..a40c571 100644 --- a/source/devel-extra/valgrind/FrugalBuild +++ b/source/devel-extra/valgrind/FrugalBuild @@ -9,6 +9,7 @@ url="http://valgrind.org/" depends=('perl') groups=('devel-extra') archs=('i686' 'x86_64' 'ppc') +_F_archive_grepv="RC" up2date="Flasttar $url/downloads/current.html" source=($url/downloads/$pkgname-$pkgver.tar.bz2) sha1sums=('3a64ee5f6439815fa6c5200dcfd0399f9dc83348') From vmiklos at frugalware.org Thu Jan 1 19:57:41 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Jan 1 19:57:46 2009 Subject: [Frugalware-git] frugalware-current: dazuko-2.3.6pre1-6-i686 Message-ID: <20090101185741.CB5A611B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c38640ccee7ebf4d189b95cc6b142b1dfab8660e commit c38640ccee7ebf4d189b95cc6b142b1dfab8660e Author: Miklos Vajna Date: Thu Jan 1 19:30:13 2009 +0100 dazuko-2.3.6pre1-6-i686 - cleanup, add _F_archive_grepv diff --git a/source/apps-extra/dazuko/FrugalBuild b/source/apps-extra/dazuko/FrugalBuild index 3a72351..ac6ef95 100644 --- a/source/apps-extra/dazuko/FrugalBuild +++ b/source/apps-extra/dazuko/FrugalBuild @@ -14,7 +14,8 @@ Finclude kernel-module depends=(${depends[@]} "redirfs=${redirver/-/}") archs=('i686' 'x86_64') groups=('apps-extra') -up2date="lynx -dump '$url/files/?M=O' | grep -v source |grep -v birthday|grep -v pre|Flasttar" +_F_archive_grepv="\(source\|birthday\|pre\)" +up2date="Flasttar $url/files" source=(http://ftp.frugalware.org/pub/other/sources/$pkgname/$pkgname-$realver.tgz \ http://www.redirfs.org/packages/redirfs-$redirver.tar.gz \ README.Frugalware \ From vmiklos at frugalware.org Thu Jan 1 19:57:41 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Jan 1 19:57:46 2009 Subject: [Frugalware-git] frugalware-current: fop-0.95-1-i686 Message-ID: <20090101185741.E684D11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7d1501c708d56cbab52a80fe5b3c3fab4409d5e9 commit 7d1501c708d56cbab52a80fe5b3c3fab4409d5e9 Author: Miklos Vajna Date: Thu Jan 1 19:31:01 2009 +0100 fop-0.95-1-i686 - cleanup add _F_archive_grepv diff --git a/source/apps-extra/fop/FrugalBuild b/source/apps-extra/fop/FrugalBuild index 9025a50..09025c6 100644 --- a/source/apps-extra/fop/FrugalBuild +++ b/source/apps-extra/fop/FrugalBuild @@ -11,7 +11,8 @@ depends=(${depends[@]} 'batik' 'avalon-framework' 'commons-logging' 'xmlgraphics groups=('apps-extra') replaces=('fop-devel') archs=('i686' 'x86_64') -up2date="lynx -dump http://www.apache.org/dist/xmlgraphics/fop/source/ |grep -v beta |Flastarchive -src.tar.gz" +_F_archive_grepv="beta" +up2date="Flastarchive http://www.apache.org/dist/xmlgraphics/fop/source/ -src.tar.gz" source=(http://www.apache.org/dist/xmlgraphics/fop/source/fop-$pkgver-src.tar.gz) signatures=($source.asc) From vmiklos at frugalware.org Thu Jan 1 19:57:42 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Jan 1 19:57:47 2009 Subject: [Frugalware-git] frugalware-current: dhcpcd-3.2.3-1-i686 Message-ID: <20090101185742.12CB711B8630@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=68a77710650480305b980b7f8b141035f78de01a commit 68a77710650480305b980b7f8b141035f78de01a Author: Miklos Vajna Date: Thu Jan 1 19:35:31 2009 +0100 dhcpcd-3.2.3-1-i686 - up2date fix diff --git a/source/base/dhcpcd/FrugalBuild b/source/base/dhcpcd/FrugalBuild index 638de67..4cb9002 100644 --- a/source/base/dhcpcd/FrugalBuild +++ b/source/base/dhcpcd/FrugalBuild @@ -11,7 +11,8 @@ groups=('base') archs=('i686' 'x86_64' 'ppc') depends=('glibc>=2.8-3') rodepends=('frugalwareutils>=0.8.2-2') -up2date="lynx -dump http://roy.marples.name/dhcpcd | grep -v beta | grep -v rc| grep dhcpcd- | Flasttarbz2" +_F_archive_nosort="y" +up2date="lynx -dump http://roy.marples.name/projects/dhcpcd/wiki/DhcpcdDownload | tac| Flasttarbz2" source=(http://roy.marples.name/dhcpcd/$pkgname-$pkgver.tar.bz2) sha1sums=('666d6bafd86c9986efe28076d0b7e5d3349006e2') From vmiklos at frugalware.org Thu Jan 1 19:57:42 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Jan 1 19:57:47 2009 Subject: [Frugalware-git] frugalware-current: bzr-svn-0.4.16-2-i686 Message-ID: <20090101185742.30BA911B8631@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a719a8392633863de088a7c8bd094fca0f3de1cc commit a719a8392633863de088a7c8bd094fca0f3de1cc Author: Miklos Vajna Date: Thu Jan 1 19:36:20 2009 +0100 bzr-svn-0.4.16-2-i686 - cleanup, use _F_archive_grepv diff --git a/source/devel-extra/bzr-svn/FrugalBuild b/source/devel-extra/bzr-svn/FrugalBuild index f52bc3f..ff18576 100644 --- a/source/devel-extra/bzr-svn/FrugalBuild +++ b/source/devel-extra/bzr-svn/FrugalBuild @@ -10,7 +10,8 @@ depends=('bzr' 'subversion-bindings') makedepends=('docutils') groups=('devel-extra') archs=('i686' 'x86_64') -up2date="lynx -dump $url |grep -v rc |Flasttar" +_F_archive_grepv="rc" +up2date="Flasttar $url" source=(http://samba.org/~jelmer/bzr/bzr-svn-$pkgver.tar.gz) signatures=($source.asc) From vmiklos at frugalware.org Thu Jan 1 19:57:42 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Jan 1 19:57:48 2009 Subject: [Frugalware-git] frugalware-current: git-1.6.1-1-i686 Message-ID: <20090101185742.573E111B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4f7941460cd03315a247b45ffcc7bd52417da6ff commit 4f7941460cd03315a247b45ffcc7bd52417da6ff Author: Miklos Vajna Date: Thu Jan 1 19:36:57 2009 +0100 git-1.6.1-1-i686 - clean up up2date diff --git a/source/devel-extra/git/FrugalBuild b/source/devel-extra/git/FrugalBuild index 90a1ffe..0b4f1c6 100644 --- a/source/devel-extra/git/FrugalBuild +++ b/source/devel-extra/git/FrugalBuild @@ -19,7 +19,7 @@ backup=(etc/sysconfig/git) makedepends=('asciidoc' 'docbook-xsl>=1.73.0-2' 'docbook-xml' 'docbook2x' 'sgml-common' 'xmlto' 'cpio') groups=('devel-extra') archs=('i686' 'x86_64' 'ppc') -up2date="lynx -dump $pkgurl|grep -v rc |Flastarchive .tar.bz2" +up2date="lynx -dump $pkgurl |Flasttar" if ! Fuse $USE_DEVEL; then source=($pkgurl/$pkgname-$pkgver.tar.bz2) signatures=(${source[0]}.sign '' '' '' '' '') From vmiklos at frugalware.org Thu Jan 1 19:57:42 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Jan 1 19:57:48 2009 Subject: [Frugalware-git] frugalware-current: gnu-crypto-2.0.1-1-i686 Message-ID: <20090101185742.8CE8511B887F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f10464c4c230f6515167406fa9df16ca3b6c0766 commit f10464c4c230f6515167406fa9df16ca3b6c0766 Author: Miklos Vajna Date: Thu Jan 1 19:39:16 2009 +0100 gnu-crypto-2.0.1-1-i686 - cleanup, use _F_archive_grepv diff --git a/source/devel-extra/gnu-crypto/FrugalBuild b/source/devel-extra/gnu-crypto/FrugalBuild index 9a3e3c3..3aad41d 100644 --- a/source/devel-extra/gnu-crypto/FrugalBuild +++ b/source/devel-extra/gnu-crypto/FrugalBuild @@ -10,7 +10,8 @@ Finclude java #depends=() groups=('devel-extra') archs=('i686' 'x86_64') -up2date="lynx -dump ftp://ftp.gnupg.org/GnuPG/gnu-crypto/|grep -v -- -rc |Flasttarbz2" +_F_archive_grepv="-rc" +up2date="Flasttarbz2 ftp://ftp.gnupg.org/GnuPG/gnu-crypto/" source=(ftp://ftp.gnupg.org/GnuPG/gnu-crypto/gnu-crypto-$pkgver.tar.bz2 \ gnu-crypto-2.0.1-jdk15.patch) signatures=($source.asc '') From vmiklos at frugalware.org Thu Jan 1 19:57:42 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Jan 1 19:57:48 2009 Subject: [Frugalware-git] frugalware-current: rhino-1_7R1-1-i686 Message-ID: <20090101185742.AB96211B887D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c3523818628652b0ca8c02995da9818aea20a8ad commit c3523818628652b0ca8c02995da9818aea20a8ad Author: Miklos Vajna Date: Thu Jan 1 19:40:59 2009 +0100 rhino-1_7R1-1-i686 - cleanup, use _F_archive_grepv diff --git a/source/devel-extra/rhino/FrugalBuild b/source/devel-extra/rhino/FrugalBuild index bdae33a..3e84b4f 100644 --- a/source/devel-extra/rhino/FrugalBuild +++ b/source/devel-extra/rhino/FrugalBuild @@ -10,7 +10,8 @@ Finclude java groups=('devel-extra') archs=('i686' 'x86_64') Fpkgversep="" -up2date="lynx -dump http://ftp.mozilla.org/pub/mozilla.org/js/ |egrep -v '15|pre|RC' |Flastarchive .zip" +_F_archive_grepv="\(15\|pre\|RC\)" +up2date="Flastarchive http://ftp.mozilla.org/pub/mozilla.org/js/ .zip" source=(http://ftp.mozilla.org/pub/mozilla.org/js/rhino$pkgver.zip) sha1sums=('4ee03d524f231a04fccff0cdbe13a41dae6d44f7') From vmiklos at frugalware.org Thu Jan 1 19:57:42 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Jan 1 19:57:48 2009 Subject: [Frugalware-git] frugalware-current: librdf-1.0.8-1-i686 Message-ID: <20090101185742.C516F11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=fe9033186ac4580e75feeaaf7037c453e8c3f5ca commit fe9033186ac4580e75feeaaf7037c453e8c3f5ca Author: Miklos Vajna Date: Thu Jan 1 19:41:51 2009 +0100 librdf-1.0.8-1-i686 - cleanup, use _F_archive_grepv diff --git a/source/lib-extra/librdf/FrugalBuild b/source/lib-extra/librdf/FrugalBuild index 32a9a55..eee8860 100644 --- a/source/lib-extra/librdf/FrugalBuild +++ b/source/lib-extra/librdf/FrugalBuild @@ -11,7 +11,8 @@ depends=('raptor>=1.4.18' 'rasqal>=0.9.16' 'db>=4.7.25' 'sqlite3>=3.3.17' 'libpq makedepends=('postgresql>=8.2.4') groups=('lib-extra') archs=('i686' 'x86_64') -up2date="lynx -dump $url| grep -v $_F_archive_name-bindings |Flasttar" +_F_archive_grepv="$_F_archive_name-bindings" +up2date="Flasttar $url" source=(http://download.librdf.org/source/$_F_archive_name-$pkgver.tar.gz) Fconfopts="$Fconfopts --with-raptor=system --with-rasqal=system --with-sqlit=yes --with-sqlite-version=3" sha1sums=('9501b95a2b668067e2dcb0ab3bdb59e0376144de') From vmiklos at frugalware.org Thu Jan 1 19:57:42 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Jan 1 19:57:48 2009 Subject: [Frugalware-git] frugalware-current: aircrack-ng-0.9.3-1-i686 Message-ID: <20090101185742.E143911B8630@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ff695dc3dc36a870172f82a8ef58437c0f96cc9a commit ff695dc3dc36a870172f82a8ef58437c0f96cc9a Author: Miklos Vajna Date: Thu Jan 1 19:42:33 2009 +0100 aircrack-ng-0.9.3-1-i686 - cleanup, use _F_archive_grepv diff --git a/source/network-extra/aircrack-ng/FrugalBuild b/source/network-extra/aircrack-ng/FrugalBuild index a85893f..ba9a5a3 100644 --- a/source/network-extra/aircrack-ng/FrugalBuild +++ b/source/network-extra/aircrack-ng/FrugalBuild @@ -9,7 +9,8 @@ url="http://www.aircrack-ng.org/" depends=('libpcap') groups=('network-extra') archs=('i686' 'x86_64') -up2date="lynx -dump http://www.aircrack-ng.org/doku.php?id=downloads|grep -v -- -rc|Flasttar" +_F_archive_grepv="-rc" +up2date="Flasttar http://www.aircrack-ng.org/doku.php?id=downloads" source=(http://download.aircrack-ng.org/$pkgname-$pkgver.tar.gz) sha1sums=('b2f671324d056408b83d32eb1ab6061b7fa87ac5') From vmiklos at frugalware.org Thu Jan 1 19:57:43 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Jan 1 19:57:48 2009 Subject: [Frugalware-git] frugalware-current: flowplayer-3.0.2-1-i686 Message-ID: <20090101185743.0BC5811B8631@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a531d7cfad8c55e11a46f0114c1f10601fc7bf45 commit a531d7cfad8c55e11a46f0114c1f10601fc7bf45 Author: Miklos Vajna Date: Thu Jan 1 19:43:15 2009 +0100 flowplayer-3.0.2-1-i686 - cleanup, use _F_archive_grepv diff --git a/source/network-extra/flowplayer/FrugalBuild b/source/network-extra/flowplayer/FrugalBuild index c5e0bc7..54bb2e3 100644 --- a/source/network-extra/flowplayer/FrugalBuild +++ b/source/network-extra/flowplayer/FrugalBuild @@ -10,7 +10,8 @@ url="http://flowplayer.org/" depends=() groups=('network-extra') archs=('i686' 'x86_64') -up2date="lynx -dump http://flowplayer.org/download/index.html |grep -v src |Flastarchive .zip" +_F_archive_grepv="src" +up2date="Flastarchive http://flowplayer.org/download/index.html .zip" source=(http://flowplayer.org/releases/flowplayer/flowplayer-$pkgver.zip \ README.Frugalware) sha1sums=('700be39235c9f39b9a15e0aaf491e9bb379f28dd' \ From iron at frugalware.org Thu Jan 1 20:26:23 2009 From: iron at frugalware.org (Krisztian VASAS) Date: Thu Jan 1 20:26:25 2009 Subject: [Frugalware-git] xorg74: xf86-input-magictouch-1.0.0.5-4-i686 Message-ID: <20090101192623.AE97211B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=2600338bf378de605b0c9605690324c023e126a9 commit 2600338bf378de605b0c9605690324c023e126a9 Author: Krisztian VASAS Date: Thu Jan 1 20:26:04 2009 +0100 xf86-input-magictouch-1.0.0.5-4-i686 - rebuilt with newer xorg-server - added compile fixes diff --git a/source/x11/xf86-input-magictouch/01-fix_xinput_abi_version.patch1 b/source/x11/xf86-input-magictouch/01-fix_xinput_abi_version.patch1 new file mode 100644 index 0000000..0626813 --- /dev/null +++ b/source/x11/xf86-input-magictouch/01-fix_xinput_abi_version.patch1 @@ -0,0 +1,17 @@ +diff --git a/src/xf86MagicTouch.c b/src/xf86MagicTouch.c +index 1a784ff..9541318 100644 +--- a/src/xf86MagicTouch.c ++++ b/src/xf86MagicTouch.c +@@ -574,7 +574,11 @@ xf86MagicControl(DeviceIntPtr dev, + /* + * Il movimento viene eseguito su due assi in coordinate assolute. + */ +- if (InitValuatorClassDeviceStruct(dev, 2, xf86GetMotionEvents, local->history_size, Absolute) == FALSE ) ++ if (InitValuatorClassDeviceStruct(dev, 2, ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 ++ xf86GetMotionEvents, ++#endif ++ local->history_size, Absolute) == FALSE ) + { + ErrorF("MagicTouch ValuatorClassDeviceStruct: ERRORE\n"); + return !Success; diff --git a/source/x11/xf86-input-magictouch/02-remove_xfree86_v4.patch1 b/source/x11/xf86-input-magictouch/02-remove_xfree86_v4.patch1 new file mode 100644 index 0000000..f4750d6 --- /dev/null +++ b/source/x11/xf86-input-magictouch/02-remove_xfree86_v4.patch1 @@ -0,0 +1,582 @@ +diff -Naur xf86-input-magictouch-1.0.0.5.orig/src/xf86MagicTouch.c xf86-input-magictouch-1.0.0.5/src/xf86MagicTouch.c +--- xf86-input-magictouch-1.0.0.5.orig/src/xf86MagicTouch.c 2009-01-01 20:10:28.000000000 +0100 ++++ xf86-input-magictouch-1.0.0.5/src/xf86MagicTouch.c 2009-01-01 20:20:37.000000000 +0100 +@@ -6,18 +6,11 @@ + #include "config.h" + #endif + +-#include +-#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(3,9,0,0,0) +-#define XFREE86_V4 +-#endif +- +-#ifdef XFREE86_V4 ++#include + +-#ifndef XFree86LOADER + #include + #include + #include +-#endif + + #include + #include +@@ -28,133 +21,7 @@ + #include + #include + +-#ifdef XFree86LOADER + #include +-#endif +- +-#else /* XFREE86_V4 */ +- +-#include +-#include +-#include +-#define NEED_EVENTS +-#include +-#include +-#include "inputstr.h" +-#include "scrnintstr.h" +- +-#include +-#include +- +-#if defined(sun) && !defined(i386) +-#include +-#include +-#include +-#include +- +-#include "extio.h" +-#else /* defined(sun) && !defined(i386) */ +-#include "compiler.h" +- +-#include "xf86.h" +-#include "xf86Procs.h" +-#include "xf86_OSlib.h" +-#include "xf86_Config.h" +-#include "xf86Xinput.h" +-#include "xf86Version.h" +-#endif /* defined(sun) && !defined(i386) */ +- +-#if !defined(sun) || defined(i386) +-#include "os.h" +-#include "osdep.h" +-#include "exevents.h" +- +-#include "extnsionst.h" +-#include "extinit.h" +-#endif /* !defined(sun) || defined(i386) */ +- +-#endif /* XFREE86_V4 */ +- +- +-#ifndef XFREE86_V4 +-#if !defined(sun) || defined(i386) +-/* +- *************************************************************************** +- * +- * Configuration descriptor. +- * +- *************************************************************************** +- */ +- +-#define PORT 1 +-#define MAGIC_DEVICE_NAME 2 +-#define SCREEN_NO 3 +-#define MAXX 4 +-#define MAXY 5 +-#define MINX 6 +-#define MINY 7 +-#define DEBUG_LEVEL 8 +-#define HISTORY_SIZE 9 +-#define LINK_SPEED 10 +-#define ALWAYS_CORE 11 +-#define SWAP_AXES 12 +-#define N_SAMPLE_X 13 +-#define N_SAMPLE_Y 14 +- +-static SymTabRec MagicTab[] = { +- { ENDSUBSECTION, "endsubsection" }, +- { PORT, "port" }, +- { MAGIC_DEVICE_NAME, "devicename" }, +- { SCREEN_NO, "screenno" }, +- { MAXX, "maximumxposition" }, +- { MAXY, "maximumyposition" }, +- { MINX, "minimumxposition" }, +- { MINY, "minimumyposition" }, +- { DEBUG_LEVEL, "debuglevel" }, +- { HISTORY_SIZE, "historysize" }, +- { LINK_SPEED, "linkspeed" }, +- { ALWAYS_CORE, "alwayscore" }, +- { SWAP_AXES, "swapxy" }, +- { N_SAMPLE_X, "numsamplex" }, +- { N_SAMPLE_Y, "numsampley" }, +- { -1, "" }, +-}; +- +- +-#define LS1200 1 +-#define LS2400 2 +-#define LS4800 3 +-#define LS9600 4 +- +-static SymTabRec LinkSpeedTab[] = { +- { LS1200, "b1200" }, +- { LS2400, "b2400" }, +- { LS4800, "b4800" }, +- { LS9600, "b9600" } +-}; +-#endif /* !defined(sun) || defined(i386) */ +- +-/* +- * This struct connects a line speed with +- * a compatible motion packet delay. The +- * driver will attempt to enforce a correct +- * delay (according to this table) in order to +- * avoid losing data in the touchscreen controller. +- * LinkSpeedValues should be kept in sync with +- * LinkSpeedTab. +- */ +-typedef struct { +- int speed; +- int delay; +-} LinkParameterStruct; +- +-static LinkParameterStruct LinkSpeedValues[] = { +- { B1200, 8 }, +- { B2400, 4 }, +- { B4800, 2 }, +- { B9600, 1 } +-}; +-#endif /* XFREE86_V4 */ + + + /* +@@ -206,7 +73,6 @@ + #endif + + +-#ifdef XFREE86_V4 + #undef SYSCALL + #undef read + #undef write +@@ -217,7 +83,6 @@ + #define write(fd, ptr, num) xf86WriteSerial(fd, ptr, num) + #define close(fd) xf86CloseSerial(fd) + #define strdup(str) xf86strdup(str) +-#endif + + + +@@ -237,9 +102,7 @@ + int max_x; /* Maximum x */ + int min_y; /* Minimum y reported by calibration */ + int max_y; /* Maximum y */ +-#ifndef XFREE86_V4 + int link_speed; /* Speed of the RS232 link connecting the ts. */ +-#endif + int screen_no; /* Screen associated with the device */ + int screen_width; /* Width of the associated X screen */ + int screen_height; /* Height of the screen */ +@@ -255,219 +118,6 @@ + } MagicPrivateRec, *MagicPrivatePtr; + + +-#ifndef XFREE86_V4 +-#if !defined(sun) || defined(i386) +-/* +- **************************************************************************** +- * xf86MagicConfig -- +- * Configure the device driver from configuration data +- **************************************************************************** +- */ +-static Bool +-xf86MagicConfig(LocalDevicePtr *array, +- int inx, +- int max, +- LexPtr val) +-{ +- LocalDevicePtr local = array[inx]; +- MagicPrivatePtr priv = (MagicPrivatePtr)(local->private); +- int token; +- +- while ((token = xf86GetToken(MagicTab)) != ENDSUBSECTION) { +- switch(token) { +- +- case PORT: +- if (xf86GetToken(NULL) != STRING) { +- xf86ConfigError("MagicTouch input port expected"); +- } +- priv->input_dev = strdup(val->str); +- if (xf86Verbose) { +- ErrorF("%s MagicTouch input port: %s\n", +- XCONFIG_GIVEN, priv->input_dev); +- } +- break; +- +- case MAGIC_DEVICE_NAME: +- if (xf86GetToken(NULL) != STRING) { +- xf86ConfigError("Magictouch device name expected"); +- } +- local->name = strdup(val->str); +- if (xf86Verbose) { +- ErrorF("%s MagicTouch X device name: %s\n", +- XCONFIG_GIVEN, local->name); +- } +- break; +- +- case SCREEN_NO: +- if (xf86GetToken(NULL) != NUMBER) { +- xf86ConfigError("MagicTouch screen number expected"); +- } +- priv->screen_no = val->num; +- if (xf86Verbose) { +- ErrorF("%s MagicTouch associated screen: %d\n", +- XCONFIG_GIVEN, priv->screen_no); +- } +- break; +- +- case LINK_SPEED: +- { +- int ltoken = xf86GetToken(LinkSpeedTab); +- if (ltoken == EOF || +- ltoken == STRING || +- ltoken == NUMBER) { +- xf86ConfigError("MagicTouch link speed expected"); +- } +- priv->link_speed = LinkSpeedValues[ltoken-1].speed; +- if (xf86Verbose) { +- ErrorF("%s MagicTouch link speed: %s bps\n", +- XCONFIG_GIVEN, (LinkSpeedTab[ltoken-1].name)+1); +- } +- } +- break; +- +- case MAXX: +- if (xf86GetToken(NULL) != NUMBER) { +- xf86ConfigError("MagicTouch maximum x position expected"); +- } +- priv->max_x = val->num; +- if (xf86Verbose) { +- ErrorF("%s MagicTouch maximum x position: %d\n", +- XCONFIG_GIVEN, priv->max_x); +- } +- break; +- +- case MAXY: +- if (xf86GetToken(NULL) != NUMBER) { +- xf86ConfigError("MagicTouch maximum y position expected"); +- } +- priv->max_y = val->num; +- if (xf86Verbose) { +- ErrorF("%s MagicTouch maximum y position: %d\n", +- XCONFIG_GIVEN, priv->max_y); +- } +- break; +- +- case MINX: +- if (xf86GetToken(NULL) != NUMBER) { +- xf86ConfigError("MagicTouch minimum x position expected"); +- } +- priv->min_x = val->num; +- if (xf86Verbose) { +- ErrorF("%s MagicTouch minimum x position: %d\n", +- XCONFIG_GIVEN, priv->min_x); +- } +- break; +- +- case MINY: +- if (xf86GetToken(NULL) != NUMBER) { +- xf86ConfigError("MagicTouch minimum y position expected"); +- } +- priv->min_y = val->num; +- if (xf86Verbose) { +- ErrorF("%s MagicTouch minimum y position: %d\n", +- XCONFIG_GIVEN, priv->min_y); +- } +- break; +- +- case DEBUG_LEVEL: +- if (xf86GetToken(NULL) != NUMBER) { +- xf86ConfigError("MagicTouch driver debug level expected"); +- } +- debug_level = val->num; +- if (xf86Verbose) { +-#if DEBUG +- ErrorF("%s MagicTouch debug level sets to %d\n", XCONFIG_GIVEN, +- debug_level); +-#else +- ErrorF("%s MagicTouch debug not available\n", +- XCONFIG_GIVEN, debug_level); +-#endif +- } +- break; +- +- case HISTORY_SIZE: +- if (xf86GetToken(NULL) != NUMBER) { +- xf86ConfigError("MagicTouch motion history size expected"); +- } +- local->history_size = val->num; +- if (xf86Verbose) { +- ErrorF("%s MagicTouch motion history size is %d\n", XCONFIG_GIVEN, +- local->history_size); +- } +- break; +- +- case ALWAYS_CORE: +- xf86AlwaysCore(local, TRUE); +- if (xf86Verbose) { +- ErrorF("%s MagicTouch device will always stays core pointer\n", +- XCONFIG_GIVEN); +- } +- break; +- +- case SWAP_AXES: +- priv->swap_axes = 1; +- if (xf86Verbose) { +- ErrorF("%s MagicTouch device will work with X and Y axes swapped\n", +- XCONFIG_GIVEN); +- } +- break; +- +- case N_SAMPLE_X: +- if (xf86GetToken(NULL) != NUMBER) { +- xf86ConfigError("MagicTouch driver NumSamplesX expected"); +- } +- priv->num_medie_x = val->num; +- +- +- if (priv->num_medie_x>MEDIE_X) +- priv->num_medie_x=MEDIE_X; +- +- DBG(4, +- ErrorF("NumSampleX = %d\n", priv->num_medie_x) +- ); +- +- break; +- +- case N_SAMPLE_Y: +- if (xf86GetToken(NULL) != NUMBER) { +- xf86ConfigError("MagicTouch driver NumSamplesY expected"); +- } +- priv->num_medie_y = val->num; +- +- if (priv->num_medie_y>MEDIE_Y) +- priv->num_medie_y=MEDIE_Y; +- +- DBG(4, +- ErrorF("NumSampleY = %d\n", priv->num_medie_y) +- ); +- break; +- +- case EOF: +- FatalError("Unexpected EOF (missing EndSubSection)"); +- break; +- +- default: +- xf86ConfigError("MagicTouch subsection keyword expected"); +- break; +- } +- } +- +- if (priv->max_x - priv->min_x <= 0) { +- ErrorF("%s MagicTouch: reverse x mode (minimum x position >= maximum x position)\n", +- XCONFIG_GIVEN); +- } +- if (priv->max_y - priv->min_y <= 0) { +- ErrorF("%s MagicTouch: reverse y mode (minimum y position >= maximum y position)\n", +- XCONFIG_GIVEN); +- } +- +- DBG(2, ErrorF("xf86MagicConfig port name=%s\n", priv->input_dev)) +- +- return Success; +-} +- +-#endif /* !defined(sun) || defined(i386) */ +-#endif /* XFREE86_V4 */ + + /**************************************************************************** + * +@@ -609,10 +259,6 @@ + */ + xf86MotionHistoryAllocate(local); + +-#ifndef XFREE86_V4 +- AssignTypeAndName(dev, local->atom, local->name); +-#endif /* XFREE86_V4 */ +- + DBG(2, ErrorF("MagicTouch INIT OK\n") ); + + break; /* DEVICE_INIT*/ +@@ -620,67 +266,14 @@ + case DEVICE_ON: + DBG(2, ErrorF("MagicTouch ON\n") ); + if (local->fd<0) { +-#ifndef XFREE86_V4 +- struct termios termios_tty; +- int i,result; +-#endif + + DBG(2, ErrorF("Opening device...\n") ); + +-#ifdef XFREE86_V4 + local->fd = xf86OpenSerial(local->options); + if (local->fd<0) { + ErrorF("Impossibile aprire MagicTouch\n"); + return !Success; + } +-#else +- SYSCALL( local->fd = open(priv->input_dev, O_RDWR | O_NDELAY, 0) ); +- if (local->fd<0) { +- Error("Impossibile aprire MagicTouch\n"); +- return !Success; +- } +- +- DBG(3, ErrorF("Provo a configurare il MagicTouch\n") ); +- +- +- memset(&termios_tty, 0, sizeof(termios_tty) ); +- termios_tty.c_iflag = 0; +- termios_tty.c_cflag = priv->link_speed | CS8 | CREAD | CLOCAL; +- termios_tty.c_oflag = 0; +- termios_tty.c_lflag = 0; +- termios_tty.c_cc[VTIME]=0; +- termios_tty.c_cc[VMIN]=1; +- +- /* +- * Attivo l'RTS per abilitare il touch controller +- */ +-#if 0 +- SYSCALL( result = ioctl(local->fd, TIOCMGET, &status_line) ); +- if (result<0) +- { +- Error("Impossibile leggere stato linee seriale\n"); +- close(local->fd); +- return !Success; +- } +- status_line |= TIOCM_RTS; +- SYSCALL( result = ioctl(local->fd, TIOCMSET, &status_line) ); +- if (result<0) +- { +- Error("Impossibile settare stato linee seriale\n"); +- close(local->fd); +- return !Success; +- } +-#endif +- +- SYSCALL( result = tcsetattr(local->fd, TCSANOW, &termios_tty) ); +- if (result<0) +- { +- Error("Impossibile configurare MagicTouch\n"); +- close(local->fd); +- return !Success; +- } +-#endif +- + + /* Controlla se e' presente il touch controller.*/ + req[0] = 0x00; +@@ -965,14 +558,12 @@ + *x = (priv->screen_width * (input_x - priv->min_x)) / width; + *y = (priv->screen_height - (priv->screen_height * (input_y - priv->min_y)) / height); + +-#ifdef XFREE86_V4 + /* + * Need to check if still on the correct screen. + * This call is here so that this work can be done after + * calib and before posting the event. + */ + xf86XInputSetScreen(local, priv->screen_no, *x, *y); +-#endif + + DBG(3, ErrorF("MagicConvert: x(%d), y(%d)\n", *x, *y)); + +@@ -989,17 +580,9 @@ + ************************************************************************ + */ + static LocalDevicePtr +-#ifndef XFREE86_V4 +-xf86MagicAllocate(void) +-#else + xf86MagicAllocate(InputDriverPtr drv) +-#endif + { +-#ifndef XFREE86_V4 +- LocalDevicePtr local = (LocalDevicePtr) xalloc( sizeof(LocalDeviceRec) ); +-#else + LocalDevicePtr local = xf86AllocateInput(drv, 0); +-#endif + + MagicPrivatePtr priv = (MagicPrivatePtr) xalloc( sizeof(MagicPrivateRec) ); + +@@ -1019,12 +602,7 @@ + } + + /* I buffers sono allocati correttamente */ +-#ifdef XFREE86_V4 + priv->input_dev = strdup(MAGIC_PORT); +-#else +- priv->input_dev = MAGIC_PORT; +- priv->link_speed = MAGIC_LINK_SPEED; +-#endif + + priv->min_x = 60; + priv->max_x = 960; +@@ -1050,12 +628,6 @@ + local->name = XI_TOUCHSCREEN; + local->flags = 0; + +-#ifndef XFREE86_V4 +-#if !defined(sun) || defined(i386) +- local->device_config = xf86MagicConfig; +-#endif /* !defined(sun) || defined(i386) */ +-#endif /* XFREE86_V4*/ +- + local->device_control = xf86MagicControl; + local->read_input = xf86MagicReadInput; + local->control_proc = NULL; +@@ -1076,40 +648,7 @@ + + + +-#ifndef XFREE86_V4 +- +-/* +- * Sezione relativa a X < 4.0.0 +- */ +- +-DeviceAssocRec magictouch_assoc = { +- "magictouch", +- xf86MagicAllocate +-}; +- +-#ifdef DYNAMIC_MODULE +- +-#ifndef DLSYM_BUG +-int init_module(unsigned long server_version) +-#else +-int init_xf86Magic(unsigned long server_version) +-#endif +-{ +- /* Aggiunge l'assiocazione per il touchscreen */ +- xf86AddDeviceAssoc(&magictouch_assoc); +- +- /* Controlla la versione */ +- if (server_version != XF86_VERSION_CURRENT) { +- ErrorF("Warining: MagicTouch module compiled for version %s\n", XF86_VERSION); +- return 0; +- } +- return 1; +-} +-#endif /* DYNAMIC_MODULE */ +- +-#else + /* + * Sezione relativa a X >= 4.0.0 + */ + +-#endif /* XFREE86_V4 */ diff --git a/source/x11/xf86-input-magictouch/03-remove_xf86_ansic.h.patch1 b/source/x11/xf86-input-magictouch/03-remove_xf86_ansic.h.patch1 new file mode 100644 index 0000000..3e067ff --- /dev/null +++ b/source/x11/xf86-input-magictouch/03-remove_xf86_ansic.h.patch1 @@ -0,0 +1,14 @@ +diff --git a/src/xf86MagicTouch.c b/src/xf86MagicTouch.c +index d23d89c..12992e6 100644 +--- a/src/xf86MagicTouch.c ++++ b/src/xf86MagicTouch.c +@@ -21,9 +21,6 @@ + + #include + #include +-#if !defined(DGUX) +-#include +-#endif + #include + #include + #include diff --git a/source/x11/xf86-input-magictouch/FrugalBuild b/source/x11/xf86-input-magictouch/FrugalBuild index ef9d79a..b575300 100644 --- a/source/x11/xf86-input-magictouch/FrugalBuild +++ b/source/x11/xf86-input-magictouch/FrugalBuild @@ -3,7 +3,14 @@ pkgname=xf86-input-magictouch pkgver=1.0.0.5 -pkgrel=3 +pkgrel=4 Finclude xorg -sha1sums=('b93cd66d5a9f18a3756231176f4ff54a67c8b406') +source=(${source[@]} \ + '01-fix_xinput_abi_version.patch1' \ + '02-remove_xfree86_v4.patch1' \ + '03-remove_xf86_ansic.h.patch1') +sha1sums=('b93cd66d5a9f18a3756231176f4ff54a67c8b406' \ + 'cc2d3ff02b8424bf91d01fe9f8992342a405a289' \ + '76d1c8871380e60cec2a6c3d96168f5c1a9cd9cd' \ + 'e86b2199b1641a27931bd2166191d1f37baf8025') # optimization OK From iron at frugalware.org Thu Jan 1 20:32:08 2009 From: iron at frugalware.org (Krisztian VASAS) Date: Thu Jan 1 20:32:10 2009 Subject: [Frugalware-git] xorg74: xf86-input-microtouch-1.2.0-1-i686 Message-ID: <20090101193208.79EAF11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=0b2f3dd71468c3381c185806f7f12f8c3d697507 commit 0b2f3dd71468c3381c185806f7f12f8c3d697507 Author: Krisztian VASAS Date: Thu Jan 1 20:31:49 2009 +0100 xf86-input-microtouch-1.2.0-1-i686 - version bump - added compile fixes diff --git a/source/x11/xf86-input-microtouch/01-fix_xinput_abi_version.patch1 b/source/x11/xf86-input-microtouch/01-fix_xinput_abi_version.patch1 new file mode 100644 index 0000000..24ab4ee --- /dev/null +++ b/source/x11/xf86-input-microtouch/01-fix_xinput_abi_version.patch1 @@ -0,0 +1,26 @@ +diff --git a/src/microtouch.c b/src/microtouch.c +index b18a22f..a963959 100644 +--- a/src/microtouch.c ++++ b/src/microtouch.c +@@ -138,7 +138,9 @@ static const char *reqSymbols[] = { + "xf86ErrorFVerb", + "xf86FindOptionValue", + "xf86FlushInput", ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 + "xf86GetMotionEvents", ++#endif + "xf86GetVerbosity", + "xf86LoaderReqSymLists", + "xf86MotionHistoryAllocate", +@@ -425,7 +427,10 @@ DeviceInit (DeviceIntPtr dev) + * Device reports motions on 2 axes in absolute coordinates. + * Axes min and max values are reported in raw coordinates. + */ +- if (InitValuatorClassDeviceStruct (dev, 2, xf86GetMotionEvents, ++ if (InitValuatorClassDeviceStruct (dev, 2, ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 ++ xf86GetMotionEvents, ++#endif + local->history_size, Absolute) == FALSE) + { + ErrorF ("Unable to allocate MicroTouch touchscreen ValuatorClassDeviceStruct\n"); diff --git a/source/x11/xf86-input-microtouch/02-remove_libc_wrapper_functions.patch1 b/source/x11/xf86-input-microtouch/02-remove_libc_wrapper_functions.patch1 new file mode 100644 index 0000000..e67f9e8 --- /dev/null +++ b/source/x11/xf86-input-microtouch/02-remove_libc_wrapper_functions.patch1 @@ -0,0 +1,17 @@ +diff --git a/src/microtouch.c b/src/microtouch.c +index a963959..c537cc0 100644 +--- a/src/microtouch.c ++++ b/src/microtouch.c +@@ -162,12 +162,6 @@ static const char *reqSymbols[] = { + #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0 + "xf86XInputSetSendCoreEvents", + #endif +- "xf86memset", +- "xf86sscanf", +- "xf86strcmp", +- "xf86strlen", +- "xf86strncmp", +- "xf86strncpy", + NULL + }; + diff --git a/source/x11/xf86-input-microtouch/FrugalBuild b/source/x11/xf86-input-microtouch/FrugalBuild index 2baed96..0dc5206 100644 --- a/source/x11/xf86-input-microtouch/FrugalBuild +++ b/source/x11/xf86-input-microtouch/FrugalBuild @@ -2,8 +2,13 @@ # Maintainer: Christian Hamar alias krix pkgname=xf86-input-microtouch -pkgver=1.1.1 +pkgver=1.2.0 Finclude xorg -sha1sums=('99b0c8fb5e3f94e92916ba7b15676b84c4dfd7ab') +source=(${source[@]} \ + '01-fix_xinput_abi_version.patch1' \ + '02-remove_libc_wrapper_functions.patch1') +sha1sums=('f105f00662a6f5f35fdcbb2d04ae9b4dafc9e20a' \ + '2e98cfe2a6ae1643c510ec4dbf74a088c13a4a96' \ + '0b78e7c62050e2df004dd9cb6a9d25650008754b') # optimization OK From iron at frugalware.org Thu Jan 1 20:34:53 2009 From: iron at frugalware.org (Krisztian VASAS) Date: Thu Jan 1 20:34:54 2009 Subject: [Frugalware-git] xorg74: xf86-input-mutouch-1.2.1-1-i686 Message-ID: <20090101193453.9E56011B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=a47e1c1f3a344190ad20d0f17c87dede23b95d36 commit a47e1c1f3a344190ad20d0f17c87dede23b95d36 Author: Krisztian VASAS Date: Thu Jan 1 20:34:44 2009 +0100 xf86-input-mutouch-1.2.1-1-i686 - version bump diff --git a/source/x11/xf86-input-mutouch/FrugalBuild b/source/x11/xf86-input-mutouch/FrugalBuild index 6593348..4801d12 100644 --- a/source/x11/xf86-input-mutouch/FrugalBuild +++ b/source/x11/xf86-input-mutouch/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Christian Hamar alias krix pkgname=xf86-input-mutouch -pkgver=1.1.0 -pkgrel=3 +pkgver=1.2.1 +pkgrel=1 Finclude xorg -sha1sums=('87c2e9aee8c313aacd2927a19a6ed5b855650616') +sha1sums=('c5883c2c5cc80186f711751e8847c9c07f2e4448') # optimization OK From iron at frugalware.org Thu Jan 1 20:38:55 2009 From: iron at frugalware.org (Krisztian VASAS) Date: Thu Jan 1 20:38:57 2009 Subject: [Frugalware-git] xorg74: xf86-input-palmax-1.2.0-1-i686 Message-ID: <20090101193855.F1E7611B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=401393306403961032f8062bda5ca4086ed82bc5 commit 401393306403961032f8062bda5ca4086ed82bc5 Author: Krisztian VASAS Date: Thu Jan 1 20:38:36 2009 +0100 xf86-input-palmax-1.2.0-1-i686 - version bump - added a compile fix diff --git a/source/x11/xf86-input-palmax/01-fix_xinput_abi_version.patch1 b/source/x11/xf86-input-palmax/01-fix_xinput_abi_version.patch1 new file mode 100644 index 0000000..c9972c0 --- /dev/null +++ b/source/x11/xf86-input-palmax/01-fix_xinput_abi_version.patch1 @@ -0,0 +1,26 @@ +diff --git a/src/xf86Palmax.c b/src/xf86Palmax.c +index e42f169..bb77f07 100644 +--- a/src/xf86Palmax.c ++++ b/src/xf86Palmax.c +@@ -68,7 +68,9 @@ static const char *reqSymbols[] = { + "xf86CollectInputOptions", + "xf86ErrorFVerb", + "xf86FindOptionValue", ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 + "xf86GetMotionEvents", ++#endif + "xf86GetVerbosity", + "xf86MotionHistoryAllocate", + "xf86NameCmp", +@@ -467,7 +469,10 @@ xf86PmxControl(DeviceIntPtr dev, + * screen to fit one meter. + */ + +- if (InitValuatorClassDeviceStruct(dev, 2, xf86GetMotionEvents, ++ if (InitValuatorClassDeviceStruct(dev, 2, ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 ++ xf86GetMotionEvents, ++#endif + local->history_size, Absolute) == FALSE) { + ErrorF("Unable to allocate ValuatorClassDeviceStruct\n"); + return !Success; diff --git a/source/x11/xf86-input-palmax/FrugalBuild b/source/x11/xf86-input-palmax/FrugalBuild index 9ab6458..be4cd91 100644 --- a/source/x11/xf86-input-palmax/FrugalBuild +++ b/source/x11/xf86-input-palmax/FrugalBuild @@ -2,8 +2,11 @@ # Maintainer: Christian Hamar alias krix pkgname=xf86-input-palmax -pkgver=1.1.0 -pkgrel=3 +pkgver=1.2.0 +pkgrel=1 Finclude xorg -sha1sums=('428da606695aca592c54a76e4d33d2bf0a5b218e') +source=(${source[@]} \ + '01-fix_xinput_abi_version.patch1') +sha1sums=('a79eaf8760ff1469810aadf90b69721eb7ac5b2d' \ + '2a9b5b1e87cc3eab21217be43b1628b5f6ef123b') # optimization OK From iron at frugalware.org Thu Jan 1 20:49:59 2009 From: iron at frugalware.org (Krisztian VASAS) Date: Thu Jan 1 20:50:00 2009 Subject: [Frugalware-git] xorg74: xf86-input-penmount-1.3.0-1-i686 Message-ID: <20090101194959.11BC111B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=d4061afa741e63bc075b9a6a76974660606d8d32 commit d4061afa741e63bc075b9a6a76974660606d8d32 Author: Krisztian VASAS Date: Thu Jan 1 20:49:33 2009 +0100 xf86-input-penmount-1.3.0-1-i686 - version bump - added compile fixes diff --git a/source/x11/xf86-input-penmount/01-fix_xinput_abi_version.patch1 b/source/x11/xf86-input-penmount/01-fix_xinput_abi_version.patch1 new file mode 100644 index 0000000..76f6448 --- /dev/null +++ b/source/x11/xf86-input-penmount/01-fix_xinput_abi_version.patch1 @@ -0,0 +1,26 @@ +diff --git a/src/xf86PM.c b/src/xf86PM.c +index 612b68b..7c65ee3 100644 +--- a/src/xf86PM.c ++++ b/src/xf86PM.c +@@ -105,7 +105,9 @@ static const char *reqSymbols[] = { + "xf86CollectInputOptions", + "xf86ErrorFVerb", + "xf86FindOptionValue", ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 + "xf86GetMotionEvents", ++#endif + "xf86GetVerbosity", + "xf86MotionHistoryAllocate", + "xf86NameCmp", +@@ -195,7 +197,10 @@ ProcessDeviceInit(PenMountPrivatePtr priv, DeviceIntPtr dev, InputInfoPtr pInfo) + * Device reports motions on 2 axes in absolute coordinates. + * Axes min and max values are reported in raw coordinates. + */ +- if (InitValuatorClassDeviceStruct (dev, 2, xf86GetMotionEvents, ++ if (InitValuatorClassDeviceStruct (dev, 2, ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 ++ xf86GetMotionEvents, ++#endif + pInfo->history_size, Absolute) == FALSE) + { + ErrorF ("Unable to allocate PenMount ValuatorClassDeviceStruct\n"); diff --git a/source/x11/xf86-input-penmount/02-fix_scaling_behaviour_if_the_axes_are_swapped.patch1 b/source/x11/xf86-input-penmount/02-fix_scaling_behaviour_if_the_axes_are_swapped.patch1 new file mode 100644 index 0000000..170aa9f --- /dev/null +++ b/source/x11/xf86-input-penmount/02-fix_scaling_behaviour_if_the_axes_are_swapped.patch1 @@ -0,0 +1,25 @@ +diff --git a/src/xf86PM.c b/src/xf86PM.c +index 7c65ee3..b268393 100644 +--- a/src/xf86PM.c ++++ b/src/xf86PM.c +@@ -685,15 +685,15 @@ DMC9000_ReadInput (InputInfoPtr pInfo) + } + x = ((((unsigned int) (priv->packet[1]&0x07)) << 7) | (priv->packet[2]&0x7F)); + y = ((((unsigned int) (priv->packet[3]&0x07)) << 7) | (priv->packet[4]&0x7F)); +- if (priv->invert_y) +- { +- y = priv->max_y - y; +- } + if ( priv->swap_xy) + { + tmp = y; + y = x; +- x = tmp; ++ x = tmp; ++ } ++ if (priv->invert_y) ++ { ++ y = priv->max_y - y; + } + priv->packet[0] = priv->pen_down ? 0x01 : 0x00; + diff --git a/source/x11/xf86-input-penmount/03-inverty_disabled_by_default.patch1 b/source/x11/xf86-input-penmount/03-inverty_disabled_by_default.patch1 new file mode 100644 index 0000000..271b4cc --- /dev/null +++ b/source/x11/xf86-input-penmount/03-inverty_disabled_by_default.patch1 @@ -0,0 +1,13 @@ +diff --git a/src/xf86PM.c b/src/xf86PM.c +index b268393..954bdc8 100644 +--- a/src/xf86PM.c ++++ b/src/xf86PM.c +@@ -389,7 +389,7 @@ PenMountPreInit(InputDriverPtr drv, IDevPtr dev, int flags) + priv->screen_num = xf86SetIntOption( pInfo->options, "ScreenNumber", 0 ); + priv->button_number = xf86SetIntOption( pInfo->options, "ButtonNumber", 1 ); + priv->swap_xy = xf86SetIntOption( pInfo->options, "SwapXY", 0 ); +- priv->invert_y = xf86SetIntOption( pInfo->options, "InvertY", 1 ); ++ priv->invert_y = xf86SetIntOption( pInfo->options, "InvertY", 0 ); + priv->buffer = NULL; + s = xf86FindOptionValue (pInfo->options, "ReportingMode"); + if ((s) && (xf86NameCmp (s, "raw") == 0)) diff --git a/source/x11/xf86-input-penmount/04-init_axes_according_to_config.patch1 b/source/x11/xf86-input-penmount/04-init_axes_according_to_config.patch1 new file mode 100644 index 0000000..efa36f0 --- /dev/null +++ b/source/x11/xf86-input-penmount/04-init_axes_according_to_config.patch1 @@ -0,0 +1,48 @@ +diff --git a/src/xf86PM.c b/src/xf86PM.c +index 954bdc8..71edeee 100644 +--- a/src/xf86PM.c ++++ b/src/xf86PM.c +@@ -177,6 +177,7 @@ ProcessDeviceInit(PenMountPrivatePtr priv, DeviceIntPtr dev, InputInfoPtr pInfo) + { + unsigned char map[] = + {0, 1}; ++ int min_x, min_y, max_x, max_y; + /* + * these have to be here instead of in the SetupProc, because when the + * SetupProc is run at server startup, screenInfo is not setup yet +@@ -208,11 +209,33 @@ ProcessDeviceInit(PenMountPrivatePtr priv, DeviceIntPtr dev, InputInfoPtr pInfo) + } + else + { +- InitValuatorAxisStruct (dev, 0, priv->min_x, priv->max_x, ++ /* max_* min_* refer to the max/min values we will emit to the core. ++ * When reporting mode is TS_Raw since we do no scaling, it will ++ * just be the values in xorg.conf. If however reporting mode is ++ * TS_Scaled however, xf86ScaleAxis will return a value between 0 ++ * screen_width/screen_height, so we must setup the axis accordingly ++ * or there will be strange behaviour ++ */ ++ if ( priv->reporting_mode == TS_Raw ) ++ { ++ max_x = priv->max_x; ++ min_x = priv->min_x; ++ max_y = priv->max_y; ++ min_y = priv->min_y; ++ } ++ else ++ { ++ max_x = priv->screen_width; ++ min_x = 0; ++ max_y = priv->screen_height; ++ min_y = 0; ++ } ++ ++ InitValuatorAxisStruct (dev, 0, min_x, max_x, + 9500, + 0 /* min_res */ , + 9500 /* max_res */ ); +- InitValuatorAxisStruct (dev, 1, priv->min_y, priv->max_y, ++ InitValuatorAxisStruct (dev, 1, min_y, max_y, + 10500, + 0 /* min_res */ , + 10500 /* max_res */ ); diff --git a/source/x11/xf86-input-penmount/05-fix_y_axes_nonzero_minimum.patch1 b/source/x11/xf86-input-penmount/05-fix_y_axes_nonzero_minimum.patch1 new file mode 100644 index 0000000..42a67bf --- /dev/null +++ b/source/x11/xf86-input-penmount/05-fix_y_axes_nonzero_minimum.patch1 @@ -0,0 +1,13 @@ +diff --git a/src/xf86PM.c b/src/xf86PM.c +index 71edeee..95adb8b 100644 +--- a/src/xf86PM.c ++++ b/src/xf86PM.c +@@ -716,7 +716,7 @@ DMC9000_ReadInput (InputInfoPtr pInfo) + } + if (priv->invert_y) + { +- y = priv->max_y - y; ++ y = priv->max_y - y + priv->min_y; + } + priv->packet[0] = priv->pen_down ? 0x01 : 0x00; + diff --git a/source/x11/xf86-input-penmount/FrugalBuild b/source/x11/xf86-input-penmount/FrugalBuild index c08e61d..a7c9a14 100644 --- a/source/x11/xf86-input-penmount/FrugalBuild +++ b/source/x11/xf86-input-penmount/FrugalBuild @@ -2,8 +2,19 @@ # Maintainer: Christian Hamar alias krix pkgname=xf86-input-penmount -pkgver=1.2.1 +pkgver=1.3.0 Finclude xorg -sha1sums=('e55751262d4b34dfc6e1d2fce4ca443aeae94647') +source=(${source[@]} \ + '01-fix_xinput_abi_version.patch1' \ + '02-fix_scaling_behaviour_if_the_axes_are_swapped.patch1' \ + '03-inverty_disabled_by_default.patch1' \ + '04-init_axes_according_to_config.patch1' \ + '05-fix_y_axes_nonzero_minimum.patch1') +sha1sums=('d77e4570b5b96500720eae3768dd1e23808a68fc' \ + 'bf9a151c4c8d6dca58b064a55f18503a5e1f90c7' \ + '005a6bb0dfd9423e4f009850c3dca75ab04bee91' \ + '40cbdb219e84513267edacc24986b88e364fda89' \ + 'cb9f1c6e29b1ce2ed7c97c2ff658b5a50f449bbb' \ + '25f2a17e318a46d2cb670c340c4e306467f10ef3') # optimization OK From priyank at frugalware.org Thu Jan 1 20:53:53 2009 From: priyank at frugalware.org (Priyank) Date: Thu Jan 1 20:53:55 2009 Subject: [Frugalware-git] frugalware-current: wxmaxima-0.8.1-1-i686 Message-ID: <20090101195353.36F4911B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=843bef374cf8b33e35e4236ebeedf0e8351d8c93 commit 843bef374cf8b33e35e4236ebeedf0e8351d8c93 Author: Priyank Date: Fri Jan 2 01:21:41 2009 +0530 wxmaxima-0.8.1-1-i686 * Version bump diff --git a/source/xapps-extra/wxmaxima/FrugalBuild b/source/xapps-extra/wxmaxima/FrugalBuild index 00f4f2d..c788a74 100644 --- a/source/xapps-extra/wxmaxima/FrugalBuild +++ b/source/xapps-extra/wxmaxima/FrugalBuild @@ -3,8 +3,8 @@ # Contributor: Rohan Dhruva pkgname=wxmaxima -pkgver=0.8.0 -pkgrel=2 +pkgver=0.8.1 +pkgrel=1 pkgdesc="wxMaxima is a wxWidgets GUI for the computer algebra system Maxima." Finclude sourceforge url="http://wxmaxima.sourceforge.net/" @@ -14,7 +14,7 @@ archs=('i686' 'x86_64') options=('scriptlet') source=(${source/wxmaxima-/wxMaxima-}) _F_cd_path="wxMaxima-$pkgver" -sha1sums=('9292bf8c5c93b08b3492917b169c06d4dd1ae3be') +sha1sums=('8a332da2d5dc0013a20ce479c0ca0648060677b2') build() { From bouleetbil at frogdev.info Thu Jan 1 20:55:10 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Thu Jan 1 20:55:10 2009 Subject: [Frugalware-git] frugalware-current: coherence-0.6.0-1-i686 Message-ID: <20090101195510.8B4D611B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c4466d874398389a1d7fe962e8cb44c0a055d3aa commit c4466d874398389a1d7fe962e8cb44c0a055d3aa Author: bouleetbil Date: Thu Jan 1 20:49:10 2009 +0100 coherence-0.6.0-1-i686 *version bump diff --git a/source/devel-extra/coherence/FrugalBuild b/source/devel-extra/coherence/FrugalBuild index 5e0df4e..c49ebb3 100644 --- a/source/devel-extra/coherence/FrugalBuild +++ b/source/devel-extra/coherence/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: bouleetbil pkgname=coherence -pkgver=0.5.8 -pkgrel=2 +pkgver=0.6.0 +pkgrel=1 pkgdesc="Coherence is a framework written in Python enabling your application to participate in digital living networks, at the moment primarily the UPnP universe" depends=('python' 'louie-python' 'configobj' 'nevow' \ 'gst-python' 'soappy') @@ -14,4 +14,4 @@ url="https://coherence.beebits.net" _F_archive_name="Coherence" up2date="elinks -dump -source https://coherence.beebits.net/wiki/WikiStart#Download | Flasttar" source=(https://coherence.beebits.net/download/${_F_archive_name}-${pkgver}.tar.gz) -sha1sums=('967652be0397c74846bcb306c71c5a1998dcf16a') +sha1sums=('a26dbc7a33cc4d6e0003757d2d01584c04567fd6') From iron at frugalware.org Thu Jan 1 20:58:05 2009 From: iron at frugalware.org (Krisztian VASAS) Date: Thu Jan 1 20:58:06 2009 Subject: [Frugalware-git] xorg74: xf86-input-spaceorb-1.1.1-2-i686 Message-ID: <20090101195805.491BC11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=7f38a68023da1c010b36492a25e79210d8e87ec1 commit 7f38a68023da1c010b36492a25e79210d8e87ec1 Author: Krisztian VASAS Date: Thu Jan 1 20:57:43 2009 +0100 xf86-input-spaceorb-1.1.1-2-i686 - rebuilt with new xorg-server - added a compile fix diff --git a/source/x11/xf86-input-spaceorb/01-fix_xinput_abi_version.patch1 b/source/x11/xf86-input-spaceorb/01-fix_xinput_abi_version.patch1 new file mode 100644 index 0000000..d0da5f2 --- /dev/null +++ b/source/x11/xf86-input-spaceorb/01-fix_xinput_abi_version.patch1 @@ -0,0 +1,26 @@ +diff --git a/src/spaceorb.c b/src/spaceorb.c +index 7a8f6e6..5452ef7 100644 +--- a/src/spaceorb.c ++++ b/src/spaceorb.c +@@ -107,7 +107,9 @@ static const char *reqSymbols[] = { + "xf86CollectInputOptions", + "xf86ErrorFVerb", + "xf86FindOptionValue", ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 + "xf86GetMotionEvents", ++#endif + "xf86GetVerbosity", + "xf86MotionHistoryAllocate", + "xf86NameCmp", +@@ -337,7 +339,10 @@ DeviceInit (DeviceIntPtr dev) + return !Success; + } + +- if (InitValuatorClassDeviceStruct (dev, 6, xf86GetMotionEvents, ++ if (InitValuatorClassDeviceStruct (dev, 6, ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 ++ xf86GetMotionEvents, ++#endif + pInfo->history_size, Absolute) == FALSE) + { + ErrorF ("Unable to allocate SPACEORB ValuatorClassDeviceStruct\n"); diff --git a/source/x11/xf86-input-spaceorb/FrugalBuild b/source/x11/xf86-input-spaceorb/FrugalBuild index ce7e352..85efd43 100644 --- a/source/x11/xf86-input-spaceorb/FrugalBuild +++ b/source/x11/xf86-input-spaceorb/FrugalBuild @@ -3,7 +3,10 @@ pkgname=xf86-input-spaceorb pkgver=1.1.1 +pkgrel=2 Finclude xorg -sha1sums=('202b835d37a367bc334d5388824bfc368ed94be8') +source=( ${source[@]} '01-fix_xinput_abi_version.patch1') +sha1sums=('202b835d37a367bc334d5388824bfc368ed94be8' \ + '37e19b15b123489a7cb6d2930b726e0d26fc41a4') # optimization OK From bouleetbil at frogdev.info Thu Jan 1 20:59:22 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Thu Jan 1 20:59:23 2009 Subject: [Frugalware-git] frugalware-current: jcommon-1.0.15-1-i686 Message-ID: <20090101195922.7372811B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b1283ccaf49b8bf4f386471401dd0242832f9ec7 commit b1283ccaf49b8bf4f386471401dd0242832f9ec7 Author: bouleetbil Date: Thu Jan 1 20:53:34 2009 +0100 jcommon-1.0.15-1-i686 *version bump diff --git a/source/devel-extra/jcommon/FrugalBuild b/source/devel-extra/jcommon/FrugalBuild index 9957f4d..45703b0 100644 --- a/source/devel-extra/jcommon/FrugalBuild +++ b/source/devel-extra/jcommon/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: bouleetbil pkgname=jcommon -pkgver=1.0.14 +pkgver=1.0.15 pkgrel=1 pkgdesc="JCommon is a collection of useful classes used by JFreeChart, JFreeReport and other projects." _F_sourceforge_realname="3. JCommon" @@ -13,7 +13,7 @@ groups=('devel-extra') archs=('i686' 'x86_64') url="http://www.jfree.org/jcommon/index.php" source=($source build.xml) -sha1sums=('89156c941e75a5346a05e30dfd65ca5ef21c21eb' \ +sha1sums=('4ce3acb85158a29dbca5429518a309149238809c' \ 'a78c1bda83c9fd11215a15b3089cb7550d208ae9') build() { From bouleetbil at frogdev.info Thu Jan 1 21:01:20 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Thu Jan 1 21:01:21 2009 Subject: [Frugalware-git] frugalware-current: jfreechart-1.0.12-1-i686 Message-ID: <20090101200120.556D011B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5d66be70718a1c2b8ca1f779df24d2c6e2cde17f commit 5d66be70718a1c2b8ca1f779df24d2c6e2cde17f Author: bouleetbil Date: Thu Jan 1 20:55:18 2009 +0100 jfreechart-1.0.12-1-i686 *version bump diff --git a/source/devel-extra/jfreechart/FrugalBuild b/source/devel-extra/jfreechart/FrugalBuild index 333da88..b2add70 100644 --- a/source/devel-extra/jfreechart/FrugalBuild +++ b/source/devel-extra/jfreechart/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: bouleetbil pkgname=jfreechart -pkgver=1.0.11 +pkgver=1.0.12 pkgrel=1 pkgdesc="JFreeChart is a free (LGPL) chart library for the Java(tm) platform." _F_sourceforge_realname="1. JFreeChart" @@ -11,7 +11,7 @@ depends=(${depends[@]} 'jaxp' 'itext' 'jcommon' 'servletapi') groups=('devel-extra') archs=('i686') url="http://www.jfree.org/jfreechart/" -sha1sums=('8f59dac673405ca6943396ee415f29853bdfff1d') +sha1sums=('5db1337bfb55910dd5879fec9649d90eda83e8d6') build() { Fcd From bouleetbil at frogdev.info Thu Jan 1 21:02:43 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Thu Jan 1 21:02:45 2009 Subject: [Frugalware-git] frugalware-current: gegl-0.0.22-1-i686 Message-ID: <20090101200243.BA7A811B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3f6fb42e60752ca23861669e03d6633b4ebf52ff commit 3f6fb42e60752ca23861669e03d6633b4ebf52ff Author: bouleetbil Date: Thu Jan 1 20:57:10 2009 +0100 gegl-0.0.22-1-i686 *version bump diff --git a/source/xlib/gegl/FrugalBuild b/source/xlib/gegl/FrugalBuild index a98f86a..e83e570 100644 --- a/source/xlib/gegl/FrugalBuild +++ b/source/xlib/gegl/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: bouleetbil pkgname=gegl -pkgver=0.0.20 +pkgver=0.0.22 pkgrel=1 pkgdesc="GEGL is a graph based image processing framework." url="http://www.gegl.org/" @@ -14,6 +14,6 @@ options=('scriptlet') urldl="ftp://ftp.gimp.org/pub/$pkgname/0.0" up2date="lynx -dump $urldl | Flasttarbz2" source=($urldl/$pkgname-$pkgver.tar.bz2) -sha1sums=('37be399b58d50a87134f2dfad389a476e1155874') +sha1sums=('de684d4c8d9eaa9b7e283c55c5f779e5bdabee78') # optimization OK From bouleetbil at frogdev.info Thu Jan 1 21:05:42 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Thu Jan 1 21:05:43 2009 Subject: [Frugalware-git] frugalware-current: swingx-0.9.5-1-i686 Message-ID: <20090101200542.3061311B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4f01bf2ffc32d6d66589dc184e6bfa7aaaca1122 commit 4f01bf2ffc32d6d66589dc184e6bfa7aaaca1122 Author: bouleetbil Date: Thu Jan 1 20:59:27 2009 +0100 swingx-0.9.5-1-i686 *version bump diff --git a/source/devel-extra/swingx/FrugalBuild b/source/devel-extra/swingx/FrugalBuild index 45ccc41..86e9fc0 100644 --- a/source/devel-extra/swingx/FrugalBuild +++ b/source/devel-extra/swingx/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: bouleetbil pkgname=swingx -pkgver=0.9.4 +pkgver=0.9.5 pkgrel=1 pkgdesc="A collection of powerful, useful, and just plain fun Swing components." Finclude java @@ -12,9 +12,9 @@ groups=('devel-extra') archs=('i686') url="http://swinglabs.org/index.jsp" up2date="lynx -dump -source http://swinglabs.org/downloads.jsp |grep $pkgname | tail -1 | cut -d '-' -f2" -source=(https://swingx.dev.java.net/files/documents/2981/110622/$pkgname-$pkgver-src.zip UseFWJar.diff \ +source=(https://swingx.dev.java.net/files/documents/2981/121928/$pkgname-$pkgver-src.zip UseFWJar.diff \ FixJavaBuild.diff) -sha1sums=('e3dddd3a57d5d79925637200007b1b5c8cb059c2' \ +sha1sums=('cdca2a8c7ea40a5e70c9668ff617323fc6fd6e9e' \ '8fdc047492eefaa9ec5835f764edfd696185130c' \ 'fbe04a3feed679b294ddeb85fc3eb30785c68984') _F_cd_path=${pkgname}-${pkgver}-src From bouleetbil at frogdev.info Thu Jan 1 21:27:51 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Thu Jan 1 21:27:52 2009 Subject: [Frugalware-git] bouleetbiltesting: gst-plugins-base-0.10.21-2-i686 Message-ID: <20090101202751.7D82011B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbiltesting.git;a=commitdiff;h=c2828b77485085e2bbc53cd8409d26ba26e13603 commit c2828b77485085e2bbc53cd8409d26ba26e13603 Author: bouleetbil Date: Thu Jan 1 21:18:43 2009 +0100 gst-plugins-base-0.10.21-2-i686 *http://bugzilla.gnome.org/show_bug.cgi?id=554961 *enable experimental plugins for some gnome-* (sound-juicer) *new subpkg gst-plugins-base-gio diff --git a/source/xmultimedia/gst-plugins-base/FrugalBuild b/source/xmultimedia/gst-plugins-base/FrugalBuild index 1fa1859..0bc2a58 100644 --- a/source/xmultimedia/gst-plugins-base/FrugalBuild +++ b/source/xmultimedia/gst-plugins-base/FrugalBuild @@ -3,38 +3,39 @@ # Maintainer: crazy pkgname=gst-plugins-base -pkgver=0.10.20 -pkgrel=1 +pkgver=0.10.21 +pkgrel=2 pkgdesc="Plugins for GStreamer" url="http://gstreamer.freedesktop.org/" -depends=('libxv' 'libsm' 'gstreamer>=0.10.20') +depends=('libxv' 'libsm' 'gstreamer>=0.10.21') rodepends=('libmms' 'hermes' 'ortp') makedepends=('gtk-doc' 'pyxml' 'gnome-vfs>=2.22.0' 'cdparanoia' 'pango' 'liboil>=0.3.14' \ 'alsa-lib' 'libtheora' 'fontconfig' 'dbus-glib>=0.74-2' 'avahi-glib>=0.6.14-2' \ - 'libvisual-plugins' 'libvorbis') + 'libvisual-plugins' 'libvorbis' 'gvfs') groups=('xmultimedia') archs=('i686' 'x86_64' 'ppc') options=('scriptlet') replaces=('gst-plugins') up2date="lynx -dump $url/src/$pkgname/|grep '.tar.bz2$'|sort -n -r|head -n 1|sed 's/.*-\(.*\).t.*/\1/'" source=($url/src/$pkgname/$pkgname-$pkgver.tar.bz2) -sha1sums=('e887f071eda3128249657805dc5a42b2ad2d3bef') +sha1sums=('ae83b3306f52aa3affd014dade30c6cd5c2baa66') +Fconfopts="${Fconfopts[@]} --enable-experimental" subpkgs=("$pkgname-gnomevfs" "$pkgname-cdparanoia" "$pkgname-pango" "$pkgname-alsa" \ "$pkgname-theora" "$pkgname-oil" "$pkgname-libvisual" "$pkgname-ogg" "$pkgname-vorbis" \ - "$pkgname-docs") + "$pkgname-docs" "$pkgname-gio") subdescs=('GStreamer gnome-vfs plugin (Base).' 'GStreamer cdparanoia plugin (Base).' 'GStreamer pango plugin (Base).' \ 'GStreamer alsa plugin (Base).' 'GStreamer theora plugin (Base).' 'GStreamer oil plugin (Base).' \ 'GStreamer libvisual plugin (Base).' 'GStreamer ogg plugin (Base).' 'GStreamer vorbis plugin (Base).' \ - 'GStreamer Plugins Documentation.') + 'GStreamer Plugins Documentation.' 'GStreamer gio plugin (Base).') subdepends=("gnome-vfs>=2.22.0 $pkgname=$pkgver dbus-glib>=0.74-2 avahi-glib>=0.6.14-2" "cdparanoia $pkgname=$pkgver" \ "pango fontconfig $pkgname=$pkgver" "alsa-lib $pkgname=$pkgver" "libtheora $pkgname=$pkgver" \ "liboil>=0.3.14 $pkgname=$pkgver" "libvisual-plugins $pkgname=$pkgver" "libogg $pkgname=$pkgver" \ - "libvorbis $pkgname=$pkgver" '') + "libvorbis $pkgname=$pkgver" '' "gvfs $pkgname=$pkgver" ) subgroups=('gnome' 'xmultimedia' 'xmultimedia' 'xmultimedia' 'xmultimedia' \ - 'xmultimedia' 'xmultimedia' 'xmultimedia' 'xmultimedia' 'docs-extra') + 'xmultimedia' 'xmultimedia' 'xmultimedia' 'xmultimedia' 'docs-extra' 'gnome') subarchs=('i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' \ - 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc') + 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686') build() { if [ "$CARCH" == "x86_64" ]; then @@ -43,7 +44,7 @@ build() { Fpatchall Fmake \ --disable-schemas-install \ - --enable-gtk-doc \ + --disable-gtk-doc \ --disable-debug \ --disable-dependency-tracking \ --with-gnu-ld \ @@ -60,6 +61,7 @@ build() { Fsplit $pkgname-ogg usr/lib/gstreamer-0.10/libgstogg.* Fsplit $pkgname-vorbis usr/lib/gstreamer-0.10/libgstvorbis.* Fsplit $pkgname-docs usr/share/gtk-doc + Fsplit $pkgname-gio usr/lib/gstreamer-0.10/libgstgio.* } # optimization OK From bouleetbil at frogdev.info Thu Jan 1 21:37:43 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Thu Jan 1 21:37:44 2009 Subject: [Frugalware-git] frugalware-current: gnome-scan-0.6.1-1-i686 Message-ID: <20090101203743.9AC0411B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6df7a747dae59e84ce57e8f16f4103581cee74a4 commit 6df7a747dae59e84ce57e8f16f4103581cee74a4 Author: bouleetbil Date: Thu Jan 1 21:32:08 2009 +0100 gnome-scan-0.6.1-1-i686 *version bump diff --git a/source/gnome-extra/gnome-scan/FrugalBuild b/source/gnome-extra/gnome-scan/FrugalBuild index a966676..12673cf 100644 --- a/source/gnome-extra/gnome-scan/FrugalBuild +++ b/source/gnome-extra/gnome-scan/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: bouleetbil pkgname=gnome-scan -pkgver=0.6 +pkgver=0.6.1 pkgrel=1 pkgdesc="Tools for scan easy in Gnome" depends=('sane-backends' 'gconf' 'gdk-pixbuf' 'gtk+2' 'gegl' 'libglade' 'gimp' \ @@ -13,6 +13,6 @@ groups=('gnome-extra') _F_gnome_desktop="y" _F_gnome_iconcache="y" Finclude gnome gnome-scriptlet -sha1sums=('9d29c07429a175e5314405a2832c31c6c5f2099b') +sha1sums=('432e4f6370e0f9de5a9453a34871ea12aae9e025') # optimization OK From vmiklos at frugalware.org Thu Jan 1 21:44:22 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Jan 1 21:44:22 2009 Subject: [Frugalware-git] frugalware-current: sbcl-1.0.24-1-i686 Message-ID: <20090101204422.16AF511B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f66f13bc968103f8327e5159a5aef21cd9c32ce3 commit f66f13bc968103f8327e5159a5aef21cd9c32ce3 Author: Miklos Vajna Date: Thu Jan 1 21:44:10 2009 +0100 sbcl-1.0.24-1-i686 - version bump diff --git a/source/devel-extra/sbcl/FrugalBuild b/source/devel-extra/sbcl/FrugalBuild index cfcf651..48b6b06 100644 --- a/source/devel-extra/sbcl/FrugalBuild +++ b/source/devel-extra/sbcl/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Miklos Vajna pkgname=sbcl -pkgver=1.0.23 +pkgver=1.0.24 pkgrel=1 pkgdesc="Steel Bank Common Lisp" depends=('glibc') @@ -13,7 +13,7 @@ _F_sourceforge_ext="-source.tar.bz2" Finclude sourceforge url="http://sbcl.sourceforge.net/" source=($source no_local_lib_please.patch cflags.patch) -sha1sums=('fcbb09f7c2260c8efbe963451469b1f584b454ab' \ +sha1sums=('bf769f647c3d0126c4092f8a05eef58063a9f9dd' \ '29df2f80163179eb2c38d22836e9ed8c0778bfd2' \ 'd41025710da5f3d9fc9a93dd83c8f998142f4482') From vmiklos at frugalware.org Thu Jan 1 22:00:24 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Jan 1 22:00:26 2009 Subject: [Frugalware-git] frugalware-current: etckeeper-0.25-1-i686 Message-ID: <20090101210024.9C16F11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e6660bde7293a408684a5874a37209820fdb0e1c commit e6660bde7293a408684a5874a37209820fdb0e1c Author: Miklos Vajna Date: Thu Jan 1 21:47:41 2009 +0100 etckeeper-0.25-1-i686 - version bump diff --git a/source/apps-extra/etckeeper/FrugalBuild b/source/apps-extra/etckeeper/FrugalBuild index 3383976..452f18e 100644 --- a/source/apps-extra/etckeeper/FrugalBuild +++ b/source/apps-extra/etckeeper/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Miklos Vajna pkgname=etckeeper -pkgver=0.23 +pkgver=0.25 pkgrel=1 pkgdesc="Stores the /etc directory in a git repo." url="http://kitenet.net/~joey/code/etckeeper/" @@ -14,7 +14,7 @@ archs=('i686' 'x86_64') Fpkgversep="_" up2date="lynx -dump http://ftp.debian.org/debian/pool/main/e/etckeeper|Flasttar" source=(http://ftp.debian.org/debian/pool/main/e/etckeeper/etckeeper_$pkgver.tar.gz) -sha1sums=('f5d5a9199e0085d2f3efe6d5fa21b2b33954d1ba') +sha1sums=('02ed44c6422832ba4dfc84e788ab4646de6ee1a5') build() { From vmiklos at frugalware.org Thu Jan 1 22:00:24 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Jan 1 22:00:26 2009 Subject: [Frugalware-git] frugalware-current: dante-1.1.19-1-i686 Message-ID: <20090101210024.B9DDD11B8630@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7d97ef96e24d8f38b377a0f5967319ca8336bec1 commit 7d97ef96e24d8f38b377a0f5967319ca8336bec1 Author: Miklos Vajna Date: Thu Jan 1 21:48:40 2009 +0100 dante-1.1.19-1-i686 - up2date fix diff --git a/source/network-extra/dante/FrugalBuild b/source/network-extra/dante/FrugalBuild index e276a26..1f45134 100644 --- a/source/network-extra/dante/FrugalBuild +++ b/source/network-extra/dante/FrugalBuild @@ -10,7 +10,8 @@ depends=('glibc') backup=(etc/socks.conf etc/sockd.conf) groups=('network-extra') archs=('i686' 'x86_64') -up2date="elinks -dump ftp://ftp.inet.no/pub/socks/ 2>/dev/null|Flasttar" +_F_archive_grepv="pre" +up2date="Flasttar ftp://ftp.inet.no/pub/socks/" source=(ftp://ftp.inet.no/pub/socks/dante-$pkgver.tar.gz README.Frugalware) sha1sums=('e366a60a880ceff6205f7cd87249c7322b844d3c' \ '942c3cffb2f392dfff39f09b222065352e66deb5') From vmiklos at frugalware.org Thu Jan 1 22:00:24 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Jan 1 22:00:27 2009 Subject: [Frugalware-git] frugalware-current: firefox-wmlbrowser-0.7.20-1-i686 Message-ID: <20090101210024.D311011B8631@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5d674d96b3a4434c2420881f43d59952edd6457d commit 5d674d96b3a4434c2420881f43d59952edd6457d Author: Miklos Vajna Date: Thu Jan 1 21:51:13 2009 +0100 firefox-wmlbrowser-0.7.20-1-i686 - version bump diff --git a/source/xapps-extra/firefox-wmlbrowser/FrugalBuild b/source/xapps-extra/firefox-wmlbrowser/FrugalBuild index 9d6f0f7..84ab215 100644 --- a/source/xapps-extra/firefox-wmlbrowser/FrugalBuild +++ b/source/xapps-extra/firefox-wmlbrowser/FrugalBuild @@ -4,7 +4,7 @@ pkgname=firefox-wmlbrowser _F_firefox_ext=wmlbrowser _F_firefox_id=c4dc572a-3295-40eb-b30f-b54aa4cdc4b7 -pkgver=0.7.19 +pkgver=0.7.20 pkgrel=1 pkgdesc="Display WML (Wireless Markup Language) content." url="http://wmlbrowser.mozdev.org" @@ -15,5 +15,5 @@ up2date="lynx -dump http://wmlbrowser.mozdev.org/installation/wmlbrowser.html|gr source=(http://downloads.mozdev.org/wmlbrowser/wmlbrowser-$pkgver.xpi \ chrome.manifest) Finclude firefox-extension -sha1sums=('12aa4760e898b33ef763b69fd8fa46d3779e86e3' \ +sha1sums=('4801ab0d442fda4783b6a28d6b6b19694ac8b9ab' \ '3b9841f798f75817a19170347c6593985b2fe5a9') From iron at frugalware.org Thu Jan 1 23:54:09 2009 From: iron at frugalware.org (Krisztian VASAS) Date: Thu Jan 1 23:54:11 2009 Subject: [Frugalware-git] xorg74: xf86-input-tek4957-1.2.0-1-i686 Message-ID: <20090101225409.B9A6F11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=f04306f6fb070109ac0836b6b4fcb54bf1cc3363 commit f04306f6fb070109ac0836b6b4fcb54bf1cc3363 Author: Krisztian VASAS Date: Thu Jan 1 23:53:41 2009 +0100 xf86-input-tek4957-1.2.0-1-i686 - version bump - added compile fixes diff --git a/source/x11/xf86-input-tek4957/01-fix_xinput_abi_version.patch1 b/source/x11/xf86-input-tek4957/01-fix_xinput_abi_version.patch1 new file mode 100644 index 0000000..4afd98c --- /dev/null +++ b/source/x11/xf86-input-tek4957/01-fix_xinput_abi_version.patch1 @@ -0,0 +1,16 @@ +diff --git a/src/xf86Tek4957.c b/src/xf86Tek4957.c +index 5877269..de9ee83 100644 +--- a/src/xf86Tek4957.c ++++ b/src/xf86Tek4957.c +@@ -446,7 +446,10 @@ TekProc(DeviceIntPtr pDev, int what) + return !Success; + } + +- if (InitValuatorClassDeviceStruct(pDev,2,xf86GetMotionEvents, ++ if (InitValuatorClassDeviceStruct(pDev,2, ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 ++ xf86GetMotionEvents, ++#endif + local->history_size,Absolute)== FALSE) { + xf86Msg(X_ERROR,"Tek4957:Unable to allocate Valuator class device\n"); + return !Success; diff --git a/source/x11/xf86-input-tek4957/02-dont_use_deprecated_calls_for_newer_xinput_abi.patch1 b/source/x11/xf86-input-tek4957/02-dont_use_deprecated_calls_for_newer_xinput_abi.patch1 new file mode 100644 index 0000000..66aa72e --- /dev/null +++ b/source/x11/xf86-input-tek4957/02-dont_use_deprecated_calls_for_newer_xinput_abi.patch1 @@ -0,0 +1,16 @@ +diff --git a/src/xf86Tek4957.c b/src/xf86Tek4957.c +index de9ee83..110de77 100644 +--- a/src/xf86Tek4957.c ++++ b/src/xf86Tek4957.c +@@ -152,7 +152,11 @@ TekConvert(LocalDevicePtr local, + + /* Gets current screen size. It can change dynamically in the case of + a multi-head configuration with different screen sizes ... */ ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0 + SP=miPointerCurrentScreen(); ++#else ++ SP=miPointerGetScreen(local->dev); ++#endif + W=SP->width; + H=SP->height; + diff --git a/source/x11/xf86-input-tek4957/FrugalBuild b/source/x11/xf86-input-tek4957/FrugalBuild index 112bbe9..ce23ee5 100644 --- a/source/x11/xf86-input-tek4957/FrugalBuild +++ b/source/x11/xf86-input-tek4957/FrugalBuild @@ -2,8 +2,13 @@ # Maintainer: Christian Hamar alias krix pkgname=xf86-input-tek4957 -pkgver=1.1.0 -pkgrel=3 +pkgver=1.2.0 +pkgrel=1 Finclude xorg -sha1sums=('3a20a1498e5bb84471ddcf497b6fe92edb310c3e') +source=(${source[@]} \ + '01-fix_xinput_abi_version.patch1' \ + '02-dont_use_deprecated_calls_for_newer_xinput_abi.patch1') +sha1sums=('49928f8dea09cff5c401ee5b89c8dde30d206064' \ + '0d37235d1528eeb9e44d0966af44c0098cfbe254' \ + '8f6316a8a2ee028ef6813b27f771a6ae7092b798') # optimization OK From iron at frugalware.org Thu Jan 1 23:59:51 2009 From: iron at frugalware.org (Krisztian VASAS) Date: Thu Jan 1 23:59:52 2009 Subject: [Frugalware-git] xorg74: xf86-input-ur98-1.1.0-4-i686 Message-ID: <20090101225951.4449711B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=99048a0fb85148e23d860c616fcfddffa0274657 commit 99048a0fb85148e23d860c616fcfddffa0274657 Author: Krisztian VASAS Date: Thu Jan 1 23:59:28 2009 +0100 xf86-input-ur98-1.1.0-4-i686 - rebuilt with newer xorg-server - added a compile fix diff --git a/source/x11/xf86-input-ur98/01-fix_xinput_abi_version.patch1 b/source/x11/xf86-input-ur98/01-fix_xinput_abi_version.patch1 new file mode 100644 index 0000000..20a42bf --- /dev/null +++ b/source/x11/xf86-input-ur98/01-fix_xinput_abi_version.patch1 @@ -0,0 +1,26 @@ +diff --git a/src/xf86Ur-98.c b/src/xf86Ur-98.c +index dabf3ca..2b148b0 100644 +--- a/src/xf86Ur-98.c ++++ b/src/xf86Ur-98.c +@@ -49,7 +49,9 @@ static const char *reqSymbols[] = { + "xf86CollectInputOptions", + "xf86ErrorFVerb", + "xf86FindOptionValue", ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 + "xf86GetMotionEvents", ++#endif + "xf86GetVerbosity", + "xf86MotionHistoryAllocate", + "xf86NameCmp", +@@ -316,7 +318,10 @@ xf86UR98Control(DeviceIntPtr dev, + * screen to fit one meter. + */ + +- if (InitValuatorClassDeviceStruct(dev, priv->axes, xf86GetMotionEvents, ++ if (InitValuatorClassDeviceStruct(dev, priv->axes, ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 ++ xf86GetMotionEvents, ++#endif + local->history_size, Absolute) == FALSE) { + ErrorF("Unable to allocate ValuatorClassDeviceStruct\n"); + return !Success; diff --git a/source/x11/xf86-input-ur98/FrugalBuild b/source/x11/xf86-input-ur98/FrugalBuild index f0ffe54..e6e14df 100644 --- a/source/x11/xf86-input-ur98/FrugalBuild +++ b/source/x11/xf86-input-ur98/FrugalBuild @@ -3,7 +3,10 @@ pkgname=xf86-input-ur98 pkgver=1.1.0 -pkgrel=3 +pkgrel=4 Finclude xorg -sha1sums=('8070b10af5d91e941310499b75376603a0655f07') +source=(${source[@]} \ + '01-fix_xinput_abi_version.patch1') +sha1sums=('8070b10af5d91e941310499b75376603a0655f07' \ + 'db38f361bd109fa7242ed5be95adecf37c0272ea') # optimization OK From iron at frugalware.org Fri Jan 2 00:02:55 2009 From: iron at frugalware.org (Krisztian VASAS) Date: Fri Jan 2 00:02:57 2009 Subject: [Frugalware-git] xorg74: xf86-input-vmmouse-12.6.3-1-i686 Message-ID: <20090101230255.B78F011B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=5595787033beb033207c9d0b3465b6e2b2d7e1b7 commit 5595787033beb033207c9d0b3465b6e2b2d7e1b7 Author: Krisztian VASAS Date: Fri Jan 2 00:02:45 2009 +0100 xf86-input-vmmouse-12.6.3-1-i686 - version bump diff --git a/source/x11/xf86-input-vmmouse/FrugalBuild b/source/x11/xf86-input-vmmouse/FrugalBuild index f9cf4a7..2d0f86a 100644 --- a/source/x11/xf86-input-vmmouse/FrugalBuild +++ b/source/x11/xf86-input-vmmouse/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Christian Hamar alias krix pkgname=xf86-input-vmmouse -pkgver=12.4.3 +pkgver=12.6.3 Finclude xorg -sha1sums=('8ae2d4212fc30c4db6ed5bce748918247c84f755') +sha1sums=('9181902f29d97dc46e906dcb8c22c25840148fd1') # optimization OK From iron at frugalware.org Fri Jan 2 00:06:42 2009 From: iron at frugalware.org (Krisztian VASAS) Date: Fri Jan 2 00:06:44 2009 Subject: [Frugalware-git] xorg74: xf86-input-void-1.1.1-3-i686 Message-ID: <20090101230642.822D611B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=1fed441664369bb2103e057af18653f38d723ccc commit 1fed441664369bb2103e057af18653f38d723ccc Author: Krisztian VASAS Date: Fri Jan 2 00:06:22 2009 +0100 xf86-input-void-1.1.1-3-i686 - rebuilt with newer xorg-server - added a compile fix diff --git a/source/x11/xf86-input-void/01-fix_xinput_abi_version.patch1 b/source/x11/xf86-input-void/01-fix_xinput_abi_version.patch1 new file mode 100644 index 0000000..e0464df --- /dev/null +++ b/source/x11/xf86-input-void/01-fix_xinput_abi_version.patch1 @@ -0,0 +1,15 @@ +diff --git a/src/void.c b/src/void.c +index bf5848c..a5a47be 100644 +--- a/src/void.c ++++ b/src/void.c +@@ -209,7 +209,9 @@ xf86VoidControlProc(DeviceIntPtr device, int what) + + if (InitValuatorClassDeviceStruct(device, + 2, +- xf86GetMotionEvents, ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 ++ xf86GetMotionEvents, ++#endif + 0, + Absolute) == FALSE) { + InitValuatorAxisStruct(device, diff --git a/source/x11/xf86-input-void/FrugalBuild b/source/x11/xf86-input-void/FrugalBuild index 737fd5f..6c74c7b 100644 --- a/source/x11/xf86-input-void/FrugalBuild +++ b/source/x11/xf86-input-void/FrugalBuild @@ -3,7 +3,9 @@ pkgname=xf86-input-void pkgver=1.1.1 -pkgrel=2 +pkgrel=3 Finclude xorg -sha1sums=('7e40331bd3a96f14ab79518b69a418e7beae8b67') +source=(${source[@]} '01-fix_xinput_abi_version.patch1') +sha1sums=('7e40331bd3a96f14ab79518b69a418e7beae8b67' \ + 'aef13ce46ea2550909dcddff497c98594de345fd') # optimization OK From vmiklos at frugalware.org Fri Jan 2 00:43:03 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Jan 2 00:43:04 2009 Subject: [Frugalware-git] frugalware-current: asciidoc-8.3.2-1-i686 Message-ID: <20090101234303.5887611B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=023b1580f17085fc8f109c8e314dac5dfe526642 commit 023b1580f17085fc8f109c8e314dac5dfe526642 Author: Miklos Vajna Date: Fri Jan 2 00:39:13 2009 +0100 asciidoc-8.3.2-1-i686 - version bump - fixed vim syntax hilight diff --git a/source/apps-extra/asciidoc/FrugalBuild b/source/apps-extra/asciidoc/FrugalBuild index e4bf58a..af01d02 100644 --- a/source/apps-extra/asciidoc/FrugalBuild +++ b/source/apps-extra/asciidoc/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: voroskoi pkgname=asciidoc -pkgver=8.3.1 +pkgver=8.3.2 pkgrel=1 pkgdesc="AsciiDoc is a text document format for writing short documents, articles, books and UNIX man pages." url="http://www.methods.co.nz/asciidoc/index.html" @@ -14,7 +14,7 @@ up2date="lynx -dump http://www.methods.co.nz/asciidoc/downloads.html |Flasttar" source=(http://www.methods.co.nz/asciidoc/asciidoc-$pkgver.tar.gz \ http://ftp.frugalware.org/pub/other/sources/asciidoc/asciidoc-fonts-0.1.tar.bz2 \ README.Frugalware) -sha1sums=('4d9a6c12ce1259ce70eab56782996a07709ace75' \ +sha1sums=('15fba8b985acbd58a7aa06e11367b1d2e97686d0' \ '717779406f876f439ac37c79878f403ecdef3467' \ '31d7a38de67fd8d2492b8a07d64721491b69d1ea') @@ -22,8 +22,9 @@ build() { # enable offline build Fsed 'http://www.oasis-open.org/docbook/xml/' 'file:///usr/share/sgml/docbook/dtd/xml-dtd-' docbook.conf Fmake + Fmkdir /usr/share/vim # yeah the name is misleading, this is install-doc in fact - MAKEFLAGS= Fmakeinstall docs + MAKEFLAGS= Fmakeinstall docs vimdir=/usr/share/vim Fmv /usr/share/doc/asciidoc{,-$pkgver} # install the mathml fonts Fmkdir /usr/lib/X11/fonts/TTF From bouleetbil at frogdev.info Fri Jan 2 09:39:34 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Jan 2 09:39:36 2009 Subject: [Frugalware-git] frugalware-current: cairo-1.8.6-1-i686 Message-ID: <20090102083934.3AC6E11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2815ba30d1dcc028284b284ec5cab1520662bc0b commit 2815ba30d1dcc028284b284ec5cab1520662bc0b Author: bouleetbil Date: Fri Jan 2 09:33:26 2009 +0100 cairo-1.8.6-1-i686 *version bump diff --git a/source/xlib/cairo/FrugalBuild b/source/xlib/cairo/FrugalBuild index 3c034f3..b71d980 100644 --- a/source/xlib/cairo/FrugalBuild +++ b/source/xlib/cairo/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=cairo -pkgver=1.8.4 +pkgver=1.8.6 pkgrel=1 pkgdesc="A vector graphics library with cross-device output support" url="http://cairographics.org" @@ -18,6 +18,6 @@ up2date="lynx -dump 'http://cairographics.org/releases/?C=D;O=A'|grep -m1 '/LATE source=($url/releases/$pkgname-$pkgver.tar.gz) options=('scriptlet') Fconfopts="$Fconfopts --enable-glitz --enable-gtk-doc --enable-pdf --enable-ps --enable-xcb" -sha1sums=('57fd2c7e0af16bee7cd53436d7c9dc526784f1da') +sha1sums=('d1e5479d4eeb7b1a3589672e3ef8f4899e7c5eba') # optimization OK From iron at frugalware.org Fri Jan 2 09:52:22 2009 From: iron at frugalware.org (Krisztian VASAS) Date: Fri Jan 2 09:52:24 2009 Subject: [Frugalware-git] xorg74: xf86-video-apm-1.2.1-1-i686 Message-ID: <20090102085222.CCCA611B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=b95f70ff4787183fa05f111dfba440febb73a09e commit b95f70ff4787183fa05f111dfba440febb73a09e Author: Krisztian VASAS Date: Fri Jan 2 09:52:08 2009 +0100 xf86-video-apm-1.2.1-1-i686 - version bump diff --git a/source/x11/xf86-video-apm/FrugalBuild b/source/x11/xf86-video-apm/FrugalBuild index 0fee467..9b25146 100644 --- a/source/x11/xf86-video-apm/FrugalBuild +++ b/source/x11/xf86-video-apm/FrugalBuild @@ -2,15 +2,15 @@ # Maintainer: Christian Hamar alias krix pkgname=xf86-video-apm -pkgver=1.1.1 -pkgrel=3 +pkgver=1.2.1 +pkgrel=1 pkgdesc="X.Org driver for apm cards" url="http://xorg.freedesktop.org" groups=('x11' 'xorg-core' 'xorg-drivers') archs=('i686' 'x86_64') -depends=('xorg-server>=1.4.0.90') -makedepends=('xproto>=7.0.11' 'randrproto' 'renderproto' 'videoproto' 'xorg-sgml-doctools>=1.2') +depends=('xorg-server>=1.5.99.3') +makedepends=('xproto>=7.0.14' 'randrproto' 'renderproto' 'videoproto' 'xorg-sgml-doctools>=1.2') Finclude xorg -sha1sums=('5e0e32f74b50f6834f866aac9a03c22283577ec4') +sha1sums=('881eaf215c9f111e513e90d4765582af89f72a25') # optimization OK From devil505linux at gmail.com Fri Jan 2 09:56:19 2009 From: devil505linux at gmail.com (Devil505) Date: Fri Jan 2 09:56:21 2009 Subject: [Frugalware-git] frugalware-current: devil-1.7.5-1-i686 Message-ID: <20090102085619.B107D11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8169aa900f3cdbb2a88cef3277f52d5748d14e47 commit 8169aa900f3cdbb2a88cef3277f52d5748d14e47 Author: Devil505 Date: Fri Jan 2 09:53:41 2009 +0100 devil-1.7.5-1-i686 * version bump diff --git a/source/xlib-extra/devil/FrugalBuild b/source/xlib-extra/devil/FrugalBuild index ecb7930..4e4a0b0 100755 --- a/source/xlib-extra/devil/FrugalBuild +++ b/source/xlib-extra/devil/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Devil505 pkgname=devil -pkgver=1.7.3 +pkgver=1.7.5 pkgrel=1 pkgdesc="Library for reading several different image formats" _F_sourceforge_dirname="openil" @@ -12,12 +12,6 @@ depends=('glibc' 'libpng' 'libmng') groups=('xlib-extra') archs=('i686' 'x86_64') Fconfopts="${Fconfopts[@]} --with-gnu-ld --disable-allegro" -_F_cd_path="./" -sha1sums=('36ef947007160b084bc331753132a702c94f9d3f') +sha1sums=('2e21925f3bd8c08442e6b55676ee8872c8dead40') -build() -{ - Fautoreconf - Fbuild -} # optimization OK From iron at frugalware.org Fri Jan 2 09:56:30 2009 From: iron at frugalware.org (Krisztian VASAS) Date: Fri Jan 2 09:56:32 2009 Subject: [Frugalware-git] xorg74: xf86-video-ark-0.7.1-1-i686 Message-ID: <20090102085630.1A8E011B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=e5bfa4552c98cef7b65e79e4686b894aec0e5a5c commit e5bfa4552c98cef7b65e79e4686b894aec0e5a5c Author: Krisztian VASAS Date: Fri Jan 2 09:56:17 2009 +0100 xf86-video-ark-0.7.1-1-i686 - version bump diff --git a/source/x11/xf86-video-ark/FrugalBuild b/source/x11/xf86-video-ark/FrugalBuild index 4401201..e0a3c62 100644 --- a/source/x11/xf86-video-ark/FrugalBuild +++ b/source/x11/xf86-video-ark/FrugalBuild @@ -2,15 +2,15 @@ # Maintainer: Christian Hamar alias krix pkgname=xf86-video-ark -pkgver=0.6.0 -pkgrel=3 +pkgver=0.7.1 +pkgrel=1 pkgdesc="X.Org driver for ark cards" url="http://xorg.freedesktop.org" groups=('x11' 'xorg-core' 'xorg-drivers') archs=('i686' 'x86_64') -depends=('xorg-server>=1.4.0.90') +depends=('xorg-server>=1.5.99.3') makedepends=('xproto' 'randrproto' 'renderproto') Finclude xorg -sha1sums=('349572d92ca6cd2c8f370105c4bffc70b7034bf3') +sha1sums=('d2e929cddda2e5f2df87a1ef53db585bcedb0c59') # optimization OK From bouleetbil at frogdev.info Fri Jan 2 09:56:38 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Jan 2 09:56:40 2009 Subject: [Frugalware-git] frugalware-current: pango-1.22.4-1-i686 Message-ID: <20090102085638.9BCC211B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c1f454a836d0ad017a949fe5eabc5558eb0062bd commit c1f454a836d0ad017a949fe5eabc5558eb0062bd Author: bouleetbil Date: Fri Jan 2 09:50:48 2009 +0100 pango-1.22.4-1-i686 *version bump diff --git a/source/xlib/pango/FrugalBuild b/source/xlib/pango/FrugalBuild index 9199dbb..0672f93 100644 --- a/source/xlib/pango/FrugalBuild +++ b/source/xlib/pango/FrugalBuild @@ -2,16 +2,16 @@ # Maintainer: Christian Hamar alias krix pkgname=pango -pkgver=1.22.3 +pkgver=1.22.4 pkgrel=1 pkgdesc="A library for layout and rendering of text" url="http://www.gtk.org/" -depends=('cairo>=1.8.4' 'glib2>=2.18.3' 'libxft') +depends=('cairo>=1.8.6' 'glib2>=2.18.3' 'libxft') groups=('xlib') makedepends=('gtk-doc' 'perl') archs=('i686' 'x86_64' 'ppc') Finclude gnome Fconfopts="$Fconfopts --enable-gtk-doc --enable-debug=minimum" -sha1sums=('6fa59f6ede26b1ad7e46ad5cad376f6a99b7bca2') +sha1sums=('d39a8ce9ed7dd57407a04ad3996b9cc1106cfd7d') # optimization OK From devil505linux at gmail.com Fri Jan 2 10:06:11 2009 From: devil505linux at gmail.com (Devil505) Date: Fri Jan 2 10:06:13 2009 Subject: [Frugalware-git] frugalware-current: gtkhash-0.2.1-1-i686 Message-ID: <20090102090611.CA2EC11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=53ed19679573ad04436c030d5f010005e122da1a commit 53ed19679573ad04436c030d5f010005e122da1a Author: Devil505 Date: Fri Jan 2 10:03:35 2009 +0100 gtkhash-0.2.1-1-i686 * version bump diff --git a/source/xapps-extra/gtkhash/FrugalBuild b/source/xapps-extra/gtkhash/FrugalBuild index 223d3a2..cb843ed 100644 --- a/source/xapps-extra/gtkhash/FrugalBuild +++ b/source/xapps-extra/gtkhash/FrugalBuild @@ -2,18 +2,16 @@ # Maintainer: Devil505 pkgname=gtkhash -pkgver=0.2.0 +pkgver=0.2.1 pkgrel=1 pkgdesc="A GTK+ utility for computing message digests or checksums using the mhash library." -_F_sourceforge_broken_up2date="1" Finclude sourceforge -url="http://gtkhash.sourceforge.net/" depends=('gtk+2' 'freetype2' 'libxau' 'libxdmcp' 'libglade' 'mhash' 'libxdamage' 'libxext') -makedepends=('perl-xml-parser') +makedepends=('perl-xml-parser' 'intltool') options=('scriptlet') groups=('xapps-extra') archs=('i686' 'x86_64') -sha1sums=('24587e41b9106ef9a885dd40a227ddbf4f843515') +sha1sums=('33ef92fdd7c8a1c8281e1a2f841edfbfe3a9753a') _F_desktop_name="GtkHash" _F_desktop_desc="A GTK+ utility for computing file checksums." From iron at frugalware.org Fri Jan 2 10:13:45 2009 From: iron at frugalware.org (Krisztian VASAS) Date: Fri Jan 2 10:13:45 2009 Subject: [Frugalware-git] xorg74: xf86-video-ast-0.87.0-1-i686 Message-ID: <20090102091345.27A8311B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=3146befc27c8eba37ff5f16b65cff9f245007ad2 commit 3146befc27c8eba37ff5f16b65cff9f245007ad2 Author: Krisztian VASAS Date: Fri Jan 2 10:13:30 2009 +0100 xf86-video-ast-0.87.0-1-i686 - version bump diff --git a/source/x11/xf86-video-ast/FrugalBuild b/source/x11/xf86-video-ast/FrugalBuild index 21291d4..5a7b415 100644 --- a/source/x11/xf86-video-ast/FrugalBuild +++ b/source/x11/xf86-video-ast/FrugalBuild @@ -2,14 +2,14 @@ # Maintainer: Christian Hamar alias krix pkgname=xf86-video-ast -pkgver=0.81.0 -pkgrel=3 +pkgver=0.87.0 +pkgrel=1 pkgdesc="X.Org video driver for ast cards" url="http://xorg.freedesktop.org" groups=('x11' 'xorg-core' 'xorg-drivers') archs=('i686' 'x86_64') -depends=('xorg-server>=1.4.0.90') +depends=('xorg-server>=1.5.99.3') makedepends=('randrproto' 'renderproto' 'videoproto') Finclude xorg -sha1sums=('4b7c68677382fcdcfde876f9cd861366d6f85cea') +sha1sums=('6f03a5af51daf7813940540facd95598fb461bfe') # optimization OK From bouleetbil at frogdev.info Fri Jan 2 10:30:16 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Jan 2 10:30:17 2009 Subject: [Frugalware-git] frugalware-current: gtk+2-2.14.6-1-i686 Message-ID: <20090102093016.4EA1811B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=80ec3b1bd4ad8f39c2a363d7a94b971cdf10cefc commit 80ec3b1bd4ad8f39c2a363d7a94b971cdf10cefc Author: bouleetbil Date: Fri Jan 2 10:23:04 2009 +0100 gtk+2-2.14.6-1-i686 *version bump diff --git a/source/xlib/gtk+2/FrugalBuild b/source/xlib/gtk+2/FrugalBuild index 44e0f2f..21053fd 100644 --- a/source/xlib/gtk+2/FrugalBuild +++ b/source/xlib/gtk+2/FrugalBuild @@ -3,11 +3,11 @@ pkgname=gtk+2 _F_gnome_name=gtk+ -pkgver=2.14.5 +pkgver=2.14.6 pkgrel=1 pkgdesc="The GTK+ Toolkit (2.x series)" depends=('libtiff' 'atk>=1.22.0' 'libxi' 'libxinerama' 'fontconfig' 'libjpeg' \ - 'pango>=1.22.3' 'cairo>=1.8.4' 'libxcursor' 'libxrandr' 'libsm' 'glib2>=2.18.3' \ + 'pango>=1.22.4' 'cairo>=1.8.6' 'libxcursor' 'libxrandr' 'libsm' 'glib2>=2.18.3' \ 'libcups' 'libx11' 'libtiff' 'libpng' 'jasper') rodepends=('gnome-icon-theme' 'shared-mime-info') groups=('xlib') @@ -49,7 +49,7 @@ build() { Fsplit $pkgname-docs usr/share/gtk-doc } -sha1sums=('6b7a988807627d5f4e70a2fc5b56c7832fe3e1b4' \ +sha1sums=('e888a28be5e062f36abc3e69857d9aa9381ad2c1' \ '7db980e782a5b04d27bffb55e3dc0190ad22e118' \ '783920d179ba0755ccab9186b6bff9f293828a96') # optimization OK From iron at frugalware.org Fri Jan 2 10:39:21 2009 From: iron at frugalware.org (Krisztian VASAS) Date: Fri Jan 2 10:39:23 2009 Subject: [Frugalware-git] xorg74: xf86-video-ati-6.9.0.91-1-i686 Message-ID: <20090102093921.A95D911B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=469243ab18cc5ab6ce02bedfb15420637f472198 commit 469243ab18cc5ab6ce02bedfb15420637f472198 Author: Krisztian VASAS Date: Fri Jan 2 10:39:04 2009 +0100 xf86-video-ati-6.9.0.91-1-i686 - version bump - added some patches diff --git a/source/x11/xf86-video-ati/01-fix_for_xorg_bug_19269.patch1 b/source/x11/xf86-video-ati/01-fix_for_xorg_bug_19269.patch1 new file mode 100644 index 0000000..f664ae6 --- /dev/null +++ b/source/x11/xf86-video-ati/01-fix_for_xorg_bug_19269.patch1 @@ -0,0 +1,65 @@ +diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c +index c285109..39c987c 100644 +--- a/src/radeon_exa_render.c ++++ b/src/radeon_exa_render.c +@@ -324,7 +324,7 @@ static Bool R100CheckCompositeTexture(PicturePtr pPict, int unit) + * see 197a62704742a4a19736c2637ac92d1dc5ab34ed + */ + +- if ((w > 2047) || (h > 2047)) ++ if ((w > 2048) || (h > 2048)) + RADEON_FALLBACK(("Picture w/h too large (%dx%d)\n", w, h)); + + for (i = 0; i < sizeof(R100TexFormats) / sizeof(R100TexFormats[0]); i++) { +@@ -643,7 +643,11 @@ static Bool R200CheckCompositeTexture(PicturePtr pPict, int unit) + int h = pPict->pDrawable->height; + int i; + +- if ((w > 2048) || (h > 2048)) ++ /* r200 limit should be 2048, there are issues with 2048 ++ * see bug 19269 ++ */ ++ ++ if ((w > 2047) || (h > 2047)) + RADEON_FALLBACK(("Picture w/h too large (%dx%d)\n", w, h)); + + for (i = 0; i < sizeof(R200TexFormats) / sizeof(R200TexFormats[0]); i++) +@@ -768,10 +772,14 @@ static Bool R200CheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskP + if (!pSrcPicture->pDrawable) + return FALSE; + ++ /* r200 limit should be 2048, there are issues with 2048 ++ * see bug 19269 ++ */ ++ + pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable); + +- if (pSrcPixmap->drawable.width > 2048 || +- pSrcPixmap->drawable.height > 2048) { ++ if (pSrcPixmap->drawable.width > 2047 || ++ pSrcPixmap->drawable.height > 2047) { + RADEON_FALLBACK(("Source w/h too large (%d,%d).\n", + pSrcPixmap->drawable.width, + pSrcPixmap->drawable.height)); +@@ -779,8 +787,8 @@ static Bool R200CheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskP + + pDstPixmap = RADEONGetDrawablePixmap(pDstPicture->pDrawable); + +- if (pDstPixmap->drawable.width > 2048 || +- pDstPixmap->drawable.height > 2048) { ++ if (pDstPixmap->drawable.width > 2047 || ++ pDstPixmap->drawable.height > 2047) { + RADEON_FALLBACK(("Dest w/h too large (%d,%d).\n", + pDstPixmap->drawable.width, + pDstPixmap->drawable.height)); +@@ -789,8 +797,8 @@ static Bool R200CheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskP + if (pMaskPicture) { + PixmapPtr pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable); + +- if (pMaskPixmap->drawable.width > 2048 || +- pMaskPixmap->drawable.height > 2048) { ++ if (pMaskPixmap->drawable.width > 2047 || ++ pMaskPixmap->drawable.height > 2047) { + RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n", + pMaskPixmap->drawable.width, + pMaskPixmap->drawable.height)); diff --git a/source/x11/xf86-video-ati/02-include_radeon_drm.h_in_tarball.patch1 b/source/x11/xf86-video-ati/02-include_radeon_drm.h_in_tarball.patch1 new file mode 100644 index 0000000..66fd400 --- /dev/null +++ b/source/x11/xf86-video-ati/02-include_radeon_drm.h_in_tarball.patch1 @@ -0,0 +1,12 @@ +diff --git a/src/Makefile.am b/src/Makefile.am +index a13bfad..c15cc30 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -134,6 +134,7 @@ EXTRA_DIST = \ + generic_bus.h \ + radeon_commonfuncs.c \ + radeon_dri.h \ ++ radeon_drm.h \ + radeon_exa_render.c \ + radeon_exa_funcs.c \ + radeon.h \ diff --git a/source/x11/xf86-video-ati/03-radeon-a-bit_motherboard_has_no_dvi.patch1 b/source/x11/xf86-video-ati/03-radeon-a-bit_motherboard_has_no_dvi.patch1 new file mode 100644 index 0000000..4b4a99e --- /dev/null +++ b/source/x11/xf86-video-ati/03-radeon-a-bit_motherboard_has_no_dvi.patch1 @@ -0,0 +1,18 @@ +diff --git a/src/radeon_atombios.c b/src/radeon_atombios.c +index 3cd7eae..b674a41 100644 +--- a/src/radeon_atombios.c ++++ b/src/radeon_atombios.c +@@ -1530,6 +1530,13 @@ static void RADEONApplyATOMQuirks(ScrnInfoPtr pScrn, int index) + info->BiosConnector[index].ConnectorType = CONNECTOR_DVI_D; + } + } ++ /* a-bit f-i90hd - ciaranm on #radeonhd - this board has no DVI */ ++ if ((info->Chipset == PCI_CHIP_RS600_7941) && ++ (PCI_SUB_VENDOR_ID(info->PciInfo) == 0x147b) && ++ (PCI_SUB_DEVICE_ID(info->PciInfo) == 0x2412)) { ++ if (info->BiosConnector[index].ConnectorType == CONNECTOR_DVI_I) ++ info->BiosConnector[index].valid = FALSE; ++ } + + /* Falcon NW laptop lists vga ddc line for LVDS */ + if ((info->Chipset == PCI_CHIP_RV410_5653) && diff --git a/source/x11/xf86-video-ati/04-rs600_remove_gpio_quirk_for_ddc.patch1 b/source/x11/xf86-video-ati/04-rs600_remove_gpio_quirk_for_ddc.patch1 new file mode 100644 index 0000000..52c4b9f --- /dev/null +++ b/source/x11/xf86-video-ati/04-rs600_remove_gpio_quirk_for_ddc.patch1 @@ -0,0 +1,14 @@ +diff --git a/src/radeon_atombios.c b/src/radeon_atombios.c +index b674a41..43f2c18 100644 +--- a/src/radeon_atombios.c ++++ b/src/radeon_atombios.c +@@ -2049,8 +2049,7 @@ RADEONGetATOMConnectorInfoFromBIOSConnectorTable (ScrnInfoPtr pScrn) + (i == ATOM_DEVICE_TV2_INDEX) || + (i == ATOM_DEVICE_CV_INDEX)) + info->BiosConnector[i].ddc_i2c.valid = FALSE; +- else if ((info->ChipFamily == CHIP_FAMILY_RS600) || +- (info->ChipFamily == CHIP_FAMILY_RS690) || ++ else if ((info->ChipFamily == CHIP_FAMILY_RS690) || + (info->ChipFamily == CHIP_FAMILY_RS740)) { + /* IGP DFP ports use non-standard gpio entries */ + if ((i == ATOM_DEVICE_DFP2_INDEX) || (i == ATOM_DEVICE_DFP3_INDEX)) diff --git a/source/x11/xf86-video-ati/05-atombios_endian_fix_for_r600.patch1 b/source/x11/xf86-video-ati/05-atombios_endian_fix_for_r600.patch1 new file mode 100644 index 0000000..e71cbf6 --- /dev/null +++ b/source/x11/xf86-video-ati/05-atombios_endian_fix_for_r600.patch1 @@ -0,0 +1,15 @@ +diff --git a/src/radeon_atombios.c b/src/radeon_atombios.c +index 43f2c18..1ca9f86 100644 +--- a/src/radeon_atombios.c ++++ b/src/radeon_atombios.c +@@ -1644,8 +1644,8 @@ RADEONGetATOMConnectorInfoFromBIOSObject (ScrnInfoPtr pScrn) + for (j = 0; j < SrcDstTable->ucNumberOfSrc; j++) { + uint8_t sobj_id; + +- sobj_id = (SrcDstTable->usSrcObjectID[j] & OBJECT_ID_MASK) >> OBJECT_ID_SHIFT; +- ErrorF("src object id %04x %d\n", SrcDstTable->usSrcObjectID[j], sobj_id); ++ sobj_id = (le16_to_cpu(SrcDstTable->usSrcObjectID[j]) & OBJECT_ID_MASK) >> OBJECT_ID_SHIFT; ++ ErrorF("src object id %04x %d\n", le16_to_cpu(SrcDstTable->usSrcObjectID[j]), sobj_id); + + switch(sobj_id) { + case ENCODER_OBJECT_ID_INTERNAL_LVDS: diff --git a/source/x11/xf86-video-ati/06-man_page_update.patch1 b/source/x11/xf86-video-ati/06-man_page_update.patch1 new file mode 100644 index 0000000..1b36033 --- /dev/null +++ b/source/x11/xf86-video-ati/06-man_page_update.patch1 @@ -0,0 +1,58 @@ +diff --git a/man/radeon.man b/man/radeon.man +index 19ffb94..3bc3a56 100644 +--- a/man/radeon.man ++++ b/man/radeon.man +@@ -25,14 +25,17 @@ Full support for 8, 15, 16 and 24 bit pixel depths; + RandR 1.2 and RandR 1.3 support; + .TP + \(bu +-TV Out support (only on R/RV/RS1xx, R/RV/RS2xx, R/RV/RS3xx); ++TV-out support (only on R/RV/RS1xx, R/RV/RS2xx, R/RV/RS3xx. Experimental ++support on R/RV5xx, R/RV6xx, and R/RV7xx through the ++.B ATOMTvOut ++option); + .TP + \(bu + Full EXA 2D acceleration (not supported on R/RV6xx and R/RV/RS7xx); + .TP + \(bu + Full XAA 2D acceleration (not supported on R/RV6xx and R/RV/RS7xx. XAA Render +-acceleration supported only on R/RV100, R/RV/RS2xx and RS300); ++acceleration supported only on R/RV100, R/RV/RS2xx and RS3xx); + .TP + \(bu + Textured XVideo acceleration (not supported on R/RV6xx and R/RV/RS7xx. +@@ -151,6 +154,12 @@ Radeon HD 3450/3470 + .B RS780 + Radeon HD 3100/3200/3300 + .TP 12 ++.B RV710 ++Radeon HD 4350/4550 ++.TP 12 ++.B RV730 ++Radeon HD 4650/4670 ++.TP 12 + .B RV770 + Radeon HD 4850/4870 + .PD +@@ -325,7 +334,7 @@ parameter may be specified as a float value with standard suffixes like + .BI "Option \*qRenderAccel\*q \*q" boolean \*q + Enables or disables hardware Render acceleration. It is supported on all + Radeon cards when using EXA acceleration and on Radeon R/RV/RS1xx, +-R/RV/RS2xx and RS300 when usig XAA. The default is to ++R/RV/RS2xx and RS3xx when usig XAA. The default is to + .B enable + Render acceleration. + .TP +@@ -552,8 +561,9 @@ The default is + .B off. + .TP + .BI "Option \*qATOMTvOut\*q \*q" boolean \*q +-This option enables experimental TV-out support for r500 and r600 atombios chips. +-tv-out is experimental and may not function on these chips as well as hoped for. ++This option enables experimental TV-out support for R/RV5xx, R/RV6xx, and R/RV7xx ++atombios chips. TV-out is experimental and may not function on these chips as ++well as hoped for. + The default is + .B off. + diff --git a/source/x11/xf86-video-ati/07-r2xx_another_agp_quirk.patch1 b/source/x11/xf86-video-ati/07-r2xx_another_agp_quirk.patch1 new file mode 100644 index 0000000..b6d05d8 --- /dev/null +++ b/source/x11/xf86-video-ati/07-r2xx_another_agp_quirk.patch1 @@ -0,0 +1,14 @@ +diff --git a/src/radeon_dri.c b/src/radeon_dri.c +index 7c317e6..c0200f1 100644 +--- a/src/radeon_dri.c ++++ b/src/radeon_dri.c +@@ -763,6 +763,9 @@ static radeon_agpmode_quirk radeon_agpmode_quirk_list[] = { + /* VIA K8M800 Host Bridge / RV280 [Radeon 9200 PRO] Needs AGPMode 4 (fdo #12544) */ + { 0x1106,0x0204, PCI_VENDOR_ATI,0x5960, 0x17af,0x2020, 4 }, + ++ /* ATI Host Bridge / RV280 [M9+] Needs AGPMode 1 (phoronix forum) */ ++ { 0x1002,0xcbb2, PCI_VENDOR_ATI,0x5c61, 0x104d,0x8175, 1 }, ++ + { 0, 0, 0, 0, 0, 0, 0 }, + }; + diff --git a/source/x11/xf86-video-ati/FrugalBuild b/source/x11/xf86-video-ati/FrugalBuild index a745408..80948af 100644 --- a/source/x11/xf86-video-ati/FrugalBuild +++ b/source/x11/xf86-video-ati/FrugalBuild @@ -2,18 +2,33 @@ # Maintainer: Christian Hamar alias krix pkgname=xf86-video-ati -pkgver=6.8.0 -pkgrel=2 +pkgver=6.9.0.91 +pkgrel=1 pkgdesc="X.Org driver for ATI cards" url="http://xorg.freedesktop.org" groups=('x11' 'xorg-core' 'xorg-drivers') archs=('i686' 'x86_64' 'ppc') -depends=('xorg-server>=1.4.0.90') +depends=('xorg-server>=1.5.99.3') # to help upgraders. can be removed after 0.9 is out -rodepends=('xf86-video-mach64' 'xf86-video-r128') +#rodepends=('xf86-video-mach64' 'xf86-video-r128') makedepends=('xproto' 'randrproto' 'renderproto' 'xf86driproto' 'videoproto' 'xf86miscproto' 'xineramaproto' 'glproto') Finclude xorg -sha1sums=('b6974237b6ae9b45b32fc37f31a3fee7358230d3') +source=(${source[@]} \ + '01-fix_for_xorg_bug_19269.patch1' \ + '02-include_radeon_drm.h_in_tarball.patch1' \ + '03-radeon-a-bit_motherboard_has_no_dvi.patch1' \ + '04-rs600_remove_gpio_quirk_for_ddc.patch1' \ + '05-atombios_endian_fix_for_r600.patch1' \ + '06-man_page_update.patch1' \ + '07-r2xx_another_agp_quirk.patch1') +sha1sums=('710827ccbf2ad3660fde9ad9a8aab91b7820af54' \ + '40ce82693a9accba06797d8e59e55a316227b4e2' \ + '6e152a35edb54dde946bf0ebfaf9e1a88564ee23' \ + '52caae2104d1a4b0719c07b3ebf6c4630bc6f180' \ + '7aee4b52f9a529e49dc441a6c65c874615a8ff4f' \ + '6fef6b50e278a8bac24fdaa0f29474a5a5a832a9' \ + 'f7ac25d0705e3d9514ebddbf0eccd60933787b8e' \ + '9118c8dd958117cad2712d95a7898c6c0e9d3f7e') Fconfopts="$Fconfopts --enable-dri" # NOTE: TVout interface not available on x86_64 From iron at frugalware.org Fri Jan 2 10:43:43 2009 From: iron at frugalware.org (Krisztian VASAS) Date: Fri Jan 2 10:43:45 2009 Subject: [Frugalware-git] xorg74: dri2proto-1.99.3-1-i686 Message-ID: <20090102094343.0A3AB11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=a02e41e08a14354123c18b37026f49e7dd6f5f09 commit a02e41e08a14354123c18b37026f49e7dd6f5f09 Author: Krisztian VASAS Date: Fri Jan 2 10:43:27 2009 +0100 dri2proto-1.99.3-1-i686 - version bump diff --git a/source/x11/dri2proto/FrugalBuild b/source/x11/dri2proto/FrugalBuild index 5880c02..3666617 100644 --- a/source/x11/dri2proto/FrugalBuild +++ b/source/x11/dri2proto/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=dri2proto -pkgver=1.1 +pkgver=1.99.3 pkgrel=1 pkgdesc="X.Org DRI2 extension headers" url="http://xorg.freedesktop.org" From iron at frugalware.org Fri Jan 2 10:44:42 2009 From: iron at frugalware.org (Krisztian VASAS) Date: Fri Jan 2 10:44:44 2009 Subject: [Frugalware-git] xorg74: printproto-1.0.4-1-i686 Message-ID: <20090102094442.E1B5711B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=76f75fd97e2fe2988d879635e55e10e38155b241 commit 76f75fd97e2fe2988d879635e55e10e38155b241 Author: Krisztian VASAS Date: Fri Jan 2 10:44:31 2009 +0100 printproto-1.0.4-1-i686 - version bump diff --git a/source/x11/printproto/FrugalBuild b/source/x11/printproto/FrugalBuild index c3d3a36..62dc43b 100644 --- a/source/x11/printproto/FrugalBuild +++ b/source/x11/printproto/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=printproto -pkgver=1.0.3 +pkgver=1.0.4 pkgrel=1 pkgdesc="X.Org print protocol headers" url="http://xorg.freedesktop.org" @@ -12,6 +12,6 @@ depends=() makedepends=('pkgconfig') _F_xorg_nr=0 Finclude xorg -sha1sums=('c9b62c20ed50ce44c4835d5fd2d1bb52af66f75f') +sha1sums=('8da2d19faca74f894d0e2b3e142283b725c0ef46') # optimization OK From iron at frugalware.org Fri Jan 2 10:45:25 2009 From: iron at frugalware.org (Krisztian VASAS) Date: Fri Jan 2 10:45:27 2009 Subject: [Frugalware-git] xorg74: xf86-video-chips-1.2.1-1-i686 Message-ID: <20090102094525.AE20511B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=6fcc18e5bb1d6387b650bde832f3b0c5363ec3b9 commit 6fcc18e5bb1d6387b650bde832f3b0c5363ec3b9 Author: Krisztian VASAS Date: Fri Jan 2 10:45:14 2009 +0100 xf86-video-chips-1.2.1-1-i686 - version bump diff --git a/source/x11/xf86-video-chips/FrugalBuild b/source/x11/xf86-video-chips/FrugalBuild index 8ef01ed..8206a80 100644 --- a/source/x11/xf86-video-chips/FrugalBuild +++ b/source/x11/xf86-video-chips/FrugalBuild @@ -2,15 +2,15 @@ # Maintainer: Christian Hamar alias krix pkgname=xf86-video-chips -pkgver=1.1.1 -pkgrel=3 +pkgver=1.2.1 +pkgrel=1 pkgdesc="X.Org driver for chips cards" url="http://xorg.freedesktop.org" groups=('x11' 'xorg-core' 'xorg-drivers') archs=('i686' 'x86_64') -depends=('xorg-server>=1.4.0.90') +depends=('xorg-server>=1.5.99.3') makedepends=('randrproto' 'renderproto' 'videoproto') Finclude xorg -sha1sums=('0df4bd2545b6b9db5670a7e512f24562fb1b7a03') +sha1sums=('95705cb8d970fb52fb21e05acad952b71afb808b') # optimization OK From iron at frugalware.org Fri Jan 2 10:47:55 2009 From: iron at frugalware.org (Krisztian VASAS) Date: Fri Jan 2 10:47:56 2009 Subject: [Frugalware-git] xorg74: dri2proto-1.99.3-1-i686 Message-ID: <20090102094755.7C21911B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=224dd5b5006d2ca5965bba4c745058804d9ac3c2 commit 224dd5b5006d2ca5965bba4c745058804d9ac3c2 Author: Krisztian VASAS Date: Fri Jan 2 10:47:13 2009 +0100 dri2proto-1.99.3-1-i686 - changing previously forgot sha1sum diff --git a/source/x11/dri2proto/FrugalBuild b/source/x11/dri2proto/FrugalBuild index 3666617..3e681eb 100644 --- a/source/x11/dri2proto/FrugalBuild +++ b/source/x11/dri2proto/FrugalBuild @@ -11,5 +11,5 @@ archs=('i686' 'x86_64') depends=() makedepends=('pkgconfig') Finclude xorg -sha1sums=('6429338a703561c02c0aa7516d1d981e7a2bf005') +sha1sums=('0be97cbc1440df50cd950b4b5f36e5fcb44a4ab7') From iron at frugalware.org Fri Jan 2 10:58:21 2009 From: iron at frugalware.org (Krisztian VASAS) Date: Fri Jan 2 10:58:22 2009 Subject: [Frugalware-git] xorg74: xf86-video-cirrus-1.2.1-1-i686 Message-ID: <20090102095821.4D23B11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=9b8ffcb1b0aaf83dbdf9548be2e49f90fa7bc561 commit 9b8ffcb1b0aaf83dbdf9548be2e49f90fa7bc561 Author: Krisztian VASAS Date: Fri Jan 2 10:58:04 2009 +0100 xf86-video-cirrus-1.2.1-1-i686 - version bump - added some patches diff --git a/source/x11/xf86-video-cirrus/01-export_symbols_used_by_different_cirrus_driver_modules.patch1 b/source/x11/xf86-video-cirrus/01-export_symbols_used_by_different_cirrus_driver_modules.patch1 new file mode 100644 index 0000000..f627749 --- /dev/null +++ b/source/x11/xf86-video-cirrus/01-export_symbols_used_by_different_cirrus_driver_modules.patch1 @@ -0,0 +1,124 @@ +diff --git a/src/CirrusClk.c b/src/CirrusClk.c +index f23fde8..a3590c9 100644 +--- a/src/CirrusClk.c ++++ b/src/CirrusClk.c +@@ -88,7 +88,7 @@ static cirrusClockRec cirrusClockTab[] = { + * use the tested clock since others can be unstable. + */ + +-Bool ++_X_EXPORT Bool + CirrusFindClock(int *rfreq, int max_clock, int *num_out, int *den_out) + { + int n, i; +diff --git a/src/cir_dga.c b/src/cir_dga.c +index bedb796..bc98df6 100644 +--- a/src/cir_dga.c ++++ b/src/cir_dga.c +@@ -67,7 +67,7 @@ DGAFunctionRec CirDGAFuncs = { + + + +-Bool ++_X_EXPORT Bool + CirDGAInit(ScreenPtr pScreen) + { + ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; +diff --git a/src/cir_driver.c b/src/cir_driver.c +index 1942b15..0ce058d 100644 +--- a/src/cir_driver.c ++++ b/src/cir_driver.c +@@ -93,7 +93,7 @@ SymTabRec CIRChipsets[] = { + }; + + /* List of PCI chipset names */ +-PciChipsets CIRPciChipsets[] = { ++_X_EXPORT PciChipsets CIRPciChipsets[] = { + { PCI_CHIP_GD5430, PCI_CHIP_GD5430, RES_SHARED_VGA }, + { PCI_CHIP_GD5434_4,PCI_CHIP_GD5434_4, RES_SHARED_VGA }, + { PCI_CHIP_GD5434_8,PCI_CHIP_GD5434_8, RES_SHARED_VGA }, +@@ -320,7 +320,7 @@ CIRProbe(DriverPtr drv, int flags) + * Map the framebuffer and MMIO memory. + */ + +-Bool ++_X_EXPORT Bool + CirMapMem(CirPtr pCir, int scrnIndex) + { + int mmioFlags; +@@ -410,7 +410,7 @@ CirMapMem(CirPtr pCir, int scrnIndex) + * Unmap the framebuffer and MMIO memory. + */ + +-Bool ++_X_EXPORT Bool + CirUnmapMem(CirPtr pCir, int scrnIndex) + { + #ifdef CIR_DEBUG +@@ -438,7 +438,7 @@ CirUnmapMem(CirPtr pCir, int scrnIndex) + return TRUE; + } + +-void ++_X_EXPORT void + cirProbeDDC(ScrnInfoPtr pScrn, int index) + { + vbeInfoPtr pVbe; +diff --git a/src/cir_shadow.c b/src/cir_shadow.c +index a7964cd..e8b8d35 100644 +--- a/src/cir_shadow.c ++++ b/src/cir_shadow.c +@@ -19,7 +19,7 @@ + #include "cir.h" + #include "alp.h" + +-void ++_X_EXPORT void + cirRefreshArea(ScrnInfoPtr pScrn, int num, BoxPtr pbox) + { + CirPtr pCir = CIRPTR(pScrn); +@@ -46,7 +46,7 @@ cirRefreshArea(ScrnInfoPtr pScrn, int num, BoxPtr pbox) + } + } + +-void ++_X_EXPORT void + cirPointerMoved(int index, int x, int y) + { + ScrnInfoPtr pScrn = xf86Screens[index]; +@@ -64,7 +64,7 @@ cirPointerMoved(int index, int x, int y) + (*pCir->PointerMoved)(index, newX, newY); + } + +-void ++_X_EXPORT void + cirRefreshArea8(ScrnInfoPtr pScrn, int num, BoxPtr pbox) + { + CirPtr pCir = CIRPTR(pScrn); +@@ -110,7 +110,7 @@ cirRefreshArea8(ScrnInfoPtr pScrn, int num, BoxPtr pbox) + } + + +-void ++_X_EXPORT void + cirRefreshArea16(ScrnInfoPtr pScrn, int num, BoxPtr pbox) + { + CirPtr pCir = CIRPTR(pScrn); +@@ -157,7 +157,7 @@ cirRefreshArea16(ScrnInfoPtr pScrn, int num, BoxPtr pbox) + + + /* this one could be faster */ +-void ++_X_EXPORT void + cirRefreshArea24(ScrnInfoPtr pScrn, int num, BoxPtr pbox) + { + CirPtr pCir = CIRPTR(pScrn); +@@ -208,7 +208,7 @@ cirRefreshArea24(ScrnInfoPtr pScrn, int num, BoxPtr pbox) + } + } + +-void ++_X_EXPORT void + cirRefreshArea32(ScrnInfoPtr pScrn, int num, BoxPtr pbox) + { + CirPtr pCir = CIRPTR(pScrn); diff --git a/source/x11/xf86-video-cirrus/02-update_to_use_miPointerGetPosition.patch1 b/source/x11/xf86-video-cirrus/02-update_to_use_miPointerGetPosition.patch1 new file mode 100644 index 0000000..04063af --- /dev/null +++ b/source/x11/xf86-video-cirrus/02-update_to_use_miPointerGetPosition.patch1 @@ -0,0 +1,13 @@ +diff --git a/src/lg_driver.c b/src/lg_driver.c +index c731f61..ff5a477 100644 +--- a/src/lg_driver.c ++++ b/src/lg_driver.c +@@ -1547,7 +1547,7 @@ LgAdjustFrame(int scrnIndex, int x, int y, int flags) + (PCI_CHIP_GD5465 == pCir->Chipset) ? 1 : (24==pScrn->bitsPerPixel?3:1); + + /* Where's the pointer? */ +- miPointerPosition(&cursorX, &cursorY); ++ miPointerGetPosition(inputInfo.pointer, &cursorX, &cursorY); + + /* Where's the middle of the screen? We want to eventually know + which side of the screen the pointer is on. */ diff --git a/source/x11/xf86-video-cirrus/03-alpine_fix_order_of_arguments_of_PCI_WRITE_LONG.patch1 b/source/x11/xf86-video-cirrus/03-alpine_fix_order_of_arguments_of_PCI_WRITE_LONG.patch1 new file mode 100644 index 0000000..769efad --- /dev/null +++ b/source/x11/xf86-video-cirrus/03-alpine_fix_order_of_arguments_of_PCI_WRITE_LONG.patch1 @@ -0,0 +1,15 @@ +diff --git a/src/alp_driver.c b/src/alp_driver.c +index c5d2426..b7be5b2 100644 +--- a/src/alp_driver.c ++++ b/src/alp_driver.c +@@ -591,8 +591,8 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags) + * BIOSes tend to mess them up + */ + +- PCI_WRITE_LONG(pCir->PciInfo, 0x10, PCI_REGION_BASE(pCir->PciInfo, 0, REGION_MEM)); +- PCI_WRITE_LONG(pCir->PciInfo, 0x14, PCI_REGION_BASE(pCir->PciInfo, 1, REGION_MEM)); ++ PCI_WRITE_LONG(pCir->PciInfo, PCI_REGION_BASE(pCir->PciInfo, 0, REGION_MEM), 0x10); ++ PCI_WRITE_LONG(pCir->PciInfo, PCI_REGION_BASE(pCir->PciInfo, 1, REGION_MEM), 0x14); + + } + diff --git a/source/x11/xf86-video-cirrus/FrugalBuild b/source/x11/xf86-video-cirrus/FrugalBuild index 1132ff7..eb6b5b0 100644 --- a/source/x11/xf86-video-cirrus/FrugalBuild +++ b/source/x11/xf86-video-cirrus/FrugalBuild @@ -2,15 +2,22 @@ # Maintainer: Christian Hamar alias krix pkgname=xf86-video-cirrus -pkgver=1.1.0 -pkgrel=3 +pkgver=1.2.1 +pkgrel=1 pkgdesc="X.Org driver for Cirrus Logic cards" url="http://xorg.freedesktop.org" groups=('x11' 'xorg-core' 'xorg-drivers') archs=('i686' 'x86_64') -depends=('xorg-server>=1.4.0.90') +depends=('xorg-server>=1.5.99.3') makedepends=('randrproto' 'renderproto' 'videoproto') Finclude xorg -sha1sums=('1832fc03ea9d60a96bfd96c156cb439818bfc579') +source=(${source[@]} \ + '01-export_symbols_used_by_different_cirrus_driver_modules.patch1' \ + '02-update_to_use_miPointerGetPosition.patch1' \ + '03-alpine_fix_order_of_arguments_of_PCI_WRITE_LONG.patch1') +sha1sums=('cd5219897a0f3dfd7b3b9e79a3c977802707dc9c' \ + '250439b85cce46f12f3bbe59c6c9c9874d84cd89' \ + 'aa3708dc9bf7a901a1b851feafd19411d7b15112' \ + 'fd51e20e6e3b552618c698c2729f0fe0c728f02a') # optimization OK From bouleetbil at frogdev.info Fri Jan 2 11:12:16 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Jan 2 11:12:17 2009 Subject: [Frugalware-git] frugalware-current: music-applet-2.5.0-1-i686 Message-ID: <20090102101216.2219911B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=df3cabc57ac9a36e2aa2afb9a7849345047152b4 commit df3cabc57ac9a36e2aa2afb9a7849345047152b4 Author: bouleetbil Date: Fri Jan 2 11:04:52 2009 +0100 music-applet-2.5.0-1-i686 *version bump diff --git a/source/gnome-extra/music-applet/FrugalBuild b/source/gnome-extra/music-applet/FrugalBuild index 2df3f78..f3bcd18 100644 --- a/source/gnome-extra/music-applet/FrugalBuild +++ b/source/gnome-extra/music-applet/FrugalBuild @@ -3,8 +3,8 @@ # Contributor: AlexExtreme pkgname=music-applet -pkgver=2.4.2 -pkgrel=2 +pkgver=2.5.0 +pkgrel=1 pkgdesc="Music Applet is a GNOME panel applet that lets you control different music players" url="http://www.kuliniewicz.org/music-applet/" depends=('pygtk' 'gconf' 'gnome-python-desktop-applet' 'dbus-python>=0.8') @@ -17,6 +17,6 @@ groups=('gnome-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://www.kuliniewicz.org/music-applet/downloads/ | grep -m1 'Music Applet [0-9]\.[0-9]' | sed 's/.*Applet //' | sed 's/ -.*//'" source=(http://www.kuliniewicz.org/$pkgname/downloads/$pkgname-$pkgver.tar.gz) -sha1sums=('cfa7d1870cbc1cbf001dd42a6dd503c8db9e82bb') +sha1sums=('068181697fdf70cc73b019141812b47c5a409f95') # optimization OK From iron at frugalware.org Fri Jan 2 11:13:08 2009 From: iron at frugalware.org (Krisztian VASAS) Date: Fri Jan 2 11:13:10 2009 Subject: [Frugalware-git] xorg74: xf86-video-dummy-0.3.0-1-i686 Message-ID: <20090102101308.B2DE311B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=5ffa32af9652b6d65eb8fc69948edebc98d37e4e commit 5ffa32af9652b6d65eb8fc69948edebc98d37e4e Author: Krisztian VASAS Date: Fri Jan 2 11:12:52 2009 +0100 xf86-video-dummy-0.3.0-1-i686 - version bump - added a compile fix diff --git a/source/x11/xf86-video-dummy/01-remove_xf86Version.h.patch1 b/source/x11/xf86-video-dummy/01-remove_xf86Version.h.patch1 new file mode 100644 index 0000000..b89f5f2 --- /dev/null +++ b/source/x11/xf86-video-dummy/01-remove_xf86Version.h.patch1 @@ -0,0 +1,14 @@ +diff --git a/src/dummy_driver.c b/src/dummy_driver.c +index 02ba1d9..1f44d7e 100644 +--- a/src/dummy_driver.c ++++ b/src/dummy_driver.c +@@ -11,9 +11,6 @@ + #include "xf86.h" + #include "xf86_OSproc.h" + +-/* This is used for module versioning */ +-#include "xf86Version.h" +- + /* All drivers initialising the SW cursor need this */ + #include "mipointer.h" + diff --git a/source/x11/xf86-video-dummy/FrugalBuild b/source/x11/xf86-video-dummy/FrugalBuild index 1f7b146..d0adc66 100644 --- a/source/x11/xf86-video-dummy/FrugalBuild +++ b/source/x11/xf86-video-dummy/FrugalBuild @@ -2,15 +2,18 @@ # Maintainer: Christian Hamar alias krix pkgname=xf86-video-dummy -pkgver=0.2.0 -pkgrel=3 +pkgver=0.3.0 +pkgrel=1 pkgdesc="X.Org driver for dummy cards" url="http://xorg.freedesktop.org" groups=('x11' 'xorg-core' 'xorg-drivers') archs=('i686' 'x86_64') -depends=('xorg-server>=1.4.0.90') +depends=('xorg-server>=1.5.99.3') makedepends=('randrproto' 'renderproto' 'xf86dgaproto' 'videoproto') Finclude xorg -sha1sums=('8a176b64ed0eb8bc8ce16eeb3e78cf73a95b165e') +source=(${source[@]} \ + '01-remove_xf86Version.h.patch1') +sha1sums=('0fd77aeb9939db79d9eb24f9e1c0c6e6e47e9824' \ + '893d532490a98f86c5c0fe00eb6d301bee147e48') # optimization OK From bouleetbil at frogdev.info Fri Jan 2 11:18:32 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Jan 2 11:18:33 2009 Subject: [Frugalware-git] frugalware-current: rarian-0.8.1-1-i686 Message-ID: <20090102101832.6242611B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a2218f1938ffb0924f3679245bfcb9ae400ebaf1 commit a2218f1938ffb0924f3679245bfcb9ae400ebaf1 Author: bouleetbil Date: Fri Jan 2 11:12:28 2009 +0100 rarian-0.8.1-1-i686 *version bump diff --git a/source/gnome/rarian/FrugalBuild b/source/gnome/rarian/FrugalBuild index 9a8f936..883588d 100644 --- a/source/gnome/rarian/FrugalBuild +++ b/source/gnome/rarian/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=rarian -pkgver=0.8.0 +pkgver=0.8.1 pkgrel=1 pkgdesc="Documentation metadata access library" url="http://www.gnome.org/" @@ -11,7 +11,7 @@ makedepends=('intltool') groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64' 'ppc') Finclude gnome -sha1sums=('ee19a6c1300a51adec765f02351b1779477fc462') +sha1sums=('9b3f1bad1cdbb0de51d6f74431b20eb3647edc5a') Fconfopts="$Fconfopts --disable-skdb-update" # optimization OK From iron at frugalware.org Fri Jan 2 11:30:13 2009 From: iron at frugalware.org (Krisztian VASAS) Date: Fri Jan 2 11:30:14 2009 Subject: [Frugalware-git] xorg74: xf86-video-fbdev-0.4.0-1-i686 Message-ID: <20090102103013.419D211B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=b43b335a6ab2a096553dab43a7550f2de3794f60 commit b43b335a6ab2a096553dab43a7550f2de3794f60 Author: Krisztian VASAS Date: Fri Jan 2 11:29:54 2009 +0100 xf86-video-fbdev-0.4.0-1-i686 - version bump - added a small patch diff --git a/source/x11/xf86-video-fbdev/01-make_isa_optional.patch1 b/source/x11/xf86-video-fbdev/01-make_isa_optional.patch1 new file mode 100644 index 0000000..5fcc66e --- /dev/null +++ b/source/x11/xf86-video-fbdev/01-make_isa_optional.patch1 @@ -0,0 +1,73 @@ +diff --git a/configure.ac b/configure.ac +index ec3d7aa..7e82996 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -59,6 +59,14 @@ XORG_DRIVER_CHECK_EXT(XV, videoproto) + PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES]) + sdkdir=$(pkg-config --variable=sdkdir xorg-server) + ++save_CFLAGS="$CFLAGS" ++CFLAGS="$XORG_CFLAGS" ++AC_CHECK_DECL(xf86ConfigIsaEntity, ++ [AC_DEFINE(HAVE_ISA, 1, [Have ISA support])], ++ [], ++ [#include "xf86.h"]) ++CFLAGS="$save_CFLAGS" ++ + AM_CONDITIONAL(PCIACCESS, [test "x$PCIACCESS" = xyes]) + if test "x$PCIACCESS" = xyes; then + AC_DEFINE(PCIACCESS, 1, [Use libpciaccess]) +diff --git a/src/fbdev.c b/src/fbdev.c +index df278f5..7f1a749 100644 +--- a/src/fbdev.c ++++ b/src/fbdev.c +@@ -373,9 +373,7 @@ FBDevProbe(DriverPtr drv, int flags) + + for (i = 0; i < numDevSections; i++) { + Bool isIsa = FALSE; +-#ifndef XSERVER_LIBPCIACCESS + Bool isPci = FALSE; +-#endif + + dev = xf86FindOptionValue(devSections[i]->options,"fbdev"); + if (devSections[i]->busID) { +@@ -387,14 +385,18 @@ FBDevProbe(DriverPtr drv, int flags) + isPci = TRUE; + } else + #endif ++#ifdef HAVE_ISA + if (xf86ParseIsaBusString(devSections[i]->busID)) + isIsa = TRUE; ++ else ++#endif ++ 0; + + } + if (fbdevHWProbe(NULL,dev,NULL)) { + pScrn = NULL; +-#ifndef XSERVER_LIBPCIACCESS + if (isPci) { ++#ifndef XSERVER_LIBPCIACCESS + /* XXX what about when there's no busID set? */ + int entity; + +@@ -410,9 +412,9 @@ FBDevProbe(DriverPtr drv, int flags) + xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, + "claimed PCI slot %d:%d:%d\n",bus,device,func); + +- } else + #endif +- if (isIsa) { ++ } else if (isIsa) { ++#ifdef HAVE_ISA + int entity; + + entity = xf86ClaimIsaSlot(drv, 0, +@@ -420,6 +422,7 @@ FBDevProbe(DriverPtr drv, int flags) + pScrn = xf86ConfigIsaEntity(pScrn,0,entity, + NULL,RES_SHARED_VGA, + NULL,NULL,NULL,NULL); ++#endif + } else { + int entity; + diff --git a/source/x11/xf86-video-fbdev/FrugalBuild b/source/x11/xf86-video-fbdev/FrugalBuild index 8a1ad3e..1948c41 100644 --- a/source/x11/xf86-video-fbdev/FrugalBuild +++ b/source/x11/xf86-video-fbdev/FrugalBuild @@ -2,13 +2,15 @@ # Maintainer: Christian Hamar alias krix pkgname=xf86-video-fbdev -pkgver=0.3.1 -pkgrel=3 +pkgver=0.4.0 +pkgrel=1 pkgdesc="X.Org driver for fbdev cards" groups=('x11' 'xorg-core' 'xorg-drivers') archs=('i686' 'x86_64') -depends=('xorg-server>=1.4.0.90') +depends=('xorg-server>=1.5.99.3') makedepends=('randrproto' 'renderproto' 'xf86dgaproto' 'videoproto') Finclude xorg -sha1sums=('6b1cc6fbe0d1b34daff6cb202db6827007ec1cb5') +source=(${source[@]} '01-make_isa_optional.patch1') +sha1sums=('b23da9224faac7e1bcc25e82aff4b453e71e406f' \ + '2328be67a7f0ab3c4eb7a315ccfb49e5b7e94a7d') # optimization OK From bouleetbil at frogdev.info Fri Jan 2 11:46:21 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Jan 2 11:46:23 2009 Subject: [Frugalware-git] frugalware-current: cairomm-1.7.2-1-i686 Message-ID: <20090102104621.AB6CC11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4c47f33e7fcac74194a44eaf2be30a539914c638 commit 4c47f33e7fcac74194a44eaf2be30a539914c638 Author: bouleetbil Date: Fri Jan 2 11:40:12 2009 +0100 cairomm-1.7.2-1-i686 *version bump *added depend libsigc++2 diff --git a/source/xlib/cairomm/FrugalBuild b/source/xlib/cairomm/FrugalBuild index 242fd89..e160bbf 100644 --- a/source/xlib/cairomm/FrugalBuild +++ b/source/xlib/cairomm/FrugalBuild @@ -2,17 +2,17 @@ # Maintainer: Christian Hamar alias krix pkgname=cairomm -pkgver=1.6.4 +pkgver=1.7.2 pkgrel=1 pkgdesc="C++ bindings for cairo" url="http://cairographics.org" -depends=('cairo>=1.6.4') +depends=('cairo>=1.8.6' 'libsigc++2') makedepends=('doxygen' 'graphviz') groups=('xlib') archs=('i686' 'x86_64' 'ppc') options=('scriptlet') up2date="lynx -dump $url/releases/ |grep ]LATEST-cairomm|sed 's/.*mm-\([^ ]*\) .*/\1/'" source=($url/releases/$pkgname-$pkgver.tar.gz) +sha1sums=('d0c84195d7c4f16688283af259dd6438dddb0db6') -sha1sums=('61f1a1adcd3f147da89faf3311842e4f68763db4') # optimization OK From iron at frugalware.org Fri Jan 2 12:10:32 2009 From: iron at frugalware.org (Krisztian VASAS) Date: Fri Jan 2 12:10:33 2009 Subject: [Frugalware-git] xorg74: xf86-video-glint-1.2.2-1-i686 Message-ID: <20090102111032.8355311B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=db8225a35f7a3f417eca78577869ce10609b61b3 commit db8225a35f7a3f417eca78577869ce10609b61b3 Author: Krisztian VASAS Date: Fri Jan 2 12:10:23 2009 +0100 xf86-video-glint-1.2.2-1-i686 - version bump diff --git a/source/x11/xf86-video-glint/FrugalBuild b/source/x11/xf86-video-glint/FrugalBuild index 4351882..7e1e61d 100644 --- a/source/x11/xf86-video-glint/FrugalBuild +++ b/source/x11/xf86-video-glint/FrugalBuild @@ -2,16 +2,16 @@ # Maintainer: Christian Hamar alias krix pkgname=xf86-video-glint -pkgver=1.1.1 -pkgrel=3 +pkgver=1.2.2 +pkgrel=1 pkgdesc="X.Org driver for glint cards" url="http://xorg.freedesktop.org" groups=('x11' 'xorg-core' 'xorg-drivers') archs=('i686' 'x86_64') -depends=('xorg-server>=1.4.0.90') +depends=('xorg-server>=1.5.99.3') makedepends=('randrproto' 'renderproto' 'xf86dgaproto' 'videoproto' 'xf86driproto' 'glproto') Finclude xorg Fconfopts="$Fconfopts --enable-dri" -sha1sums=('0e70ae96862483e66e75553dd19ef6ef5bcb8132') +sha1sums=('4b352d503f747172790605ea3dcded412bbf1921') # optimization OK From janny at frugalware.org Fri Jan 2 15:01:11 2009 From: janny at frugalware.org (Janos Kovacs) Date: Fri Jan 2 15:01:13 2009 Subject: [Frugalware-git] frugalware-current: virtualbox-modules-2.1.0-1-i686 Message-ID: <20090102140111.58D1311B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6a77b8a665000bc4c64e452196191d4ceaeb3e88 commit 6a77b8a665000bc4c64e452196191d4ceaeb3e88 Author: Janos Kovacs Date: Fri Jan 2 14:59:17 2009 +0100 virtualbox-modules-2.1.0-1-i686 - add new packages - splitted virtualbox kernel modules diff --git a/source/apps-extra/virtualbox-modules/FrugalBuild b/source/apps-extra/virtualbox-modules/FrugalBuild new file mode 100644 index 0000000..af830a9 --- /dev/null +++ b/source/apps-extra/virtualbox-modules/FrugalBuild @@ -0,0 +1,35 @@ +# Compiling Time: 0.03 SBU +# Maintainer: Janos Kovacs + +pkgname=virtualbox-modules +pkgver=2.1.0 +pkgrel=1 +pkgdesc="Kernel modules for VirtualBox" +url="http://www.virtualbox.org" +Finclude kernel-module +makedepends=(${makedepends[@]} 'gcc-4.1') +_F_kernelmod_scriptlet=${pkgname}.install +install=${pkgname}.install +groups=('apps-extra') +archs=('i686' 'x86_64') +license=('GPL-2') +up2date="lynx -dump ${url}|grep released|sed 's/.* \([0-9.]*\) .*/\1/;q'" +source=(http://gentoo.zerodev.it/files/vbox-kernel-module-src-${pkgver}.tar.bz2 60-virtualbox.rules ${pkgname}.install) +options=('scriptlet' 'genscriptlet') +sha1sums=('eacb4d89d7f32a51240ba72dff2cfc5a62ba2beb' \ + 'b9cb188f62148603b78a0b8c04b6fff369bb7b62' \ + '452822b9d386a8f6eab953becabdf84fc89c235a') + +build() { + Fmkdir ${_F_kernelmod_dir}/kernel/misc + + make KERN_DIR=${_F_kernelmod_dir}/build MODULE_DIR_TST=${Fdestdir}/${_F_kernelmod_dir} \ + MODULE_DIR=${Fdestdir}/${_F_kernelmod_dir}/kernel/misc || Fdie + make KERN_DIR=${_F_kernelmod_dir}/build MODULE_DIR_TST=${Fdestdir}/${_F_kernelmod_dir} \ + MODULE_DIR=${Fdestdir}/${_F_kernelmod_dir}/kernel/misc INSTALL_MOD_PATH=${Fdestdir} install || Fdie + + ## udev rule + Fexerel ${Fsrcdir}/60-virtualbox.rules /etc/udev/rules.d/60-virtualbox.rules +} + +# optimalization OK - uses the kernel's option diff --git a/source/apps-extra/virtualbox-modules/virtualbox-modules.install b/source/apps-extra/virtualbox-modules/virtualbox-modules.install new file mode 100644 index 0000000..fb01bcf --- /dev/null +++ b/source/apps-extra/virtualbox-modules/virtualbox-modules.install @@ -0,0 +1,58 @@ + +common_install() +{ + /sbin/depmod -ea $_F_kernelmod_uname +} + +post_install() +{ + common_install + if ! grep -q vboxnetflt /etc/sysconfig/modules; then + echo vboxnetflt >>/etc/sysconfig/modules + fi + + if [ -e /lib/modules/`uname -r`/kernel/misc/vboxdrv.ko ]; then + modprobe vboxnetflt + fi +} + +pre_upgrade() +{ + if ! grep -q vboxdrv /etc/sysconfig/modules; then + echo vboxnetflt >>/etc/sysconfig/modules + fi +} + +post_upgrade() +{ + common_install + ## if that exisit we bumped / upgraded the package only no new kernel + ## on a new kernel we do nothing because one has to reboot anyway + if [ -e /lib/modules/`uname -r`/kernel/misc/vboxdrv.ko ]; then + ## see if is loaded , if yes kill it and modprobe again if not do nothing + if grep -q vboxdrv /proc/modules; then + echo -n "reloading vboxdrv kernel module.." + rmmod vboxnetflt + rmmod vboxdrv + sleep 1 + modprobe vboxnetflt + echo " done." + fi + fi +} + +post_remove() +{ + if grep -q vboxdrv /proc/modules; then + rmmod vboxnetflt + rmmod vboxdrv + fi + sed '/^vboxdrv/d' -i /etc/sysconfig/modules + sed '/^vboxnetflt/d' -i /etc/sysconfig/modules + + common_install +} + +op=$1 +shift +$op $* From janny at frugalware.org Fri Jan 2 15:02:34 2009 From: janny at frugalware.org (Janos Kovacs) Date: Fri Jan 2 15:02:35 2009 Subject: [Frugalware-git] frugalware-current: virtualbox-modules-2.1.0-1-i686 Message-ID: <20090102140234.C525711B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=14d5dee3aeb69435bca89dba178e562196e417b6 commit 14d5dee3aeb69435bca89dba178e562196e417b6 Author: Janos Kovacs Date: Fri Jan 2 15:02:13 2009 +0100 virtualbox-modules-2.1.0-1-i686 - add udev rules file diff --git a/source/apps-extra/virtualbox-modules/60-virtualbox.rules b/source/apps-extra/virtualbox-modules/60-virtualbox.rules new file mode 100644 index 0000000..39b988a --- /dev/null +++ b/source/apps-extra/virtualbox-modules/60-virtualbox.rules @@ -0,0 +1 @@ +KERNEL=="vboxdrv", NAME="%k", OWNER="root", GROUP="users", MODE="0666" From janny at frugalware.org Fri Jan 2 15:03:01 2009 From: janny at frugalware.org (Janos Kovacs) Date: Fri Jan 2 15:03:01 2009 Subject: [Frugalware-git] frugalware-current: virtualbox-2.1.0-1-i686 Message-ID: <20090102140301.53B6711B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=eb6fe5b80809d438b4ab7a21a99b8d69d9c627de commit eb6fe5b80809d438b4ab7a21a99b8d69d9c627de Author: Janos Kovacs Date: Fri Jan 2 15:02:50 2009 +0100 virtualbox-2.1.0-1-i686 - version bump diff --git a/source/xapps-extra/virtualbox/60-virtualbox.rules b/source/xapps-extra/virtualbox/60-virtualbox.rules deleted file mode 100644 index 39b988a..0000000 --- a/source/xapps-extra/virtualbox/60-virtualbox.rules +++ /dev/null @@ -1 +0,0 @@ -KERNEL=="vboxdrv", NAME="%k", OWNER="root", GROUP="users", MODE="0666" diff --git a/source/xapps-extra/virtualbox/FrugalBuild b/source/xapps-extra/virtualbox/FrugalBuild index bd25003..78de43c 100644 --- a/source/xapps-extra/virtualbox/FrugalBuild +++ b/source/xapps-extra/virtualbox/FrugalBuild @@ -4,45 +4,33 @@ pkgname=virtualbox realname=VirtualBox -pkgver=2.0.6 -pkgrel=3 +pkgver=2.1.0 +pkgrel=1 pkgdesc="InnoTek VirtualBox is a family of powerful x86 virtualization products for enterprise as well as home use." url="http://www.virtualbox.org" -Finclude kernel-module -_F_kernelmod_scriptlet=${pkgname}.install -install=${pkgname}.install -depends=(${depends[@]} 'xerces-c>=2.8.0' 'xalan-c>=1.10.0-2' 'iasl' 'dev86' 'libxslt' 'libxcursor' 'qt' 'libidl' 'sdl' \ +depends=('xerces-c>=2.8.0' 'xalan-c>=1.10.0-2' 'iasl' 'dev86' 'libxslt' 'libxcursor' 'qt' 'libidl' 'sdl' \ 'hal' 'libstdc++5' 'alsa-lib' 'qt4-linguist') -makedepends=(${makedepends[@]} 'gcc-4.1') +makedepends=('kernel-source' 'kernel-headers' 'gcc-4.1') # For get-vbox-additions -rodepends=('wget') +rodepends=('wget' 'virtualbox-modules') groups=('xapps-extra') archs=('i686' '!x86_64') up2date="lynx -dump ${url}|grep released|sed 's/.* \([0-9.]*\) .*/\1/;q'" source=(http://download.virtualbox.org/virtualbox/${pkgver}/${realname}-${pkgver}-OSE.tar.bz2 \ - vboxsvc virtualbox get-vbox-additions 60-virtualbox.rules virtualbox.install README.Frugalware) + vboxsvc virtualbox get-vbox-additions README.Frugalware) _F_cd_path="${realname}-${pkgver}" options=('scriptlet' 'genscriptlet') -sha1sums=('e0f43d59b3309b37fe1703fb19b234f590598733' \ +sha1sums=('a6ad07118c4a1161c4afa44ccb95db25ef07b7e0' \ 'e32ebff11bb235b50f8826b70d85dbcf4a56aee4' \ '3c0c856b9ad5f186405e87cf6eac09f1060b62cd' \ '07f49d0c5fac8311ec87d1a38a981de9ba3a4e07' \ - 'b9cb188f62148603b78a0b8c04b6fff369bb7b62' \ - 'bf4bee9647bb3bf941ae99f3b4dd775f17df16dc' \ '155be5405f4c91e5c7f4a51b5bac8fc4760a894c') -_F_desktop_name="$realname" -_F_desktop_desc="InnoTek VirtualBox virtualization program" -_F_desktop_icon="vbox.png" -_F_desktop_exec="virtualbox" -_F_desktop_categories="System;" - build() { Fcd - ## yeah fscking realize is 2007 and xfree died long time ago .. WTH! Fsed '/usr/X11R6/bin/xterm' '/usr/bin/xterm' \ - src/VBox/Runtime/VBox/RTAssertDoBreakpoint-vbox.cpp + src/VBox/Runtime/VBox/RTAssertShouldPanic-vbox.cpp Fsed 'X11R6/' '' configure Fsed 'X11R6/' '' Config.kmk @@ -51,15 +39,7 @@ build() { --disable-pulse --disable-hardening || Fdie source ./env.sh || Fdie - kmk KBUILD_VERBOSE=2 all || Fdie - - # Kernel module - Fmkdir ${_F_kernelmod_dir}/kernel/misc - cd out/linux.x86/release/bin/src || Fdie - make KERN_DIR=${_F_kernelmod_dir}/build MODULE_DIR_TST=${Fdestdir}/${_F_kernelmod_dir} \ - MODULE_DIR=${Fdestdir}/${_F_kernelmod_dir}/kernel/misc || Fdie - make KERN_DIR=${_F_kernelmod_dir}/build MODULE_DIR_TST=$Fdestdir/${_F_kernelmod_dir} \ - MODULE_DIR=${Fdestdir}/${_F_kernelmod_dir}/kernel/misc INSTALL_MOD_PATH=${Fdestdir} install || Fdie + kmk all || Fdie # Install it cd ${Fsrcdir}/${_F_cd_path}/out/linux.x86/release/bin || Fdie @@ -67,13 +47,15 @@ build() { rm -rf sdk src tst* testcase additions/src || Fdie rm -f vboxdrv.ko SUPInstall SUPUninstall || Fdie cp -R * ${Fdestdir}/usr/lib/VirtualBox/ || Fdie - for each in VBox{BFE,Manage,SDL,SVC,XPCOMIPCD,Tunctl} VirtualBox vditool additions/vboxadd-timesync ; do + for each in VBox{BFE,Manage,SDL,SVC,XPCOMIPCD,Tunctl} VirtualBox additions/vboxadd-timesync ; do # vditool chmod 0755 ${Fdestdir}/usr/lib/VirtualBox/${each} || Fdie done # Desktop file - Fln "/usr/lib/VirtualBox/VBox.png" "/usr/share/pixmaps/vbox.png" - Fdesktop2 + sed -i '/DocPath/d' ${Fdestdir}/usr/lib/VirtualBox/VirtualBox.desktop || Fdie + Fsed 'VirtualBox' 'virtualbox' ${Fdestdir}/usr/lib/VirtualBox/VirtualBox.desktop + Fln "/usr/lib/VirtualBox/VirtualBox.desktop" "/usr/share/applications/VirtualBox.desktop" + Fln "/usr/lib/VirtualBox/VBox.png" "/usr/share/pixmaps/VBox.png" # Install the wrappers Fexerel ${Fsrcdir}/vboxsvc /usr/bin/vboxsvc @@ -81,13 +63,8 @@ build() { Fsed "version=" "version=${vboxrealpkgver}" ${Fsrcdir}/get-vbox-additions Fexerel ${Fsrcdir}/get-vbox-additions /usr/bin/get-vbox-additions - ## udev rule - Fexerel ${Fsrcdir}/60-virtualbox.rules /etc/udev/rules.d/60-virtualbox.rules - ## Hacking files permission chmod 4511 ${Fdestdir}/usr/lib/VirtualBox/{VirtualBox,VBoxSDL,VBoxHeadless} || Fdie - - Fbuild_kernelmod_scriptlet } # optimization OK diff --git a/source/xapps-extra/virtualbox/virtualbox.install b/source/xapps-extra/virtualbox/virtualbox.install deleted file mode 100644 index 0ead8eb..0000000 --- a/source/xapps-extra/virtualbox/virtualbox.install +++ /dev/null @@ -1,63 +0,0 @@ - -common_install() -{ - /sbin/depmod -ea $_F_kernelmod_uname - echo -n "updating desktop database..." - if update-desktop-database > /dev/null 2>&1 ; then - echo " done." - else - echo " failed." - fi -} - -post_install() -{ - common_install - if ! grep -q vboxdrv /etc/sysconfig/modules; then - echo vboxdrv >>/etc/sysconfig/modules - fi - - if [ -e /lib/modules/`uname -r`/kernel/misc/vboxdrv.ko ]; then - modprobe vboxdrv - fi -} -pre_upgrade() -{ - # and that means there isn't vboxdrv in /etc/sysconfig/modules , add it here - # do not force in later upgrade(s) - # to be removed in 0.9 - if ! grep -q vboxdrv /etc/sysconfig/modules; then - echo vboxdrv >>/etc/sysconfig/modules - fi -} - -post_upgrade() -{ - common_install - ## if that exisit we bumped / upgraded the package only no new kernel - ## on a new kernel we do nothing because one has to reboot anyway - if [ -e /lib/modules/`uname -r`/kernel/misc/vboxdrv.ko ]; then - ## see if is loaded , if yes kill it and modprobe again if not do nothing - if grep -q vboxdrv /proc/modules; then - echo -n "reloading vboxdrv kernel module.." - rmmod vboxdrv - sleep 1 - modprobe vboxdrv - echo " done." - fi - fi -} - - -post_remove() -{ - if grep -q vboxdrv /proc/modules; then - rmmod vboxdrv - fi - sed '/^vboxdrv/d' -i /etc/sysconfig/modules - common_install -} - -op=$1 -shift -$op $* From boobaa at frugalware.org Fri Jan 2 15:16:58 2009 From: boobaa at frugalware.org (CSÉCSY László) Date: Fri Jan 2 15:16:59 2009 Subject: [Frugalware-git] frugalware-current: perl-locale-maketext-lexicon-0.77-1-i686 Message-ID: <20090102141658.0BD9B11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=93d8ec8bb391d217a1d1953c542b8d3cdbd25f67 commit 93d8ec8bb391d217a1d1953c542b8d3cdbd25f67 Author: CSÉCSY László Date: Fri Jan 2 15:16:48 2009 +0100 perl-locale-maketext-lexicon-0.77-1-i686 version bump diff --git a/source/devel-extra/perl-locale-maketext-lexicon/FrugalBuild b/source/devel-extra/perl-locale-maketext-lexicon/FrugalBuild index 1dc8484..6ccde46 100644 --- a/source/devel-extra/perl-locale-maketext-lexicon/FrugalBuild +++ b/source/devel-extra/perl-locale-maketext-lexicon/FrugalBuild @@ -5,11 +5,11 @@ pkgname=perl-locale-maketext-lexicon _F_perl_name=Locale-Maketext-Lexicon _F_perl_author=D/DR/DRTECH -pkgver=0.76 +pkgver=0.77 pkgrel=1 pkgdesc="Use other catalog formats in Maketext" depends=('perl') groups=('devel-extra') Finclude perl archs=('i686' 'x86_64') -sha1sums=('0a6a01d8bef3ca0ee67478a62c9ecaf90a30a47d') +sha1sums=('297229b18585d9c35c637b395627c8dd1090729f') From boobaa at frugalware.org Fri Jan 2 15:18:19 2009 From: boobaa at frugalware.org (CSÉCSY László) Date: Fri Jan 2 15:18:20 2009 Subject: [Frugalware-git] frugalware-current: drupal-imagefield-5.x_2.2-1-i686 Message-ID: <20090102141819.0C59E11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=887560fab85c733d3e6e5641e036b789778c373b commit 887560fab85c733d3e6e5641e036b789778c373b Author: CSÉCSY László Date: Fri Jan 2 15:18:11 2009 +0100 drupal-imagefield-5.x_2.2-1-i686 version bump diff --git a/source/network-extra/drupal-imagefield/FrugalBuild b/source/network-extra/drupal-imagefield/FrugalBuild index 4cfe237..a89c127 100644 --- a/source/network-extra/drupal-imagefield/FrugalBuild +++ b/source/network-extra/drupal-imagefield/FrugalBuild @@ -2,9 +2,9 @@ # Maintainer: CSÉCSY László _F_drupal_module=imagefield -pkgver=5.x_2.1 +pkgver=5.x_2.2 pkgrel=1 pkgdesc="Provides a basic image field for CCK in Drupal" rodepends=('drupal-cck') Finclude drupal -sha1sums=('439645b8592cb4e96f7f293e3ac98b1608aee5b8') +sha1sums=('b5428f455cb8d656d4631fca4d42353620db5afa') From boobaa at frugalware.org Fri Jan 2 15:19:42 2009 From: boobaa at frugalware.org (CSÉCSY László) Date: Fri Jan 2 15:19:44 2009 Subject: [Frugalware-git] frugalware-current: drupal6-devel-6.x_1.13-1-i686 Message-ID: <20090102141942.8F0D911B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=fdbd266bd8e3fb12c00e8330a4a6e56e39088435 commit fdbd266bd8e3fb12c00e8330a4a6e56e39088435 Author: CSÉCSY László Date: Fri Jan 2 15:19:22 2009 +0100 drupal6-devel-6.x_1.13-1-i686 version bump diff --git a/source/network-extra/drupal6-devel/FrugalBuild b/source/network-extra/drupal6-devel/FrugalBuild index f83c2f3..be20a16 100644 --- a/source/network-extra/drupal6-devel/FrugalBuild +++ b/source/network-extra/drupal6-devel/FrugalBuild @@ -3,8 +3,8 @@ _F_drupal_module=devel _F_drupal_ver=6.x -pkgver=6.x_1.12 +pkgver=6.x_1.13 pkgrel=1 pkgdesc="A suite of modules for both Drupal module and theme developers" Finclude drupal -sha1sums=('0eb6260af0605d4131e426c3ae64c4d438bdc29c') +sha1sums=('bb119af155df717ec898d2fa7451dc56081fc72d') From devil505linux at gmail.com Fri Jan 2 16:12:16 2009 From: devil505linux at gmail.com (Devil505) Date: Fri Jan 2 16:12:17 2009 Subject: [Frugalware-git] frugalware-current: alltray-0.70-1-i686 Message-ID: <20090102151216.61E0011B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c3b2b9dda2cbbf65590c259ba838b058630945b9 commit c3b2b9dda2cbbf65590c259ba838b058630945b9 Author: Devil505 Date: Fri Jan 2 16:08:13 2009 +0100 alltray-0.70-1-i686 * new package * closes request FS#1806 diff --git a/source/gnome-extra/alltray/FrugalBuild b/source/gnome-extra/alltray/FrugalBuild new file mode 100644 index 0000000..55f6a00 --- /dev/null +++ b/source/gnome-extra/alltray/FrugalBuild @@ -0,0 +1,15 @@ +# Compiling Time: 0.05 SBU +# Maintainer: Devil505 + +pkgname=alltray +pkgver=0.70 +pkgrel=1 +pkgdesc="Dock any application into the system tray/notification area." +Finclude sourceforge +depends=('gtk+2' 'atk' 'pango' 'freetype2' 'glibc' 'libxau' 'libxdmcp' 'gconf' 'libxinerama' 'libxi' 'libxrandr' 'libxcursor' 'libxdamage') +options=('scriptlet') +groups=('gnome-extra') +archs=('i686' 'x86_64') +sha1sums=('68f336b33656747d2f4397f5f7089238da528d1e') + +# optimization OK From vmiklos at frugalware.org Fri Jan 2 16:14:47 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Jan 2 16:14:50 2009 Subject: [Frugalware-git] frugalware-current: user-mode-linux-2.6.28-1-i686 Message-ID: <20090102151447.7DF6011B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9727011e4b929427033cad0d033baf7fed4f8e62 commit 9727011e4b929427033cad0d033baf7fed4f8e62 Author: Miklos Vajna Date: Fri Jan 2 15:04:05 2009 +0100 user-mode-linux-2.6.28-1-i686 - version bump diff --git a/source/apps-extra/user-mode-linux/FrugalBuild b/source/apps-extra/user-mode-linux/FrugalBuild index e2e6198..1223c42 100644 --- a/source/apps-extra/user-mode-linux/FrugalBuild +++ b/source/apps-extra/user-mode-linux/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Miklos Vajna pkgname=user-mode-linux -pkgver=2.6.27 +pkgver=2.6.28 patchlevel= pkgrel=1 pkgdesc="A safe, secure way of running Linux versions and Linux processes." From vmiklos at frugalware.org Fri Jan 2 16:14:47 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Jan 2 16:14:50 2009 Subject: [Frugalware-git] frugalware-current: busybox-1.13.2-1-i686 Message-ID: <20090102151447.9272511B8630@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=70ea4c6b4a307e0cbec061550e463b3538795e4c commit 70ea4c6b4a307e0cbec061550e463b3538795e4c Author: Miklos Vajna Date: Fri Jan 2 15:06:15 2009 +0100 busybox-1.13.2-1-i686 - version bump diff --git a/source/apps-extra/busybox/FrugalBuild b/source/apps-extra/busybox/FrugalBuild index 3491314..91f7af8 100644 --- a/source/apps-extra/busybox/FrugalBuild +++ b/source/apps-extra/busybox/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Miklos Vajna pkgname=busybox -pkgver=1.13.1 +pkgver=1.13.2 pkgrel=1 pkgdesc="Utilities for rescue and embedded systems." url="http://www.busybox.net/" @@ -12,7 +12,7 @@ archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump 'http://busybox.net/'|grep '(stable)'|sed 's/[^,]*BusyBox \([0-9.]*\) (.*/\1/'|Fsort|tail -n 1" source=(http://www.busybox.net/downloads/busybox-$pkgver.tar.bz2 config) # NOTE: we can't use signatures() here as the author signes only the checksums -sha1sums=('9380c7ab81013b7b242daf02696c0aa1fec74b28' \ +sha1sums=('6659d92b0056971e0faab254fdcbc7fcce872e9e' \ '1c0553515eb1fd6e707100da8baecdee5d22f2c0') build() From vmiklos at frugalware.org Fri Jan 2 16:14:47 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Jan 2 16:14:50 2009 Subject: [Frugalware-git] frugalware-current: rdiff-backup-1.2.4-1-i686 Message-ID: <20090102151447.A63FD11B8631@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=65e64eb24e4039d092ff78171440c7af4f23975a commit 65e64eb24e4039d092ff78171440c7af4f23975a Author: Miklos Vajna Date: Fri Jan 2 15:14:29 2009 +0100 rdiff-backup-1.2.4-1-i686 - version bump diff --git a/source/apps-extra/rdiff-backup/FrugalBuild b/source/apps-extra/rdiff-backup/FrugalBuild index 414fa38..85b6c81 100644 --- a/source/apps-extra/rdiff-backup/FrugalBuild +++ b/source/apps-extra/rdiff-backup/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Miklos Vajna pkgname=rdiff-backup -pkgver=1.2.3 +pkgver=1.2.4 pkgrel=1 pkgdesc="Backs up one directory to another, possibly over a network." url="http://www.nongnu.org/rdiff-backup/" @@ -12,4 +12,4 @@ archs=('i686' 'x86_64') up2date="lynx -dump $url|grep stable |sed 's/.*n \(.*\), r.*/\1/;q'" source=(http://savannah.nongnu.org/download/rdiff-backup/rdiff-backup-$pkgver.tar.gz) # optimization OK -sha1sums=('f8290958dd82122bbc4c7cd51a400fedb69d3c5b') +sha1sums=('ff96ed9308eb96fb90f13b92dc84478e21a2a7ed') From vmiklos at frugalware.org Fri Jan 2 16:14:47 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Jan 2 16:14:50 2009 Subject: [Frugalware-git] frugalware-current: linuxwacom-0.8.2_1-1-i686 Message-ID: <20090102151447.BBD5A11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=81a706fc76e712f748fdc979215a40f9cc396530 commit 81a706fc76e712f748fdc979215a40f9cc396530 Author: Miklos Vajna Date: Fri Jan 2 16:14:36 2009 +0100 linuxwacom-0.8.2_1-1-i686 - version bump diff --git a/source/x11-extra/linuxwacom/FrugalBuild b/source/x11-extra/linuxwacom/FrugalBuild index bf705cf..6c93132 100644 --- a/source/x11-extra/linuxwacom/FrugalBuild +++ b/source/x11-extra/linuxwacom/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Miklos Vajna pkgname=linuxwacom -pkgver=0.8.2 +pkgver=0.8.2_1 pkgrel=1 pkgdesc="Drivers, libraries, and doc for configuring and running Wacom tablets." _F_sourceforge_ext=".tar.bz2" @@ -13,7 +13,7 @@ rodepends=('udev') groups=('x11-extra') archs=('i686' 'x86_64' 'ppc') source=($source check_driver{,.1} 60-wacom.rules) -sha1sums=('96ba8783b9756bc8ac418c62faafacf28841e212' \ +sha1sums=('d18fc66f5c2b4382bbc6645616bf2e719e7d8881' \ '12ae37807a03f36be2c5cc47e444475677b41693' \ '7adf948f2d6f29635e80f4cc336799b7962d2a9a' \ '075411d58a7915c194bd25a866babbed1d0a1127') From devil505linux at gmail.com Fri Jan 2 17:24:14 2009 From: devil505linux at gmail.com (Devil505) Date: Fri Jan 2 17:24:16 2009 Subject: [Frugalware-git] frugalware-current: alltray-0.70-2-i686 Message-ID: <20090102162414.947E511B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=08f292478deb3da94aa49a015ea28ff0310264c4 commit 08f292478deb3da94aa49a015ea28ff0310264c4 Author: Devil505 Date: Fri Jan 2 17:23:30 2009 +0100 alltray-0.70-2-i686 * moved to xapps-extra * disable gconf diff --git a/source/xapps-extra/alltray/FrugalBuild b/source/xapps-extra/alltray/FrugalBuild new file mode 100644 index 0000000..f4aa7ec --- /dev/null +++ b/source/xapps-extra/alltray/FrugalBuild @@ -0,0 +1,16 @@ +# Compiling Time: 0.05 SBU +# Maintainer: Devil505 + +pkgname=alltray +pkgver=0.70 +pkgrel=2 +pkgdesc="Dock any application into the system tray/notification area." +Finclude sourceforge +depends=('gtk+2' 'atk' 'pango' 'freetype2' 'glibc' 'libxau' 'libxdmcp' 'gconf' 'libxinerama' 'libxi' 'libxrandr' 'libxcursor' 'libxdamage') +options=('scriptlet') +groups=('xapps-extra') +archs=('i686' 'x86_64') +Fconfopts="$Fconfopts --disable-gconf" +sha1sums=('68f336b33656747d2f4397f5f7089238da528d1e') + +# optimization OK From devil505linux at gmail.com Fri Jan 2 17:25:25 2009 From: devil505linux at gmail.com (Devil505) Date: Fri Jan 2 17:25:27 2009 Subject: [Frugalware-git] frugalware-current: * removed alltray from gnome-extra Message-ID: <20090102162525.7FAB711B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d70a471633558eccd2991e7936b7d6f59d54a9a1 commit d70a471633558eccd2991e7936b7d6f59d54a9a1 Author: Devil505 Date: Fri Jan 2 17:25:03 2009 +0100 * removed alltray from gnome-extra diff --git a/source/gnome-extra/alltray/FrugalBuild b/source/gnome-extra/alltray/FrugalBuild deleted file mode 100644 index 55f6a00..0000000 --- a/source/gnome-extra/alltray/FrugalBuild +++ /dev/null @@ -1,15 +0,0 @@ -# Compiling Time: 0.05 SBU -# Maintainer: Devil505 - -pkgname=alltray -pkgver=0.70 -pkgrel=1 -pkgdesc="Dock any application into the system tray/notification area." -Finclude sourceforge -depends=('gtk+2' 'atk' 'pango' 'freetype2' 'glibc' 'libxau' 'libxdmcp' 'gconf' 'libxinerama' 'libxi' 'libxrandr' 'libxcursor' 'libxdamage') -options=('scriptlet') -groups=('gnome-extra') -archs=('i686' 'x86_64') -sha1sums=('68f336b33656747d2f4397f5f7089238da528d1e') - -# optimization OK From boobaa at frugalware.org Fri Jan 2 19:04:33 2009 From: boobaa at frugalware.org (CSÉCSY László) Date: Fri Jan 2 19:04:36 2009 Subject: [Frugalware-git] frugalware-current: lilypond-2.12.1-1-i686 Message-ID: <20090102180433.DDA1E11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=981387fcf153d35973ae95770af348f8a613a7fd commit 981387fcf153d35973ae95770af348f8a613a7fd Author: CSÉCSY László Date: Fri Jan 2 19:02:37 2009 +0100 lilypond-2.12.1-1-i686 version bump removed patches that are no longer needed diff --git a/source/xapps-extra/lilypond/FrugalBuild b/source/xapps-extra/lilypond/FrugalBuild index a8e1df6..9426814 100644 --- a/source/xapps-extra/lilypond/FrugalBuild +++ b/source/xapps-extra/lilypond/FrugalBuild @@ -2,16 +2,16 @@ # Maintainer: CSÉCSY László pkgname=lilypond -pkgver=2.10.33 -pkgrel=3 +pkgver=2.12.1 +pkgrel=1 pkgdesc="music notation for everyone" url="http://lilypond.org/web/" depends=('fontforge' 'mftrace>=1.2.3' 'guile>=1.8.4-2' 'texinfo' 'python' 'gettext' 'pango' 'ghostscript' 'urw-fonts' 'fontconfig' 'freetype2' 'libtool>=2.2.2') -makedepends=('netpbm' 'imagemagick' 'rsync') +makedepends=('netpbm' 'imagemagick' 'rsync' 'zip') groups=('xapps-extra') archs=('i686' 'x86_64') up2date="lynx -dump 'http://lilypond.org/web/' | grep 'Stable.*Docum' | sed 's/.* \([0-9\.]\+\) .*/\1/'" -source=(http://download.linuxaudio.org/lilypond/sources/v2.10/$pkgname-$pkgver.tar.gz hack.patch strict-gcc.patch) +source=(http://download.linuxaudio.org/lilypond/sources/v2.12/$pkgname-$pkgver.tar.gz) options=('scriptlet') docpkg=lilypond-doc @@ -33,6 +33,4 @@ build() } # optimization OK -sha1sums=('22717aa67723067f43208e7e771d6909f8db045f'\ - 'da35df783510eb8ee06cff9da77f3faad6a2b101'\ - '7af1558a50136f56eae532c278004f70d056670f') +sha1sums=('203bead967f8409dbac00fd835d2a411694f408b') diff --git a/source/xapps-extra/lilypond/hack.patch b/source/xapps-extra/lilypond/hack.patch deleted file mode 100644 index 4a20b64..0000000 --- a/source/xapps-extra/lilypond/hack.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -Naur lilypond-2.10.11.orig/lily/font-config.cc lilypond-2.10.11/lily/font-config.cc ---- lilypond-2.10.11.orig/lily/font-config.cc 2006-11-12 00:14:44.000000000 +0100 -+++ lilypond-2.10.11/lily/font-config.cc 2007-01-14 20:50:46.000000000 +0100 -@@ -38,7 +38,7 @@ - /* - This is a terrible kludge, but there is apparently no way for - FontConfig to signal whether it needs to rescan directories. -- */ -+ - if (cache_file - && !is_file ((char const *)cache_file)) - message (_f ("Rebuilding FontConfig cache %s, this may take a while...", cache_file)); -@@ -67,12 +67,12 @@ - if (cache_file - && !is_file ((char*)cache_file)) - { -- /* inhibit future messages. */ -+ - FILE *f = fopen ((char*)cache_file, "w"); - if (f) - fclose (f); - } -- -+ */ - } - - #else diff --git a/source/xapps-extra/lilypond/strict-gcc.patch b/source/xapps-extra/lilypond/strict-gcc.patch deleted file mode 100644 index e0e0391..0000000 --- a/source/xapps-extra/lilypond/strict-gcc.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff -ru lilypond-2.11.42.original/flower/file-name.cc lilypond-2.11.42/flower/file-name.cc ---- lilypond-2.11.42.original/flower/file-name.cc 2008-01-02 03:39:05.000000000 +0100 -+++ lilypond-2.11.42/flower/file-name.cc 2008-03-24 20:50:40.000000000 +0100 -@@ -12,6 +12,7 @@ - #include - #include - #include -+#include - - using namespace std; - -diff -ru lilypond-2.11.42.original/flower/include/rational.hh lilypond-2.11.42/flower/include/rational.hh ---- lilypond-2.11.42.original/flower/include/rational.hh 2008-01-02 03:39:05.000000000 +0100 -+++ lilypond-2.11.42/flower/include/rational.hh 2008-03-24 20:51:07.000000000 +0100 -@@ -10,6 +10,7 @@ - #define RATIONAL_HH - - #include "std-string.hh" -+#include - - /** - Rational numbers. Included is support for + and - infinity. -diff -ru lilypond-2.11.42.original/flower/include/std-vector.hh lilypond-2.11.42/flower/include/std-vector.hh ---- lilypond-2.11.42.original/flower/include/std-vector.hh 2008-01-02 03:39:05.000000000 +0100 -+++ lilypond-2.11.42/flower/include/std-vector.hh 2008-03-24 20:47:10.000000000 +0100 -@@ -22,6 +22,7 @@ - #include /* find, reverse, sort */ - #include /* unary_function */ - #include -+#include - - using namespace std; - -diff -ru lilypond-2.11.42.original/lily/include/lily-guile.hh lilypond-2.11.42/lily/include/lily-guile.hh ---- lilypond-2.11.42.original/lily/include/lily-guile.hh 2008-01-02 03:39:06.000000000 +0100 -+++ lilypond-2.11.42/lily/include/lily-guile.hh 2008-03-24 20:55:40.000000000 +0100 -@@ -14,7 +14,7 @@ - #endif - - #include -- -+#include - - /* - Hack for various MacOS incarnations. -diff -ru lilypond-2.11.42.original/lily/include/midi-stream.hh lilypond-2.11.42/lily/include/midi-stream.hh ---- lilypond-2.11.42.original/lily/include/midi-stream.hh 2008-01-02 03:39:06.000000000 +0100 -+++ lilypond-2.11.42/lily/include/midi-stream.hh 2008-03-24 20:54:23.000000000 +0100 -@@ -10,6 +10,7 @@ - #include - using namespace std; - -+#include - #include "std-string.hh" - #include "lily-proto.hh" - -diff -ru lilypond-2.11.42.original/lily/piano-pedal-engraver.cc lilypond-2.11.42/lily/piano-pedal-engraver.cc ---- lilypond-2.11.42.original/lily/piano-pedal-engraver.cc 2008-01-02 03:39:06.000000000 +0100 -+++ lilypond-2.11.42/lily/piano-pedal-engraver.cc 2008-03-24 20:55:16.000000000 +0100 -@@ -28,6 +28,7 @@ - - #include "translator.icc" - -+#include - - /* - TODO: From bouleetbil at frogdev.info Fri Jan 2 20:06:03 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Jan 2 20:06:06 2009 Subject: [Frugalware-git] frugalware-current: gnome-commander-1.2.7-1-i686 Message-ID: <20090102190603.BBE8711B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bf290aa5acd7ce3b0e8a3c57b4fdf41804494281 commit bf290aa5acd7ce3b0e8a3c57b4fdf41804494281 Author: bouleetbil Date: Fri Jan 2 19:59:41 2009 +0100 gnome-commander-1.2.7-1-i686 *version bump diff --git a/source/gnome-extra/gnome-commander/FrugalBuild b/source/gnome-extra/gnome-commander/FrugalBuild index d9116c9..4190a0c 100644 --- a/source/gnome-extra/gnome-commander/FrugalBuild +++ b/source/gnome-extra/gnome-commander/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=gnome-commander -pkgver=1.2.4 +pkgver=1.2.7 pkgrel=1 pkgdesc="GNOME Commander is a nice and fast file manager for the GNOME desktop." url="http://www.nongnu.org/gcmd/" @@ -13,6 +13,6 @@ archs=('i686' 'x86_64') _F_gnome_scrollkeeper="y" _F_gnome_desktop="y" Finclude gnome gnome-scriptlet -sha1sums=('689d20ac1858e3970224ed721ecc8e0903c2ea33') +sha1sums=('d9fc6921a5d6c1f7ac0c552351b46990fc81907a') # optimization OK From bouleetbil at frogdev.info Fri Jan 2 21:08:46 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Fri Jan 2 21:08:48 2009 Subject: [Frugalware-git] frugalware-current: frozen-bubble-2.2.0-1-i686 Message-ID: <20090102200846.AB15D11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7eebf5e918941b32e1b46b2d993a9dfdbc6ed5d3 commit 7eebf5e918941b32e1b46b2d993a9dfdbc6ed5d3 Author: bouleetbil Date: Fri Jan 2 20:59:39 2009 +0100 frozen-bubble-2.2.0-1-i686 *version bump diff --git a/source/games-extra/frozen-bubble/FrugalBuild b/source/games-extra/frozen-bubble/FrugalBuild index 3704af9..b4c2e2f 100644 --- a/source/games-extra/frozen-bubble/FrugalBuild +++ b/source/games-extra/frozen-bubble/FrugalBuild @@ -3,8 +3,8 @@ # Contributor: BMH1980 pkgname=frozen-bubble -pkgver=2.1.0 -pkgrel=2 +pkgver=2.2.0 +pkgrel=1 pkgdesc="Full-featured, colorful animated penguin eyecandy" url="http://www.frozen-bubble.org/" license="GPL2" @@ -17,7 +17,7 @@ depends=('perl-sdl>=2.1.3-4' 'libgl' 'mesa' 'sdl_pango>=0.1.2-2' 'fontconfig' 'g rodepends=('desktop-file-utils') makedepends=('pkgconfig') options=('scriptlet') -sha1sums=('4fa45612e430f65d996b89959fdfbda9d629eb3e' \ +sha1sums=('df5a8c839a76fd662777925b2eb80fcb8adf3fa6' \ '510a01b2bad0b69ed383569e967bb10b53909f97' \ '03460c83a6679fc5756af428f29212c3a4380464') From iron at frugalware.org Fri Jan 2 22:50:29 2009 From: iron at frugalware.org (Krisztian VASAS) Date: Fri Jan 2 22:50:31 2009 Subject: [Frugalware-git] xorg74: xf86-video-i128-1.3.1-1-i686 Message-ID: <20090102215029.74E8C11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=b7159247626f181d931031c312fc9937660a60dd commit b7159247626f181d931031c312fc9937660a60dd Author: Krisztian VASAS Date: Fri Jan 2 22:50:17 2009 +0100 xf86-video-i128-1.3.1-1-i686 - version bump diff --git a/source/x11/xf86-video-i128/FrugalBuild b/source/x11/xf86-video-i128/FrugalBuild index a4bd04a..6c2b3f3 100644 --- a/source/x11/xf86-video-i128/FrugalBuild +++ b/source/x11/xf86-video-i128/FrugalBuild @@ -2,15 +2,15 @@ # Maintainer: Christian Hamar alias krix pkgname=xf86-video-i128 -pkgver=1.2.1 -pkgrel=3 +pkgver=1.3.1 +pkgrel=1 pkgdesc="X.Org driver for i128 cards" url="http://xorg.freedesktop.org" groups=('x11' 'xorg-core' 'xorg-drivers') archs=('i686' 'x86_64') -depends=('xorg-server>=1.4.0.90') +depends=('xorg-server>=1.5.99.3') makedepends=('randrproto' 'renderproto' 'videoproto') Finclude xorg -sha1sums=('8906c29c25dc4b54958052b3327d4d2150d1155e') +sha1sums=('4e58d4c09d794f9dd9d3e035b0a2ada0086dba81') # optimization OK From iron at frugalware.org Fri Jan 2 22:59:44 2009 From: iron at frugalware.org (Krisztian VASAS) Date: Fri Jan 2 22:59:47 2009 Subject: [Frugalware-git] xorg74: xf86-video-i740-1.2.0-1-i686 Message-ID: <20090102215944.79FA711B8630@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=55c7078d13f6854b05373d03a3722152ae711008 commit 55c7078d13f6854b05373d03a3722152ae711008 Author: Krisztian VASAS Date: Fri Jan 2 22:59:34 2009 +0100 xf86-video-i740-1.2.0-1-i686 - version bump diff --git a/source/x11/xf86-video-i740/01-uncomment_ddc2_code.patch1 b/source/x11/xf86-video-i740/01-uncomment_ddc2_code.patch1 new file mode 100644 index 0000000..a3efb3d --- /dev/null +++ b/source/x11/xf86-video-i740/01-uncomment_ddc2_code.patch1 @@ -0,0 +1,130 @@ +diff --git a/src/i740_driver.c b/src/i740_driver.c +index 8d66f22..f6a0688 100644 +--- a/src/i740_driver.c ++++ b/src/i740_driver.c +@@ -47,10 +47,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * DGA + */ + +-#ifndef USE_DDC2 +-#define USE_DDC2 0 +-#endif +- + /* + * These are X and server generic header files. + */ +@@ -239,22 +235,6 @@ static const char *vbeSymbols[] = { + }; + #endif + +-#if USE_DDC2 +-static const char *ddcSymbols[] = { +- "xf86PrintEDID", +- "xf86DoEDID_DDC1", +- "xf86DoEDID_DDC2", +- NULL +-}; +- +-static const char *i2cSymbols[] = { +- "xf86CreateI2CBusRec", +- "xf86I2CBusInit", +- NULL +-}; +-#endif +- +- + #ifdef XFree86LOADER + + static MODULESETUPPROTO(i740Setup); +@@ -297,9 +277,6 @@ i740Setup(pointer module, pointer opts, int *errmaj, int *errmin) + */ + LoaderRefSymLists(vgahwSymbols, fbSymbols, xaaSymbols, + ramdacSymbols, vbeSymbols, +-#if USE_DDC2 +- ddcSymbols, i2cSymbols, +-#endif + NULL); + + /* +@@ -454,6 +431,7 @@ I740Probe(DriverPtr drv, int flags) { + return foundScreen; + } + ++/* Ugh. Can we not do this? */ + static void + I740ProbeDDC(ScrnInfoPtr pScrn, int index) + { +@@ -745,6 +723,32 @@ I740PreInit(ScrnInfoPtr pScrn, int flags) { + clockRanges->interlaceAllowed = FALSE; /*PL*/ + clockRanges->doubleScanAllowed = TRUE; /*PL*/ + ++ { /*PL*/ ++ ++ if (xf86LoadSubModule(pScrn, "ddc")) { ++ if (xf86LoadSubModule(pScrn, "i2c") ) { ++ if (I740MapMem(pScrn)) { ++ if (I740_I2CInit(pScrn)) ++ { ++ xf86MonPtr MonInfo; ++ if ((MonInfo = xf86DoEDID_DDC2(pScrn->scrnIndex,pI740->rc_i2c))) { ++ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "DDC Monitor info: %p\n", ++ MonInfo); ++ xf86PrintEDID( MonInfo ); ++ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "end of DDC Monitor " ++ "info\n\n"); ++ xf86SetDDCproperties(pScrn,MonInfo); ++ } ++ } ++ else ++ xf86DrvMsg(pScrn->scrnIndex,X_ERROR,"I2C initialization failed\n"); ++ ++ I740UnmapMem(pScrn); ++ } ++ } ++ } ++ } ++ + i = xf86ValidateModes(pScrn, pScrn->monitor->Modes, + pScrn->display->modes, clockRanges, + 0, 320, 1600, +@@ -819,40 +823,6 @@ I740PreInit(ScrnInfoPtr pScrn, int flags) { + pI740->usevgacompat=FALSE; + + +-#if USE_DDC2 /*DDC2*/ +- { /*PL*/ +- +- if (xf86LoadSubModule(pScrn, "ddc")) { +- xf86LoaderReqSymLists(ddcSymbols, NULL); +- if ( xf86LoadSubModule(pScrn, "i2c") ) { +- xf86LoaderReqSymLists(i2cSymbols,NULL); +- +- if (I740MapMem(pScrn)) +- { +- if (I740_I2CInit(pScrn)) +- { +- xf86MonPtr MonInfo; +- +- if ((MonInfo = xf86DoEDID_DDC2(pScrn->scrnIndex,pI740->rc_i2c))) { +- xf86DrvMsg(pScrn->scrnIndex, X_INFO, "DDC Monitor info: %p\n", +- MonInfo); +- xf86PrintEDID( MonInfo ); +- xf86DrvMsg(pScrn->scrnIndex, X_INFO, "end of DDC Monitor " +- "info\n\n"); +- xf86SetDDCproperties(pScrn,MonInfo); +- } +- +- //xf86SetDDCproperties(pScrn,xf86PrintEDID( xf86DoEDID_DDC2(pScrn->scrnIndex,pI740->rc_i2c))); +- } +- else +- xf86DrvMsg(pScrn->scrnIndex,X_ERROR,"I2C initialization failed\n"); +- +- I740UnmapMem(pScrn); +- } +- } +- } +- } +-#endif /*DDC2*/ + + { /* Overlay */ + pI740->colorKey = (1 << pScrn->offset.red) | (1 << pScrn->offset.green) | diff --git a/source/x11/xf86-video-i740/FrugalBuild b/source/x11/xf86-video-i740/FrugalBuild index 7e05919..09a7d72 100644 --- a/source/x11/xf86-video-i740/FrugalBuild +++ b/source/x11/xf86-video-i740/FrugalBuild @@ -2,15 +2,18 @@ # Maintainer: Christian Hamar alias krix pkgname=xf86-video-i740 -pkgver=1.1.0 -pkgrel=3 +pkgver=1.2.0 +pkgrel=1 pkgdesc="X.Org driver for i740 cards" url="http://xorg.freedesktop.org" groups=('x11' 'xorg-core' 'xorg-drivers') archs=('i686' 'x86_64') -depends=('xorg-server>=1.4.0.90') +depends=('xorg-server>=1.5.99.3') makedepends=('randrproto' 'renderproto' 'videoproto') Finclude xorg -sha1sums=('99575052e29236d50db23d093a30ba0047d78e43') +source=(${source[@]} \ + '01-uncomment_ddc2_code.patch1') +sha1sums=('3c479ccc7bf54be925269a66a7e5742e72dbdf1d' \ + 'cda1895ce3802e19ff89279cb5b72b5eb3ef5996') # optimization OK From vmiklos at frugalware.org Fri Jan 2 23:02:38 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Jan 2 23:02:39 2009 Subject: [Frugalware-git] frugalware-current: Revert "diffutils-2.8.1-4-i686" Message-ID: <20090102220238.040F111B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f853ec5613d3616fc87733d1610882637006c7bc commit f853ec5613d3616fc87733d1610882637006c7bc Author: Miklos Vajna Date: Fri Jan 2 23:00:24 2009 +0100 Revert "diffutils-2.8.1-4-i686" This reverts commit dfb83108dcfc843d3c0ae02a916d5fdb1c975a78. As Elentir pointed out on -devel, grub depends on it so we need it in base. diff --git a/source/base/diffutils/FrugalBuild b/source/base/diffutils/FrugalBuild new file mode 100644 index 0000000..e317019 --- /dev/null +++ b/source/base/diffutils/FrugalBuild @@ -0,0 +1,16 @@ +# Compiling Time: 0.08 SBU +# Maintainer: Miklos Vajna + +pkgname=diffutils +pkgver=2.8.1 +pkgrel=5 +pkgdesc="Utility programs used for creating patch files" +url="http://www.gnu.org/software/diffutils" +depends=('glibc>=2.8-3' 'bash') +groups=('base' 'devel-core') +archs=('i686' 'x86_64' 'ppc') +Fup2gnugz +source=(http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz) +sha1sums=('a4c467c3a6a08cde9f3d94d02067ec26436e7dc5') + +# optimization OK diff --git a/source/devel/diffutils/FrugalBuild b/source/devel/diffutils/FrugalBuild deleted file mode 100644 index 1dee377..0000000 --- a/source/devel/diffutils/FrugalBuild +++ /dev/null @@ -1,16 +0,0 @@ -# Compiling Time: 0.08 SBU -# Maintainer: Miklos Vajna - -pkgname=diffutils -pkgver=2.8.1 -pkgrel=4 -pkgdesc="Utility programs used for creating patch files" -url="http://www.gnu.org/software/diffutils" -depends=('glibc>=2.8-3' 'bash') -groups=('devel' 'devel-core') -archs=('i686' 'x86_64' 'ppc') -Fup2gnugz -source=(http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz) -sha1sums=('a4c467c3a6a08cde9f3d94d02067ec26436e7dc5') - -# optimization OK From vmiklos at frugalware.org Fri Jan 2 23:03:41 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Jan 2 23:03:42 2009 Subject: [Frugalware-git] frugalware-current: grub-0.97-22-i686 Message-ID: <20090102220341.4BBCF11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7c4e265163c5056ec0638a91f8d34fdbfa027561 commit 7c4e265163c5056ec0638a91f8d34fdbfa027561 Author: Miklos Vajna Date: Fri Jan 2 23:03:29 2009 +0100 grub-0.97-22-i686 - add diffutils to rodepends() diff --git a/source/base/grub/FrugalBuild b/source/base/grub/FrugalBuild index f993639..10c2104 100644 --- a/source/base/grub/FrugalBuild +++ b/source/base/grub/FrugalBuild @@ -9,7 +9,8 @@ url="http://www.gnu.org/software/grub/" depends=('texinfo') [ "$CARCH" == "i686" ] && depends=(${depends[@]} 'ncurses' 'mktemp') [ "$CARCH" == "x86_64" ] && makedepends=(${makedepends[@]} 'ncurses' 'mktemp') -rodepends=('grub-theme-frugalware' 'os-prober') +# diffutils: grub-install needs cmp(1) +rodepends=('grub-theme-frugalware' 'os-prober' 'diffutils') groups=('base') archs=('i686' 'x86_64') up2date="lynx -dump ftp://alpha.gnu.org/gnu/grub/|grep 0.9.*tar.gz$|Flasttar" From vmiklos at frugalware.org Fri Jan 2 23:20:36 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Jan 2 23:20:37 2009 Subject: [Frugalware-git] frugalware-current: fwife-0.3-1-i686 Message-ID: <20090102222036.CED2111B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=728be4e57db61b5e2f2dc3057745575ee9e91391 commit 728be4e57db61b5e2f2dc3057745575ee9e91391 Author: Miklos Vajna Date: Fri Jan 2 23:19:27 2009 +0100 fwife-0.3-1-i686 - version bump diff --git a/source/xapps-extra/fwife/FrugalBuild b/source/xapps-extra/fwife/FrugalBuild index aab0362..5eff1bb 100644 --- a/source/xapps-extra/fwife/FrugalBuild +++ b/source/xapps-extra/fwife/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: Elentir pkgname=fwife -pkgver=0.2.1 +pkgver=0.3 pkgrel=1 pkgdesc="Gtk GUI Installer for Frugalware" url="http://utopia.toile-libre.org/$pkgname/" @@ -12,6 +12,6 @@ groups=('xapps-extra') archs=('i686' 'x86_64') source=($url/$pkgname-$pkgver.tar.gz) up2date="Flasttar $url" -sha1sums=('f3b27c473c1db724ca63b6f56ef6fa94b3fb5820') +sha1sums=('8bcd728f2ad0703ff2e954e5f6f1d2644c2c0159') unset MAKEFLAGS # optimization OK From iron at frugalware.org Fri Jan 2 23:29:50 2009 From: iron at frugalware.org (Krisztian VASAS) Date: Fri Jan 2 23:29:52 2009 Subject: [Frugalware-git] xorg74: xf86-video-intel-2.5.99.1-1-i686 Message-ID: <20090102222950.D884F11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=da6d963914f4e898d0ec813ee8b31e288a354d4d commit da6d963914f4e898d0ec813ee8b31e288a354d4d Author: Krisztian VASAS Date: Fri Jan 2 23:29:32 2009 +0100 xf86-video-intel-2.5.99.1-1-i686 - version bump - added some small fixes diff --git a/source/x11/xf86-video-intel/01-wait_vblank_before_renderto_fix_tearing.patch1 b/source/x11/xf86-video-intel/01-wait_vblank_before_renderto_fix_tearing.patch1 new file mode 100644 index 0000000..ac3eec6 --- /dev/null +++ b/source/x11/xf86-video-intel/01-wait_vblank_before_renderto_fix_tearing.patch1 @@ -0,0 +1,13 @@ +diff --git a/src/xvmc/intel_xvmc.c b/src/xvmc/intel_xvmc.c +index dbde22f..c197e35 100644 +--- a/src/xvmc/intel_xvmc.c ++++ b/src/xvmc/intel_xvmc.c +@@ -757,7 +757,7 @@ _X_EXPORT Status XvMCPutSurface(Display *display,XvMCSurface *surface, + } + intel_surf->last_draw = draw; + /* fill intel_surf->data */ +- if (0) ++ if (1) + { + drmVBlank vbl; + vbl.request.type = DRM_VBLANK_RELATIVE; diff --git a/source/x11/xf86-video-intel/02-xvmc_fix_up_needed_libs.patch1 b/source/x11/xf86-video-intel/02-xvmc_fix_up_needed_libs.patch1 new file mode 100644 index 0000000..49a8c5b --- /dev/null +++ b/source/x11/xf86-video-intel/02-xvmc_fix_up_needed_libs.patch1 @@ -0,0 +1,34 @@ +diff --git a/configure.ac b/configure.ac +index 31c14a8..7dbcd47 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -248,6 +248,7 @@ if test "$XVMC" = yes && test "$DRI" = no; then + fi + if test "$XVMC" = yes; then + PKG_CHECK_MODULES(XVMCLIB, [xvmc], [XVMC=yes], [XVMC=no]) ++ PKG_CHECK_MODULES(XEXT, [xext]) + fi + AC_MSG_CHECKING([whether to include XvMC support]) + AC_MSG_RESULT([$XVMC]) +diff --git a/src/xvmc/Makefile.am b/src/xvmc/Makefile.am +index 0060190..9e62683 100644 +--- a/src/xvmc/Makefile.am ++++ b/src/xvmc/Makefile.am +@@ -7,7 +7,7 @@ libI810XvMC_la_SOURCES = I810XvMC.c \ + libI810XvMC_la_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @DRM_CFLAGS@ @DRI_CFLAGS@ \ + -I$(top_srcdir)/src -DTRUE=1 -DFALSE=0 + libI810XvMC_la_LDFLAGS = -version-number 1:0:0 +-libI810XvMC_la_LIBADD = @DRI_LIBS@ ++libI810XvMC_la_LIBADD = @DRI_LIBS@ @DRM_LIBS@ @XVMCLIB_LIBS@ + + libIntelXvMC_la_SOURCES = intel_xvmc.c \ + intel_xvmc.h \ +@@ -27,7 +27,7 @@ libIntelXvMC_la_SOURCES = intel_xvmc.c \ + libIntelXvMC_la_CFLAGS = @XORG_CFLAGS@ @DRM_CFLAGS@ @DRI_CFLAGS@ \ + @XVMCLIB_CFLAGS@ -I$(top_srcdir)/src -DTRUE=1 -DFALSE=0 + libIntelXvMC_la_LDFLAGS = -version-number 1:0:0 +-libIntelXvMC_la_LIBADD = @DRI_LIBS@ ++libIntelXvMC_la_LIBADD = @DRI_LIBS@ @DRM_LIBS@ @XVMCLIB_LIBS@ @XEXT_LIBS@ -lpthread + + INTEL_G4A = \ + dual_prime_igd.g4a \ diff --git a/source/x11/xf86-video-intel/03-uxa_hack_to_use_aperture_mapping_insted_of_bo_map.patch1 b/source/x11/xf86-video-intel/03-uxa_hack_to_use_aperture_mapping_insted_of_bo_map.patch1 new file mode 100644 index 0000000..9900aaa --- /dev/null +++ b/source/x11/xf86-video-intel/03-uxa_hack_to_use_aperture_mapping_insted_of_bo_map.patch1 @@ -0,0 +1,36 @@ +diff --git a/src/i830_exa.c b/src/i830_exa.c +index 3e3487e..df2a5ab 100644 +--- a/src/i830_exa.c ++++ b/src/i830_exa.c +@@ -785,17 +785,11 @@ i830_uxa_prepare_access (PixmapPtr pixmap, uxa_access_t access) + i830->need_sync = FALSE; + } + +- /* For tiled front buffer, short-circuit to the GTT mapping. */ +- if (i830_pixmap_tiled(pixmap)) { +- drm_intel_gem_bo_start_gtt_access(bo, access == UXA_ACCESS_RW); +- +- pixmap->devPrivate.ptr = pI830->FbBase + bo->offset; +- } else { +- if (dri_bo_map (bo, access == UXA_ACCESS_RW) != 0) +- return FALSE; ++ if (drm_intel_bo_pin(bo, 4096) != 0) ++ return FALSE; + +- pixmap->devPrivate.ptr = bo->virtual; +- } ++ drm_intel_gem_bo_start_gtt_access(bo, access == UXA_ACCESS_RW); ++ pixmap->devPrivate.ptr = pI830->FbBase + bo->offset; + } + return TRUE; + } +@@ -810,8 +804,7 @@ i830_uxa_finish_access (PixmapPtr pixmap) + ScrnInfoPtr scrn = xf86Screens[screen->myNum]; + I830Ptr i830 = I830PTR(scrn); + +- if (!i830_pixmap_tiled(pixmap)) +- dri_bo_unmap(bo); ++ drm_intel_bo_unpin(bo); + + pixmap->devPrivate.ptr = NULL; + if (bo == i830->front_buffer->bo) diff --git a/source/x11/xf86-video-intel/04-remove_vblank_wait_code_drm_doesnt_support.patch1 b/source/x11/xf86-video-intel/04-remove_vblank_wait_code_drm_doesnt_support.patch1 new file mode 100644 index 0000000..0a3bc92 --- /dev/null +++ b/source/x11/xf86-video-intel/04-remove_vblank_wait_code_drm_doesnt_support.patch1 @@ -0,0 +1,18 @@ +diff --git a/src/xvmc/intel_xvmc.c b/src/xvmc/intel_xvmc.c +index c197e35..4b73caa 100644 +--- a/src/xvmc/intel_xvmc.c ++++ b/src/xvmc/intel_xvmc.c +@@ -757,13 +757,6 @@ _X_EXPORT Status XvMCPutSurface(Display *display,XvMCSurface *surface, + } + intel_surf->last_draw = draw; + /* fill intel_surf->data */ +- if (1) +- { +- drmVBlank vbl; +- vbl.request.type = DRM_VBLANK_RELATIVE; +- vbl.request.sequence = 1; +- drmWaitVBlank(xvmc_driver->fd, &vbl); +- } + ret = (xvmc_driver->put_surface)(display, surface, draw, srcx, srcy, + srcw, srch, destx, desty, destw, desth, flags, &intel_surf->data); + if (ret) { diff --git a/source/x11/xf86-video-intel/05-sdvo_reset_pixel_repeat_in_avi_frame.patch1 b/source/x11/xf86-video-intel/05-sdvo_reset_pixel_repeat_in_avi_frame.patch1 new file mode 100644 index 0000000..b9defc0 --- /dev/null +++ b/source/x11/xf86-video-intel/05-sdvo_reset_pixel_repeat_in_avi_frame.patch1 @@ -0,0 +1,12 @@ +diff --git a/src/i830_sdvo.c b/src/i830_sdvo.c +index 256d16d..6d2d8b1 100644 +--- a/src/i830_sdvo.c ++++ b/src/i830_sdvo.c +@@ -947,7 +947,6 @@ static void i830_sdvo_set_avi_infoframe(xf86OutputPtr output, + .len = DIP_LEN_AVI, + }; + +- avi_if.u.avi.PR = i830_sdvo_get_pixel_multiplier(mode) - 1; + avi_if.checksum = i830_sdvo_calc_hbuf_csum((uint8_t *)&avi_if, + 4 + avi_if.len); + i830_sdvo_set_hdmi_buf(output, 1, (uint8_t *)&avi_if, 4 + avi_if.len, diff --git a/source/x11/xf86-video-intel/FrugalBuild b/source/x11/xf86-video-intel/FrugalBuild index 2b25bc7..04a8393 100644 --- a/source/x11/xf86-video-intel/FrugalBuild +++ b/source/x11/xf86-video-intel/FrugalBuild @@ -2,18 +2,29 @@ # Maintainer: Christian Hamar alias krix pkgname=xf86-video-intel -pkgver=2.2.1 +pkgver=2.5.99.1 pkgrel=1 pkgdesc="X.Org driver for Intel cards (opensource)" groups=('x11' 'xorg-core' 'xorg-drivers') archs=('i686' 'x86_64') -depends=('xorg-server>=1.4.0.90' 'libxvmc') +depends=('xorg-server>=1.5.99.3' 'libxvmc') makedepends=('randrproto' 'renderproto' 'videoproto' 'xf86driproto' \ 'xf86dgaproto' 'glproto' 'xineramaproto' 'util-macros') Finclude xorg +source=(${source[@]} \ + '01-wait_vblank_before_renderto_fix_tearing.patch1' \ + '02-xvmc_fix_up_needed_libs.patch1' \ + '03-uxa_hack_to_use_aperture_mapping_insted_of_bo_map.patch1' \ + '04-remove_vblank_wait_code_drm_doesnt_support.patch1' \ + '05-sdvo_reset_pixel_repeat_in_avi_frame.patch1') replaces=('xf86-video-i810') conflicts=('xf86-video-i810') provides=('xf86-video-i810') Fconfopts="$Fconfopts --enable-dri" -sha1sums=('7180c7ab83e3334053bd1bec1cdd1755b529e19c') +sha1sums=('16406db34bf58e4743b9db2619aca1508cf86f62' \ + '2190754ddfdf4a1e7def5365e53ffdf69120cdd0' \ + 'f0858028917c129260bf849d6b700d5c87309590' \ + 'b278335491af572e6e3e0680f1b1edb478c48712' \ + '6fcc7e259b64c07777122d5dcde220740267c089' \ + '1ac30477eb0556309150c746f83be52c9e062e85') # optimization OK From vmiklos at frugalware.org Sat Jan 3 00:06:16 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Jan 3 00:06:17 2009 Subject: [Frugalware-git] pacman-g2: _pacman_db_test: fix directory detection inside the local database Message-ID: <20090102230616.2C73411B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=fca7cf0ddef1b903190790249c3197e1642d9286 commit fca7cf0ddef1b903190790249c3197e1642d9286 Author: Miklos Vajna Date: Sat Jan 3 00:07:25 2009 +0100 _pacman_db_test: fix directory detection inside the local database It was possible to get a "database seems to be consistent" message even with an inconsistent db because of this. Reported-by: Marcus Habermehl diff --git a/lib/libpacman/be_files.c b/lib/libpacman/be_files.c index 2341d03..a8d8539 100644 --- a/lib/libpacman/be_files.c +++ b/lib/libpacman/be_files.c @@ -70,7 +70,8 @@ pmlist_t *_pacman_db_test(pmdb_t *db) pmlist_t *ret = NULL; while ((ent = readdir(db->handle)) != NULL) { - stat(ent->d_name, &buf); + snprintf(path, PATH_MAX, "%s/%s", db->path, ent->d_name); + stat(path, &buf); if(!strcmp(ent->d_name, ".") || !strcmp(ent->d_name, "..") || !S_ISDIR(buf.st_mode)) { continue; } From crazy at frugalware.org Sat Jan 3 00:09:05 2009 From: crazy at frugalware.org (crazy) Date: Sat Jan 3 00:09:07 2009 Subject: [Frugalware-git] frugalware-current: alltray-0.70-3-x86_64 Message-ID: <20090102230905.EA2C911B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=557a1a1737f64bcdd37510d7a6aba1ed4d9bfbd5 commit 557a1a1737f64bcdd37510d7a6aba1ed4d9bfbd5 Author: crazy Date: Sat Jan 3 00:06:25 2009 +0100 alltray-0.70-3-x86_64 * sometimes I really should stop * saying anything and fix up things by myself .. * I really HATE rushed packages uploads .. * Fix that gconf crap for real now diff --git a/source/xapps-extra/alltray/FrugalBuild b/source/xapps-extra/alltray/FrugalBuild index f4aa7ec..c13947d 100644 --- a/source/xapps-extra/alltray/FrugalBuild +++ b/source/xapps-extra/alltray/FrugalBuild @@ -3,10 +3,10 @@ pkgname=alltray pkgver=0.70 -pkgrel=2 +pkgrel=3 pkgdesc="Dock any application into the system tray/notification area." Finclude sourceforge -depends=('gtk+2' 'atk' 'pango' 'freetype2' 'glibc' 'libxau' 'libxdmcp' 'gconf' 'libxinerama' 'libxi' 'libxrandr' 'libxcursor' 'libxdamage') +depends=('gtk+2' 'atk' 'pango' 'freetype2' 'glibc' 'libxau' 'libxdmcp' 'libxinerama' 'libxi' 'libxrandr' 'libxcursor' 'libxdamage') options=('scriptlet') groups=('xapps-extra') archs=('i686' 'x86_64') From vmiklos at frugalware.org Sat Jan 3 04:08:11 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Jan 3 04:08:14 2009 Subject: [Frugalware-git] pacman-g2: move the log callback declaration to pacman.h where we have all the others already Message-ID: <20090103030811.99A9B11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=57c38519e1f6db54e854fc5f14697fe4defce837 commit 57c38519e1f6db54e854fc5f14697fe4defce837 Author: Miklos Vajna Date: Sat Jan 3 04:10:02 2009 +0100 move the log callback declaration to pacman.h where we have all the others already diff --git a/lib/libpacman/log.h b/lib/libpacman/log.h index a5f5be1..b4a3ad3 100644 --- a/lib/libpacman/log.h +++ b/lib/libpacman/log.h @@ -21,9 +21,9 @@ #ifndef _PACMAN_LOG_H #define _PACMAN_LOG_H -#define LOG_STR_LEN 256 +#include "pacman.h" -typedef void (*pacman_cb_log)(unsigned short, char *); +#define LOG_STR_LEN 256 extern pacman_cb_log pm_logcb; extern unsigned char pm_logmask; diff --git a/lib/libpacman/pacman.h b/lib/libpacman/pacman.h index 5ca76d3..3eba97e 100644 --- a/lib/libpacman/pacman.h +++ b/lib/libpacman/pacman.h @@ -75,6 +75,9 @@ int pacman_release(void); #define PM_LOG_FLOW2 0x10 #define PM_LOG_FUNCTION 0x20 +/* Log callback */ +typedef void (*pacman_cb_log)(unsigned short, char *); + int pacman_logaction(char *fmt, ...); /* From iron at frugalware.org Sat Jan 3 08:44:25 2009 From: iron at frugalware.org (Krisztian VASAS) Date: Sat Jan 3 08:44:27 2009 Subject: [Frugalware-git] xorg74: xf86-video-mach64-6.8.0-2-i686 Message-ID: <20090103074425.20D8411B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=b05eb4bc526c447b327b9338190de930575f401d commit b05eb4bc526c447b327b9338190de930575f401d Author: Krisztian VASAS Date: Sat Jan 3 08:43:53 2009 +0100 xf86-video-mach64-6.8.0-2-i686 - rebuilt with new xorg-server diff --git a/source/x11/xf86-video-mach64/FrugalBuild b/source/x11/xf86-video-mach64/FrugalBuild index 5b5c42b..385b2aa 100644 --- a/source/x11/xf86-video-mach64/FrugalBuild +++ b/source/x11/xf86-video-mach64/FrugalBuild @@ -3,12 +3,12 @@ pkgname=xf86-video-mach64 pkgver=6.8.0 -pkgrel=1 +pkgrel=2 pkgdesc="X.Org video driver for mach64 cards" url="http://xorg.freedesktop.org" groups=('x11' 'xorg-core' 'xorg-drivers') archs=('i686' 'x86_64' 'ppc') -depends=('xorg-server>=1.4.0.90') +depends=('xorg-server>=1.5.99.3') makedepends=('randrproto' 'renderproto' 'xineramaproto' 'videoproto' 'xf86driproto' 'glproto') Finclude xorg sha1sums=('0f130aca927ede0fd3ed7876c52817a5ef9215bb') From iron at frugalware.org Sat Jan 3 09:05:41 2009 From: iron at frugalware.org (Krisztian VASAS) Date: Sat Jan 3 09:05:43 2009 Subject: [Frugalware-git] xorg74: xf86-video-mga-1.4.9-1-i686 Message-ID: <20090103080541.6BD9511B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=ba6d9f3c5ed8a0ec13e4d1c33903617099a0ba5d commit ba6d9f3c5ed8a0ec13e4d1c33903617099a0ba5d Author: Krisztian VASAS Date: Sat Jan 3 09:05:28 2009 +0100 xf86-video-mga-1.4.9-1-i686 - version bump diff --git a/source/x11/xf86-video-mga/FrugalBuild b/source/x11/xf86-video-mga/FrugalBuild index 1d6b5df..241f8dd 100644 --- a/source/x11/xf86-video-mga/FrugalBuild +++ b/source/x11/xf86-video-mga/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=xf86-video-mga -pkgver=1.4.8 +pkgver=1.4.9 pkgrel=1 pkgdesc="X.Org driver for Matrox cards" url="http://xorg.freedesktop.org" @@ -13,5 +13,5 @@ makedepends=('randrproto' 'renderproto' 'videoproto' 'xf86driproto' 'xf86dgaprot Finclude xorg options=('force') Fconfopts="$Fconfopts --enable-dri" -sha1sums=('678a65acc395574bf5e5998d75864f49ceb42bbd') +sha1sums=('faf1bfea401b280f9eb39979fcc0b020ee542e41') # optimization OK From devil505linux at gmail.com Sat Jan 3 09:06:30 2009 From: devil505linux at gmail.com (Devil505) Date: Sat Jan 3 09:06:31 2009 Subject: [Frugalware-git] frugalware-current: gnome-mplayer-0.9.3-1-i686 Message-ID: <20090103080630.5E00911B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=04c8d8f5a95fce61bf8a6d0e48fe34935a0d3a60 commit 04c8d8f5a95fce61bf8a6d0e48fe34935a0d3a60 Author: Devil505 Date: Sat Jan 3 09:06:00 2009 +0100 gnome-mplayer-0.9.3-1-i686 * version bump diff --git a/source/gnome-extra/gnome-mplayer/FrugalBuild b/source/gnome-extra/gnome-mplayer/FrugalBuild index 6adbda9..d5cd891 100644 --- a/source/gnome-extra/gnome-mplayer/FrugalBuild +++ b/source/gnome-extra/gnome-mplayer/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: Priyank Gosalia pkgname=gnome-mplayer -pkgver=0.9.2 +pkgver=0.9.3 pkgrel=1 pkgdesc="A media player for GNOME that uses MPlayer." url="http://dekorte.homeip.net/download/gnome-mplayer" @@ -15,7 +15,7 @@ Finclude googlecode _F_gnome_schemas=('/etc/gconf/schemas/gnome-mplayer.schemas') _F_gnome_desktop="y" Finclude gnome-scriptlet -sha1sums=('0602b53f139e0c4c4bf9caf08aee845ced6e9968') +sha1sums=('98ec1e3434d9adc7a60c946b028504a74cd0b44b') build () { From iron at frugalware.org Sat Jan 3 09:13:42 2009 From: iron at frugalware.org (Krisztian VASAS) Date: Sat Jan 3 09:13:43 2009 Subject: [Frugalware-git] xorg74: xf86-video-neomagic-1.2.2-1-i686 Message-ID: <20090103081342.32AB911B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=ca24e2bbe09387a84acd7396b2379a0876ce8c73 commit ca24e2bbe09387a84acd7396b2379a0876ce8c73 Author: Krisztian VASAS Date: Sat Jan 3 09:13:28 2009 +0100 xf86-video-neomagic-1.2.2-1-i686 - version bump diff --git a/source/x11/xf86-video-neomagic/FrugalBuild b/source/x11/xf86-video-neomagic/FrugalBuild index 122e866..7bbb8d3 100644 --- a/source/x11/xf86-video-neomagic/FrugalBuild +++ b/source/x11/xf86-video-neomagic/FrugalBuild @@ -2,15 +2,15 @@ # Maintainer: Christian Hamar alias krix pkgname=xf86-video-neomagic -pkgver=1.1.1 -pkgrel=3 +pkgver=1.2.2 +pkgrel=1 pkgdesc="X.Org driver for NeoMagic cards" url="http://xorg.freedesktop.org" groups=('x11' 'xorg-core' 'xorg-drivers') archs=('i686' 'x86_64') -depends=('xorg-server>=1.4.0.90') +depends=('xorg-server>=1.5.99.3') makedepends=('randrproto' 'renderproto' 'videoproto' 'xf86dgaproto') Finclude xorg -sha1sums=('45bbd2921b2fb5996fc3cdadacc87fff54132fa1') +sha1sums=('f40c877a8592a2f977a20cfdcb8082421cbf5a60') # optimization OK From iron at frugalware.org Sat Jan 3 09:31:08 2009 From: iron at frugalware.org (Krisztian VASAS) Date: Sat Jan 3 09:31:10 2009 Subject: [Frugalware-git] xorg74: xf86-video-newport-0.2.1-4-i686 Message-ID: <20090103083108.F365011B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=2032f43d95a33e96d13683a55eaaf50826688c42 commit 2032f43d95a33e96d13683a55eaaf50826688c42 Author: Krisztian VASAS Date: Sat Jan 3 09:30:41 2009 +0100 xf86-video-newport-0.2.1-4-i686 - rebuilt with new xorg-server - added 2 compile fixes diff --git a/source/x11/xf86-video-newport/02-fix_xaa_init.patch b/source/x11/xf86-video-newport/02-fix_xaa_init.patch new file mode 100644 index 0000000..9327f29 --- /dev/null +++ b/source/x11/xf86-video-newport/02-fix_xaa_init.patch @@ -0,0 +1,23 @@ +diff --git a/src/newport_driver.c b/src/newport_driver.c +index 4794df1..0bf0fe1 100644 +--- a/src/newport_driver.c ++++ b/src/newport_driver.c +@@ -593,12 +593,15 @@ NewportScreenInit(int index, ScreenPtr pScreen, int argc, char **argv) + pNewport->NoAccel = FALSE; + if (xf86ReturnOptValBool(pNewport->Options, OPTION_NOACCEL, FALSE)) + { +- if (!xf86LoadSubModule(pScrn, "xaa")) +- return FALSE; +- xf86LoaderReqSymLists(xaaSymbols, NULL); + pNewport->NoAccel = TRUE; + xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Acceleration disabled\n"); + } ++ if (!pNewport->NoAccel) { ++ if (!xf86LoadSubModule(pScrn, "xaa")) ++ pNewport->NoAccel = TRUE; ++ else ++ xf86LoaderReqSymLists(xaaSymbols, NULL); ++ } + #if 0 + if (pScrn->bitsPerPixel < 24) + { /* not implemented yet */ diff --git a/source/x11/xf86-video-newport/03-use_no_bus_not_isa.patch b/source/x11/xf86-video-newport/03-use_no_bus_not_isa.patch new file mode 100644 index 0000000..98474a1 --- /dev/null +++ b/source/x11/xf86-video-newport/03-use_no_bus_not_isa.patch @@ -0,0 +1,40 @@ +diff --git a/src/newport_driver.c b/src/newport_driver.c +index 0bf0fe1..757fd12 100644 +--- a/src/newport_driver.c ++++ b/src/newport_driver.c +@@ -1,6 +1,4 @@ + /* +- * Id: newport_driver.c,v 1.2 2000/11/29 20:58:10 agx Exp $ +- * + * Driver for the SGI Indy's Newport graphics card + * + * This driver is based on the newport.c & newport_con.c kernel code +@@ -30,7 +28,6 @@ + * Project. + * + */ +-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/newport/newport_driver.c,v 1.25 2003/04/23 21:51:41 tsi Exp $ */ + + #ifdef HAVE_CONFIG_H + #include "config.h" +@@ -272,17 +269,13 @@ NewportProbe(DriverPtr drv, int flags) + int entity; + ScrnInfoPtr pScrn = NULL; + +- /* This is a hack because don't have the RAC info(and don't want it). +- * Set it as an ISA entity to get the entity field set up right. +- */ +- entity = xf86ClaimIsaSlot(drv, 0, dev, TRUE); ++ entity = xf86ClaimNoSlot(drv, 0, dev, TRUE); + base = (NEWPORT_BASE_ADDR0 + + busID * NEWPORT_BASE_OFFSET); + RANGE(range[0], base, base + sizeof(NewportRegs),\ + ResExcMemBlock); +- pScrn = xf86ConfigIsaEntity(pScrn, 0, entity, NULL, range, \ +- NULL, NULL, NULL, NULL); +- /* Allocate a ScrnInfoRec */ ++ pScrn = xf86AllocateScreen(drv, 0); ++ xf86AddEntityToScreen(pScrn, entity); + pScrn->driverVersion = NEWPORT_VERSION; + pScrn->driverName = NEWPORT_DRIVER_NAME; + pScrn->name = NEWPORT_NAME; diff --git a/source/x11/xf86-video-newport/FrugalBuild b/source/x11/xf86-video-newport/FrugalBuild index 2591a5e..4c73e12 100644 --- a/source/x11/xf86-video-newport/FrugalBuild +++ b/source/x11/xf86-video-newport/FrugalBuild @@ -3,14 +3,19 @@ pkgname=xf86-video-newport pkgver=0.2.1 -pkgrel=3 +pkgrel=4 pkgdesc="X.Org driver for newport cards" url="http://xorg.freedesktop.org" groups=('x11' 'xorg-core' 'xorg-drivers') archs=('i686' 'x86_64') -depends=('xorg-server>=1.4.0.90') +depends=('xorg-server>=1.5.99.3') makedepends=('randrproto' 'renderproto' 'videoproto') Finclude xorg -sha1sums=('49a12490dfdc3796b196d19d9f66d3fd19281945') +source=(${source[@]} \ + '02-fix_xaa_init.patch' \ + '03-use_no_bus_not_isa.patch') +sha1sums=('49a12490dfdc3796b196d19d9f66d3fd19281945' \ + 'fb1cef8db58b69f8e4f61901274b65519a2eb1d4' \ + 'f28df61b7bfc5040d9f8c6f3e6bc9d7d2618fe91') # optimization OK From devil505linux at gmail.com Sat Jan 3 09:43:57 2009 From: devil505linux at gmail.com (Devil505) Date: Sat Jan 3 09:43:58 2009 Subject: [Frugalware-git] frugalware-current: gecko-mediaplayer-0.9.3-1-i686 Message-ID: <20090103084357.DE75011B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6712dcd61e24c5658f9ae85758af14872411e8cb commit 6712dcd61e24c5658f9ae85758af14872411e8cb Author: Devil505 Date: Sat Jan 3 09:43:42 2009 +0100 gecko-mediaplayer-0.9.3-1-i686 * version bump diff --git a/source/gnome-extra/gecko-mediaplayer/FrugalBuild b/source/gnome-extra/gecko-mediaplayer/FrugalBuild index 625036a..5d4814d 100644 --- a/source/gnome-extra/gecko-mediaplayer/FrugalBuild +++ b/source/gnome-extra/gecko-mediaplayer/FrugalBuild @@ -2,17 +2,17 @@ # Maintainer: Devil505 pkgname=gecko-mediaplayer -pkgver=0.9.2 +pkgver=0.9.3 pkgrel=1 pkgdesc="browser plugin that uses GNOME MPlayer to play media in a browser (Mozilla, Firefox, Opera, etc.)." url="http://dekorte.homeip.net/download/gecko-mediaplayer/" -depends=('gnome-mplayer>=0.9.2' 'dbus-glib' 'gconf' 'libstdc++') +depends=('gnome-mplayer>=0.9.3' 'dbus-glib' 'gconf' 'libstdc++') makedepends=('xulrunner' 'pkgconfig') Finclude googlecode _F_gnome_schemas=('/etc/gconf/schemas/gecko-mediaplayer.schemas') Finclude gnome-scriptlet groups=(gnome-extra) archs=('i686' 'x86_64' 'ppc') -sha1sums=('6ce67c3679ffc8b473adb0505f815f2328696172') +sha1sums=('35de6e16cbf79cf137197cda2c0b3fdb6a9d4a2d') # optimization OK From iron at frugalware.org Sat Jan 3 10:31:08 2009 From: iron at frugalware.org (Krisztian VASAS) Date: Sat Jan 3 10:31:09 2009 Subject: [Frugalware-git] xorg74: xf86-video-nv-2.1.12-1-i686 Message-ID: <20090103093108.60D6911B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=d37bdc5fb56a13a4637602b200bb7b4b6e49ecbb commit d37bdc5fb56a13a4637602b200bb7b4b6e49ecbb Author: Krisztian VASAS Date: Sat Jan 3 10:30:43 2009 +0100 xf86-video-nv-2.1.12-1-i686 - version bump - added some patches diff --git a/source/x11/xf86-video-nv/01-fix_for_xorg_bug_18099.patch b/source/x11/xf86-video-nv/01-fix_for_xorg_bug_18099.patch new file mode 100644 index 0000000..1d2a244 --- /dev/null +++ b/source/x11/xf86-video-nv/01-fix_for_xorg_bug_18099.patch @@ -0,0 +1,49 @@ +diff --git a/src/g80_driver.c b/src/g80_driver.c +index 50d55a0..ad8a424 100644 +--- a/src/g80_driver.c ++++ b/src/g80_driver.c +@@ -206,11 +206,8 @@ G80PreInit(ScrnInfoPtr pScrn, int flags) + CARD32 tmp; + memType BAR1sizeKB; + +- if(flags & PROBE_DETECT) { +- xf86DrvMsg(pScrn->scrnIndex, X_ERROR, +- "G80 PROBE_DETECT unimplemented\n"); +- return FALSE; +- } ++ if(flags & PROBE_DETECT) ++ return TRUE; + + /* Check the number of entities, and fail if it isn't one. */ + if(pScrn->numEntities != 1) +diff --git a/src/nv_driver.c b/src/nv_driver.c +index 831e90b..faf73a9 100644 +--- a/src/nv_driver.c ++++ b/src/nv_driver.c +@@ -77,11 +77,22 @@ static Bool NVModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode); + static Bool NVSetModeVBE(ScrnInfoPtr pScrn, DisplayModePtr pMode); + + #if XSERVER_LIBPCIACCESS +-/* For now, just match any NVIDIA PCI device and sort through them in the probe +- * routine */ ++/* For now, just match any NVIDIA display device and sort through them in the ++ * probe routine */ ++ ++/* ++ * libpciaccess's masks are shifted by 8 bits compared to the ones in xf86Pci.h. ++ */ ++#define LIBPCIACCESS_CLASS_SHIFT (PCI_CLASS_SHIFT - 8) ++#define LIBPCIACCESS_CLASS_MASK (PCI_CLASS_MASK >> 8) ++ + static const struct pci_id_match NVPciIdMatchList[] = { +- { PCI_VENDOR_NVIDIA, PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY, 0, 0, 0 }, +- { PCI_VENDOR_NVIDIA_SGS, PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY, 0, 0, 0}, ++ { PCI_VENDOR_NVIDIA, PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY, ++ PCI_CLASS_DISPLAY << LIBPCIACCESS_CLASS_SHIFT, LIBPCIACCESS_CLASS_MASK, 0 }, ++ ++ { PCI_VENDOR_NVIDIA_SGS, PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY, ++ PCI_CLASS_DISPLAY << LIBPCIACCESS_CLASS_SHIFT, LIBPCIACCESS_CLASS_MASK, 0 }, ++ + { 0, 0, 0 } + }; + #endif diff --git a/source/x11/xf86-video-nv/02-nv34_panel_tweak_for_toshiba_tecra_m2.patch b/source/x11/xf86-video-nv/02-nv34_panel_tweak_for_toshiba_tecra_m2.patch new file mode 100644 index 0000000..ab6f8d3 --- /dev/null +++ b/source/x11/xf86-video-nv/02-nv34_panel_tweak_for_toshiba_tecra_m2.patch @@ -0,0 +1,28 @@ +diff --git a/src/nv_dac.c b/src/nv_dac.c +index b1049cc..a256d0a 100644 +--- a/src/nv_dac.c ++++ b/src/nv_dac.c +@@ -42,8 +42,21 @@ NVDACPanelTweaks(NVPtr pNv, NVRegPtr state) + we can do is experiment and apply hacks. */ + + if(((pNv->Chipset & 0xffff) == 0x0328) && (state->bpp == 32)) { +- /* At least one NV34 laptop needs this workaround. */ +- tweak = -1; ++#if XSERVER_LIBPCIACCESS ++ if (((pNv->PciInfo->subvendor_id & 0xffff) == 0x1179) && ++ ((pNv->PciInfo->subdevice_id & 0xffff) == 0x0020)) ++#else ++ if (((pNv->PciInfo->subsysVendor & 0xffff) == 0x1179) && ++ ((pNv->PciInfo->subsysCard & 0xffff) == 0x0020)) ++#endif ++ { ++ ++ /* Toshiba Tecra M2 */ ++ tweak = 1; ++ } else { ++ /* At least one NV34 laptop needs this workaround. */ ++ tweak = -1; ++ } + } + + if((pNv->Chipset & 0xfff0) == 0x0310) { diff --git a/source/x11/xf86-video-nv/FrugalBuild b/source/x11/xf86-video-nv/FrugalBuild index 10cf5cd..4781376 100644 --- a/source/x11/xf86-video-nv/FrugalBuild +++ b/source/x11/xf86-video-nv/FrugalBuild @@ -2,15 +2,20 @@ # Maintainer: Christian Hamar alias krix pkgname=xf86-video-nv -pkgver=2.1.7 +pkgver=2.1.12 pkgrel=1 pkgdesc="X.Org driver for NVidia cards" url="http://xorg.freedesktop.org" groups=('x11' 'xorg-core' 'xorg-drivers') archs=('i686' 'x86_64' 'ppc') -depends=('xorg-server>=1.4.0.90') +depends=('xorg-server>=1.5.99.3') makedepends=('randrproto' 'renderproto' 'videoproto' 'xf86dgaproto') Finclude xorg -sha1sums=('cfca8a16b1c43b24513ae38a1f6b09ada99f3d14') +source=(${source[@]} \ + '01-fix_for_xorg_bug_18099.patch' \ + '02-nv34_panel_tweak_for_toshiba_tecra_m2.patch') +sha1sums=('d468596e6ffb41582cd3b214e42fc0004cc93418' \ + 'afca1d252901b0a067a7ba4f5f68f76279223a99' \ + '715808d932be5d99c60a4cadacf7e041617871eb') # optimization OK From iron at frugalware.org Sat Jan 3 10:37:42 2009 From: iron at frugalware.org (Krisztian VASAS) Date: Sat Jan 3 10:37:44 2009 Subject: [Frugalware-git] xorg74: xf86-video-r128-6.8.0-2-i686 Message-ID: <20090103093742.E438311B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=e77be36e00af6605b936d2992459aa83828a9088 commit e77be36e00af6605b936d2992459aa83828a9088 Author: Krisztian VASAS Date: Sat Jan 3 10:37:29 2009 +0100 xf86-video-r128-6.8.0-2-i686 - rebuilt with new xorg-server diff --git a/source/x11/xf86-video-r128/FrugalBuild b/source/x11/xf86-video-r128/FrugalBuild index 216e164..4209c20 100644 --- a/source/x11/xf86-video-r128/FrugalBuild +++ b/source/x11/xf86-video-r128/FrugalBuild @@ -3,12 +3,12 @@ pkgname=xf86-video-r128 pkgver=6.8.0 -pkgrel=1 +pkgrel=2 pkgdesc="X.Org video driver for r128 cards" url="http://xorg.freedesktop.org" groups=('x11' 'xorg-core' 'xorg-drivers') archs=('i686' 'x86_64' 'ppc') -depends=('xorg-server>=1.4.0.90') +depends=('xorg-server>=1.5.99.3') makedepends=('randrproto' 'renderproto' 'xineramaproto' 'videoproto' 'xf86driproto' 'glproto') Finclude xorg sha1sums=('a94f3014a139d5c469622723192aaf1626e6470b') From iron at frugalware.org Sat Jan 3 10:45:00 2009 From: iron at frugalware.org (Krisztian VASAS) Date: Sat Jan 3 10:45:01 2009 Subject: [Frugalware-git] xorg74: xf86-video-radeonhd-1.2.4-1-i686 Message-ID: <20090103094500.349B111B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=2d53c1b2b893e79a651343c283f6d6a1aa8333b0 commit 2d53c1b2b893e79a651343c283f6d6a1aa8333b0 Author: Krisztian VASAS Date: Sat Jan 3 10:44:44 2009 +0100 xf86-video-radeonhd-1.2.4-1-i686 - version bump diff --git a/source/x11/xf86-video-radeonhd/FrugalBuild b/source/x11/xf86-video-radeonhd/FrugalBuild index d5f4659..2fc493b 100644 --- a/source/x11/xf86-video-radeonhd/FrugalBuild +++ b/source/x11/xf86-video-radeonhd/FrugalBuild @@ -2,15 +2,15 @@ # Maintainer: Christian Hamar alias krix pkgname=xf86-video-radeonhd -pkgver=1.2.1 +pkgver=1.2.4 pkgrel=1 pkgdesc="X.Org driver for AMD GPG r5xx/r6xx chipsets" url="http://xorg.freedesktop.org" groups=('x11' 'xorg-core' 'xorg-drivers') archs=('i686' 'x86_64') -depends=('xorg-server>=1.4.0.90' 'pciutils' 'libpciaccess') +depends=('xorg-server>=1.5.99.3' 'pciutils' 'libpciaccess') makedepends=('randrproto' 'renderproto' 'videoproto') Finclude xorg -sha1sums=('9784c0c3562b7076de72db4a11118e0660fe2272') +sha1sums=('1634e354c54a703910c0ae547fd27285e02afb28') # optimization OK From iron at frugalware.org Sat Jan 3 10:49:14 2009 From: iron at frugalware.org (Krisztian VASAS) Date: Sat Jan 3 10:49:15 2009 Subject: [Frugalware-git] xorg74: xf86-video-rendition-4.2.0-1-i686 Message-ID: <20090103094914.9438811B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=8e89154220e61fa3105bae450285cc12b7f555c9 commit 8e89154220e61fa3105bae450285cc12b7f555c9 Author: Krisztian VASAS Date: Sat Jan 3 10:48:59 2009 +0100 xf86-video-rendition-4.2.0-1-i686 - version bump - added a compile fix diff --git a/source/x11/xf86-video-rendition/01-uninclude_xf86Version.h.patch b/source/x11/xf86-video-rendition/01-uninclude_xf86Version.h.patch new file mode 100644 index 0000000..1c212ee --- /dev/null +++ b/source/x11/xf86-video-rendition/01-uninclude_xf86Version.h.patch @@ -0,0 +1,14 @@ +diff --git a/src/rendition.h b/src/rendition.h +index 6dfb818..2b43cba 100644 +--- a/src/rendition.h ++++ b/src/rendition.h +@@ -14,9 +14,6 @@ + /* Everything using inb/outb, etc needs "compiler.h" */ + #include "compiler.h" + +-/* This is used for module versioning */ +-#include "xf86Version.h" +- + /* Drivers for PCI hardware need this */ + #include "xf86PciInfo.h" + diff --git a/source/x11/xf86-video-rendition/FrugalBuild b/source/x11/xf86-video-rendition/FrugalBuild index 1304759..a061946 100644 --- a/source/x11/xf86-video-rendition/FrugalBuild +++ b/source/x11/xf86-video-rendition/FrugalBuild @@ -2,15 +2,18 @@ # Maintainer: Christian Hamar alias krix pkgname=xf86-video-rendition -pkgver=4.1.3 -pkgrel=3 +pkgver=4.2.0 +pkgrel=1 pkgdesc="X.Org driver for rendition cards" url="http://xorg.freedesktop.org" groups=('x11' 'xorg-core' 'xorg-drivers') archs=('i686' 'x86_64') -depends=('xorg-server>=1.4.0.90') +depends=('xorg-server>=1.5.99.3') makedepends=('randrproto' 'renderproto' 'videoproto' 'xf86dgaproto') Finclude xorg -sha1sums=('9cbd77ad6cba6807823fff3b74923b955580a540') +source=(${source[@]} \ + '01-uninclude_xf86Version.h.patch') +sha1sums=('aeec6ebf71012aa2bd1898081380f73736db35bb' \ + 'b15d1a9bb085b0e0f8257f1e7ebb47512142fb63') # optimization OK From iron at frugalware.org Sat Jan 3 11:02:41 2009 From: iron at frugalware.org (Krisztian VASAS) Date: Sat Jan 3 11:02:42 2009 Subject: [Frugalware-git] xorg74: xf86-video-s3-0.6.1-1-i686 Message-ID: <20090103100241.4197D11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=7e85bf15bca5e08c2bc3628c3597e46dbf27202e commit 7e85bf15bca5e08c2bc3628c3597e46dbf27202e Author: Krisztian VASAS Date: Sat Jan 3 11:02:32 2009 +0100 xf86-video-s3-0.6.1-1-i686 - version bump diff --git a/source/x11/xf86-video-s3/FrugalBuild b/source/x11/xf86-video-s3/FrugalBuild index 9b141a6..de8cfc2 100644 --- a/source/x11/xf86-video-s3/FrugalBuild +++ b/source/x11/xf86-video-s3/FrugalBuild @@ -2,15 +2,15 @@ # Maintainer: Christian Hamar alias krix pkgname=xf86-video-s3 -pkgver=0.5.0 -pkgrel=3 +pkgver=0.6.1 +pkgrel=1 pkgdesc="X.Org driver for S3 cards" url="http://xorg.freedesktop.org" groups=('x11' 'xorg-core' 'xorg-drivers') archs=('i686' 'x86_64') -depends=('xorg-server>=1.4.0.90') +depends=('xorg-server>=1.5.99.3') makedepends=('randrproto' 'renderproto' 'videoproto' 'xf86dgaproto') Finclude xorg -sha1sums=('1ae624635f71f82ecc73999cad5499a1d5d69be6') +sha1sums=('6dcc29988ce89a68a5011b156fc95b8d0755dd70') # optimization OK From ryuo at frugalware.org Sat Jan 3 13:05:02 2009 From: ryuo at frugalware.org (James Buren) Date: Sat Jan 3 13:05:04 2009 Subject: [Frugalware-git] frugalware-current: libconfig-1.3.1-1-i686 Message-ID: <20090103120502.2959811B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d22f85d62135475128b84cb84c3fea1b4538de5d commit d22f85d62135475128b84cb84c3fea1b4538de5d Author: James Buren Date: Sat Jan 3 06:08:06 2009 -0600 libconfig-1.3.1-1-i686 * new package diff --git a/source/lib-extra/libconfig/FrugalBuild b/source/lib-extra/libconfig/FrugalBuild new file mode 100644 index 0000000..ad602f3 --- /dev/null +++ b/source/lib-extra/libconfig/FrugalBuild @@ -0,0 +1,16 @@ +# Compiling Time: 0.05 SBU +# Maintainer: James Buren + +pkgname=libconfig +pkgver=1.3.1 +pkgrel=1 +pkgdesc="Configuration file library for C and C++." +url="http://hyperrealm.com/libconfig/libconfig.html" +depends=('libstdc++') +groups=('lib-extra') +archs=('i686') +up2date="Flasttar $url" +source=(http://hyperrealm.com/libconfig/$pkgname-$pkgver.tar.gz) +sha1sums=('b93081c9eff36e2ba3f97ff707a069a120e97b1b') + +# optimization OK From vmiklos at frugalware.org Sat Jan 3 14:45:05 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Jan 3 14:45:07 2009 Subject: [Frugalware-git] frugalware-current: perl-net-dns-0.64-1-i686 Message-ID: <20090103134505.B56C111B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=46fdf959be36597687bb8cfb79f6f8adfee6f40b commit 46fdf959be36597687bb8cfb79f6f8adfee6f40b Author: Miklos Vajna Date: Sat Jan 3 14:43:59 2009 +0100 perl-net-dns-0.64-1-i686 - version bump diff --git a/source/devel-extra/perl-net-dns/FrugalBuild b/source/devel-extra/perl-net-dns/FrugalBuild index c1094b9..3f1148f 100644 --- a/source/devel-extra/perl-net-dns/FrugalBuild +++ b/source/devel-extra/perl-net-dns/FrugalBuild @@ -4,13 +4,13 @@ _F_perl_name=Net-DNS _F_perl_author=O/OL/OLAF _F_conf_perl_pipefrom="echo n" -pkgver=0.63 +pkgver=0.64 pkgrel=1 pkgdesc="Perl interface to the DNS resolver" depends=('perl-digest-hmac' 'perl-net-ip' 'perl-io-socket-inet6') Finclude perl archs=('i686' 'x86_64' 'ppc') -sha1sums=('58fa1272706067e7e0e56d53ee52e8ffff492fbe') +sha1sums=('0b473cf9797075ac14ae190d958cb9e440a66953') Fconfopts="$Fconfopts --noonline-tests" # optimization OK From vmiklos at frugalware.org Sat Jan 3 14:45:05 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Jan 3 14:45:07 2009 Subject: [Frugalware-git] frugalware-current: perl-dbd-pg-2.11.8-1-i686 Message-ID: <20090103134505.D824C11B8630@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f63dfed727ba591baf18541b4daa88f7c7a9c071 commit f63dfed727ba591baf18541b4daa88f7c7a9c071 Author: Miklos Vajna Date: Sat Jan 3 14:44:27 2009 +0100 perl-dbd-pg-2.11.8-1-i686 - version bump diff --git a/source/devel-extra/perl-dbd-pg/FrugalBuild b/source/devel-extra/perl-dbd-pg/FrugalBuild index ac8e538..3b86ecd 100644 --- a/source/devel-extra/perl-dbd-pg/FrugalBuild +++ b/source/devel-extra/perl-dbd-pg/FrugalBuild @@ -3,11 +3,11 @@ _F_perl_name=DBD-Pg _F_perl_author=T/TU/TURNSTEP -pkgver=2.11.6 +pkgver=2.11.8 pkgrel=1 pkgdesc="PostgreSQL database driver for the DBI module" depends=('perl-dbi>=1.45' 'postgresql>=8.2') Finclude perl archs=(${archs[@]} 'x86_64') -sha1sums=('1d1b3e083847fc01ca9cfdac4bf20c5991c14324') +sha1sums=('ebb901b6feccaf65432509c416f09ac8e0b2ba35') # optimization OK From iron at frugalware.org Sat Jan 3 15:32:04 2009 From: iron at frugalware.org (Krisztian VASAS) Date: Sat Jan 3 15:32:06 2009 Subject: [Frugalware-git] xorg74: xf86-video-s3virge-1.10.2-1-i686 Message-ID: <20090103143204.8EA4411B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=c998c57fb171afe51f2ec69a184c87c35f6925af commit c998c57fb171afe51f2ec69a184c87c35f6925af Author: Krisztian VASAS Date: Sat Jan 3 15:31:52 2009 +0100 xf86-video-s3virge-1.10.2-1-i686 - version bump diff --git a/source/x11/xf86-video-s3virge/FrugalBuild b/source/x11/xf86-video-s3virge/FrugalBuild index 8a148fe..06e1013 100644 --- a/source/x11/xf86-video-s3virge/FrugalBuild +++ b/source/x11/xf86-video-s3virge/FrugalBuild @@ -2,15 +2,15 @@ # Maintainer: Christian Hamar alias krix pkgname=xf86-video-s3virge -pkgver=1.9.1 -pkgrel=3 +pkgver=1.10.2 +pkgrel=1 pkgdesc="X.Org driver for S3 Virge cards" url="http://xorg.freedesktop.org" groups=('x11' 'xorg-core' 'xorg-drivers') archs=('i686' 'x86_64') -depends=('xorg-server>=1.4.0.90') +depends=('xorg-server>=1.5.99.3') makedepends=('randrproto' 'renderproto' 'videoproto' 'xf86dgaproto') Finclude xorg -sha1sums=('e9994531b1847cb4e23fffec6851f3554f6a35cc') +sha1sums=('f153846fbc18e7d46d996157cdc74be8ea95ad87') # optimization OK From priyank at frugalware.org Sat Jan 3 15:58:05 2009 From: priyank at frugalware.org (Priyank) Date: Sat Jan 3 15:58:06 2009 Subject: [Frugalware-git] xfce46: sion-0.1.0-1-i686 Message-ID: <20090103145805.715E711B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfce46.git;a=commitdiff;h=50304344edbd703a1ed574abdea9b0c9e297ea67 commit 50304344edbd703a1ed574abdea9b0c9e297ea67 Author: Priyank Date: Sat Jan 3 20:27:21 2009 +0530 sion-0.1.0-1-i686 * New package / Initial import diff --git a/source/xfce4-extra/sion/FrugalBuild b/source/xfce4-extra/sion/FrugalBuild new file mode 100644 index 0000000..bc6e3c8 --- /dev/null +++ b/source/xfce4-extra/sion/FrugalBuild @@ -0,0 +1,25 @@ +# Compiling Time: 0.02 SBU +# Maintainer: Priyank Gosalia + +pkgname=sion +pkgver=0.1.0 +pkgrel=1 +pkgdesc="A frontend to easily manage connections to remove filesystems using GIO/GVFS." +url="http://goodies.xfce.org/projects/applications/sion" +makedepends=('intltool') +depends=('gtk+2>=2.14.6' 'gvfs>=1.0.3') +groups=('xfce4-extra') +archs=('i686' 'x86_64') +up2date="Flasttar http://goodies.xfce.org/releases/$pkgname/" +source=(http://goodies.xfce.org/releases/$pkgname/$pkgname-$pkgver.tar.bz2) +sha1sums=('4f1410bb88c6c4d83517f4afa097f8a6231de5be') + +build() +{ + Fcd + ./waf configure --prefix=/usr || Fdie + ./waf build || Fdie + ./waf --destdir=${Fdestdir} install || Fdie +} + +# optimization OK From priyank at frugalware.org Sat Jan 3 16:36:51 2009 From: priyank at frugalware.org (Priyank) Date: Sat Jan 3 16:36:54 2009 Subject: [Frugalware-git] frugalware-current: Fdesktop2: drop the Encoding keyword. It has been deprecated by the FreeDesktop standard Message-ID: <20090103153651.58BBE11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4e793738014dacf6b9c457daa933386207c530f0 commit 4e793738014dacf6b9c457daa933386207c530f0 Author: Priyank Date: Sat Jan 3 21:06:04 2009 +0530 Fdesktop2: drop the Encoding keyword. It has been deprecated by the FreeDesktop standard diff --git a/source/include/util.sh b/source/include/util.sh index a7f2dd2..56c3957 100644 --- a/source/include/util.sh +++ b/source/include/util.sh @@ -1023,7 +1023,6 @@ Fdesktop2() Fmessage "Installing desktop file: $deskfilename" cat > $Fdestdir$Fmenudir/$deskfilename << EOF [Desktop Entry] -Encoding=UTF-8 Name=$dname Comment=$ddesc Exec=$dexec From iron at frugalware.org Sat Jan 3 16:39:07 2009 From: iron at frugalware.org (Krisztian VASAS) Date: Sat Jan 3 16:39:08 2009 Subject: [Frugalware-git] xorg74: xf86-video-savage-2.2.1-1-i686 Message-ID: <20090103153907.8F04511B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=b4b14a75dcca36d16b90bd0e9cb097b5805b6121 commit b4b14a75dcca36d16b90bd0e9cb097b5805b6121 Author: Krisztian VASAS Date: Sat Jan 3 16:38:55 2009 +0100 xf86-video-savage-2.2.1-1-i686 - version bump diff --git a/source/x11/xf86-video-savage/01-use_xfVillKeyHelperDrawable_if_available.patch b/source/x11/xf86-video-savage/01-use_xfVillKeyHelperDrawable_if_available.patch new file mode 100644 index 0000000..0d69d14 --- /dev/null +++ b/source/x11/xf86-video-savage/01-use_xfVillKeyHelperDrawable_if_available.patch @@ -0,0 +1,45 @@ +diff --git a/configure.ac b/configure.ac +index b6d64e4..80c91bc 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -100,6 +100,10 @@ CFLAGS="$XORG_CFLAGS" + AC_CHECK_DECL(XSERVER_LIBPCIACCESS, + [XSERVER_LIBPCIACCESS=yes], [XSERVER_LIBPCIACCESS=no], + [#include "xorg-server.h"]) ++AC_CHECK_DECL(xf86XVFillKeyHelperDrawable, ++ [AC_DEFINE(HAVE_XV_DRAWABLE_HELPER, 1, [Have xf86XVFillKeyHelperDrawable prototype])], ++ [], ++ [#include "xf86xv.h"]) + CFLAGS="$save_CFLAGS" + + if test "x$XSERVER_LIBPCIACCESS" = xyes; then +diff --git a/src/savage_video.c b/src/savage_video.c +index a68c191..56ced56 100644 +--- a/src/savage_video.c ++++ b/src/savage_video.c +@@ -1840,6 +1840,16 @@ SavageDisplayVideo2000( + #endif + } + ++static void ++SavageFillKeyHelper(DrawablePtr pDraw, uint32_t colorKey, RegionPtr clipBoxes) ++{ ++#if HAVE_XV_DRAWABLE_HELPER ++ xf86XVFillKeyHelperDrawable(pDraw, colorKey, clipBoxes); ++#else ++ xf86XVFillKeyHelper(pDraw->pScreen, colorKey, clipBoxes); ++#endif ++} ++ + static int + SavagePutImage( + ScrnInfoPtr pScrn, +@@ -1988,7 +1998,7 @@ SavagePutImage( + if(!REGION_EQUAL(pScreen, &pPriv->clip, clipBoxes)) { + REGION_COPY(pScreen, &pPriv->clip, clipBoxes); + /* draw these */ +- xf86XVFillKeyHelper(pScrn->pScreen, pPriv->colorKey, clipBoxes); ++ SavageFillKeyHelper(pDraw, pPriv->colorKey, clipBoxes); + + } + diff --git a/source/x11/xf86-video-savage/02-fix_exa_copy.patch b/source/x11/xf86-video-savage/02-fix_exa_copy.patch new file mode 100644 index 0000000..30e40fe --- /dev/null +++ b/source/x11/xf86-video-savage/02-fix_exa_copy.patch @@ -0,0 +1,49 @@ +diff --git a/src/savage_exa.c b/src/savage_exa.c +index 6320e18..7c6efb3 100644 +--- a/src/savage_exa.c ++++ b/src/savage_exa.c +@@ -382,7 +382,7 @@ SavagePrepareCopy(PixmapPtr pSrcPixmap, PixmapPtr pDstPixmap, int xdir, int ydir + + /*ErrorF("in preparecopy\n");*/ + +- cmd = BCI_CMD_RECT | BCI_CMD_DEST_PBD_NEW | BCI_CMD_SRC_SBD_COLOR_NEW; ++ cmd = BCI_CMD_RECT | BCI_CMD_DEST_PBD | BCI_CMD_SRC_SBD_COLOR; + + BCI_CMD_SET_ROP( cmd, SavageGetCopyROP(alu) ); + +@@ -397,18 +397,23 @@ SavagePrepareCopy(PixmapPtr pSrcPixmap, PixmapPtr pDstPixmap, int xdir, int ydir + + psav->SavedBciCmd = cmd; + +- psav->WaitQueue(psav,7); ++ psav->WaitQueue(psav,8); + + BCI_SEND(BCI_SET_REGISTER + | BCI_SET_REGISTER_COUNT(1) + | BCI_BITPLANE_WRITE_MASK); + BCI_SEND(planemask); + +- BCI_SEND(psav->SavedBciCmd); + /* src */ ++ BCI_SEND(BCI_SET_REGISTER ++ | BCI_SET_REGISTER_COUNT(2) ++ | BCI_SBD_1); + BCI_SEND(psav->sbd_offset); + BCI_SEND(psav->sbd_high); + /* dst */ ++ BCI_SEND(BCI_SET_REGISTER ++ | BCI_SET_REGISTER_COUNT(2) ++ | BCI_PBD_1); + BCI_SEND(psav->pbd_offset); + BCI_SEND(psav->pbd_high); + +@@ -437,7 +442,8 @@ SavageCopy(PixmapPtr pDstPixmap, int srcX, int srcY, int dstX, int dstY, int wid + height ++; + } + +- psav->WaitQueue(psav,4); ++ psav->WaitQueue(psav,5); ++ BCI_SEND(psav->SavedBciCmd); + BCI_SEND(BCI_X_Y(srcX, srcY)); + BCI_SEND(BCI_X_Y(dstX, dstY)); + BCI_SEND(BCI_W_H(width, height)); diff --git a/source/x11/xf86-video-savage/FrugalBuild b/source/x11/xf86-video-savage/FrugalBuild index bd974f2..2b94546 100644 --- a/source/x11/xf86-video-savage/FrugalBuild +++ b/source/x11/xf86-video-savage/FrugalBuild @@ -2,16 +2,21 @@ # Maintainer: Christian Hamar alias krix pkgname=xf86-video-savage -pkgver=2.1.3 -pkgrel=2 +pkgver=2.2.1 +pkgrel=1 pkgdesc="X.Org driver for S3 Savage cards" url="http://xorg.freedesktop.org" groups=('x11' 'xorg-core' 'xorg-drivers') archs=('i686' 'x86_64') -depends=('xorg-server>=1.4.0.90') +depends=('xorg-server>=1.5.99.3') makedepends=('randrproto' 'renderproto' 'videoproto' 'xf86dgaproto' 'glproto' 'xf86driproto') Finclude xorg -sha1sums=('bb73843d38a8152c39311acc8b1a18d5d51603af') +source=(${source[@]} \ + '01-use_xfVillKeyHelperDrawable_if_available.patch' \ + '02-fix_exa_copy.patch') +sha1sums=('c20eaf260cae10c8c65d3d690825a5c70a30419b' \ + '61884b36c2787ebe4f306b11cebb8affd9061b06' \ + '38f0b200974e455a9ef827f50dbb858b19ea0c29') Fconfopts="$Fconfopts --enable-dri" # optimization OK From iron at frugalware.org Sat Jan 3 16:45:30 2009 From: iron at frugalware.org (Krisztian VASAS) Date: Sat Jan 3 16:45:32 2009 Subject: [Frugalware-git] xorg74: xf86-video-siliconmotion-1.7.0-1-i686 Message-ID: <20090103154530.466B911B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=c0d4df70907e80d446c473eb25845195aa2c1e15 commit c0d4df70907e80d446c473eb25845195aa2c1e15 Author: Krisztian VASAS Date: Sat Jan 3 16:45:04 2009 +0100 xf86-video-siliconmotion-1.7.0-1-i686 - version bump diff --git a/source/x11/xf86-video-siliconmotion/FrugalBuild b/source/x11/xf86-video-siliconmotion/FrugalBuild index aa373b3..438abf6 100644 --- a/source/x11/xf86-video-siliconmotion/FrugalBuild +++ b/source/x11/xf86-video-siliconmotion/FrugalBuild @@ -2,15 +2,15 @@ # Maintainer: Christian Hamar alias krix pkgname=xf86-video-siliconmotion -pkgver=1.5.1 +pkgver=1.7.0 pkgrel=1 pkgdesc="X.Org driver for siliconmotion cards" url="http://xorg.freedesktop.org" groups=('x11' 'xorg-core' 'xorg-drivers') archs=('i686' 'x86_64') -depends=('xorg-server>=1.4.0.90') +depends=('xorg-server>=1.5.99.3') makedepends=('randrproto' 'renderproto' 'videoproto' 'xf86dgaproto') Finclude xorg -sha1sums=('a3ed12502765df05d91a9fcbe2264e5684fdd103') +sha1sums=('ebbe5d20244f5e6fca5568ea55379a9a866d303e') # optimization OK From iron at frugalware.org Sat Jan 3 16:49:34 2009 From: iron at frugalware.org (Krisztian VASAS) Date: Sat Jan 3 16:49:35 2009 Subject: [Frugalware-git] xorg74: xf86-video-sis-0.10.1-1-i686 Message-ID: <20090103154934.27BDB11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=966657b4df377faad625577fcac46b64d0b85a8a commit 966657b4df377faad625577fcac46b64d0b85a8a Author: Krisztian VASAS Date: Sat Jan 3 16:49:09 2009 +0100 xf86-video-sis-0.10.1-1-i686 - version bump diff --git a/source/x11/xf86-video-sis/FrugalBuild b/source/x11/xf86-video-sis/FrugalBuild index f4c06fc..60342a5 100644 --- a/source/x11/xf86-video-sis/FrugalBuild +++ b/source/x11/xf86-video-sis/FrugalBuild @@ -2,13 +2,13 @@ # Maintainer: Christian Hamar alias krix pkgname=xf86-video-sis -pkgver=0.9.4 +pkgver=0.10.1 pkgrel=1 pkgdesc="X.Org driver for SiS cards" url="http://xorg.freedesktop.org" groups=('x11' 'xorg-core' 'xorg-drivers') archs=('i686' 'x86_64') -depends=('xorg-server>=1.4.0.90') +depends=('xorg-server>=1.5.99.3') makedepends=('randrproto' 'renderproto' 'videoproto' 'xf86dgaproto' 'glproto' 'xf86driproto' 'xf86miscproto' 'xineramaproto') Finclude xorg sha1sums=('0ff33b7217e36cca350eb8117c42fcf6c37f8659') From iron at frugalware.org Sat Jan 3 16:54:35 2009 From: iron at frugalware.org (Krisztian VASAS) Date: Sat Jan 3 16:54:37 2009 Subject: [Frugalware-git] xorg74: xf86-video-sis-0.10.1-1-i686 Message-ID: <20090103155435.1E03411B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=6a931264552bd7f094df412651fa46059fa7d1ef commit 6a931264552bd7f094df412651fa46059fa7d1ef Author: Krisztian VASAS Date: Sat Jan 3 16:54:15 2009 +0100 xf86-video-sis-0.10.1-1-i686 - sha1sum correction diff --git a/source/x11/xf86-video-sis/FrugalBuild b/source/x11/xf86-video-sis/FrugalBuild index 60342a5..1f28b2d 100644 --- a/source/x11/xf86-video-sis/FrugalBuild +++ b/source/x11/xf86-video-sis/FrugalBuild @@ -11,7 +11,7 @@ archs=('i686' 'x86_64') depends=('xorg-server>=1.5.99.3') makedepends=('randrproto' 'renderproto' 'videoproto' 'xf86dgaproto' 'glproto' 'xf86driproto' 'xf86miscproto' 'xineramaproto') Finclude xorg -sha1sums=('0ff33b7217e36cca350eb8117c42fcf6c37f8659') +sha1sums=('27d5090d04c496ca0c1192d3ea3f74ffa6d44a42') Fconfopts="$Fconfopts --enable-dri" # optimization OK From bouleetbil at frogdev.info Sat Jan 3 17:00:53 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Sat Jan 3 17:00:54 2009 Subject: [Frugalware-git] frugalware-current: gvfs-1.0.3-2-i686 Message-ID: <20090103160053.1E0F711B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6498f439a38740ce85abf240b285d769a9a58d05 commit 6498f439a38740ce85abf240b285d769a9a58d05 Author: bouleetbil Date: Sat Jan 3 16:54:15 2009 +0100 gvfs-1.0.3-2-i686 *moved to xapps *don't depend to some gnome* notified by crazy diff --git a/source/xapps/gvfs/FrugalBuild b/source/xapps/gvfs/FrugalBuild new file mode 100644 index 0000000..6718e43 --- /dev/null +++ b/source/xapps/gvfs/FrugalBuild @@ -0,0 +1,18 @@ +# Compiling time: 0.66 SBU +# Maintainer: Christian Hamar alias krix + +pkgname=gvfs +pkgver=1.0.3 +pkgrel=2 +pkgdesc="gvfs is a userspace virtual filesystem designed to work with the i/o abstractions of gio." +url="http://www.gnome.org/" +depends=('glib2>=2.18.2' 'dbus' 'avahi-glib' 'avahi' 'hal') +makedepends=('intltool' 'gnome-doc-utils' 'samba' 'fuse' 'libsoup' 'gconf' \ + 'gnome-keyring' 'libcdio' 'gphoto2' \ + 'bluez-libs' 'expat' 'openssh') +groups=('xapps') +archs=('i686' 'x86_64' 'ppc') +Finclude gnome +sha1sums=('2beb736acc7b38e99c9fcb0585de6918fad5e7b7') + +# optimization OK From priyank at frugalware.org Sat Jan 3 17:03:27 2009 From: priyank at frugalware.org (Priyank) Date: Sat Jan 3 17:03:28 2009 Subject: [Frugalware-git] frugalware-current: guile-gtk-2.1-1-i686 Message-ID: <20090103160327.F3FD711B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9662ddc6cd715f32d239baf62b39e51c7ac383bd commit 9662ddc6cd715f32d239baf62b39e51c7ac383bd Author: Priyank Date: Sat Jan 3 21:30:51 2009 +0530 guile-gtk-2.1-1-i686 * Version bump * Added a patch to fix build with gtkglarea diff --git a/source/xlib-extra/guile-gtk/FrugalBuild b/source/xlib-extra/guile-gtk/FrugalBuild index 9665030..43fb4a7 100644 --- a/source/xlib-extra/guile-gtk/FrugalBuild +++ b/source/xlib-extra/guile-gtk/FrugalBuild @@ -1,4 +1,4 @@ -# Compiling Time: 0.15 SBU +# Compiling Time: 0.19 SBU # Maintainer: Priyank Gosalia pkgname=guile-gtk @@ -7,12 +7,13 @@ pkgrel=1 pkgdesc="GTK+ bindings for guile." url="http://www.gnu.org/software/guile-gtk/" makedepends=('pkgconfig') -depends=('guile' 'gtk+' 'gdk-pixbuf') +depends=('guile' 'gtkglarea' 'gdk-pixbuf' 'libglade') groups=('xlib-extra') archs=('i686' 'x86_64') up2date="$pkgver" -source=(ftp://ftp.gnu.org/gnu/guile-gtk/$pkgname-${pkgver/1.2./0.}.tar.gz) +source=(ftp://ftp.gnu.org/gnu/guile-gtk/$pkgname-${pkgver/1.2./0.}.tar.gz $pkgname-$pkgver-gdkgl.diff) _F_cd_path="$pkgname-${pkgver/1.2./0.}" -sha1sums=('e587bf31c08deac34bf58c8e0f9bac8c239529fb') +sha1sums=('e587bf31c08deac34bf58c8e0f9bac8c239529fb' \ + 'dd9af83b123adec5c21ccdd3612ee683e6db2e82') # optimization OK diff --git a/source/xlib-extra/guile-gtk/guile-gtk-2.1-gdkgl.diff b/source/xlib-extra/guile-gtk/guile-gtk-2.1-gdkgl.diff new file mode 100644 index 0000000..c8f004d --- /dev/null +++ b/source/xlib-extra/guile-gtk/guile-gtk-2.1-gdkgl.diff @@ -0,0 +1,25 @@ +diff -Naur guile-gtk-2.1/gtk-gl/gdk-gl-glue.c guile-gtk-2.1.new/gtk-gl/gdk-gl-glue.c +--- guile-gtk-2.1/gtk-gl/gdk-gl-glue.c 2007-12-13 03:30:11.000000000 +0530 ++++ guile-gtk-2.1.new/gtk-gl/gdk-gl-glue.c 2009-01-03 21:22:17.000000000 +0530 +@@ -83,8 +83,8 @@ + + sgtk_boxed_info sgtk_gdk_gl_context_info = { + { "GdkGLContext", GTK_TYPE_BOXED, NULL }, +- (void *(*)(void*))gdk_gl_context_ref, +- (void (*)(void*))gdk_gl_context_unref, ++ (void *(*)(void*))g_object_ref, ++ (void (*)(void*))g_object_unref, + (void (*)(SCM)) NULL, + 0 + }; +@@ -100,8 +100,8 @@ + + sgtk_boxed_info sgtk_gdk_gl_pixmap_info = { + { "GdkGLPixmap", GTK_TYPE_BOXED, NULL }, +- (void *(*)(void*))gdk_gl_pixmap_ref, +- (void (*)(void*))gdk_gl_pixmap_unref, ++ (void *(*)(void*))g_object_ref, ++ (void (*)(void*))g_object_unref, + (void (*)(SCM)) NULL, + 0 + }; From iron at frugalware.org Sat Jan 3 17:08:22 2009 From: iron at frugalware.org (Krisztian VASAS) Date: Sat Jan 3 17:08:23 2009 Subject: [Frugalware-git] xorg74: xf86-video-sisusb-0.9.0-1-i686 Message-ID: <20090103160822.61D5B11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=ab0ad1316c7446ea9be4bcde290628107865eed8 commit ab0ad1316c7446ea9be4bcde290628107865eed8 Author: Krisztian VASAS Date: Sat Jan 3 17:08:02 2009 +0100 xf86-video-sisusb-0.9.0-1-i686 - version bump - added some build fixes diff --git a/source/x11/xf86-video-sisusb/01-add_missing_ioctl_include.patch b/source/x11/xf86-video-sisusb/01-add_missing_ioctl_include.patch new file mode 100644 index 0000000..d7a3bcb --- /dev/null +++ b/source/x11/xf86-video-sisusb/01-add_missing_ioctl_include.patch @@ -0,0 +1,12 @@ +diff --git a/src/sisusb.h b/src/sisusb.h +index b5126f6..36f9f3a 100644 +--- a/src/sisusb.h ++++ b/src/sisusb.h +@@ -39,6 +39,7 @@ + #include + #include + #include ++#include + + #define SISUSBDRIVERVERSIONYEAR 5 + #define SISUSBDRIVERVERSIONMONTH 9 diff --git a/source/x11/xf86-video-sisusb/02-remove_xfree86-misc_support.patch b/source/x11/xf86-video-sisusb/02-remove_xfree86-misc_support.patch new file mode 100644 index 0000000..536da7d --- /dev/null +++ b/source/x11/xf86-video-sisusb/02-remove_xfree86-misc_support.patch @@ -0,0 +1,97 @@ +diff --git a/configure.ac b/configure.ac +index 9eaf057..1c5ac16 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -53,7 +53,6 @@ XORG_DRIVER_CHECK_EXT(XINERAMA, xineramaproto) + XORG_DRIVER_CHECK_EXT(RANDR, randrproto) + XORG_DRIVER_CHECK_EXT(RENDER, renderproto) + XORG_DRIVER_CHECK_EXT(XV, videoproto) +-XORG_DRIVER_CHECK_EXT(XF86MISC, xf86miscproto) + XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto) + + # Checks for pkg-config packages +diff --git a/src/sisusb_driver.c b/src/sisusb_driver.c +index ec7fe81..2cc526f 100644 +--- a/src/sisusb_driver.c ++++ b/src/sisusb_driver.c +@@ -43,8 +43,6 @@ + #include "mibank.h" + #include "mipointer.h" + #include "mibstore.h" +-#define _XF86MISC_SERVER_ +-#include + + #include "sisusb_regs.h" + #include "sisusb_dac.h" +@@ -482,11 +480,7 @@ SISUSBProbe(DriverPtr drv, int flags) + pScrn->LeaveVT = SISUSBLeaveVT; + pScrn->FreeScreen = SISUSBFreeScreen; + pScrn->ValidMode = SISUSBValidMode; +-#ifdef X_XF86MiscPassMessage +- if(xf86GetVersion() >= XF86_VERSION_NUMERIC(4,3,99,2,0)) { +- pScrn->HandleMessage = SISUSBHandleMessage; +- } +-#endif ++ + foundScreen = TRUE; + } + +diff --git a/src/sisusb_driver.h b/src/sisusb_driver.h +index eb7d9e0..c4bc1dd 100644 +--- a/src/sisusb_driver.h ++++ b/src/sisusb_driver.h +@@ -83,10 +83,6 @@ static Bool SISUSBDriverFunc(ScrnInfoPtr pScrn, xorgDriverFuncOp op, pointer p); + #endif + + /* Optional functions */ +-#ifdef X_XF86MiscPassMessage +-extern int SISUSBHandleMessage(int scrnIndex, const char *msgtype, +- const char *msgval, char **retmsg); +-#endif + static void SISUSBFreeScreen(int scrnIndex, int flags); + static ModeStatus SISUSBValidMode(int scrnIndex, DisplayModePtr mode, + Bool verbose, int flags); +diff --git a/src/sisusb_utility.c b/src/sisusb_utility.c +index 07477db..8c03d63 100644 +--- a/src/sisusb_utility.c ++++ b/src/sisusb_utility.c +@@ -38,8 +38,6 @@ + #define NEED_EVENTS + #include + #include "dixstruct.h" +-#define _XF86MISC_SERVER_ +-#include + + #include "sisusb_videostr.h" + +@@ -245,10 +243,6 @@ typedef struct { + int (*HandleSiSDirectCommand[SISCTRL_MAX_SCREENS])(xSiSCtrlCommandReply *); + } xSiSCtrlScreenTable; + +-#ifdef X_XF86MiscPassMessage +-int SISUSBHandleMessage(int scrnIndex, const char *msgtype, +- const char *msgval, char **retmsg); +-#endif + void SiSUSBCtrlExtInit(ScrnInfoPtr pScrn); + void SiSUSBCtrlExtUnregister(SISUSBPtr pSiSUSB, int index); + +@@ -266,19 +260,6 @@ extern void SISUSBSetPortDefaults(ScrnInfoPtr pScrn, SISUSBPortPrivPtr pPriv); + #endif /* SIS_GLOBAL_ENABLEXV */ + + /*********************************** +- * MessageHandler interface * +- * (unused now; use extension) * +- ***********************************/ +- +-#ifdef X_XF86MiscPassMessage +-int +-SISUSBHandleMessage(int scrnIndex, const char *msgtype, const char *msgval, char **retmsg) +-{ +- return BadMatch; +-} +-#endif +- +-/*********************************** + * SiSCtrl extension interface * + ***********************************/ + diff --git a/source/x11/xf86-video-sisusb/03-build_fix_1.patch b/source/x11/xf86-video-sisusb/03-build_fix_1.patch new file mode 100644 index 0000000..76cbdec --- /dev/null +++ b/source/x11/xf86-video-sisusb/03-build_fix_1.patch @@ -0,0 +1,30 @@ +diff --git a/src/sisusb.h b/src/sisusb.h +index 36f9f3a..3852819 100644 +--- a/src/sisusb.h ++++ b/src/sisusb.h +@@ -95,7 +95,7 @@ + #include "xorgVersion.h" + #define SISUSBMYSERVERNAME "X.org" + #ifndef XF86_VERSION_NUMERIC +-#define XF86_VERSION_NUMERIC(major,minor,patch,snap,dummy) \ ++#define XF86_VERSION_NUMERIC(major,minor,patch,snap) \ + (((major) * 10000000) + ((minor) * 100000) + ((patch) * 1000) + snap) + #define XF86_VERSION_CURRENT XF86_VERSION_NUMERIC(4,3,99,902) + #endif +diff --git a/src/sisusb_types.h b/src/sisusb_types.h +index 04d9ff9..04c7a7a 100644 +--- a/src/sisusb_types.h ++++ b/src/sisusb_types.h +@@ -93,12 +93,7 @@ typedef unsigned char BOOLEAN; + + #define SISIOMEMTYPE + +-#if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,2,0,0,0) +-typedef unsigned long IOADDRESS; +-typedef unsigned long SISIOADDRESS; +-#else + typedef IOADDRESS SISIOADDRESS; +-#endif + + typedef enum _SIS_CHIP_TYPE { + SIS_VGALegacy = 0, diff --git a/source/x11/xf86-video-sisusb/04-build_fix_2.patch b/source/x11/xf86-video-sisusb/04-build_fix_2.patch new file mode 100644 index 0000000..af5516f --- /dev/null +++ b/source/x11/xf86-video-sisusb/04-build_fix_2.patch @@ -0,0 +1,13 @@ +diff --git a/src/sisusb.h b/src/sisusb.h +index 3852819..b5bb3ad 100644 +--- a/src/sisusb.h ++++ b/src/sisusb.h +@@ -109,7 +109,7 @@ + #define SISUSBMYSERVERNAME "XFree86" + #endif + +-#if (XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,3,99,0,0)) || (defined(XvExtension)) ++#if (XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,3,99,0)) || (defined(XvExtension)) + #include "xf86xv.h" + #include + #endif diff --git a/source/x11/xf86-video-sisusb/05-build_fix_3.patch b/source/x11/xf86-video-sisusb/05-build_fix_3.patch new file mode 100644 index 0000000..322c3cb --- /dev/null +++ b/source/x11/xf86-video-sisusb/05-build_fix_3.patch @@ -0,0 +1,88 @@ +diff --git a/src/sisusb_cursor.c b/src/sisusb_cursor.c +index 1de1554..b5b3629 100644 +--- a/src/sisusb_cursor.c ++++ b/src/sisusb_cursor.c +@@ -166,7 +166,7 @@ SiSUSBUseHWCursor(ScreenPtr pScreen, CursorPtr pCurs) + return TRUE; + } + +-#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,2,99,0,0) ++#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,2,99,0) + #ifdef ARGB_CURSOR + #ifdef SIS_ARGB_CURSOR + static Bool +@@ -279,7 +279,7 @@ SiSUSBHWCursorInit(ScreenPtr pScreen) + infoPtr->SetCursorColors = SiSUSBSetCursorColors; + infoPtr->LoadCursorImage = SiSUSBLoadCursorImage; + infoPtr->UseHWCursor = SiSUSBUseHWCursor; +-#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,2,99,0,0) ++#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,2,99,0) + #ifdef ARGB_CURSOR + #ifdef SIS_ARGB_CURSOR + if(pSiSUSB->OptUseColorCursor) { +diff --git a/src/sisusb_driver.c b/src/sisusb_driver.c +index 2cc526f..290764d 100644 +--- a/src/sisusb_driver.c ++++ b/src/sisusb_driver.c +@@ -823,7 +823,7 @@ SISUSBPreInit(ScrnInfoPtr pScrn, int flags) + } + #endif + #else +-#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,2,99,0,0) ++#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,2,99,0) + if(xf86GetVersion() != XF86_VERSION_CURRENT) { + xf86DrvMsg(pScrn->scrnIndex, X_WARNING, + "This driver binary is not compiled for this version of " SISUSBMYSERVERNAME "\n"); +@@ -1995,7 +1995,7 @@ SISUSBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) + pSiSUSB->xv_sisdirectunlocked = 0; + + #ifdef SIS_GLOBAL_ENABLEXV +-#if (XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,3,99,0,0)) || (defined(XvExtension)) ++#if (XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,3,99,0)) || (defined(XvExtension)) + if(!pSiSUSB->NoXvideo) { + SISUSBInitVideo(pScreen); + } +diff --git a/src/sisusb_opt.c b/src/sisusb_opt.c +index 491d1ce..d4612b0 100644 +--- a/src/sisusb_opt.c ++++ b/src/sisusb_opt.c +@@ -287,7 +287,7 @@ SiSUSBOptions(ScrnInfoPtr pScrn) + pSiSUSB->HideHWCursor = FALSE; + pSiSUSB->HWCursorIsVisible = FALSE; + +-#if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,2,99,0,0) ++#if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,2,99,0) + pSiSUSB->OptUseColorCursor = 0; + #else + pSiSUSB->OptUseColorCursor = 1; +@@ -343,7 +343,7 @@ SiSUSBOptions(ScrnInfoPtr pScrn) + * Enable/disable color hardware cursor + * + */ +-#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,2,99,0,0) ++#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,2,99,0) + #ifdef ARGB_CURSOR + #ifdef SIS_ARGB_CURSOR + if(pSiSUSB->HWCursor) { +diff --git a/src/sisusb_video.c b/src/sisusb_video.c +index 13db9c3..bc469b0 100644 +--- a/src/sisusb_video.c ++++ b/src/sisusb_video.c +@@ -561,7 +561,7 @@ SISUSBSetupImageVideo(ScreenPtr pScreen) + } + + #ifdef SIS_ENABLEXV +-#if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,3,99,3,0) ++#if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,3,99,3) + static Bool + RegionsEqual(RegionPtr A, RegionPtr B) + { +@@ -1654,7 +1654,7 @@ SISUSBPutImage( + /* update cliplist */ + if(pPriv->autopaintColorKey && + (pPriv->grabbedByV4L || +-#if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,3,99,3,0) ++#if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,3,99,3) + (!RegionsEqual(&pPriv->clip, clipBoxes)) || + #else + (!REGION_EQUAL(pScrn->pScreen, &pPriv->clip, clipBoxes)) || diff --git a/source/x11/xf86-video-sisusb/FrugalBuild b/source/x11/xf86-video-sisusb/FrugalBuild index 23d4f04..ae4dc65 100644 --- a/source/x11/xf86-video-sisusb/FrugalBuild +++ b/source/x11/xf86-video-sisusb/FrugalBuild @@ -2,15 +2,26 @@ # Maintainer: Christian Hamar alias krix pkgname=xf86-video-sisusb -pkgver=0.8.1 -pkgrel=3 +pkgver=0.9.0 +pkgrel=1 pkgdesc="X.Org driver for sisusb cards" url="http://xorg.freedesktop.org" groups=('x11' 'xorg-core' 'xorg-drivers') archs=('i686' 'x86_64') -depends=('xorg-server>=1.4.0.90') +depends=('xorg-server>=1.5.99.3') makedepends=('randrproto' 'renderproto' 'videoproto' 'xf86dgaproto' 'xf86miscproto' 'xineramaproto') Finclude xorg -sha1sums=('d1c925b0e899f543a32842a6bfbff4476b9b66e1') +source=(${source[@]} \ + '01-add_missing_ioctl_include.patch' \ + '02-remove_xfree86-misc_support.patch' \ + '03-build_fix_1.patch' \ + '04-build_fix_2.patch' \ + '05-build_fix_3.patch') +sha1sums=('79aaaf3a79dd4eaca177ec032d05a826a15a9c21' \ + 'dbfb2d52689fddeeb5ca6c934275c9e02650d386' \ + 'cb23fa76b185cbafc2c5ca1e33eea29d05d27ed7' \ + 'ed7189ddf315cd77f91a3341014c49424ff7dc2c' \ + '13eb02e3eb1de28b8ffc4a9a486262b8d2735af8' \ + 'f1a01f5f228849ca78ecfe266257d18e5533e01d') # optimization OK From iron at frugalware.org Sat Jan 3 17:23:20 2009 From: iron at frugalware.org (Krisztian VASAS) Date: Sat Jan 3 17:23:21 2009 Subject: [Frugalware-git] xorg74: xf86-video-tdfx-1.4.1-1-i686 Message-ID: <20090103162320.3A93111B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=b05a11ef42b6730da0eb139a718b66c1a10df3f7 commit b05a11ef42b6730da0eb139a718b66c1a10df3f7 Author: Krisztian VASAS Date: Sat Jan 3 17:23:05 2009 +0100 xf86-video-tdfx-1.4.1-1-i686 - version bump diff --git a/source/x11/xf86-video-tdfx/FrugalBuild b/source/x11/xf86-video-tdfx/FrugalBuild index 008cce4..a09be31 100644 --- a/source/x11/xf86-video-tdfx/FrugalBuild +++ b/source/x11/xf86-video-tdfx/FrugalBuild @@ -2,16 +2,16 @@ # Maintainer: Christian Hamar alias krix pkgname=xf86-video-tdfx -pkgver=1.3.0 -pkgrel=3 +pkgver=1.4.1 +pkgrel=1 pkgdesc="X.Org driver for 3dfx Voodoo cards" url="http://xorg.freedesktop.org" groups=('x11' 'xorg-core' 'xorg-drivers') archs=('i686' 'x86_64') -depends=('xorg-server>=1.4.0.90') +depends=('xorg-server>=1.5.99.3') makedepends=('randrproto' 'renderproto' 'videoproto' 'xf86dgaproto' 'glproto' 'xf86driproto' 'xf86miscproto' 'xineramaproto') Finclude xorg -sha1sums=('8089883c87b64c2876b9152b4820901cc6273f57') +sha1sums=('588b591a930838f9b48fae00507043a067f2bfe1') Fconfopts="$Fconfopts --enable-dri" # optimization OK From iron at frugalware.org Sat Jan 3 17:27:18 2009 From: iron at frugalware.org (Krisztian VASAS) Date: Sat Jan 3 17:27:20 2009 Subject: [Frugalware-git] xorg74: xf86-video-tga-1.2.0-1-i686 Message-ID: <20090103162718.EF6E711B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=c3f1290c21f734eb01403d2a3e73ffd1efed7812 commit c3f1290c21f734eb01403d2a3e73ffd1efed7812 Author: Krisztian VASAS Date: Sat Jan 3 17:27:08 2009 +0100 xf86-video-tga-1.2.0-1-i686 - version bump diff --git a/source/x11/xf86-video-tga/FrugalBuild b/source/x11/xf86-video-tga/FrugalBuild index ab9ac6c..b998f98 100644 --- a/source/x11/xf86-video-tga/FrugalBuild +++ b/source/x11/xf86-video-tga/FrugalBuild @@ -2,15 +2,15 @@ # Maintainer: Christian Hamar alias krix pkgname=xf86-video-tga -pkgver=1.1.0 -pkgrel=3 +pkgver=1.2.0 +pkgrel=1 pkgdesc="X.Org video driver for tga cards" url="http://xorg.freedesktop.org" groups=('x11' 'xorg-core' 'xorg-drivers') archs=('i686' 'x86_64') -depends=('xorg-server>=1.4.0.90') +depends=('xorg-server>=1.5.99.3') makedepends=('randrproto' 'renderproto' 'xf86dgaproto' 'videoproto') Finclude xorg -sha1sums=('448600dd45aedfaf0ba8a46eaf04d03895a712ed') +sha1sums=('78eec5bb2c688b6c6ddd8e651f02f51881e95b83') # optimization OK From iron at frugalware.org Sat Jan 3 17:33:40 2009 From: iron at frugalware.org (Krisztian VASAS) Date: Sat Jan 3 17:33:42 2009 Subject: [Frugalware-git] xorg74: xf86-video-trident-1.3.1-1-i686 Message-ID: <20090103163340.BFCBB11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=2f53f2b5e1356ca05ab2857a12d271efa6dc8b44 commit 2f53f2b5e1356ca05ab2857a12d271efa6dc8b44 Author: Krisztian VASAS Date: Sat Jan 3 17:33:23 2009 +0100 xf86-video-trident-1.3.1-1-i686 - version bump diff --git a/source/x11/xf86-video-trident/FrugalBuild b/source/x11/xf86-video-trident/FrugalBuild index 50cd9ed..2faba34 100644 --- a/source/x11/xf86-video-trident/FrugalBuild +++ b/source/x11/xf86-video-trident/FrugalBuild @@ -2,15 +2,15 @@ # Maintainer: Christian Hamar alias krix pkgname=xf86-video-trident -pkgver=1.2.4 +pkgver=1.3.1 pkgrel=1 pkgdesc="X.Org video driver for trident cards" url="http://xorg.freedesktop.org" groups=('x11' 'xorg-core' 'xorg-drivers') archs=('i686' 'x86_64') -depends=('xorg-server>=1.4.0.90') +depends=('xorg-server>=1.5.99.3') makedepends=('randrproto' 'renderproto' 'xf86dgaproto' 'videoproto') Finclude xorg -sha1sums=('ee37fdd260e0ad6701c72fb5db423238a19f9bae') +sha1sums=('d45b5b382be2917b3c7cb19cbeca85d3b947613d') # optimization OK From iron at frugalware.org Sat Jan 3 17:37:59 2009 From: iron at frugalware.org (Krisztian VASAS) Date: Sat Jan 3 17:38:00 2009 Subject: [Frugalware-git] xorg74: xf86-video-tseng-1.2.1-1-i686 Message-ID: <20090103163759.A510B11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=97a45831d56858368a4216d395d7c53b0019df0a commit 97a45831d56858368a4216d395d7c53b0019df0a Author: Krisztian VASAS Date: Sat Jan 3 17:37:47 2009 +0100 xf86-video-tseng-1.2.1-1-i686 - version bump diff --git a/source/x11/xf86-video-tseng/FrugalBuild b/source/x11/xf86-video-tseng/FrugalBuild index 6e4148b..c149cad 100644 --- a/source/x11/xf86-video-tseng/FrugalBuild +++ b/source/x11/xf86-video-tseng/FrugalBuild @@ -2,15 +2,15 @@ # Maintainer: Christian Hamar alias krix pkgname=xf86-video-tseng -pkgver=1.1.1 -pkgrel=3 +pkgver=1.2.1 +pkgrel=1 pkgdesc="X.Org video driver for tseng cards" url="http://xorg.freedesktop.org" groups=('x11' 'xorg-core' 'xorg-drivers') archs=('i686' 'x86_64') -depends=('xorg-server>=1.4.0.90') +depends=('xorg-server>=1.5.99.3') makedepends=('randrproto' 'renderproto' 'xf86dgaproto' 'videoproto') Finclude xorg -sha1sums=('7eb1cd73983aaa874dbb480efc7982063eab6af8') +sha1sums=('8f048c2d7e0068699f1c0bdb6443d4774fada14a') # optimization OK From bouleetbil at frogdev.info Sat Jan 3 17:40:53 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Sat Jan 3 17:40:55 2009 Subject: [Frugalware-git] frugalware-current: gvfs-1.0.3-1-i686 Message-ID: <20090103164053.EE38811B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b698af3f2bf9fd5835900e70c1662c4c27e49257 commit b698af3f2bf9fd5835900e70c1662c4c27e49257 Author: bouleetbil Date: Sat Jan 3 17:34:03 2009 +0100 gvfs-1.0.3-1-i686 *really delete from gnome group diff --git a/source/gnome/gvfs/FrugalBuild b/source/gnome/gvfs/FrugalBuild deleted file mode 100644 index bf66bb7..0000000 --- a/source/gnome/gvfs/FrugalBuild +++ /dev/null @@ -1,18 +0,0 @@ -# Compiling time: 0.66 SBU -# Maintainer: Christian Hamar alias krix - -pkgname=gvfs -pkgver=1.0.3 -pkgrel=1 -pkgdesc="gvfs is a userspace virtual filesystem designed to work with the i/o abstractions of gio." -url="http://www.gnome.org/" -depends=('glib2>=2.18.2' 'dbus' 'avahi-glib' 'avahi' 'hal') -makedepends=('intltool' 'gnome-doc-utils' 'samba' 'fuse' 'libsoup' 'gconf' \ - 'gnome-keyring' 'libcdio' 'gphoto2' \ - 'bluez-libs' 'expat' 'openssh') -groups=('gnome' 'gnome-minimal') -archs=('i686' 'x86_64' 'ppc') -Finclude gnome -sha1sums=('2beb736acc7b38e99c9fcb0585de6918fad5e7b7') - -# optimization OK From iron at frugalware.org Sat Jan 3 17:43:21 2009 From: iron at frugalware.org (Krisztian VASAS) Date: Sat Jan 3 17:43:22 2009 Subject: [Frugalware-git] xorg74: xf86-video-v4l-0.2.0-1-i686 Message-ID: <20090103164321.4685811B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=ad3756535c36a316034b1dec058d44507effa381 commit ad3756535c36a316034b1dec058d44507effa381 Author: Krisztian VASAS Date: Sat Jan 3 17:42:48 2009 +0100 xf86-video-v4l-0.2.0-1-i686 - version bump - added a small fix diff --git a/source/x11/xf86-video-v4l/01-fix_missing_includes.patch b/source/x11/xf86-video-v4l/01-fix_missing_includes.patch new file mode 100644 index 0000000..35311e2 --- /dev/null +++ b/source/x11/xf86-video-v4l/01-fix_missing_includes.patch @@ -0,0 +1,13 @@ +diff --git a/src/v4l.c b/src/v4l.c +index b827f80..9210a3f 100644 +--- a/src/v4l.c ++++ b/src/v4l.c +@@ -13,6 +13,8 @@ + #include + #include + #include ++#include ++#include + + #include "videodev.h" + #include "xf86.h" diff --git a/source/x11/xf86-video-v4l/FrugalBuild b/source/x11/xf86-video-v4l/FrugalBuild index 44b4f5c..0279237 100644 --- a/source/x11/xf86-video-v4l/FrugalBuild +++ b/source/x11/xf86-video-v4l/FrugalBuild @@ -2,15 +2,18 @@ # Maintainer: Christian Hamar alias krix pkgname=xf86-video-v4l -pkgver=0.1.1 -pkgrel=3 +pkgver=0.2.0 +pkgrel=1 pkgdesc="X.Org video driver for V4L cards" url="http://xorg.freedesktop.org" groups=('x11' 'xorg-core' 'xorg-drivers') archs=('i686' 'x86_64') -depends=('xorg-server>=1.4.0.90') +depends=('xorg-server>=1.5.99.3') makedepends=('randrproto' 'renderproto' 'videoproto') Finclude xorg -sha1sums=('57a0e2426964448723321f77237597ef27373697') +source=(${source[@]} \ + '01-fix_missing_includes.patch') +sha1sums=('7f2212c529a5bcc34f67858a9d0167a0d4848aaa' \ + '2813131d3865146f62812f320b909a6845fe64ba') # optimization OK From iron at frugalware.org Sat Jan 3 17:50:45 2009 From: iron at frugalware.org (Krisztian VASAS) Date: Sat Jan 3 17:50:46 2009 Subject: [Frugalware-git] xorg74: xf86-video-vesa-2.1.0-1-i686 Message-ID: <20090103165045.4A7EA11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=a93ab9eaecdd8185ee3061e68b0ae535cf78a388 commit a93ab9eaecdd8185ee3061e68b0ae535cf78a388 Author: Krisztian VASAS Date: Sat Jan 3 17:50:34 2009 +0100 xf86-video-vesa-2.1.0-1-i686 - version bump diff --git a/source/x11/xf86-video-vesa/FrugalBuild b/source/x11/xf86-video-vesa/FrugalBuild index e005d32..34dee8a 100644 --- a/source/x11/xf86-video-vesa/FrugalBuild +++ b/source/x11/xf86-video-vesa/FrugalBuild @@ -2,15 +2,15 @@ # Maintainer: Christian Hamar alias krix pkgname=xf86-video-vesa -pkgver=1.3.0 -pkgrel=4 +pkgver=2.1.0 +pkgrel=1 pkgdesc="X.Org video driver for VESA cards" url="http://xorg.freedesktop.org" groups=('x11' 'xorg-core' 'xorg-drivers') archs=('i686' 'x86_64' 'ppc') -depends=('xorg-server>=1.4.0.90') +depends=('xorg-server>=1.5.99.3') makedepends=('randrproto' 'renderproto') Finclude xorg -sha1sums=('09d74f838c07c58b6eba3600f3afa5fb74420ff4') +sha1sums=('e58c779780c70e069f3a70473e542226475c0fb8') # optimization OK From priyank at frugalware.org Sat Jan 3 17:52:48 2009 From: priyank at frugalware.org (Priyank) Date: Sat Jan 3 17:52:50 2009 Subject: [Frugalware-git] frugalware-current: guile-gtk-2.1-2-i686 Message-ID: <20090103165248.01C1711B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=293a6fe13672e5d9d5ee1983abc82224dadec87f commit 293a6fe13672e5d9d5ee1983abc82224dadec87f Author: Priyank Date: Sat Jan 3 22:21:01 2009 +0530 guile-gtk-2.1-2-i686 * unset MAKEFLAGS * this probably fixes build on x86_64 diff --git a/source/xlib-extra/guile-gtk/FrugalBuild b/source/xlib-extra/guile-gtk/FrugalBuild index 43fb4a7..08e3199 100644 --- a/source/xlib-extra/guile-gtk/FrugalBuild +++ b/source/xlib-extra/guile-gtk/FrugalBuild @@ -3,7 +3,7 @@ pkgname=guile-gtk pkgver=2.1 -pkgrel=1 +pkgrel=2 pkgdesc="GTK+ bindings for guile." url="http://www.gnu.org/software/guile-gtk/" makedepends=('pkgconfig') @@ -16,4 +16,10 @@ _F_cd_path="$pkgname-${pkgver/1.2./0.}" sha1sums=('e587bf31c08deac34bf58c8e0f9bac8c239529fb' \ 'dd9af83b123adec5c21ccdd3612ee683e6db2e82') +build() +{ + unset MAKEFLAGS + Fbuild +} + # optimization OK From iron at frugalware.org Sat Jan 3 17:59:03 2009 From: iron at frugalware.org (Krisztian VASAS) Date: Sat Jan 3 17:59:05 2009 Subject: [Frugalware-git] xorg74: xf86-video-vga-4.1.0-5-i686 Message-ID: <20090103165903.8A5FF11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=8dc8233aa87a2e8f2b8a461a7fdfe4c4fe8250e0 commit 8dc8233aa87a2e8f2b8a461a7fdfe4c4fe8250e0 Author: Krisztian VASAS Date: Sat Jan 3 17:58:38 2009 +0100 xf86-video-vga-4.1.0-5-i686 - rebuilt with newer xorg-server - added some build fixes diff --git a/source/x11/xf86-video-vga/01-add_libpciaccess_and_remove_xf1bpp_and_xf4bpp_support.patch b/source/x11/xf86-video-vga/01-add_libpciaccess_and_remove_xf1bpp_and_xf4bpp_support.patch new file mode 100644 index 0000000..980a249 --- /dev/null +++ b/source/x11/xf86-video-vga/01-add_libpciaccess_and_remove_xf1bpp_and_xf4bpp_support.patch @@ -0,0 +1,362 @@ +diff --git a/configure.ac b/configure.ac +index 39e2a3d..be83b67 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -57,6 +57,22 @@ PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_M + sdkdir=$(pkg-config --variable=sdkdir xorg-server) + + # Checks for libraries. ++SAVE_CPPFLAGS="$CPPFLAGS" ++CPPFLAGS="$CPPFLAGS $XORG_CFLAGS" ++AC_CHECK_DECL(XSERVER_LIBPCIACCESS, ++ [XSERVER_LIBPCIACCESS=yes], [XSERVER_LIBPCIACCESS=no], ++ [#include "xorg-server.h"]) ++AC_CHECK_HEADER(xf1bpp.h,[AC_DEFINE(HAVE_XF1BPP, 1, [Have 1bpp support])],[]) ++AC_CHECK_HEADER(xf4bpp.h,[AC_DEFINE(HAVE_XF4BPP, 1, [Have 4bpp support])],[]) ++CPPFLAGS="$SAVE_CPPFLAGS" ++ ++if test "x$XSERVER_LIBPCIACCESS" = xyes; then ++ PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0]) ++ XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS" ++fi ++AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes) ++ ++# Checks for libraries. + + # Checks for header files. + AC_HEADER_STDC +diff --git a/src/generic.c b/src/generic.c +index 4be7c39..8fd788f 100644 +--- a/src/generic.c ++++ b/src/generic.c +@@ -50,8 +50,13 @@ + + #include "fb.h" + ++#if HAVE_XF4BPP + #include "xf4bpp.h" ++#endif ++ ++#if HAVE_XF1BPP + #include "xf1bpp.h" ++#endif + + #include "shadowfb.h" + +@@ -62,6 +67,10 @@ + #include "xf86Resources.h" + #include "xf86int10.h" + ++#ifdef XSERVER_LIBPCIACCESS ++#include ++#endif ++ + /* Some systems #define VGA for their own purposes */ + #undef VGA + +@@ -79,10 +88,31 @@ + #define CLOCK_TOLERANCE 2000 /* Clock matching tolerance (2MHz) */ + #endif + ++/* ++ * This structure is used to wrap the screen's CloseScreen vector. ++ */ ++typedef struct _GenericRec ++{ ++ Bool ShadowFB; ++ Bool KGAUniversal; ++ CARD8 * ShadowPtr; ++ CARD32 ShadowPitch; ++ CloseScreenProcPtr CloseScreen; ++ OptionInfoPtr Options; ++#ifdef XSERVER_LIBPCIACCESS ++ struct pci_device *pciInfo; ++#endif ++} GenericRec, *GenericPtr; ++ ++ + /* Forward definitions */ + static const OptionInfoRec *GenericAvailableOptions(int chipid, int busid); + static void GenericIdentify(int); + static Bool GenericProbe(DriverPtr, int); ++#ifdef XSERVER_LIBPCIACCESS ++static Bool GenericPciProbe(DriverPtr drv, int entity_num, ++ struct pci_device *dev, intptr_t match_data); ++#endif + static Bool GenericPreInit(ScrnInfoPtr, int); + static Bool GenericScreenInit(int, ScreenPtr, int, char **); + static Bool GenericSwitchMode(int, DisplayModePtr, int); +@@ -97,6 +127,24 @@ static Bool GenericMapMem(ScrnInfoPtr scrp); + + static ModeStatus GenericValidMode(int, DisplayModePtr, Bool, int); + ++static GenericPtr GenericGetRec(ScrnInfoPtr pScreenInfo); ++ ++enum GenericTypes ++{ ++ CHIP_VGA_GENERIC ++}; ++ ++#ifdef XSERVER_LIBPCIACCESS ++static const struct pci_id_match generic_device_match[] = { ++ { ++ PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY, ++ 0x00030000, 0x00ffffff, CHIP_VGA_GENERIC ++ }, ++ ++ { 0, 0, 0 }, ++}; ++#endif ++ + /* The root of all evil... */ + _X_EXPORT DriverRec VGA = + { +@@ -106,7 +154,13 @@ _X_EXPORT DriverRec VGA = + GenericProbe, + GenericAvailableOptions, + NULL, +- 0 ++ 0, ++ NULL, ++ ++#ifdef XSERVER_LIBPCIACCESS ++ generic_device_match, ++ GenericPciProbe ++#endif + }; + + typedef enum +@@ -146,8 +200,12 @@ static const char *vgahwSymbols[] = + #ifdef XFree86LOADER + static const char *miscfbSymbols[] = + { ++#if HAVE_XF1BPP + "xf1bppScreenInit", ++#endif ++#if HAVE_XF4BPP + "xf4bppScreenInit", ++#endif + NULL + }; + #endif +@@ -210,7 +268,13 @@ GenericSetup(pointer Module, pointer Options, int *ErrorMajor, int *ErrorMinor) + if (!Initialised) + { + Initialised = TRUE; +- xf86AddDriver(&VGA, Module, 0); ++ xf86AddDriver(&VGA, Module, ++#ifdef XSERVER_LIBPCIACCESS ++ HaveDriverFuncs ++#else ++ 0 ++#endif ++ ); + LoaderRefSymLists(vgahwSymbols, miscfbSymbols, fbSymbols, + shadowfbSymbols, int10Symbols, NULL); + return (pointer)TRUE; +@@ -224,11 +288,6 @@ GenericSetup(pointer Module, pointer Options, int *ErrorMajor, int *ErrorMinor) + #endif + + +-enum GenericTypes +-{ +- CHIP_VGA_GENERIC +-}; +- + /* Supported chipsets */ + static SymTabRec GenericChipsets[] = + { +@@ -236,11 +295,13 @@ static SymTabRec GenericChipsets[] = + {-1, NULL} + }; + ++#ifndef XSERVER_LIBPCIACCESS + static PciChipsets GenericPCIchipsets[] = + { + {CHIP_VGA_GENERIC, PCI_CHIP_VGA, RES_SHARED_VGA}, + {-1, -1, RES_UNDEFINED}, + }; ++#endif + + static IsaChipsets GenericISAchipsets[] = + { +@@ -267,6 +328,37 @@ GenericAvailableOptions(int chipid, int busid) + * do a minimal probe for supported hardware. + */ + ++#ifdef XSERVER_LIBPCIACCESS ++static Bool ++GenericPciProbe(DriverPtr drv, int entity_num, struct pci_device *dev, ++ intptr_t match_data) ++{ ++ ScrnInfoPtr pScrn; ++ ++ pScrn = xf86ConfigPciEntity(NULL, 0, entity_num, NULL, ++ NULL, NULL, NULL, NULL, NULL); ++ if (pScrn != NULL) { ++ GenericPtr pGeneric = GenericGetRec(pScrn); ++ ++ pScrn->driverVersion = VGA_VERSION_CURRENT; ++ pScrn->driverName = VGA_DRIVER_NAME; ++ pScrn->name = VGA_NAME; ++ pScrn->Probe = GenericProbe; ++ pScrn->PreInit = GenericPreInit; ++ pScrn->ScreenInit = GenericScreenInit; ++ pScrn->SwitchMode = GenericSwitchMode; ++ pScrn->AdjustFrame = GenericAdjustFrame; ++ pScrn->EnterVT = GenericEnterVT; ++ pScrn->LeaveVT = GenericLeaveVT; ++ pScrn->FreeScreen = GenericFreeScreen; ++ ++ pGeneric->pciInfo = dev; ++ } ++ ++ return (pScrn != NULL); ++} ++#endif ++ + static Bool + GenericProbe(DriverPtr drv, int flags) + { +@@ -283,6 +375,7 @@ GenericProbe(DriverPtr drv, int flags) + if ((numDevSections = xf86MatchDevice(VGA_NAME, &devSections)) <= 0) + return FALSE; + ++#ifndef XSERVER_LIBPCIACCESS + /* PCI BUS */ + if (xf86GetPciVideoInfo()) + { +@@ -324,6 +417,7 @@ GenericProbe(DriverPtr drv, int flags) + xfree(usedChips); + } + } ++#endif + + /* Isa Bus */ + numUsed = xf86MatchIsaInstances(VGA_NAME, GenericChipsets, +@@ -391,20 +485,6 @@ VGAFindIsaDevice(GDevPtr dev) + return (int)CHIP_VGA_GENERIC; + } + +-/* +- * This structure is used to wrap the screen's CloseScreen vector. +- */ +-typedef struct _GenericRec +-{ +- Bool ShadowFB; +- Bool KGAUniversal; +- CARD8 * ShadowPtr; +- CARD32 ShadowPitch; +- CloseScreenProcPtr CloseScreen; +- OptionInfoPtr Options; +-} GenericRec, *GenericPtr; +- +- + static GenericPtr + GenericGetRec(ScrnInfoPtr pScreenInfo) + { +@@ -509,8 +589,14 @@ GenericPreInit(ScrnInfoPtr pScreenInfo, int flags) + + switch (pScreenInfo->depth) + { +- case 1: Module = "xf1bpp"; Sym = "xf1bppScreenInit"; break; +- case 4: Module = "xf4bpp"; Sym = "xf4bppScreenInit"; break; ++ case 1: ++#if HAVE_XF1BPP ++ Module = "xf1bpp"; Sym = "xf1bppScreenInit"; break; ++#endif ++ case 4: ++#if HAVE_XF4BPP ++ Module = "xf4bpp"; Sym = "xf4bppScreenInit"; break; ++#endif + case 8: Module = "fb"; break; + + default: +@@ -673,6 +759,8 @@ GenericPreInit(ScrnInfoPtr pScreenInfo, int flags) + /* Set display resolution */ + xf86SetDpi(pScreenInfo, 0, 0); + ++ ++#if HAVE_XF1BPP && HAVE_XF4BPP + if (xf86ReturnOptValBool(pGenericPriv->Options, OPTION_SHADOW_FB, FALSE)) + { + pGenericPriv->ShadowFB = TRUE; +@@ -688,7 +776,7 @@ GenericPreInit(ScrnInfoPtr pScreenInfo, int flags) + "Enabling universal \"KGA\" treatment.\n"); + } + +-#ifdef SPECIAL_FB_BYTE_ACCESS ++# ifdef SPECIAL_FB_BYTE_ACCESS + if (!pGenericPriv->ShadowFB && (pScreenInfo->depth == 4)) + { + xf86DrvMsg(pScreenInfo->scrnIndex, X_INFO, +@@ -696,8 +784,13 @@ GenericPreInit(ScrnInfoPtr pScreenInfo, int flags) + " ShadowFB enabled.\n"); + pGenericPriv->ShadowFB = TRUE; + } ++# endif ++ ++#else ++ pGenericPriv->ShadowFB = TRUE; + #endif + ++ + if (pGenericPriv->ShadowFB) + { + pScreenInfo->bitmapBitOrder = BITMAP_BIT_ORDER; +@@ -1378,6 +1471,7 @@ GenericScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) + #endif + ShadowFBInit(pScreen, GenericRefreshArea1bpp); + } ++#if HAVE_XF1BPP + else + { + Inited = xf1bppScreenInit(pScreen, pvgaHW->Base, +@@ -1386,6 +1480,7 @@ GenericScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) + pScreenInfo->xDpi, pScreenInfo->yDpi, + pScreenInfo->displayWidth); + } ++#endif + break; + case 4: + if (pGenericPriv->ShadowFB) +@@ -1410,6 +1505,7 @@ GenericScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) + #endif + ShadowFBInit(pScreen, GenericRefreshArea4bpp); + } ++#if HAVE_XF4BPP + else + { + Inited = xf4bppScreenInit(pScreen, pvgaHW->Base, +@@ -1418,6 +1514,7 @@ GenericScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) + pScreenInfo->xDpi, pScreenInfo->yDpi, + pScreenInfo->displayWidth); + } ++#endif + break; + case 8: + Inited = fbScreenInit(pScreen, pvgaHW->Base, +@@ -1579,6 +1676,9 @@ GenericMapMem(ScrnInfoPtr scrp) + { + vgaHWPtr hwp = VGAHWPTR(scrp); + int scr_index = scrp->scrnIndex; ++#ifdef XSERVER_LIBPCIACCESS ++ GenericPtr pPriv = GenericGetRec(scrp); ++#endif + + if (hwp->Base) + return TRUE; +@@ -1589,7 +1689,12 @@ GenericMapMem(ScrnInfoPtr scrp) + if (hwp->MapPhys == 0) + hwp->MapPhys = VGA_DEFAULT_PHYS_ADDR; + +- hwp->Base = xf86MapDomainMemory(scr_index, VIDMEM_MMIO, hwp->Tag, ++ hwp->Base = xf86MapDomainMemory(scr_index, VIDMEM_MMIO, ++#ifdef XSERVER_LIBPCIACCESS ++ pPriv->pciInfo, ++#else ++ hwp->Tag, ++#endif + hwp->MapPhys, hwp->MapSize); + return hwp->Base != NULL; + } diff --git a/source/x11/xf86-video-vga/02-make_isa_support_optional.patch b/source/x11/xf86-video-vga/02-make_isa_support_optional.patch new file mode 100644 index 0000000..e8b5362 --- /dev/null +++ b/source/x11/xf86-video-vga/02-make_isa_support_optional.patch @@ -0,0 +1,77 @@ +diff --git a/configure.ac b/configure.ac +index be83b67..a22236f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -66,6 +66,14 @@ AC_CHECK_HEADER(xf1bpp.h,[AC_DEFINE(HAVE_XF1BPP, 1, [Have 1bpp support])],[]) + AC_CHECK_HEADER(xf4bpp.h,[AC_DEFINE(HAVE_XF4BPP, 1, [Have 4bpp support])],[]) + CPPFLAGS="$SAVE_CPPFLAGS" + ++SAVE_CFLAGS="$CFLAGS" ++CFLAGS="$XORG_CFLAGS" ++AC_CHECK_DECL(xf86ConfigIsaEntity, ++ [AC_DEFINE(HAVE_ISA, 1, [Have ISA support])], ++ [], ++ [#include "xf86.h"]) ++CFLAGS="$SAVE_CFLAGS" ++ + if test "x$XSERVER_LIBPCIACCESS" = xyes; then + PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0]) + XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS" +diff --git a/src/generic.c b/src/generic.c +index 8fd788f..cda0e71 100644 +--- a/src/generic.c ++++ b/src/generic.c +@@ -120,7 +120,9 @@ static void GenericAdjustFrame(int, int, int, int); + static Bool GenericEnterVT(int, int); + static void GenericLeaveVT(int, int); + static void GenericFreeScreen(int, int); ++#ifdef HAVE_ISA + static int VGAFindIsaDevice(GDevPtr dev); ++#endif + #ifdef SPECIAL_FB_BYTE_ACCESS + static Bool GenericMapMem(ScrnInfoPtr scrp); + #endif +@@ -303,11 +305,13 @@ static PciChipsets GenericPCIchipsets[] = + }; + #endif + ++#ifdef HAVE_ISA + static IsaChipsets GenericISAchipsets[] = + { + {CHIP_VGA_GENERIC, RES_EXCLUSIVE_VGA}, + {-1, 0} + }; ++#endif + + static void + GenericIdentify(int flags) +@@ -419,6 +423,7 @@ GenericProbe(DriverPtr drv, int flags) + } + #endif + ++#ifdef HAVE_ISA + /* Isa Bus */ + numUsed = xf86MatchIsaInstances(VGA_NAME, GenericChipsets, + GenericISAchipsets, drv, +@@ -454,11 +459,13 @@ GenericProbe(DriverPtr drv, int flags) + xfree(usedChips); + } + } ++#endif + + xfree(devSections); + return foundScreen; + } + ++#ifdef HAVE_ISA + static int + VGAFindIsaDevice(GDevPtr dev) + { +@@ -484,6 +491,7 @@ VGAFindIsaDevice(GDevPtr dev) + + return (int)CHIP_VGA_GENERIC; + } ++#endif + + static GenericPtr + GenericGetRec(ScrnInfoPtr pScreenInfo) diff --git a/source/x11/xf86-video-vga/FrugalBuild b/source/x11/xf86-video-vga/FrugalBuild index 7cc3276..4b90648 100644 --- a/source/x11/xf86-video-vga/FrugalBuild +++ b/source/x11/xf86-video-vga/FrugalBuild @@ -3,14 +3,19 @@ pkgname=xf86-video-vga pkgver=4.1.0 -pkgrel=4 +pkgrel=5 pkgdesc="X.Org VGA driver" url="http://xorg.freedesktop.org" groups=('x11' 'xorg-core' 'xorg-drivers') archs=('i686' 'x86_64' 'ppc') -depends=('xorg-server>=1.4.0.90') +depends=('xorg-server>=1.5.99.3') makedepends=('xproto' 'fontsproto' 'randrproto' 'renderproto' 'xextproto') Finclude xorg -sha1sums=('a3b5562e5714d956647389cc8c089fac85d7177e') +source=(${source[@]} \ + '01-add_libpciaccess_and_remove_xf1bpp_and_xf4bpp_support.patch' \ + '02-make_isa_support_optional.patch') +sha1sums=('a3b5562e5714d956647389cc8c089fac85d7177e' \ + 'bfe27854862893da37d3e046413f61a808bffc0a' \ + 'b5a15ee6d4089f95124045cdca4e181d1477a016') # optimization OK From j3d1f0x at free.fr Sat Jan 3 18:15:44 2009 From: j3d1f0x at free.fr (gholafox) Date: Sat Jan 3 18:15:46 2009 Subject: [Frugalware-git] frugalware-current: obby-0.4.7-1-i686 Message-ID: <20090103171544.C15FD11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e38d2612046503b093ab24b500fe6a5be2a0851d commit e38d2612046503b093ab24b500fe6a5be2a0851d Author: gholafox Date: Sat Jan 3 18:15:27 2009 +0100 obby-0.4.7-1-i686 * Version bump diff --git a/source/lib-extra/obby/FrugalBuild b/source/lib-extra/obby/FrugalBuild index 22c1d50..baf5fb1 100644 --- a/source/lib-extra/obby/FrugalBuild +++ b/source/lib-extra/obby/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: AlexExtreme pkgname=obby -pkgver=0.4.6 +pkgver=0.4.7 pkgrel=1 pkgdesc="libobby is a library which provides synced document buffers." url="http://releases.0x539.de/obby/" @@ -12,7 +12,7 @@ groups=('lib-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url | sed '/latest/d' | sed '/stable/d' | Flasttar" source=($url/$pkgname-$pkgver.tar.gz) -sha1sums=('9a1258dad0da8223f517381715781cd113fca36c') +sha1sums=('efe4e6b406eb0628af63e88807d5d2115d88f390') Fconfopts="$Fconfopts --with-zeroconf --enable-ipv6" # optimization OK From iron at frugalware.org Sat Jan 3 18:21:14 2009 From: iron at frugalware.org (Krisztian VASAS) Date: Sat Jan 3 18:21:15 2009 Subject: [Frugalware-git] xorg74: xf86-video-vmware-10.16.5-1-i686 Message-ID: <20090103172114.D836411B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=d0c1f4224ccd502c673794d64cef641f5f3b664a commit d0c1f4224ccd502c673794d64cef641f5f3b664a Author: Krisztian VASAS Date: Sat Jan 3 18:20:49 2009 +0100 xf86-video-vmware-10.16.5-1-i686 - version bump diff --git a/source/x11/xf86-video-vmware/FrugalBuild b/source/x11/xf86-video-vmware/FrugalBuild index 2011cad..403dd5f 100644 --- a/source/x11/xf86-video-vmware/FrugalBuild +++ b/source/x11/xf86-video-vmware/FrugalBuild @@ -2,15 +2,15 @@ # Maintainer: Christian Hamar alias krix pkgname=xf86-video-vmware -pkgver=10.15.2 +pkgver=10.16.5 pkgrel=1 pkgdesc="X.Org video driver for vmware cards" url="http://xorg.freedesktop.org" groups=('x11' 'xorg-core' 'xorg-drivers') archs=('i686' 'x86_64') -depends=('xorg-server>=1.4.0.90') +depends=('xorg-server>=1.5.99.3') makedepends=('randrproto' 'renderproto' 'xineramaproto') Finclude xorg -sha1sums=('381dcfac71eff5d682c9189463ce9880259a6ffa') +sha1sums=('0d712f913bc9dd2c432ac6242784670c1114cfee') # optimization OK From iron at frugalware.org Sat Jan 3 18:42:38 2009 From: iron at frugalware.org (Krisztian VASAS) Date: Sat Jan 3 18:42:40 2009 Subject: [Frugalware-git] xorg74: xf86-video-voodoo-1.2.0-1-i686 Message-ID: <20090103174238.B6F8811B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=af52f82f094bcb04201f32fc15caa91adff94263 commit af52f82f094bcb04201f32fc15caa91adff94263 Author: Krisztian VASAS Date: Sat Jan 3 18:41:48 2009 +0100 xf86-video-voodoo-1.2.0-1-i686 - version bump - added some build fixes diff --git a/source/x11/xf86-video-voodoo/01-change_from_xf86version_to_xorgversion.patch b/source/x11/xf86-video-voodoo/01-change_from_xf86version_to_xorgversion.patch new file mode 100644 index 0000000..f22ba27 --- /dev/null +++ b/source/x11/xf86-video-voodoo/01-change_from_xf86version_to_xorgversion.patch @@ -0,0 +1,22 @@ +diff --git a/src/voodoo_driver.c b/src/voodoo_driver.c +index f2f6c3a..28a6654 100644 +--- a/src/voodoo_driver.c ++++ b/src/voodoo_driver.c +@@ -50,7 +50,7 @@ + #include "mipointer.h" + #include "xf86.h" + #include "xf86_OSproc.h" +-#include "xf86Version.h" ++#include "xorgVersion.h" + #include "xf86PciInfo.h" + #include "xf86Pci.h" + #include "xf86cmap.h" +@@ -163,7 +163,7 @@ static XF86ModuleVersionInfo voodooVersRec = + MODULEVENDORSTRING, + MODINFOSTRING1, + MODINFOSTRING2, +- XF86_VERSION_CURRENT, ++ XORG_VERSION_CURRENT, + VOODOO_MAJOR_VERSION, VOODOO_MINOR_VERSION, VOODOO_PATCHLEVEL, + ABI_CLASS_VIDEODRV, /* This is a video driver */ + ABI_VIDEODRV_VERSION, diff --git a/source/x11/xf86-video-voodoo/02-uninclude_xf86version.patch b/source/x11/xf86-video-voodoo/02-uninclude_xf86version.patch new file mode 100644 index 0000000..faba754 --- /dev/null +++ b/source/x11/xf86-video-voodoo/02-uninclude_xf86version.patch @@ -0,0 +1,24 @@ +diff --git a/src/voodoo_dga.c b/src/voodoo_dga.c +index 6f1f925..a8cb708 100644 +--- a/src/voodoo_dga.c ++++ b/src/voodoo_dga.c +@@ -42,7 +42,6 @@ + #include "micmap.h" + #include "xf86.h" + #include "xf86_OSproc.h" +-#include "xf86Version.h" + #include "xf86PciInfo.h" + #include "xf86Pci.h" + #include "xf86cmap.h" +diff --git a/src/voodoo_hardware.c b/src/voodoo_hardware.c +index 1469939..852a5b2 100644 +--- a/src/voodoo_hardware.c ++++ b/src/voodoo_hardware.c +@@ -43,7 +43,6 @@ + #include "micmap.h" + #include "xf86.h" + #include "xf86_OSproc.h" +-#include "xf86Version.h" + #include "xf86PciInfo.h" + #include "xf86Pci.h" + #include "xf86cmap.h" diff --git a/source/x11/xf86-video-voodoo/03-uninclude_xf86ddc.patch b/source/x11/xf86-video-voodoo/03-uninclude_xf86ddc.patch new file mode 100644 index 0000000..d543697 --- /dev/null +++ b/source/x11/xf86-video-voodoo/03-uninclude_xf86ddc.patch @@ -0,0 +1,36 @@ +diff --git a/src/voodoo_dga.c b/src/voodoo_dga.c +index a8cb708..9d088a7 100644 +--- a/src/voodoo_dga.c ++++ b/src/voodoo_dga.c +@@ -47,7 +47,6 @@ + #include "xf86cmap.h" + #include "shadowfb.h" + #include "vgaHW.h" +-#include "xf86DDC.h" + #include "xf86RAC.h" + #include "xf86Resources.h" + #include "compiler.h" +diff --git a/src/voodoo_driver.c b/src/voodoo_driver.c +index 28a6654..dc2176a 100644 +--- a/src/voodoo_driver.c ++++ b/src/voodoo_driver.c +@@ -56,7 +56,6 @@ + #include "xf86cmap.h" + #include "shadowfb.h" + #include "vgaHW.h" +-#include "xf86DDC.h" + #include "xf86RAC.h" + #include "xf86Resources.h" + #include "compiler.h" +diff --git a/src/voodoo_hardware.c b/src/voodoo_hardware.c +index 852a5b2..35e656f 100644 +--- a/src/voodoo_hardware.c ++++ b/src/voodoo_hardware.c +@@ -48,7 +48,6 @@ + #include "xf86cmap.h" + #include "shadowfb.h" + #include "vgaHW.h" +-#include "xf86DDC.h" + #include "xf86RAC.h" + #include "xf86Resources.h" + #include "xaa.h" diff --git a/source/x11/xf86-video-voodoo/04-add_missing_call_to_xf86SetCrtcForModes_and_add_pass_through_options.patch b/source/x11/xf86-video-voodoo/04-add_missing_call_to_xf86SetCrtcForModes_and_add_pass_through_options.patch new file mode 100644 index 0000000..626dcd5 --- /dev/null +++ b/source/x11/xf86-video-voodoo/04-add_missing_call_to_xf86SetCrtcForModes_and_add_pass_through_options.patch @@ -0,0 +1,105 @@ +diff --git a/src/voodoo.h b/src/voodoo.h +index 750c42b..4f97a8a 100644 +--- a/src/voodoo.h ++++ b/src/voodoo.h +@@ -13,7 +13,7 @@ typedef struct { + CloseScreenProcPtr CloseScreen; /* Wrapped Close */ + XAAInfoRecPtr AccelInfoRec; /* Cached Accel rec for close */ + Bool Blanked; +- Bool OnAtExit; ++ Bool PassThrough; /* Set to restore pass through on exit */ + EntityInfoPtr pEnt; + OptionInfoPtr Options; + +diff --git a/src/voodoo_driver.c b/src/voodoo_driver.c +index dc2176a..2822543 100644 +--- a/src/voodoo_driver.c ++++ b/src/voodoo_driver.c +@@ -110,12 +110,14 @@ _X_EXPORT DriverRec VOODOO = { + + typedef enum { + OPTION_NOACCEL, +- OPTION_SHADOW_FB ++ OPTION_SHADOW_FB, ++ OPTION_PASS_THROUGH, + } VoodooOpts; + + static const OptionInfoRec VoodooOptions[] = { + { OPTION_NOACCEL, "NoAccel", OPTV_BOOLEAN, {0}, FALSE }, + { OPTION_SHADOW_FB, "ShadowFB", OPTV_BOOLEAN, {0}, FALSE }, ++ { OPTION_PASS_THROUGH,"PassThrough", OPTV_BOOLEAN, {0}, FALSE }, + { -1, NULL, OPTV_NONE, {0}, FALSE } + }; + +@@ -436,6 +438,9 @@ VoodooPreInit(ScrnInfoPtr pScrn, int flags) + pVoo->Accel = 0; + } + ++ if (xf86ReturnOptValBool(pVoo->Options, OPTION_PASS_THROUGH, FALSE)) ++ pVoo->PassThrough = 1; ++ + if (xf86ReturnOptValBool(pVoo->Options, OPTION_NOACCEL, FALSE)) { + pVoo->ShadowFB = 1; + pVoo->Accel = 0; +@@ -544,6 +549,7 @@ VoodooPreInit(ScrnInfoPtr pScrn, int flags) + } + + /* Set the current mode to the first in the list */ ++ xf86SetCrtcForModes(pScrn, 0); + pScrn->currentMode = pScrn->modes; + + /* Do some checking, we will not support a virtual framebuffer larger than +@@ -914,8 +920,10 @@ VoodooRestore(ScrnInfoPtr pScrn, Bool Closing) + + pVoo = VoodooPTR(pScrn); + pVoo->Blanked = TRUE; +- if (!Closing || !(pVoo->OnAtExit)) +- VoodooBlank(pVoo); ++ if (!Closing) ++ VoodooBlank(pVoo); ++ if (Closing && pVoo->PassThrough) ++ VoodooRestorePassThrough(pVoo); + } + + static void +diff --git a/src/voodoo_hardware.c b/src/voodoo_hardware.c +index 35e656f..d988b33 100644 +--- a/src/voodoo_hardware.c ++++ b/src/voodoo_hardware.c +@@ -685,6 +685,17 @@ int VoodooHardwareInit(VoodooPtr pVoo) + } + + /* ++ * Voodoo exit logic ++ */ ++ ++void VoodooRestorePassThrough(VoodooPtr pVoo) ++{ ++ pci_enable(pVoo, 1, 0, 0); ++ mmio32_w(pVoo, 0x210, 0); ++ pci_enable(pVoo, 0, 0, 1); ++} ++ ++/* + * Copiers for Voodoo1 + * + * Voodoo1 has no CPU to screen blit, and also lacks SGRAM fill +@@ -969,6 +980,9 @@ static void Voodoo2SetupForSolidFill(ScrnInfoPtr pScrn, int color, + int rop, unsigned int planemask) + { + VoodooPtr pVoo = VoodooPTR(pScrn); ++ if (debug) ++ ErrorF("Setup for solid fill colour %04X, rop %d, Mask %04X.\n", ++ color, rop, planemask); + Voodoo2Setup2D(pVoo); + mmio32_w_chuck(pVoo, 0x2EC, ropxlate[rop]); /* rop */ + mmio32_w_chuck(pVoo, 0x2F0, color); /* fg color */ +@@ -979,6 +993,8 @@ static void Voodoo2SubsequentSolidFillRect(ScrnInfoPtr pScrn, int x, int y, + int w, int h) + { + VoodooPtr pVoo = VoodooPTR(pScrn); ++ if (debug) ++ ErrorF("Fill (%d, %d) for (%d, %d)\n", x, y, w, h); + wait_idle(pVoo); + mmio32_w_chuck(pVoo, 0x2E4, (y<<16) | x); /* Dst x,y */ + /* Set size and fire */ diff --git a/source/x11/xf86-video-voodoo/FrugalBuild b/source/x11/xf86-video-voodoo/FrugalBuild index a47043e..d60a121 100644 --- a/source/x11/xf86-video-voodoo/FrugalBuild +++ b/source/x11/xf86-video-voodoo/FrugalBuild @@ -2,15 +2,24 @@ # Maintainer: Christian Hamar alias krix pkgname=xf86-video-voodoo -pkgver=1.1.1 -pkgrel=3 +pkgver=1.2.0 +pkgrel=1 pkgdesc="X.Org video driver for Voodoo 1/2 cards" url="http://xorg.freedesktop.org" groups=('x11' 'xorg-core' 'xorg-drivers') archs=('i686' 'x86_64') -depends=('xorg-server>=1.4.0.90') +depends=('xorg-server>=1.5.99.3') makedepends=('randrproto' 'renderproto' 'xf86dgaproto') Finclude xorg -sha1sums=('201dd422cf1e7876d0f377f8e6b1dad1d205e493') +source=(${source[@]} \ + '01-change_from_xf86version_to_xorgversion.patch' \ + '02-uninclude_xf86version.patch' \ + '03-uninclude_xf86ddc.patch' \ + '04-add_missing_call_to_xf86SetCrtcForModes_and_add_pass_through_options.patch') +sha1sums=('d8434fb024265dfe3497182cafa35481f55dda87' \ + 'c5bc50334aee52d61945ac67734cad128f63c7ac' \ + '7ba98c07ef0368c734832fc004445c3494b5e49a' \ + '492726133a112405fa193705615f3268cec3ec93' \ + '335ff939c7e411a9d9c812312a014fd745b1fda5') # optimization OK From boobaa at frugalware.org Sat Jan 3 18:58:35 2009 From: boobaa at frugalware.org (CSÉCSY László) Date: Sat Jan 3 18:58:37 2009 Subject: [Frugalware-git] frugalware-current: phpmyadmin-2.11.9.4-1-i686 Message-ID: <20090103175835.692C911B8630@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=08d8000bc4e3ad126af8136c4f5cd0d0a097ca2c commit 08d8000bc4e3ad126af8136c4f5cd0d0a097ca2c Author: CSÉCSY László Date: Sat Jan 3 18:58:19 2009 +0100 phpmyadmin-2.11.9.4-1-i686 version bump closes #3648 in -current diff --git a/source/network-extra/phpmyadmin/FrugalBuild b/source/network-extra/phpmyadmin/FrugalBuild index 132e1d2..e18627f 100644 --- a/source/network-extra/phpmyadmin/FrugalBuild +++ b/source/network-extra/phpmyadmin/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: CSÉCSY László pkgname=phpmyadmin -pkgver=2.11.9.3 +pkgver=2.11.9.4 pkgrel=1 pkgdesc="Set of PHP-scripts to administrate MySQL over the WWW." _F_sourceforge_ext="-all-languages.tar.bz2" @@ -29,4 +29,4 @@ build() Frm /var/www/html/phpMyAdmin-${pkgver//_/-}-all-languages.tar.bz2 } -sha1sums=('b440cad76a9aab2b676acc6cc15dcf53632b25d1') +sha1sums=('ebbd34e91fd1baae400ecbd75622c93a30288604') From iron at frugalware.org Sat Jan 3 19:02:22 2009 From: iron at frugalware.org (Krisztian VASAS) Date: Sat Jan 3 19:02:25 2009 Subject: [Frugalware-git] xorg74: xbacklight-1.1-2-i686 Message-ID: <20090103180222.7934811B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=e71f8baefbde389e880b1dfd032471872bba8110 commit e71f8baefbde389e880b1dfd032471872bba8110 Author: Krisztian VASAS Date: Sat Jan 3 19:01:56 2009 +0100 xbacklight-1.1-2-i686 - rebuilt with new xorg diff --git a/source/x11/xbacklight/FrugalBuild b/source/x11/xbacklight/FrugalBuild index fb1798b..6246d3e 100644 --- a/source/x11/xbacklight/FrugalBuild +++ b/source/x11/xbacklight/FrugalBuild @@ -3,7 +3,7 @@ pkgname=xbacklight pkgver=1.1 -pkgrel=1 +pkgrel=2 pkgdesc="X.Org adjust backlight brightness using RandR extension" url="http://xorg.freedesktop.org" groups=('x11' 'xorg-core' 'xorg-apps') From boobaa at frugalware.org Sat Jan 3 19:03:58 2009 From: boobaa at frugalware.org (CSÉCSY László) Date: Sat Jan 3 19:03:59 2009 Subject: [Frugalware-git] frugalware-0.9: phpmyadmin-2.11.9.4-1solaria1-i686 Message-ID: <20090103180358.C586311B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.9.git;a=commitdiff;h=46a52aad4376c28021c5bcf511ae0f777a3e7046 commit 46a52aad4376c28021c5bcf511ae0f777a3e7046 Author: CSÉCSY László Date: Sat Jan 3 19:03:14 2009 +0100 phpmyadmin-2.11.9.4-1solaria1-i686 secfix verbump, closes #3548 in -current backport of 08d8000 diff --git a/source/network-extra/phpmyadmin/FrugalBuild b/source/network-extra/phpmyadmin/FrugalBuild index ecd939b..b499915 100644 --- a/source/network-extra/phpmyadmin/FrugalBuild +++ b/source/network-extra/phpmyadmin/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: CSÉCSY László pkgname=phpmyadmin -pkgver=2.11.9.3 +pkgver=2.11.9.4 pkgrel=1solaria1 pkgdesc="Set of PHP-scripts to administrate MySQL over the WWW." _F_sourceforge_ext="-all-languages.tar.bz2" @@ -29,4 +29,4 @@ build() Frm /var/www/html/phpMyAdmin-${pkgver//_/-}-all-languages.tar.bz2 } -sha1sums=('b440cad76a9aab2b676acc6cc15dcf53632b25d1') +sha1sums=('ebbd34e91fd1baae400ecbd75622c93a30288604') From iron at frugalware.org Sat Jan 3 19:42:27 2009 From: iron at frugalware.org (Krisztian VASAS) Date: Sat Jan 3 19:42:29 2009 Subject: [Frugalware-git] xorg74: xfontsel-1.0.2-2-i686 Message-ID: <20090103184227.E82BF11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=24e3bb6efddf0a7c879de800168915cfc0da37db commit 24e3bb6efddf0a7c879de800168915cfc0da37db Author: Krisztian VASAS Date: Sat Jan 3 19:41:10 2009 +0100 xfontsel-1.0.2-2-i686 - rebuilt with new xorg - disabled xprint support - added some build fixes diff --git a/source/x11/xfontsel/01-build_fix_for_non_case_sensitive_filesystems.patch b/source/x11/xfontsel/01-build_fix_for_non_case_sensitive_filesystems.patch new file mode 100644 index 0000000..9f8fb67 --- /dev/null +++ b/source/x11/xfontsel/01-build_fix_for_non_case_sensitive_filesystems.patch @@ -0,0 +1,17 @@ +diff --git a/Makefile.am b/Makefile.am +index 78209fb..832b1df 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -39,7 +39,7 @@ appdefaultdir = @appdefaultdir@ + + + APPDEFAULTFILES = \ +- XFontSel ++ app-defaults/XFontSel + + SUFFIXES = .ad + +diff --git a/XFontSel.ad b/app-defaults/XFontSel.ad +index 73c4854..73c4854 100644 +--- a/XFontSel.ad ++++ b/app-defaults/XFontSel.ad diff --git a/source/x11/xfontsel/02-use_am_cflags_insted_of_xfontsel_cflags.patch b/source/x11/xfontsel/02-use_am_cflags_insted_of_xfontsel_cflags.patch new file mode 100644 index 0000000..50145fb --- /dev/null +++ b/source/x11/xfontsel/02-use_am_cflags_insted_of_xfontsel_cflags.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile.am b/Makefile.am +index 832b1df..0e7514b 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -21,7 +21,7 @@ + + bin_PROGRAMS = xfontsel + +-xfontsel_CFLAGS = $(XFONTSEL_CFLAGS) ++AM_CFLAGS = $(XFONTSEL_CFLAGS) + xfontsel_LDADD = $(XFONTSEL_LIBS) + + xfontsel_SOURCES = \ diff --git a/source/x11/xfontsel/03-build_fix_1.patch b/source/x11/xfontsel/03-build_fix_1.patch new file mode 100644 index 0000000..19db251 --- /dev/null +++ b/source/x11/xfontsel/03-build_fix_1.patch @@ -0,0 +1,12 @@ +diff --git a/Makefile.am b/Makefile.am +index 0e7514b..21aa881 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -44,6 +44,7 @@ APPDEFAULTFILES = \ + SUFFIXES = .ad + + .ad: ++ [ -d app-defaults ] || mkdir app-defaults + cp $< $@ + + appdefault_DATA = $(APPDEFAULTFILES) diff --git a/source/x11/xfontsel/04-use_xaw7_insted_of_xaw8.patch b/source/x11/xfontsel/04-use_xaw7_insted_of_xaw8.patch new file mode 100644 index 0000000..0e65ab4 --- /dev/null +++ b/source/x11/xfontsel/04-use_xaw7_insted_of_xaw8.patch @@ -0,0 +1,13 @@ +diff --git a/configure.ac b/configure.ac +index 9f3a3e6..7e2b568 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -31,7 +31,7 @@ AM_CONFIG_HEADER(config.h) + AC_PROG_CC + AC_PROG_INSTALL + +-XAW_CHECK_XPRINT_SUPPORT(XFONTSEL) ++PKG_CHECK_MODULES(XFONTSEL, xaw7) + + AC_SUBST(XFONTSEL_CFLAGS) + AC_SUBST(XFONTSEL_LIBS) diff --git a/source/x11/xfontsel/FrugalBuild b/source/x11/xfontsel/FrugalBuild index 8830f31..51a2129 100644 --- a/source/x11/xfontsel/FrugalBuild +++ b/source/x11/xfontsel/FrugalBuild @@ -3,16 +3,25 @@ pkgname=xfontsel pkgver=1.0.2 -pkgrel=1 +pkgrel=2 pkgdesc="X.Org xfontsel application" url="http://xorg.freedesktop.org" groups=('x11' 'xorg-core' 'xorg-apps') archs=('i686' 'x86_64') -depends=('libx11>=1.1.3' 'libxp>=1.0.0-2' 'libxaw>=1.0.4') -makedepends=('inputproto>=1.4.2.1') +depends=('libx11>=1.1.99.2' 'libxp>=1.0.0-3' 'libxaw>=1.0.5') +makedepends=('inputproto>=1.5.0') _F_xorg_ind=1 -Fconfopts="$Fconfopts --enable-xprint" +Fconfopts="$Fconfopts --disable-xprint" Finclude xorg -sha1sums=('c492444a3bada3e44bc0319cfd85a89cd7770b84') +source=(${source[@]} \ + '01-build_fix_for_non_case_sensitive_filesystems.patch' \ + '02-use_am_cflags_insted_of_xfontsel_cflags.patch' \ + '03-build_fix_1.patch' \ + '04-use_xaw7_insted_of_xaw8.patch') +sha1sums=('c492444a3bada3e44bc0319cfd85a89cd7770b84' \ + 'f973b7291ef8f34b3773a888a0bdccb2f1b1ceb2' \ + '11af33617371acfdd5b9b4e2395b61be7cb958e0' \ + 'ce7fe929c46aa6b9fc734a5d32c1b0b93f69fe8b' \ + 'a8d5ab5413cb0a2d7c3e49cd83bfc73204f7274e') # optimization OK From boobaa at frugalware.org Sat Jan 3 20:03:37 2009 From: boobaa at frugalware.org (CSÉCSY László) Date: Sat Jan 3 20:03:39 2009 Subject: [Frugalware-git] frugalware-current: phpmyadmin-3.1.1-1-i686 Message-ID: <20090103190337.A08F811B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=103eeee5eb39399c1a69737297be2773ab8e0bc8 commit 103eeee5eb39399c1a69737297be2773ab8e0bc8 Author: CSÉCSY László Date: Sat Jan 3 20:03:06 2009 +0100 phpmyadmin-3.1.1-1-i686 version bump diff --git a/source/network-extra/phpmyadmin/FrugalBuild b/source/network-extra/phpmyadmin/FrugalBuild index e18627f..ed1a106 100644 --- a/source/network-extra/phpmyadmin/FrugalBuild +++ b/source/network-extra/phpmyadmin/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: CSÉCSY László pkgname=phpmyadmin -pkgver=2.11.9.4 +pkgver=3.1.1 pkgrel=1 pkgdesc="Set of PHP-scripts to administrate MySQL over the WWW." _F_sourceforge_ext="-all-languages.tar.bz2" @@ -13,7 +13,7 @@ rodepends=('php') backup=(var/www/html/phpmyadmin/libraries/config.default.php) groups=('network-extra') archs=('i686' 'x86_64') -up2date="lynx -dump $url |grep -1 stable|sed -n 's/.*n \(.*\)/\1/;$ p'" +up2date="lynx -dump $url |grep -m1 released | sed 's/.*n \([0-9\.]\+\) .*/\1/'" source=(${source/phpmyadmin-/phpMyAdmin-}) build() @@ -24,9 +24,9 @@ build() tar -xjf phpMyAdmin-${pkgver//_/-}-all-languages.tar.bz2 Fln phpMyAdmin-${pkgver//_/-}-all-languages /var/www/html/phpmyadmin Fdocrel $pkgname/Documentation.* - Fsed "= 'config';" "= 'http';" \ + Fsed "= 'cookie';" "= 'http';" \ $Fdestdir/var/www/html/phpmyadmin/libraries/config.default.php Frm /var/www/html/phpMyAdmin-${pkgver//_/-}-all-languages.tar.bz2 } -sha1sums=('ebbd34e91fd1baae400ecbd75622c93a30288604') +sha1sums=('89cc0425323bdd4d6865688b93bc24b713513d07') From j3d1f0x at free.fr Sat Jan 3 20:20:39 2009 From: j3d1f0x at free.fr (gholafox) Date: Sat Jan 3 20:20:40 2009 Subject: [Frugalware-git] frugalware-current: scourge-0.21.1-1-i686 Message-ID: <20090103192039.0376B11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=13695b6b4e442d27c0cc4ae57a0b3955e049d6bc commit 13695b6b4e442d27c0cc4ae57a0b3955e049d6bc Author: gholafox Date: Sat Jan 3 20:20:22 2009 +0100 scourge-0.21.1-1-i686 * New package diff --git a/source/games-extra/scourge/FrugalBuild b/source/games-extra/scourge/FrugalBuild new file mode 100644 index 0000000..80be5e2 --- /dev/null +++ b/source/games-extra/scourge/FrugalBuild @@ -0,0 +1,30 @@ +# Compiling Time: 1.53 SBU +# Maintainer: gholafox + +pkgname=scourge +pkgver=0.21.1 +pkgrel=1 +pkgdesc="Roguelike game with 3D user interface." +_F_sourceforge_realname="$pkgname" +_F_sourceforge_ext=".src.tar.gz" +Finclude sourceforge +depends=('sdl_ttf' 'sdl_mixer' 'sdlimage' 'sdl_net' 'mesa') +groups=(games-extra) +archs=('i686') +source=($source ${source/$pkgname-$pkgver.src.tar.gz/$pkgname-$pkgver.data.tar.gz}) +sha1sums=('d5742d78e2efad7f9b63cfb958e950f9608d310c' \ + 'c3eb246f3598f2282f71e47b9ea2031ff3eda75e') +Fconfopts="${Fconfopts[@]} --with-data-dir=/usr/share/games/scourge" +build() + { + #go to source dir, compil and install locales & binary: + Fcd $pkgname + Fbuild + + #copy data: + Fmkdir usr/share/games/$pkgname + cd ../${pkgname}_data || Fdie + cp -R * $Fdestdir/usr/share/games/$pkgname || Fdie + } + +# optimization OK From priyank at frugalware.org Sat Jan 3 20:31:48 2009 From: priyank at frugalware.org (Priyank) Date: Sat Jan 3 20:31:49 2009 Subject: [Frugalware-git] frugalware-current: bluez-utils-3.36-3-i686 Message-ID: <20090103193148.3CE1B11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3c29aa117bec7fe4aaa493697af447f57a68fbc6 commit 3c29aa117bec7fe4aaa493697af447f57a68fbc6 Author: Priyank Date: Sun Jan 4 00:58:45 2009 +0530 bluez-utils-3.36-3-i686 * HIDD_ENABLE is no longer recognized by rc.bluetooth * hidd is deprecated as of latest bluez-utils (Thanks to bouleetbil for noticing) diff --git a/source/apps-extra/bluez-utils/FrugalBuild b/source/apps-extra/bluez-utils/FrugalBuild index 2ab1b5c..7a494c0 100644 --- a/source/apps-extra/bluez-utils/FrugalBuild +++ b/source/apps-extra/bluez-utils/FrugalBuild @@ -3,7 +3,7 @@ pkgname=bluez-utils pkgver=3.36 -pkgrel=2 +pkgrel=3 pkgdesc="Bluetooth tools and daemons" url="http://bluez.sourceforge.net/" depends=('dbus-glib>=0.76' 'hal>=0.5.11' 'alsa-lib' 'openobex>=1.3-10' 'bluez-libs>=3.36') @@ -14,9 +14,9 @@ backup=(etc/sysconfig/bluetooth etc/bluetooth/hcid.conf etc/bluetooth/rfcomm.con up2date="lynx -dump http://www.bluez.org/download.html|grep bluez-utils-|sed -n 's/.*bluez-utils-\(.*\)\.t.*/\1/; 1 p'" source=("http://bluez.sourceforge.net/download/bluez-utils-$pkgver.tar.gz" rc.bluetooth uart.conf bluetooth.default bluetooth-dbus.conf) sha1sums=('f53ba1d17829df2c5933fe062d7f8fb1ab8c8e60' \ - 'e5323ae9a3bdfed6dac4e323dacaf1edc70171e6' \ + 'd7b8ea99d68c2f9c1e411ebc47d49cbbb8d44b4b' \ '706231256b0ef53e20f22b4f163e8008f092d28a' \ - '8a62cf9a7c10a4fee59acbab8e85f0a1058e4772' \ + 'e80cf645c853c30378411e4a7262dfd03a6f909e' \ '7b62baa3bdf06b2d54cf9e9bc3358e2f90454311') build() { diff --git a/source/apps-extra/bluez-utils/bluetooth.default b/source/apps-extra/bluez-utils/bluetooth.default index a7c2d9d..729405b 100644 --- a/source/apps-extra/bluez-utils/bluetooth.default +++ b/source/apps-extra/bluez-utils/bluetooth.default @@ -6,9 +6,6 @@ HID2HCI_ENABLE=true # Run hcid HCID_ENABLE=true -# Run sdpd -#SDPD_ENABLE=true - # Don't edit the following line unless you know what you're doing HCID_CONFIG="/etc/bluetooth/hcid.conf" diff --git a/source/apps-extra/bluez-utils/rc.bluetooth b/source/apps-extra/bluez-utils/rc.bluetooth index acd0de6..1a9429c 100644 --- a/source/apps-extra/bluez-utils/rc.bluetooth +++ b/source/apps-extra/bluez-utils/rc.bluetooth @@ -31,11 +31,11 @@ if [ "$1" = "stop" ]; then rfcomm release all &> /dev/null ok $? fi - if [ "$HIDD_ENABLE" = "true" ]; then - submsg "$stophidd" - killall hidd &> /dev/null - ok $? - fi + #if [ "$HIDD_ENABLE" = "true" ]; then + # submsg "$stophidd" + # killall hidd &> /dev/null + # ok $? + #fi #if [ "$SDPD_ENABLE" = "true" ]; then # submsg "$stopsdpd" # killall sdpd &> /dev/null @@ -65,11 +65,11 @@ elif [ "$1" = "start" ]; then # sdpd # ok $? #fi - if [ "$HIDD_ENABLE" = "true" ]; then - submsg "$starthidd" - hidd $HIDD_OPTIONS --server || true - ok $? - fi + #if [ "$HIDD_ENABLE" = "true" ]; then + # submsg "$starthidd" + # hidd $HIDD_OPTIONS --server || true + # ok $? + #fi if [ "$HID2HCI_ENABLE" = "true" ]; then submsg "$starthid2hci" hid2hci --tohci &> /dev/null || true From priyank at frugalware.org Sat Jan 3 20:37:40 2009 From: priyank at frugalware.org (Priyank) Date: Sat Jan 3 20:37:42 2009 Subject: [Frugalware-git] frugalware-current: swfdec-0.8.4-1-i686 Message-ID: <20090103193740.93BE111B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1339fa2f08716ab4de5f8c362b0b731f06cd06ea commit 1339fa2f08716ab4de5f8c362b0b731f06cd06ea Author: Priyank Date: Sun Jan 4 01:05:34 2009 +0530 swfdec-0.8.4-1-i686 * Version bump diff --git a/source/xlib/swfdec/FrugalBuild b/source/xlib/swfdec/FrugalBuild index c5c4b45..518764e 100644 --- a/source/xlib/swfdec/FrugalBuild +++ b/source/xlib/swfdec/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Priyank Gosalia pkgname=swfdec -pkgver=0.8.0 +pkgver=0.8.4 pkgrel=1 pkgdesc="Swfdec is a decoder/renderer library for Macromedia Flash animations." url="http://swfdec.freedesktop.org/" @@ -15,6 +15,6 @@ archs=('i686' 'x86_64' 'ppc') up2date="Flasttar http://swfdec.freedesktop.org/" source=($url/download/$pkgname/0.8/$pkgname-$pkgver.tar.gz) Fconfopts="${Fconfopts[@]} --enable-gnome-vfs=no --enable-libsoup --enable-ffmpeg" -sha1sums=('7a72b5d32cd276e25f55b3e62e71e80a7c7ed859') +sha1sums=('cf95930ccd0b66146c97d6e111b1e27ec0d802dc') # optimization OK From priyank at frugalware.org Sat Jan 3 20:46:05 2009 From: priyank at frugalware.org (Priyank) Date: Sat Jan 3 20:46:06 2009 Subject: [Frugalware-git] frugalware-current: swfdec-mozilla-0.8.2-1-i686 Message-ID: <20090103194605.4606A11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8ce4c608bd6267c79986634062374f595e1e161a commit 8ce4c608bd6267c79986634062374f595e1e161a Author: Priyank Date: Sun Jan 4 01:14:31 2009 +0530 swfdec-mozilla-0.8.2-1-i686 * Version bump (required because of swfdec bump) * Added _F_gnome_iconcache diff --git a/source/xlib-extra/swfdec-mozilla/FrugalBuild b/source/xlib-extra/swfdec-mozilla/FrugalBuild index 0658ef0..595e12e 100644 --- a/source/xlib-extra/swfdec-mozilla/FrugalBuild +++ b/source/xlib-extra/swfdec-mozilla/FrugalBuild @@ -2,17 +2,19 @@ # Maintainer: Christian Hamar alias krix pkgname=swfdec-mozilla -pkgver=0.8.0 +pkgver=0.8.2 pkgrel=1 pkgdesc="Mozilla plugin that uses the Swfdec library for playing SWF files in a browser capable of loading NS-Plugins" url="http://swfdec.freedesktop.org/" license="LGPL" -depends=('swfdec=0.8.0' 'firefox') +depends=('swfdec=0.8.4' 'firefox') options=('scriptlet') groups=('xlib-extra') archs=('i686' 'x86_64' 'ppc') +_F_gnome_iconcache=y +Finclude gnome-scriptlet up2date="lynx -dump http://swfdec.freedesktop.org/|Flasttar" source=($url/download/$pkgname/0.8/$pkgname-$pkgver.tar.gz) -sha1sums=('a330ca74daa536870c2b6395309792e06af652d6') +sha1sums=('330fc304acc8ee63f4e9af993cbf87c25d82cebf') # optimization OK From bouleetbil at frogdev.info Sat Jan 3 22:05:33 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Sat Jan 3 22:05:34 2009 Subject: [Frugalware-git] frugalware-current: volwheel-0.2.6-1-i686 Message-ID: <20090103210533.784BC11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a60033ffbab64b047d23cf8a44402aeaae3f0724 commit a60033ffbab64b047d23cf8a44402aeaae3f0724 Author: bouleetbil Date: Sat Jan 3 21:59:29 2009 +0100 volwheel-0.2.6-1-i686 *version bump diff --git a/source/xapps-extra/volwheel/FrugalBuild b/source/xapps-extra/volwheel/FrugalBuild index b02eaa7..7ade24e 100644 --- a/source/xapps-extra/volwheel/FrugalBuild +++ b/source/xapps-extra/volwheel/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: bouleetbil pkgname=volwheel -pkgver=0.2.5 +pkgver=0.2.6 pkgrel=1 pkgdesc="VolWheel is a little application which lets you control the volume easily through a tray icon" rodepends=('alsa-utils' 'perl-gtk2-trayicon') @@ -14,7 +14,7 @@ groups=('xapps-extra') archs=('i686' 'x86_64') _F_desktop_categories="AudioVideo;Audio;" _F_desktop_icon=$pkgname -sha1sums=('379a8dd084cf963398e7976e60f08e1c458ccdda') +sha1sums=('55d470441bde48553a88359984132d44fd056da0') build() { Fcd From bouleetbil at frogdev.info Sun Jan 4 00:00:13 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Sun Jan 4 00:00:15 2009 Subject: [Frugalware-git] frugalware-current: catfish-0.3.2-1-i686 Message-ID: <20090103230013.5FDF411B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8100f8c826882975b361b7d9844299f5f0429f7c commit 8100f8c826882975b361b7d9844299f5f0429f7c Author: bouleetbil Date: Sat Jan 3 23:54:07 2009 +0100 catfish-0.3.2-1-i686 *version bump *change m8r diff --git a/source/gnome-extra/catfish/FrugalBuild b/source/gnome-extra/catfish/FrugalBuild index ca31f42..e99d690 100644 --- a/source/gnome-extra/catfish/FrugalBuild +++ b/source/gnome-extra/catfish/FrugalBuild @@ -1,14 +1,30 @@ -# Compiling Time: 0 SBU -# Maintainer: detto +# Compiling Time: 0.01 SBU +# Maintainer: bouleetbil pkgname=catfish -pkgver=0.3 +pkgver=0.3.2 pkgrel=1 pkgdesc="A handy file searching tool that can use find, slocate or tracker as backend." url="http://software.twotoasts.de/?page=catfish" archs=('i686' 'x86_64') +options=('scriptlet') +_F_gnome_iconcache="y" +_F_gnome_desktop="y" +Finclude gnome-scriptlet groups=('gnome-extra') depends=('gtk+2' 'pygtk' 'libglade' 'findutils' 'slocate' 'tracker') -up2date="lynx -dump $url | grep "Stable" | cut -d ' ' -f6 | sed -n 's|v||p'" +up2date="lynx -dump -source http://software.twotoasts.de/index.php?/pages/catfish_summary.html | Flasttar" source=(http://software.twotoasts.de/media/$pkgname/$pkgname-$pkgver.tar.gz) -sha1sums=('5818f29e200b5a871a38bd261272f3968f9ab771') +sha1sums=('26893bc4fc5947e19289a0d82e214c035ca93936') +#for don't use Fconfopts gnome-scriptlet : Unknwon option +Fconfopts="--prefix=$Fprefix" + +build() { + Fbuild + Fbuild_gnome_scriptlet + #Fix broken link + Frm usr/share/catfish/catfish.svg + Fln /usr/share/icons/hicolor/scalable/apps/catfish.svg /usr/share/catfish/catfish.svg + Frm usr/share/catfish/locale + Fln /usr/share/locale /usr/share/catfish/locale +} From priyank at frugalware.org Sun Jan 4 07:43:41 2009 From: priyank at frugalware.org (Priyank) Date: Sun Jan 4 07:43:44 2009 Subject: [Frugalware-git] frugalware-current: obextool-0.35-1-i686 Message-ID: <20090104064341.E6FF711B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=770a9b80063937337fc36432b1c97886b6662b0d commit 770a9b80063937337fc36432b1c97886b6662b0d Author: Priyank Date: Sun Jan 4 12:10:07 2009 +0530 obextool-0.35-1-i686 * Version bump diff --git a/source/xapps-extra/obextool/FrugalBuild b/source/xapps-extra/obextool/FrugalBuild index 1f18adc..4a7e1a4 100644 --- a/source/xapps-extra/obextool/FrugalBuild +++ b/source/xapps-extra/obextool/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: Szabo Peter Laszlo pkgname=obextool -pkgver=0.34_2 +pkgver=0.35 pkgrel=1 pkgdesc="A graphical frontend to communicate with mobiles and other devices capable of communicating via Obex Protocol." url="http://www.tech-edv.co.at/programmierung/en/gplsw.html" @@ -12,12 +12,11 @@ groups=('xapps-extra') archs=('i686' 'x86_64') _F_sourceforge_mirror="nchc" Finclude sourceforge -up2date="lynx -dump 'http://sourceforge.net/project/showfiles.php?group_id=87028&package_id=90535' | grep -m1 tar.gz | sed 's/.*l-\(.*\).t.*/\1/' | tr '-' '_'" +up2date="lynx -dump 'http://sourceforge.net/project/showfiles.php?group_id=87028&package_id=90535' | grep -m1 tar.gz | sed 's/.*l-\(.*\).t.*/\1/'" source=(${source/_/-} obextool.cfg obexwrap.sh) -sha1sums=('b7296383a4f7d457511763d0b28425269132362d' \ +sha1sums=('8296cc28a34dded5ced5a6dabf0096012292fbd3' \ '702b507d8d5276c759ebcb85ccefcdeff98f375c' \ 'cfd51655dd9f7341204caa333bceb1f7b9183ef6') -_F_cd_path="${pkgname}-${pkgver/_2/}" build() { From priyank at frugalware.org Sun Jan 4 08:02:21 2009 From: priyank at frugalware.org (Priyank) Date: Sun Jan 4 08:02:22 2009 Subject: [Frugalware-git] frugalware-current: gxine-0.5.903-4solaria3-i686 Message-ID: <20090104070221.627A311B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9e3f464947a7b9241aefb4ff3abf00d488cfdc41 commit 9e3f464947a7b9241aefb4ff3abf00d488cfdc41 Author: Priyank Date: Sun Jan 4 12:32:01 2009 +0530 gxine-0.5.903-4solaria3-i686 * Rebuild with xulrunner * Fixes #3389 diff --git a/source/xmultimedia-extra/gxine/FrugalBuild b/source/xmultimedia-extra/gxine/FrugalBuild index f5faf36..16c5f6a 100644 --- a/source/xmultimedia-extra/gxine/FrugalBuild +++ b/source/xmultimedia-extra/gxine/FrugalBuild @@ -3,14 +3,14 @@ pkgname=gxine pkgver=0.5.903 -pkgrel=3 +pkgrel=4solaria3 pkgdesc="A GTK+ based frontend to Xine." _F_sourceforge_dirname="xine" _F_sourceforge_ext=".tar.bz2" _F_gnome_iconcache="y" Finclude sourceforge gnome-scriptlet url="http://xinehq.de/" -depends=('gtk+2' 'xulrunner' 'libxaw' 'xine-lib>=1.1.13' 'dbus-glib') +depends=('gtk+2' 'xulrunner>=1.8.1.3-3' 'libxaw' 'xine-lib>=1.1.13' 'dbus-glib') makedepends=('nspr>=4.7.1' 'firefox') groups=('xmultimedia-extra') archs=('i686' 'x86_64') From priyank at frugalware.org Sun Jan 4 08:11:15 2009 From: priyank at frugalware.org (Priyank) Date: Sun Jan 4 08:11:16 2009 Subject: [Frugalware-git] frugalware-current: gxine-0.5.903-4-i686 Message-ID: <20090104071115.55A5F11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3a9471cddb9a9c7f55ad23649d5d4504fc36d10b commit 3a9471cddb9a9c7f55ad23649d5d4504fc36d10b Author: Priyank Date: Sun Jan 4 12:40:33 2009 +0530 gxine-0.5.903-4-i686 * Fix pkgrel. This is -current. diff --git a/source/xmultimedia-extra/gxine/FrugalBuild b/source/xmultimedia-extra/gxine/FrugalBuild index 16c5f6a..7b00dbe 100644 --- a/source/xmultimedia-extra/gxine/FrugalBuild +++ b/source/xmultimedia-extra/gxine/FrugalBuild @@ -3,7 +3,7 @@ pkgname=gxine pkgver=0.5.903 -pkgrel=4solaria3 +pkgrel=4 pkgdesc="A GTK+ based frontend to Xine." _F_sourceforge_dirname="xine" _F_sourceforge_ext=".tar.bz2" From priyank at frugalware.org Sun Jan 4 08:12:22 2009 From: priyank at frugalware.org (Priyank) Date: Sun Jan 4 08:12:24 2009 Subject: [Frugalware-git] frugalware-0.9: gxine-0.5.903-4solaria3-i686 Message-ID: <20090104071222.715C511B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.9.git;a=commitdiff;h=0a28baabbbb9537f602e71b25c98335bccdeba06 commit 0a28baabbbb9537f602e71b25c98335bccdeba06 Author: Priyank Date: Sun Jan 4 12:41:54 2009 +0530 gxine-0.5.903-4solaria3-i686 * Rebuild with xulrunner * Fixes #3389 diff --git a/source/xmultimedia-extra/gxine/FrugalBuild b/source/xmultimedia-extra/gxine/FrugalBuild index f5faf36..16c5f6a 100644 --- a/source/xmultimedia-extra/gxine/FrugalBuild +++ b/source/xmultimedia-extra/gxine/FrugalBuild @@ -3,14 +3,14 @@ pkgname=gxine pkgver=0.5.903 -pkgrel=3 +pkgrel=4solaria3 pkgdesc="A GTK+ based frontend to Xine." _F_sourceforge_dirname="xine" _F_sourceforge_ext=".tar.bz2" _F_gnome_iconcache="y" Finclude sourceforge gnome-scriptlet url="http://xinehq.de/" -depends=('gtk+2' 'xulrunner' 'libxaw' 'xine-lib>=1.1.13' 'dbus-glib') +depends=('gtk+2' 'xulrunner>=1.8.1.3-3' 'libxaw' 'xine-lib>=1.1.13' 'dbus-glib') makedepends=('nspr>=4.7.1' 'firefox') groups=('xmultimedia-extra') archs=('i686' 'x86_64') From bouleetbil at frogdev.info Sun Jan 4 09:28:56 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Sun Jan 4 09:28:58 2009 Subject: [Frugalware-git] frugalware-current: gyachi-1.1.61-1-i686 Message-ID: <20090104082856.619B411B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=927e50cc17c944d91cc2f77c34fd9cb641e0cafc commit 927e50cc17c944d91cc2f77c34fd9cb641e0cafc Author: bouleetbil Date: Sun Jan 4 09:22:34 2009 +0100 gyachi-1.1.61-1-i686 *version bump *delete useless options diff --git a/source/gnome-extra/gyachi/FrugalBuild b/source/gnome-extra/gyachi/FrugalBuild index 81d1d60..9ff521e 100644 --- a/source/gnome-extra/gyachi/FrugalBuild +++ b/source/gnome-extra/gyachi/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: bouleetbil pkgname=gyachi -pkgver=1.1.60 +pkgver=1.1.61 pkgrel=1 pkgdesc="A fork from Gyach Enhanced Yahoo client for Linux." depends=('libtool' 'libgtkhtml' 'atk' 'pango' 'freetype2' 'openssl' 'libxau' \ @@ -14,10 +14,9 @@ groups=('gnome-extra') _F_gnome_desktop="y" archs=('i686') Finclude sourceforge gnome-scriptlet -Fconfopts="$Fconfopts --enable-v4l2 --disable-gtktest --disable-glibtest\ - --enable-plugin_photo_album --disable-plugin_xmms\ +Fconfopts="$Fconfopts --enable-plugin_photo_album --disable-plugin_xmms\ --with-x --disable-plugin_pulseaudio" -sha1sums=('41a4769615d4dd3e13587be9f17db9882acbd9fe') +sha1sums=('dcacca061ccb270e2f017b502383531f3371c556') build() { Fcd From priyank at frugalware.org Sun Jan 4 09:50:32 2009 From: priyank at frugalware.org (Priyank) Date: Sun Jan 4 09:50:33 2009 Subject: [Frugalware-git] frugalware-current: gxine-0.5.903-5-i686 Message-ID: <20090104085032.3FC3911B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=af9736dd17515bd6caba25eda225ab0dceaa3e04 commit af9736dd17515bd6caba25eda225ab0dceaa3e04 Author: Priyank Date: Sun Jan 4 14:19:24 2009 +0530 gxine-0.5.903-5-i686 * Fix buggy wrapper (thanks to bouleetbil) diff --git a/source/xmultimedia-extra/gxine/FrugalBuild b/source/xmultimedia-extra/gxine/FrugalBuild index 7b00dbe..bf4ba01 100644 --- a/source/xmultimedia-extra/gxine/FrugalBuild +++ b/source/xmultimedia-extra/gxine/FrugalBuild @@ -3,7 +3,7 @@ pkgname=gxine pkgver=0.5.903 -pkgrel=4 +pkgrel=5 pkgdesc="A GTK+ based frontend to Xine." _F_sourceforge_dirname="xine" _F_sourceforge_ext=".tar.bz2" @@ -35,7 +35,7 @@ build() # mozjs.so fix Fmv /usr/bin/gxine /usr/bin/gxine.bin Ffileschmod /usr/bin/gxine.bin 755 - Fwrapper "LD_LIBRARY_PATH=/usr/lib/xulrunner && gxine.bin" gxine + Fwrapper "LD_LIBRARY_PATH=/usr/lib/xulrunner gxine.bin" gxine } # optimization OK From bouleetbil at frogdev.info Sun Jan 4 14:05:59 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Sun Jan 4 14:06:01 2009 Subject: [Frugalware-git] frugalware-current: notification-daemon-0.4.0-1-i686 Message-ID: <20090104130559.8389411B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3b9569702cc3599123dc4d006ef202485a7cb3d7 commit 3b9569702cc3599123dc4d006ef202485a7cb3d7 Author: bouleetbil Date: Sun Jan 4 13:59:30 2009 +0100 notification-daemon-0.4.0-1-i686 *version bump *change m8r *added sound support diff --git a/source/gnome/notification-daemon/FrugalBuild b/source/gnome/notification-daemon/FrugalBuild index aa97452..97e6679 100644 --- a/source/gnome/notification-daemon/FrugalBuild +++ b/source/gnome/notification-daemon/FrugalBuild @@ -1,12 +1,12 @@ # Compiling time: 0.10 SBU -# Maintainer: AlexExtreme +# Maintainer: bouleetbil pkgname=notification-daemon -pkgver=0.3.7 -pkgrel=2 +pkgver=0.4.0 +pkgrel=1 pkgdesc="Galago Desktop Presence Framework - Desktop Notification Daemon" url="http://www.galago-project.org" -depends=('libnotify>=0.4.4' 'libwnck' 'libsexy' 'gconf' 'dbus-glib>=0.71') +depends=('libnotify>=0.4.4' 'libwnck' 'libsexy' 'gconf' 'dbus-glib>=0.78' 'libglade' 'gstreamer') makedepends=('gnome-doc-utils' 'intltool') groups=('gnome') archs=('i686' 'x86_64' 'ppc') @@ -16,7 +16,8 @@ options=('scriptlet') _F_gnome_schemas=('/etc/gconf/schemas/notification-daemon.schemas') _F_gnome_desktop="y" _F_gnome_scrollkeeper="y" +_F_gnome_iconcache="y" Finclude gnome-scriptlet -sha1sums=('421ea32f9f2ec83f8a29187259ab2beef80ae60c') +sha1sums=('d7152d8e167aa0a153ebc4040ce1c54debcb1a9c') # optimization OK From devil505linux at gmail.com Sun Jan 4 14:50:38 2009 From: devil505linux at gmail.com (Devil505) Date: Sun Jan 4 14:50:40 2009 Subject: [Frugalware-git] frugalware-current: desmume-0.9-1-i686 Message-ID: <20090104135038.B78A111B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c4f6e97b2e47163bf56982f9c8c4fda4fd760e0a commit c4f6e97b2e47163bf56982f9c8c4fda4fd760e0a Author: Devil505 Date: Sun Jan 4 14:49:58 2009 +0100 desmume-0.9-1-i686 * version bump diff --git a/source/games-extra/desmume/FrugalBuild b/source/games-extra/desmume/FrugalBuild index 19fb07d..0ab36b2 100644 --- a/source/games-extra/desmume/FrugalBuild +++ b/source/games-extra/desmume/FrugalBuild @@ -2,14 +2,13 @@ # Maintainer: Devil505 pkgname=desmume -pkgver=0.8 +pkgver=0.9 pkgrel=1 pkgdesc="Emulator for Nintendo DS." -_F_sourceforge_broken_up2date=1 Finclude sourceforge depends=('sdl' 'gtkglext' 'mesa' 'freetype2' 'libxau' 'libxdmcp' 'libglade' 'zziplib' 'libstdc++') -makedepends=('perl-xml-parser') +makedepends=('perl-xml-parser' 'intltool') groups=('games-extra') archs=('i686' 'x86_64') -sha1sums=('2cd567ccd737dc90f601f711e0bee32d78aee9de') -# optimization OK \ No newline at end of file +sha1sums=('d7ce7c3510fe4eb3d991bdad12af224014d51ab7') +# optimization OK From vmiklos at frugalware.org Sun Jan 4 15:05:17 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Jan 4 15:05:18 2009 Subject: [Frugalware-git] frugalware-current: valgrind-3.4.0-1-i686 Message-ID: <20090104140517.4873911B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a096196adc0c85290fa709eff85dbc598b5a0bf4 commit a096196adc0c85290fa709eff85dbc598b5a0bf4 Author: Miklos Vajna Date: Sun Jan 4 15:04:43 2009 +0100 valgrind-3.4.0-1-i686 - version bump diff --git a/source/devel-extra/valgrind/FrugalBuild b/source/devel-extra/valgrind/FrugalBuild index a40c571..734ac42 100644 --- a/source/devel-extra/valgrind/FrugalBuild +++ b/source/devel-extra/valgrind/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Miklos Vajna pkgname=valgrind -pkgver=3.3.1 +pkgver=3.4.0 pkgrel=1 pkgdesc="Tools for debugging and profiling Linux programs." url="http://valgrind.org/" @@ -12,7 +12,7 @@ archs=('i686' 'x86_64' 'ppc') _F_archive_grepv="RC" up2date="Flasttar $url/downloads/current.html" source=($url/downloads/$pkgname-$pkgver.tar.bz2) -sha1sums=('3a64ee5f6439815fa6c5200dcfd0399f9dc83348') +sha1sums=('ae68418a4c283d14ae6454aca4a720ac936422df') if [ "$CARCH" == "x86_64" ]; then Fconfopts="$Fconfopts --enable-only64bit" From bouleetbil at frogdev.info Sun Jan 4 15:07:16 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Sun Jan 4 15:07:18 2009 Subject: [Frugalware-git] frugalware-current: nautilus-sound-converter-1.0.0-1-i686 Message-ID: <20090104140716.A6B2711B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3b22be641006918758a295c1fd111269b67bcd13 commit 3b22be641006918758a295c1fd111269b67bcd13 Author: bouleetbil Date: Sun Jan 4 15:01:15 2009 +0100 nautilus-sound-converter-1.0.0-1-i686 *new package diff --git a/source/gnome-extra/nautilus-sound-converter/FrugalBuild b/source/gnome-extra/nautilus-sound-converter/FrugalBuild new file mode 100644 index 0000000..3a76bb6 --- /dev/null +++ b/source/gnome-extra/nautilus-sound-converter/FrugalBuild @@ -0,0 +1,16 @@ +# Compiling Time: 0.09 SBU +# Maintainer: bouleetbil + +pkgname=nautilus-sound-converter +pkgver=1.0.0 +pkgrel=1 +pkgdesc="Nautilus extension to convert audio files to a different format" +options=('scriptlet') +depends=('nautilus' 'gnome-media' 'gst-plugins-base') +makedepends=('intltool') +Finclude googlecode +groups=('gnome-extra') +archs=('i686') +sha1sums=('d0af32cb5ad6e8a192fef76677ad98ad1a94d03f') + +# optimization OK From bouleetbil at frogdev.info Sun Jan 4 16:46:45 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Sun Jan 4 16:46:47 2009 Subject: [Frugalware-git] frugalware-current: nautilus-sound-converter-1.0.0-1-ppc Message-ID: <20090104154645.5DE0F11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=fcf994d3c3228f68e6801bd21c4c504851e914c2 commit fcf994d3c3228f68e6801bd21c4c504851e914c2 Author: bouleetbil Date: Sun Jan 4 16:35:19 2009 +0100 nautilus-sound-converter-1.0.0-1-ppc *added ppc to archs() diff --git a/source/gnome-extra/nautilus-sound-converter/FrugalBuild b/source/gnome-extra/nautilus-sound-converter/FrugalBuild index 3a76bb6..2c2a485 100644 --- a/source/gnome-extra/nautilus-sound-converter/FrugalBuild +++ b/source/gnome-extra/nautilus-sound-converter/FrugalBuild @@ -10,7 +10,7 @@ depends=('nautilus' 'gnome-media' 'gst-plugins-base') makedepends=('intltool') Finclude googlecode groups=('gnome-extra') -archs=('i686') +archs=('i686' 'ppc') sha1sums=('d0af32cb5ad6e8a192fef76677ad98ad1a94d03f') # optimization OK From bouleetbil at frogdev.info Sun Jan 4 16:57:56 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Sun Jan 4 16:57:58 2009 Subject: [Frugalware-git] frugalware-current: pidgin-facebookchat-1.47-1-ppc Message-ID: <20090104155756.9BBF911B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3aa1f2185b5f15aa99a3e6b1a7fed377f3e94043 commit 3aa1f2185b5f15aa99a3e6b1a7fed377f3e94043 Author: bouleetbil Date: Sun Jan 4 16:57:12 2009 +0100 pidgin-facebookchat-1.47-1-ppc *added ppc to archs() diff --git a/source/xapps-extra/pidgin-facebookchat/FrugalBuild b/source/xapps-extra/pidgin-facebookchat/FrugalBuild index c692d64..d106a06 100644 --- a/source/xapps-extra/pidgin-facebookchat/FrugalBuild +++ b/source/xapps-extra/pidgin-facebookchat/FrugalBuild @@ -11,24 +11,23 @@ _F_googlecode_name="$pkgname-source" Finclude googlecode depends=('pidgin') groups=('xapps-extra') -archs=('i686' 'x86_64') +archs=('i686' 'x86_64' 'ppc') sha1sums=('02018ce92a153677d247571d6c0572e6f146434a') build() { Fcd "$pkgname" Fsed "i686-pc-linux-gnu-gcc" "gcc" Makefile Fsed "x86_64-pc-linux-gnu-gcc" "gcc" Makefile -# ppc compilation have to be tested by bouleetbil or vmiklos -# Fsed "powerpc-unknown-linux-gnu-gcc" "gcc" Makefile + Fsed "powerpc-unknown-linux-gnu-gcc" "gcc" Makefile Fmkdir usr/lib/purple-2/ if [ "$CARCH" = "i686" ]; then make libfacebook.so || Fdie elif [ "$CARCH" = "x86_64" ]; then make libfacebook64.so || Fdie mv libfacebook64.so libfacebook.so || Fdie -#elif [ "$CARCH" = "ppc" ]; then -# make libfacebookppc.so || Fdie -# mv libfacebookppc.so libfacebook.so || Fdie +elif [ "$CARCH" = "ppc" ]; then + make libfacebookppc.so || Fdie + mv libfacebookppc.so libfacebook.so || Fdie fi Fcprel libfacebook.so usr/lib/purple-2/ Fmkdir usr/share/pixmaps/pidgin/protocols/{16,22,48} || return 1 From bouleetbil at frogdev.info Sun Jan 4 17:06:46 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Sun Jan 4 17:06:47 2009 Subject: [Frugalware-git] frugalware-current: nasm-2.05.01-1-ppc Message-ID: <20090104160646.4EDCD11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4d98d0f4b7a7d25d951af07e17c1f2d3574e3fda commit 4d98d0f4b7a7d25d951af07e17c1f2d3574e3fda Author: bouleetbil Date: Sun Jan 4 17:06:05 2009 +0100 nasm-2.05.01-1-ppc *added ppc to archs() diff --git a/source/devel-extra/nasm/FrugalBuild b/source/devel-extra/nasm/FrugalBuild index 96e51cd..fa961d1 100644 --- a/source/devel-extra/nasm/FrugalBuild +++ b/source/devel-extra/nasm/FrugalBuild @@ -7,7 +7,7 @@ pkgrel=1 pkgdesc="NASM is the Netwide Assembler" depends=('glibc') groups=('devel-extra') -archs=('i686' 'x86_64') +archs=('i686' 'x86_64' 'ppc') url="http://www.nasm.us/" up2date="lynx -dump $url|grep releasebuilds/[0-9]|sed 's|.*/\(.*\)/$|\1|'" source=(http://www.nasm.us/pub/nasm/releasebuilds/$pkgver/nasm-$pkgver.tar.bz2) From bouleetbil at frogdev.info Sun Jan 4 17:16:27 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Sun Jan 4 17:16:29 2009 Subject: [Frugalware-git] frugalware-current: mac-3.99_u4_b5-1-ppc Message-ID: <20090104161627.984BB11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c68e3be2aba02772aefe7eb2638935c7254ad7e5 commit c68e3be2aba02772aefe7eb2638935c7254ad7e5 Author: bouleetbil Date: Sun Jan 4 17:15:51 2009 +0100 mac-3.99_u4_b5-1-ppc *added ppc to archs() diff --git a/source/multimedia-extra/mac/FrugalBuild b/source/multimedia-extra/mac/FrugalBuild index 7d8b32e..d817deb 100644 --- a/source/multimedia-extra/mac/FrugalBuild +++ b/source/multimedia-extra/mac/FrugalBuild @@ -11,7 +11,7 @@ Finclude sourceforge makedepends=('nasm') depends=('libstdc++') groups=('multimedia-extra') -archs=('i686' 'x86_64') +archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump -nolist http://sourceforge.net/project/showfiles.php?group_id=123827|grep -v bmp|grep -v xmms |grep -om1 'mac-\(.*\).tar.gz'|sed 's/.*c-\(.*\).t.*/\1/;s/-/_/g'" sha1sums=('f215c265c2cba719834c989498d5a8d2457b54de') _F_cd_path="$pkgname-`echo $pkgver | sed 's/_/-/g'`" From boobaa at frugalware.org Sun Jan 4 17:20:52 2009 From: boobaa at frugalware.org (CSÉCSY László) Date: Sun Jan 4 17:20:53 2009 Subject: [Frugalware-git] frugalware-current: perl-xml-rss-1.42-1-i686 Message-ID: <20090104162052.926DC11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3eac763ab0e853203e6d598cfc612767014cc95f commit 3eac763ab0e853203e6d598cfc612767014cc95f Author: CSÉCSY László Date: Sun Jan 4 17:20:42 2009 +0100 perl-xml-rss-1.42-1-i686 version bump diff --git a/source/devel-extra/perl-xml-rss/FrugalBuild b/source/devel-extra/perl-xml-rss/FrugalBuild index 0f3dc05..5f69dc1 100644 --- a/source/devel-extra/perl-xml-rss/FrugalBuild +++ b/source/devel-extra/perl-xml-rss/FrugalBuild @@ -3,7 +3,7 @@ _F_perl_name=XML-RSS _F_perl_author=S/SH/SHLOMIF -pkgver=1.41 +pkgver=1.42 pkgrel=1 pkgdesc="A perl module to manage RDF Site Summary (RSS) files" url="http://search.cpan.org/dist/XML-RSS/" @@ -12,4 +12,4 @@ makedepends=('perl-test-manifest') groups=('devel-extra') Finclude perl archs=('i686' 'x86_64') -sha1sums=('0e452eb867d18e52e9c5666c562bcb23f19fda1c') +sha1sums=('ba8978b49cfc7251f6b50bac002c8aa00aceda39') From boobaa at frugalware.org Sun Jan 4 17:22:04 2009 From: boobaa at frugalware.org (CSÉCSY László) Date: Sun Jan 4 17:22:05 2009 Subject: [Frugalware-git] frugalware-current: drupal-content_access-5.x_1.5-1-i686 Message-ID: <20090104162204.99C3811B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c328d0dabced2c2b6c7a965cfb7864b0981a0b47 commit c328d0dabced2c2b6c7a965cfb7864b0981a0b47 Author: CSÉCSY László Date: Sun Jan 4 17:21:51 2009 +0100 drupal-content_access-5.x_1.5-1-i686 version bump diff --git a/source/network-extra/drupal-content_access/FrugalBuild b/source/network-extra/drupal-content_access/FrugalBuild index 8d8b994..28fff4c 100644 --- a/source/network-extra/drupal-content_access/FrugalBuild +++ b/source/network-extra/drupal-content_access/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: CSÉCSY László _F_drupal_module=content_access -pkgver=5.x_1.4 +pkgver=5.x_1.5 pkgrel=1 pkgdesc="This Drupal module can manage permissions for content types by role and author" Finclude drupal -sha1sums=('9f4055222d2a17a25fbb1bf3e0bde8699ffe689f') +sha1sums=('6af78fc180cc59b441cac0ac143540ab33d36e7b') From bouleetbil at frogdev.info Sun Jan 4 17:24:48 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Sun Jan 4 17:24:49 2009 Subject: [Frugalware-git] frugalware-current: libofa-0.9.3-4-ppc Message-ID: <20090104162448.D643911B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=df072e3ee113ba8921759010673e68e5cb3c5e3d commit df072e3ee113ba8921759010673e68e5cb3c5e3d Author: bouleetbil Date: Sun Jan 4 17:23:43 2009 +0100 libofa-0.9.3-4-ppc *added ppc to archs() diff --git a/source/lib/libofa/FrugalBuild b/source/lib/libofa/FrugalBuild index 7b05c7c..d383121 100644 --- a/source/lib/libofa/FrugalBuild +++ b/source/lib/libofa/FrugalBuild @@ -9,7 +9,7 @@ pkgdesc="Open Fingerprint Architecture Library." url="http://www.musicip.com/dns/" depends=('libstdc++' 'fftw>=3.1.2-2' 'curl>=7.19.0' 'expat') groups=('lib') -archs=('i686' 'x86_64') +archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump http://code.google.com/p/musicip-libofa/|grep -om1 'libofa-\(.*\).tar.gz'|Flasttar" source=(http://musicip-libofa.googlecode.com/files/$pkgname-$pkgver.tar.gz gcc4.1.1-build_fix.patch gcc43.patch) sha1sums=('3dec8e1dcea937f74b4165e9ffd4d4f355e4594a' \ From bouleetbil at frogdev.info Sun Jan 4 18:18:07 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Sun Jan 4 18:18:10 2009 Subject: [Frugalware-git] frugalware-current: libsidplay2-2.1.1-1-ppc Message-ID: <20090104171807.DB96B11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6ea92bd1b3343d6917e7eeea4840b86345b8ab12 commit 6ea92bd1b3343d6917e7eeea4840b86345b8ab12 Author: bouleetbil Date: Sun Jan 4 18:17:13 2009 +0100 libsidplay2-2.1.1-1-ppc *added ppc to archs() *added patch gcc43 diff --git a/source/multimedia-extra/libsidplay2/FrugalBuild b/source/multimedia-extra/libsidplay2/FrugalBuild index 7db617f..d57bb4b 100644 --- a/source/multimedia-extra/libsidplay2/FrugalBuild +++ b/source/multimedia-extra/libsidplay2/FrugalBuild @@ -13,11 +13,12 @@ Finclude sourceforge url="http://sidplay2.sourceforge.net/" depends=('libstdc++') groups=('multimedia-extra') -archs=('i686' 'x86_64') -source=($source libsidplay2-gcc41.patch) +archs=('i686' 'x86_64' 'ppc') +source=($source libsidplay2-gcc41.patch libsidplay2-gcc43.patch) _F_cd_path="$_F_sourceforge_name-$pkgver" Fconfopts="$Fconfopts --with-pic" sha1sums=('8af6350866edc30b0d331e075fa97292f6f645a5' \ - 'bb635997871d232e313a14db007344e9fed8a77c') + 'bb635997871d232e313a14db007344e9fed8a77c' \ + 'ae18384f86c615d00cdd3b1ce7e64306a0794645') # optimization OK diff --git a/source/multimedia-extra/libsidplay2/libsidplay2-gcc43.patch b/source/multimedia-extra/libsidplay2/libsidplay2-gcc43.patch new file mode 100644 index 0000000..3b0b31f --- /dev/null +++ b/source/multimedia-extra/libsidplay2/libsidplay2-gcc43.patch @@ -0,0 +1,77 @@ +--- sidplay-libs-2.1.1/builders/resid-builder/src/resid.cpp.old 2008-07-25 17:00:41.000000000 \ ++0000 ++++ sidplay-libs-2.1.1/builders/resid-builder/src/resid.cpp 2008-07-25 16:59:44.000000000 \ ++0000 +@@ -16,6 +16,8 @@ + * * + ***************************************************************************/ + ++#include ++ + #include "config.h" + + #ifdef HAVE_EXCEPTIONS +--- sidplay-libs-2.1.1/builders/resid-builder/src/resid-builder.cpp.old 2008-07-25 \ +17:02:00.000000000 +0000 ++++ sidplay-libs-2.1.1/builders/resid-builder/src/resid-builder.cpp 2008-07-25 17:01:47.000000000 \ ++0000 +@@ -37,6 +37,7 @@ + ***************************************************************************/ + + #include ++#include + + #include "config.h" + #ifdef HAVE_EXCEPTIONS +--- sidplay-libs-2.1.1/builders/hardsid-builder/src/hardsid-builder.cpp.old 2008-07-25 \ +17:08:50.000000000 +0000 ++++ sidplay-libs-2.1.1/builders/hardsid-builder/src/hardsid-builder.cpp 2008-07-25 \ +17:08:17.000000000 +0000 +@@ -47,6 +47,7 @@ + ***************************************************************************/ + + #include ++#include + #include "config.h" + + #ifdef HAVE_EXCEPTIONS +--- sidplay-libs-2.1.1/libsidplay/src/sidtune/SidTune.cpp.old 2008-07-25 16:55:02.000000000 \ ++0000 ++++ sidplay-libs-2.1.1/libsidplay/src/sidtune/SidTune.cpp 2008-07-25 16:53:58.000000000 \ ++0000 +@@ -283,7 +283,7 @@ + uint_least32_t fileLen = 0; + + // This sucks big time +- openmode createAtrr = std::ios::in; ++ std::_Ios_Openmode createAtrr = std::ios::in; + #ifdef HAVE_IOS_NOCREATE + createAtrr |= std::ios::nocreate; + #endif +@@ -952,7 +952,7 @@ + if ( status ) + { + // Open binary output file stream. +- openmode createAttr = std::ios::out; ++ std::_Ios_Openmode createAttr = std::ios::out; + #if defined(HAVE_IOS_BIN) + createAttr |= std::ios::bin; + #else +@@ -1002,7 +1002,7 @@ + if ( status ) + { + // Open ASCII output file stream. +- openmode createAttr = std::ios::out; ++ std::_Ios_Openmode createAttr = std::ios::out; + if ( overWriteFlag ) + createAttr |= std::ios::trunc; + else +@@ -1036,7 +1036,7 @@ + if ( status ) + { + // Open binary output file stream. +- openmode createAttr = std::ios::out; ++ std::_Ios_Openmode createAttr = std::ios::out; + #if defined(HAVE_IOS_BIN) + createAttr |= std::ios::bin; + #else From bouleetbil at frogdev.info Sun Jan 4 18:47:10 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Sun Jan 4 18:47:12 2009 Subject: [Frugalware-git] frugalware-current: xmms2-0.5-3-ppc Message-ID: <20090104174710.BD61011B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=97e43b3df4051afa61601263a40e94fe1687a6d7 commit 97e43b3df4051afa61601263a40e94fe1687a6d7 Author: bouleetbil Date: Sun Jan 4 18:45:32 2009 +0100 xmms2-0.5-3-ppc *added ppc to archs() diff --git a/source/xmultimedia-extra/xmms2/FrugalBuild b/source/xmultimedia-extra/xmms2/FrugalBuild index 74195be..826e283 100644 --- a/source/xmultimedia-extra/xmms2/FrugalBuild +++ b/source/xmultimedia-extra/xmms2/FrugalBuild @@ -15,7 +15,7 @@ depends=('alsa-lib' 'libmad' 'libvorbis' 'curl>=7.19.0' 'faad2' \ 'libsamplerate' 'libsidplay2') makedepends=('glib2' 'sqlite3' 'libboost-mt>=1.37.0' 'boost>=1.37.0' 'perl' 'pyrex' 'ruby') groups=('xmultimedia-extra') -archs=('i686' 'x86_64') +archs=('i686' 'x86_64' 'ppc') source=(${source/$pkgver/${pkgver}${relname}} gcc43.patch) options=('scriptlet' 'force') sha1sums=('08a8e6f7cee8a7b7161d2208361cda6d474427a4' \ @@ -25,7 +25,7 @@ subpkgs=("xmms2-libs-c++" "xmms2-libs-perl" "xmms2-libs-python" "xmms2-libs-ruby subdescs=('xmms2 C++ bindings' 'perl bindings for xmms2' 'python bindings for xmms2' 'ruby bindings for xmms2') subdepends=("$pkgname=$pkgver libboost-mt>=1.35.0" "$pkgname=$pkgver perl" "$pkgname=$pkgver pyrex" "$pkgname=$pkgver ruby") subgroups=('xmultimedia-extra' 'xmultimedia-extra' 'xmultimedia-extra' 'xmultimedia-extra') -subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64') +subarchs=('i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc') Finclude python build() From bouleetbil at frogdev.info Sun Jan 4 18:53:39 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Sun Jan 4 18:53:41 2009 Subject: [Frugalware-git] frugalware-current: lxmusic-0.2.3-1-ppc Message-ID: <20090104175339.5B4C111B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1b407d18028232644d15eb6770ca6a2c2cbcacfc commit 1b407d18028232644d15eb6770ca6a2c2cbcacfc Author: bouleetbil Date: Sun Jan 4 18:53:01 2009 +0100 lxmusic-0.2.3-1-ppc *added ppc to archs() diff --git a/source/xapps-extra/lxmusic/FrugalBuild b/source/xapps-extra/lxmusic/FrugalBuild index 0fdd2cc..985acd7 100644 --- a/source/xapps-extra/lxmusic/FrugalBuild +++ b/source/xapps-extra/lxmusic/FrugalBuild @@ -10,7 +10,7 @@ depends=('xmms2-libs-c++' 'glibc' 'libxau' 'libxdmcp' 'freetype2' 'libxext' 'lib makedepends=('intltool') options=('scriptlet') groups=('xapps-extra' 'lxde-desktop') -archs=('i686') +archs=('i686' 'ppc') _F_gnome_iconcache="y" _F_gnome_desktop="y" _F_sourceforge_dirname="lxde" From bouleetbil at frogdev.info Sun Jan 4 18:56:18 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Sun Jan 4 18:56:18 2009 Subject: [Frugalware-git] frugalware-current: netcat-0.7.1-1-ppc Message-ID: <20090104175618.4D2BD11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a63e7abaad2e78eee1d973b5a5f40216a0a816a3 commit a63e7abaad2e78eee1d973b5a5f40216a0a816a3 Author: bouleetbil Date: Sun Jan 4 18:55:44 2009 +0100 netcat-0.7.1-1-ppc *added ppc to archs() diff --git a/source/network-extra/netcat/FrugalBuild b/source/network-extra/netcat/FrugalBuild index ad2696f..03409c2 100644 --- a/source/network-extra/netcat/FrugalBuild +++ b/source/network-extra/netcat/FrugalBuild @@ -7,7 +7,7 @@ pkgrel=1 pkgdesc="The GNU network swiss army knife." depends=('glibc') groups=('network-extra') -archs=('i686' 'x86_64') +archs=('i686' 'x86_64' 'ppc') Finclude sourceforge sha1sums=('b5cbc52a7ceed2fd5c4f5081f5747130b2d0fe01') From bouleetbil at frogdev.info Sun Jan 4 19:02:35 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Sun Jan 4 19:02:37 2009 Subject: [Frugalware-git] frugalware-current: gtknetcat-0.1-3-ppc Message-ID: <20090104180235.E724911B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e2a156edd989fa2351e995384bac2b110202de05 commit e2a156edd989fa2351e995384bac2b110202de05 Author: bouleetbil Date: Sun Jan 4 19:02:00 2009 +0100 gtknetcat-0.1-3-ppc *added ppc to archs() diff --git a/source/xapps-extra/gtknetcat/FrugalBuild b/source/xapps-extra/gtknetcat/FrugalBuild index 18869a2..690c2cd 100644 --- a/source/xapps-extra/gtknetcat/FrugalBuild +++ b/source/xapps-extra/gtknetcat/FrugalBuild @@ -12,7 +12,7 @@ _F_sourceforge_dirname="lxde" Finclude sourceforge options=('scriptlet') groups=('xapps-extra' 'lxde-desktop') -archs=('i686' 'x86_64') +archs=('i686' 'x86_64' 'ppc') sha1sums=('d624a4e51cda63e75792cc4ba5eb2c17024b5c7f') # optimization OK From bouleetbil at frogdev.info Sun Jan 4 19:04:55 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Sun Jan 4 19:04:57 2009 Subject: [Frugalware-git] frugalware-current: lxsession-edit-0.1-1-ppc Message-ID: <20090104180455.AC88C11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f217d60976f9ec0d808da7c7790850f17bccf6a1 commit f217d60976f9ec0d808da7c7790850f17bccf6a1 Author: bouleetbil Date: Sun Jan 4 19:04:20 2009 +0100 lxsession-edit-0.1-1-ppc *added ppc to archs() diff --git a/source/xapps-extra/lxsession-edit/FrugalBuild b/source/xapps-extra/lxsession-edit/FrugalBuild index cf97905..ce3bb2c 100644 --- a/source/xapps-extra/lxsession-edit/FrugalBuild +++ b/source/xapps-extra/lxsession-edit/FrugalBuild @@ -10,7 +10,7 @@ depends=('gtk+2' 'glibc' 'libxau' 'libxdmcp' 'freetype2' 'libxdamage' \ makedepends=('intltool') options=('scriptlet') groups=('xapps-extra' 'lxde-desktop') -archs=('i686' 'x86_64') +archs=('i686' 'x86_64' 'ppc') _F_sourceforge_realname="LXSession Edit" _F_sourceforge_prefix="lxsession-edit " _F_sourceforge_dirname="lxde" From devil505linux at gmail.com Sun Jan 4 19:22:17 2009 From: devil505linux at gmail.com (Devil505) Date: Sun Jan 4 19:22:18 2009 Subject: [Frugalware-git] frugalware-current: lxmusic-0.2.3-1-x86_64 Message-ID: <20090104182217.CAD8E11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=93996bc0c29de60bbb9a331ff23600c18d34faeb commit 93996bc0c29de60bbb9a331ff23600c18d34faeb Author: Devil505 Date: Sun Jan 4 19:18:43 2009 +0100 lxmusic-0.2.3-1-x86_64 * added x86_64 to archs diff --git a/source/xapps-extra/lxmusic/FrugalBuild b/source/xapps-extra/lxmusic/FrugalBuild index 985acd7..fefd463 100644 --- a/source/xapps-extra/lxmusic/FrugalBuild +++ b/source/xapps-extra/lxmusic/FrugalBuild @@ -10,7 +10,7 @@ depends=('xmms2-libs-c++' 'glibc' 'libxau' 'libxdmcp' 'freetype2' 'libxext' 'lib makedepends=('intltool') options=('scriptlet') groups=('xapps-extra' 'lxde-desktop') -archs=('i686' 'ppc') +archs=('i686' 'x86_64' 'ppc') _F_gnome_iconcache="y" _F_gnome_desktop="y" _F_sourceforge_dirname="lxde" From bouleetbil at frogdev.info Sun Jan 4 19:41:45 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Sun Jan 4 19:41:46 2009 Subject: [Frugalware-git] frugalware-current: lxshortcut-0.1-1-ppc Message-ID: <20090104184145.3200D11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e522de45b40cf80d1825a366daf0f86394aa8dc6 commit e522de45b40cf80d1825a366daf0f86394aa8dc6 Author: bouleetbil Date: Sun Jan 4 19:40:39 2009 +0100 lxshortcut-0.1-1-ppc *added ppc to archs() diff --git a/source/xapps-extra/lxshortcut/FrugalBuild b/source/xapps-extra/lxshortcut/FrugalBuild index 6815874..2438805 100644 --- a/source/xapps-extra/lxshortcut/FrugalBuild +++ b/source/xapps-extra/lxshortcut/FrugalBuild @@ -10,7 +10,7 @@ depends=('gtk+2' 'glibc' 'libxau' 'libxdmcp' 'freetype2' 'libxdamage' \ makedepends=('intltool') options=('scriptlet') groups=('xapps-extra' 'lxde-desktop') -archs=('i686' 'x86_64') +archs=('i686' 'x86_64' 'ppc') _F_sourceforge_realname="LXShortcut" _F_sourceforge_prefix="$pkgname " _F_sourceforge_dirname="lxde" From bouleetbil at frogdev.info Sun Jan 4 19:45:26 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Sun Jan 4 19:45:27 2009 Subject: [Frugalware-git] frugalware-current: lxlauncher-0.2-1-ppc Message-ID: <20090104184526.CF09311B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2df33110aa64df1c9363e110585231092a988c5f commit 2df33110aa64df1c9363e110585231092a988c5f Author: bouleetbil Date: Sun Jan 4 19:44:52 2009 +0100 lxlauncher-0.2-1-ppc *added ppc to archs() diff --git a/source/gnome-extra/lxlauncher/FrugalBuild b/source/gnome-extra/lxlauncher/FrugalBuild index 908b814..50173d1 100644 --- a/source/gnome-extra/lxlauncher/FrugalBuild +++ b/source/gnome-extra/lxlauncher/FrugalBuild @@ -11,7 +11,7 @@ _F_sourceforge_dirname="lxde" Finclude sourceforge options=('scriptlet') groups=('gnome-extra' 'lxde-extra') -archs=('i686' 'x86_64') +archs=('i686' 'x86_64' 'ppc') sha1sums=('2b0bad9bec4e1ee4a1675ce4c941fd4a3a90aedc') build() { From boobaa at frugalware.org Sun Jan 4 19:59:04 2009 From: boobaa at frugalware.org (CSÉCSY László) Date: Sun Jan 4 19:59:06 2009 Subject: [Frugalware-git] frugalware-current: drupal-imagefield_import-5.x_1.3-1-i686 Message-ID: <20090104185904.5283911B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=87126f70d335a8c2b9adc4e684269995685d1df4 commit 87126f70d335a8c2b9adc4e684269995685d1df4 Author: CSÉCSY László Date: Sun Jan 4 19:58:40 2009 +0100 drupal-imagefield_import-5.x_1.3-1-i686 new package / initial import diff --git a/source/network-extra/drupal-imagefield_import/FrugalBuild b/source/network-extra/drupal-imagefield_import/FrugalBuild new file mode 100644 index 0000000..3a59c57 --- /dev/null +++ b/source/network-extra/drupal-imagefield_import/FrugalBuild @@ -0,0 +1,10 @@ +# Compiling Time: 0 SBU +# Maintainer: CSÉCSY László + +_F_drupal_module=imagefield_import +pkgver=5.x_1.3 +pkgrel=1 +pkgdesc="Allows batches of images to be imported from a server-side directory" +rodepends=('drupal-imagefield' 'drupal-cck') +Finclude drupal +sha1sums=('ed7981a6f064b0bf7e28db365a192419a68df6fa') From bouleetbil at frogdev.info Sun Jan 4 20:15:18 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Sun Jan 4 20:15:20 2009 Subject: [Frugalware-git] frugalware-current: esperanza-0.4.0-3-ppc Message-ID: <20090104191518.8726111B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8d30956bd0d639a12a3bf45c068191ce2082e523 commit 8d30956bd0d639a12a3bf45c068191ce2082e523 Author: bouleetbil Date: Sun Jan 4 20:14:20 2009 +0100 esperanza-0.4.0-3-ppc *added ppc to archs() diff --git a/source/xmultimedia-extra/esperanza/FrugalBuild b/source/xmultimedia-extra/esperanza/FrugalBuild index a464541..1a195c0 100644 --- a/source/xmultimedia-extra/esperanza/FrugalBuild +++ b/source/xmultimedia-extra/esperanza/FrugalBuild @@ -9,7 +9,7 @@ url="http://wiki.xmms2.xmms.se/index.php/Client:Esperanza" depends=('xmms2-libs-c++>=0.5' 'qt4' 'libboost') makedepends=('boost') groups=('xmultimedia-extra') -archs=('i686' 'x86_64') +archs=('i686' 'x86_64' 'ppc') options=('scriptlet') up2date="lynx -dump http://exodus.xmms.se/~tru/esperanza/0.4/ | Flasttar" source=(http://exodus.xmms.se/~tru/esperanza/0.4/$pkgname-$pkgver.tar.gz Fix_xmms-0.5.diff) From bouleetbil at frogdev.info Sun Jan 4 20:23:26 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Sun Jan 4 20:23:27 2009 Subject: [Frugalware-git] frugalware-current: blastwave-0.1.1-2-ppc Message-ID: <20090104192326.39ABB11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f6c81b644cacff47e2cf49b18b751cb74d5db580 commit f6c81b644cacff47e2cf49b18b751cb74d5db580 Author: bouleetbil Date: Sun Jan 4 20:22:47 2009 +0100 blastwave-0.1.1-2-ppc *added ppc to archs() diff --git a/source/xmultimedia-extra/blastwave/FrugalBuild b/source/xmultimedia-extra/blastwave/FrugalBuild index bc34c71..1422c71 100644 --- a/source/xmultimedia-extra/blastwave/FrugalBuild +++ b/source/xmultimedia-extra/blastwave/FrugalBuild @@ -8,7 +8,7 @@ pkgdesc="blastwave is a GTK client xmms2" depends=('xmms2>=0.5' 'gtk+2') makedepends=('intltool') groups=('xmultimedia-extra') -archs=('i686' 'x86_64') +archs=('i686' 'x86_64' 'ppc') options=('scriptlet') Finclude sourceforge sha1sums=('9a15e837617575dc4a6b89c6ffb3872b277128ec') From priyank at frugalware.org Sun Jan 4 20:32:37 2009 From: priyank at frugalware.org (Priyank) Date: Sun Jan 4 20:32:38 2009 Subject: [Frugalware-git] frugalwareutils: libfwnetconfig.c: minor typo fix Message-ID: <20090104193237.162A111B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalwareutils.git;a=commitdiff;h=cfe801d91aa9e71ba8af023d14a9538b1eff1d79 commit cfe801d91aa9e71ba8af023d14a9538b1eff1d79 Author: Priyank Date: Mon Jan 5 01:02:32 2009 +0530 libfwnetconfig.c: minor typo fix diff --git a/libfwnetconfig/libfwnetconfig.c b/libfwnetconfig/libfwnetconfig.c index dd79890..a6b26a1 100644 --- a/libfwnetconfig/libfwnetconfig.c +++ b/libfwnetconfig/libfwnetconfig.c @@ -44,7 +44,7 @@ extern int fwutil_dryrun; * @{ */ -/** Prints s list of profiles available. +/** Prints a list of profiles available. * @return 1 on failure, 0 on success */ int fwnet_listprofiles(void) From bouleetbil at frogdev.info Sun Jan 4 20:35:31 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Sun Jan 4 20:35:32 2009 Subject: [Frugalware-git] frugalware-current: libmowgli-0.7.0-1-ppc Message-ID: <20090104193531.7A05811B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=61fa9191aba2ac2ee3c9a0a2f2aa7c8aa39975c1 commit 61fa9191aba2ac2ee3c9a0a2f2aa7c8aa39975c1 Author: bouleetbil Date: Sun Jan 4 20:34:55 2009 +0100 libmowgli-0.7.0-1-ppc *added ppc to archs() diff --git a/source/lib-extra/libmowgli/FrugalBuild b/source/lib-extra/libmowgli/FrugalBuild index 5d0a2b9..e4b3f12 100644 --- a/source/lib-extra/libmowgli/FrugalBuild +++ b/source/lib-extra/libmowgli/FrugalBuild @@ -8,7 +8,7 @@ pkgdesc="A development framework for C (like GLib)." url="http://www.atheme.org/projects/mowgli.shtml" depends=('glibc') groups=(lib-extra) -archs=('i686' 'x86_64') +archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump http://distfiles.atheme.org/ | Flastarchive .tgz" source=(http://distfiles.atheme.org/$pkgname-$pkgver.tgz) sha1sums=('d9a029aab1cd65189b7c8351a7f537232b2be3db') From bouleetbil at frogdev.info Sun Jan 4 20:37:29 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Sun Jan 4 20:37:30 2009 Subject: [Frugalware-git] frugalware-current: libmcs-0.7.1-2-ppc Message-ID: <20090104193729.9672111B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3d1ec2c77c589b5a01445ace9b137b6d8851cb2e commit 3d1ec2c77c589b5a01445ace9b137b6d8851cb2e Author: bouleetbil Date: Sun Jan 4 20:36:53 2009 +0100 libmcs-0.7.1-2-ppc *added ppc to archs() diff --git a/source/lib-extra/libmcs/FrugalBuild b/source/lib-extra/libmcs/FrugalBuild index 9b89d26..3ba6d63 100644 --- a/source/lib-extra/libmcs/FrugalBuild +++ b/source/lib-extra/libmcs/FrugalBuild @@ -8,7 +8,7 @@ pkgdesc="Simple, abstractable configuration library." url="http://www.atheme.org/projects/mcs.shtml" depends=('libmowgli>=0.7.0') groups=('lib-extra') -archs=('i686' 'x86_64') +archs=('i686' 'x86_64' 'ppc') conflicts="mcs" replaces="mcs" provides="mcs" From priyank at frugalware.org Sun Jan 4 20:40:24 2009 From: priyank at frugalware.org (Priyank) Date: Sun Jan 4 20:40:25 2009 Subject: [Frugalware-git] frugalwareutils: libfwyabootcfg.c: Fix some memleaks Message-ID: <20090104194024.46F1211B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalwareutils.git;a=commitdiff;h=d8e9883ce9adca422517d7dcb9c2fe8f1c9d729a commit d8e9883ce9adca422517d7dcb9c2fe8f1c9d729a Author: Priyank Date: Mon Jan 5 01:10:19 2009 +0530 libfwyabootcfg.c: Fix some memleaks diff --git a/libfwyabootcfg/libfwyabootcfg.c b/libfwyabootcfg/libfwyabootcfg.c index 6407270..691b890 100644 --- a/libfwyabootcfg/libfwyabootcfg.c +++ b/libfwyabootcfg/libfwyabootcfg.c @@ -218,15 +218,22 @@ static void os_prober(FILE *fp) void fwyaboot_create_menu(FILE *fp, int flags) { char *root = find_root(); + char *ptr = NULL; fprintf(fp, "#\n" "# /etc/yaboot.conf - configuration file for Yaboot\n" "# This file is generated automatically by yabootcfg\n" "#\n\n"); - fprintf(fp, "init-message=\"%s\"\n", gen_title()); + ptr = gen_title(); + fprintf(fp, "init-message=\"%s\"\n", ptr); + FWUTIL_FREE (ptr); fprintf(fp, "boot=%s\n", find_boot()); - fprintf(fp, "device=%s\n", of_path(root, 0)); - fprintf(fp, "partition=%s\n", of_path(root, 1)); + ptr = of_path(root, 0); + fprintf(fp, "device=%s\n", ptr); + FWUTIL_FREE (ptr); + ptr = of_path(root, 1); + fprintf(fp, "partition=%s\n", ptr); + FWUTIL_FREE (ptr); fprintf(fp, "delay=10\n" "timeout=40\n" "install=/usr/lib/yaboot/yaboot\n" From priyank at frugalware.org Sun Jan 4 20:44:20 2009 From: priyank at frugalware.org (Priyank) Date: Sun Jan 4 20:44:22 2009 Subject: [Frugalware-git] frugalwareutils: libfwxconfig.c: Fix a memleak and modified the description of fwx_get_mousedev() Message-ID: <20090104194420.D4FD311B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalwareutils.git;a=commitdiff;h=072e58460355ddb0367fe6974e4680feef6372e0 commit 072e58460355ddb0367fe6974e4680feef6372e0 Author: Priyank Date: Mon Jan 5 01:14:05 2009 +0530 libfwxconfig.c: Fix a memleak and modified the description of fwx_get_mousedev() diff --git a/libfwxconfig/libfwxconfig.c b/libfwxconfig/libfwxconfig.c index d4bb166..dcca516 100644 --- a/libfwxconfig/libfwxconfig.c +++ b/libfwxconfig/libfwxconfig.c @@ -84,6 +84,7 @@ static void print_mouse_identifier(FILE *fp, int num, char *device, char *proto) fprintf(fp, "Option \"Device\" \"%s\"\n", device); fprintf(fp, "EndSection\n\n" "Section \"InputDevice\"\n"); + free(proto); } /** Creates a config draft, which will be an input fro fwx_doconfig() @@ -225,7 +226,7 @@ int fwx_dotest() } /** Get the name of the device used by gpm - * @return the name of the device + * @return the name of the device. Returned string should be freed. */ char *fwx_get_mousedev() { From priyank at frugalware.org Sun Jan 4 20:46:54 2009 From: priyank at frugalware.org (Priyank) Date: Sun Jan 4 20:46:55 2009 Subject: [Frugalware-git] frugalwareutils: xconfig.c: Fixed a memleak Message-ID: <20090104194654.0DD2A11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalwareutils.git;a=commitdiff;h=b3abf8f4bce7b812661c67abca1cbb11832783fc commit b3abf8f4bce7b812661c67abca1cbb11832783fc Author: Priyank Date: Mon Jan 5 01:16:47 2009 +0530 xconfig.c: Fixed a memleak diff --git a/xconfig/xconfig.c b/xconfig/xconfig.c index 590cfc4..6ee658e 100644 --- a/xconfig/xconfig.c +++ b/xconfig/xconfig.c @@ -128,6 +128,7 @@ int run(int argc, char **argv) fwx_doconfig(mdev, res, depth); unlink("/root/xorg.conf.new"); + free (mdev); if(needrelease) fwutil_release(); end_dialog(); From bouleetbil at frogdev.info Sun Jan 4 20:50:18 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Sun Jan 4 20:50:20 2009 Subject: [Frugalware-git] frugalware-current: audacious-1.5.1-2-ppc Message-ID: <20090104195018.2C0CF11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=13be2cf66871b9b2c967283f9c3c671dadaf1972 commit 13be2cf66871b9b2c967283f9c3c671dadaf1972 Author: bouleetbil Date: Sun Jan 4 20:49:23 2009 +0100 audacious-1.5.1-2-ppc *added ppc to archs() diff --git a/source/xmultimedia-extra/audacious/FrugalBuild b/source/xmultimedia-extra/audacious/FrugalBuild index db42575..703ce62 100644 --- a/source/xmultimedia-extra/audacious/FrugalBuild +++ b/source/xmultimedia-extra/audacious/FrugalBuild @@ -10,7 +10,7 @@ depends=('gtk+2>=2.12.7' 'taglib' 'libglade' 'libxml2' 'glib2>=2.14.2' 'dbus-gl 'libxdmcp' 'libmcs>=0.7.1-2' 'libxdamage' 'libxext' 'libice') rodepends=('audacious-plugins') groups=('xmultimedia-extra') -archs=('i686' 'x86_64') +archs=('i686' 'x86_64' 'ppc') options=('scriptlet' 'force') conflicts=('bmp' 'bmp-docklet' 'bmp-mac') replaces=('bmp' 'bmp-docklet' 'bmp-mac') From priyank at frugalware.org Sun Jan 4 20:56:33 2009 From: priyank at frugalware.org (Priyank) Date: Sun Jan 4 20:56:35 2009 Subject: [Frugalware-git] frugalwareutils: libfwgrubconfig.c: Memleak fixes Message-ID: <20090104195634.004C011B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalwareutils.git;a=commitdiff;h=bec755e86d9ecd6eeac7e2f4bc3aea167b98855c commit bec755e86d9ecd6eeac7e2f4bc3aea167b98855c Author: Priyank Date: Mon Jan 5 01:26:28 2009 +0530 libfwgrubconfig.c: Memleak fixes diff --git a/libfwgrubconfig/libfwgrubconfig.c b/libfwgrubconfig/libfwgrubconfig.c index b0aab5f..959ac96 100644 --- a/libfwgrubconfig/libfwgrubconfig.c +++ b/libfwgrubconfig/libfwgrubconfig.c @@ -294,6 +294,7 @@ int fwgrub_install(int mode) if(mode==0) { // mbr + char *ptr = NULL; GList *devs = find_real_devs(rootdev); for(i=0;i&1", "w"); if(!pp) return(1); - fprintf(pp, "root %s\n", grub_convert(dev, 0)); - fprintf(pp, "setup %s\n", grub_convert(dev, 1)); + ptr = grub_convert(dev, 0); + fprintf(pp, "root %s\n", ptr); + free (ptr); + ptr = grub_convert(dev, 1); + fprintf(pp, "setup %s\n", ptr); + free (ptr); } } /* else if(mode==1) @@ -311,6 +316,7 @@ int fwgrub_install(int mode) else if(mode==2) { // root + char *ptr = NULL; GList *devs = find_real_devs(rootdev); for(i=0;i&1", "w"); if(!pp) return(1); - fprintf(pp, "root %s\n", grub_convert(dev, 0)); - fprintf(pp, "setup %s\n", grub_convert(dev, 0)); + ptr = grub_convert(dev, 0); + fprintf(pp, "root %s\n", ptr); + free (ptr); + ptr = grub_convert(dev, 0); + fprintf(pp, "setup %s\n", ptr); + free (ptr); } } } From bouleetbil at frogdev.info Sun Jan 4 20:58:14 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Sun Jan 4 20:58:15 2009 Subject: [Frugalware-git] frugalware-current: perl-gtk2-ex-formfactory-0.65-1-ppc Message-ID: <20090104195814.11AD511B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d4181d96c71493a8a6b91f885f520d0aa8e78365 commit d4181d96c71493a8a6b91f885f520d0aa8e78365 Author: bouleetbil Date: Sun Jan 4 20:57:35 2009 +0100 perl-gtk2-ex-formfactory-0.65-1-ppc *added ppc to archs() diff --git a/source/xlib-extra/perl-gtk2-ex-formfactory/FrugalBuild b/source/xlib-extra/perl-gtk2-ex-formfactory/FrugalBuild index e178acb..34f2717 100644 --- a/source/xlib-extra/perl-gtk2-ex-formfactory/FrugalBuild +++ b/source/xlib-extra/perl-gtk2-ex-formfactory/FrugalBuild @@ -10,6 +10,6 @@ pkgdesc="Makes building complex GUI's easy" depends=('perl-gtk2') options=('scriptlet') Finclude perl -archs=('i686' 'x86_64') +archs=('i686' 'x86_64' 'ppc') groups=('xlib-extra') sha1sums=('ff98e55cc1a11c12b6e8874654506c03041fd711') From bouleetbil at frogdev.info Sun Jan 4 21:07:54 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Sun Jan 4 21:07:55 2009 Subject: [Frugalware-git] frugalware-current: sdl_gfx-2.0.17-2-ppc Message-ID: <20090104200754.5F0AD11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=49868d3e3d3a4ce3232182936819c8d07e39f5ff commit 49868d3e3d3a4ce3232182936819c8d07e39f5ff Author: bouleetbil Date: Sun Jan 4 21:07:17 2009 +0100 sdl_gfx-2.0.17-2-ppc *added ppc to archs() diff --git a/source/xlib/sdl_gfx/FrugalBuild b/source/xlib/sdl_gfx/FrugalBuild index 3279a37..95f78f2 100644 --- a/source/xlib/sdl_gfx/FrugalBuild +++ b/source/xlib/sdl_gfx/FrugalBuild @@ -9,7 +9,7 @@ url="http://www.ferzkopp.net/mambo/index.php?option=com_content&task=view&id=14& depends=('sdl') license="LGPL" groups=('xlib') -archs=('i686' 'x86_64') +archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump 'http://www.ferzkopp.net/joomla/content/view/19/14/'|grep -m1 '.tar.gz'|sed 's/.*-\(.*\).tar.gz/\1/'" source=(http://www.ferzkopp.net/Software/SDL_gfx-2.0/SDL_gfx-$pkgver.tar.gz) sha1sums=('7be52033ca8f014ee7761f6f298feac8336bfa5a') From boobaa at frugalware.org Sun Jan 4 21:24:43 2009 From: boobaa at frugalware.org (CSÉCSY László) Date: Sun Jan 4 21:24:45 2009 Subject: [Frugalware-git] frugalware-current: drupal-captcha-5.x_3.2-1-i686 Message-ID: <20090104202443.D516511B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=559251afda830a617d29d65c4868dbd8fae19b9e commit 559251afda830a617d29d65c4868dbd8fae19b9e Author: CSÉCSY László Date: Sun Jan 4 21:24:25 2009 +0100 drupal-captcha-5.x_3.2-1-i686 version bump diff --git a/source/network-extra/drupal-captcha/FrugalBuild b/source/network-extra/drupal-captcha/FrugalBuild index 324f26c..671c092 100644 --- a/source/network-extra/drupal-captcha/FrugalBuild +++ b/source/network-extra/drupal-captcha/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: CSÉCSY László _F_drupal_module=captcha -pkgver=5.x_3.1 +pkgver=5.x_3.2 pkgrel=1 pkgdesc="Provides CAPTCHA feature to virtually any user facing web form in Drupal" Finclude drupal -sha1sums=('84bc72399bb7b647385397d13b6aa28734ffd771') +sha1sums=('51e54d62f142345f9beb12dd64bb4ac364556f27') From bouleetbil at frogdev.info Sun Jan 4 21:25:10 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Sun Jan 4 21:25:11 2009 Subject: [Frugalware-git] frugalware-current: libquicktime-1.0.2-2-ppc Message-ID: <20090104202510.30F3211B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8588634815e2d6d719e326fff8e68f59865e08fc commit 8588634815e2d6d719e326fff8e68f59865e08fc Author: bouleetbil Date: Sun Jan 4 21:24:02 2009 +0100 libquicktime-1.0.2-2-ppc *added ppc to archs() diff --git a/source/xlib/libquicktime/FrugalBuild b/source/xlib/libquicktime/FrugalBuild index 2cb6321..da60433 100644 --- a/source/xlib/libquicktime/FrugalBuild +++ b/source/xlib/libquicktime/FrugalBuild @@ -7,7 +7,7 @@ pkgrel=2 pkgdesc="A library based on quicktime4linux with extensions" depends=('lame' 'gtk+2' 'alsa-lib' 'libdv' 'libvorbis' 'libavc1394' 'faac>=1.25' 'faad2>=2.5' 'ffmpeg>=20080427') groups=('xlib') -archs=('x86_64' 'i686') +archs=('x86_64' 'i686' 'ppc') options=('scriptlet') Finclude sourceforge url="http://libquicktime.sourceforge.net/" From bouleetbil at frogdev.info Sun Jan 4 21:52:56 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Sun Jan 4 21:52:57 2009 Subject: [Frugalware-git] frugalware-current: vte-0.17.4-3-i686 Message-ID: <20090104205256.3232411B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=193ca1cf24daaee3de39ff853f13fd4ba8c7ac75 commit 193ca1cf24daaee3de39ff853f13fd4ba8c7ac75 Author: bouleetbil Date: Sun Jan 4 21:44:54 2009 +0100 vte-0.17.4-3-i686 *moved to xapps diff --git a/source/gnome/vte/FrugalBuild b/source/gnome/vte/FrugalBuild deleted file mode 100644 index 276dace..0000000 --- a/source/gnome/vte/FrugalBuild +++ /dev/null @@ -1,29 +0,0 @@ -# Compiling time: 1.08 SBU -# Maintainer: Christian Hamar alias krix - -pkgname=vte -pkgver=0.17.4 -pkgrel=2 -pkgdesc="Virtual Terminal Emulator" -url="http://www.gnome.org/" -depends=('gtk+2>=2.14.3') -makedepends=('pygtk>=2.12.0' 'gtk-doc>=1.9' 'perl-xml-parser' 'intltool') -groups=('gnome' 'gnome-minimal') -archs=('i686' 'x86_64' 'ppc') -_F_gnome_devel="y" -Finclude gnome -sha1sums=('fe4a3ec476c97d0f385249ee60edb12887b69575') -Fconfopts="$Fconfopts --enable-gtk-doc" - -subpkgs=('vte-python') -subdescs=('Python bindings for VTE') -subdepends=("pygtk>=2.12.1-4 $pkgname=$pkgver") -subgroups=('gnome') -subarchs=('i686 x86_64 ppc') - -build() { - Fbuild - Fsplit vte-python usr/lib/python* -} - -# optimization OK diff --git a/source/xapps/vte/FrugalBuild b/source/xapps/vte/FrugalBuild new file mode 100644 index 0000000..6c37b4e --- /dev/null +++ b/source/xapps/vte/FrugalBuild @@ -0,0 +1,29 @@ +# Compiling time: 1.08 SBU +# Maintainer: Christian Hamar alias krix + +pkgname=vte +pkgver=0.17.4 +pkgrel=3 +pkgdesc="Virtual Terminal Emulator" +url="http://www.gnome.org/" +depends=('gtk+2>=2.14.3') +makedepends=('pygtk>=2.12.0' 'gtk-doc>=1.9' 'perl-xml-parser' 'intltool') +groups=('xapps') +archs=('i686' 'x86_64' 'ppc') +_F_gnome_devel="y" +Finclude gnome +sha1sums=('fe4a3ec476c97d0f385249ee60edb12887b69575') +Fconfopts="$Fconfopts --enable-gtk-doc" + +subpkgs=('vte-python') +subdescs=('Python bindings for VTE') +subdepends=("pygtk>=2.12.1-4 $pkgname=$pkgver") +subgroups=('xlib-extra') +subarchs=('i686 x86_64 ppc') + +build() { + Fbuild + Fsplit vte-python usr/lib/python* +} + +# optimization OK From bouleetbil at frogdev.info Sun Jan 4 22:32:09 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Sun Jan 4 22:32:11 2009 Subject: [Frugalware-git] frugalware-current: gkrellm-2.3.2-1-ppc Message-ID: <20090104213209.402E111B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c5f1f603cc89625bb0f549f0de6d7f415e8b7104 commit c5f1f603cc89625bb0f549f0de6d7f415e8b7104 Author: bouleetbil Date: Sun Jan 4 22:31:17 2009 +0100 gkrellm-2.3.2-1-ppc *added ppc to archs() diff --git a/source/xapps/gkrellm/FrugalBuild b/source/xapps/gkrellm/FrugalBuild index 61f3c36..2a86738 100644 --- a/source/xapps/gkrellm/FrugalBuild +++ b/source/xapps/gkrellm/FrugalBuild @@ -9,7 +9,7 @@ pkgdesc="GKrellM is a single process stack of system monitors" url="http://members.dslextreme.com/users/billw/gkrellm/gkrellm.html" depends=('gtk+2' 'openssl') groups=('xapps') -archs=('i686' 'x86_64') +archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump 'http://members.dslextreme.com/users/billw/gkrellm/gkrellm.html'|grep .tar.bz2$|sed -n 's/.*lm-\(.*\).t.*/\1/;1 p'" source=(http://members.dslextreme.com/users/billw/$pkgname/$pkgname-$pkgver.tar.bz2) sha1sums=('fe94996c4fe084c28bf7a7fbc3f8d4fd64724ac0') From crazy at frugalware.org Sun Jan 4 22:54:44 2009 From: crazy at frugalware.org (crazy) Date: Sun Jan 4 22:54:45 2009 Subject: [Frugalware-git] frugalware-current: gst-plugins-base-0.10.21-2-x86_64 Message-ID: <20090104215444.3800611B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bbd7289d0145e21c968e06b4cd9c804431b7d6b9 commit bbd7289d0145e21c968e06b4cd9c804431b7d6b9 Author: crazy Date: Sun Jan 4 22:51:29 2009 +0100 gst-plugins-base-0.10.21-2-x86_64 * release bump * added gio plugin diff --git a/source/xmultimedia/gst-plugins-base/FrugalBuild b/source/xmultimedia/gst-plugins-base/FrugalBuild index 169ed23..dd98b94 100644 --- a/source/xmultimedia/gst-plugins-base/FrugalBuild +++ b/source/xmultimedia/gst-plugins-base/FrugalBuild @@ -4,14 +4,14 @@ pkgname=gst-plugins-base pkgver=0.10.21 -pkgrel=1 +pkgrel=2 pkgdesc="Plugins for GStreamer" url="http://gstreamer.freedesktop.org/" depends=('libxv' 'libsm' 'gstreamer>=0.10.21') rodepends=('libmms' 'hermes' 'ortp') makedepends=('gtk-doc' 'pyxml' 'gnome-vfs>=2.22.0' 'cdparanoia' 'pango' 'liboil>=0.3.14' \ 'alsa-lib' 'libtheora' 'fontconfig' 'dbus-glib>=0.74-2' 'avahi-glib>=0.6.14-2' \ - 'libvisual-plugins' 'libvorbis') + 'libvisual-plugins' 'libvorbis' 'gvfs') groups=('xmultimedia') archs=('i686' 'x86_64' 'ppc') options=('scriptlet') @@ -22,19 +22,19 @@ sha1sums=('ae83b3306f52aa3affd014dade30c6cd5c2baa66') subpkgs=("$pkgname-gnomevfs" "$pkgname-cdparanoia" "$pkgname-pango" "$pkgname-alsa" \ "$pkgname-theora" "$pkgname-oil" "$pkgname-libvisual" "$pkgname-ogg" "$pkgname-vorbis" \ - "$pkgname-docs") + "$pkgname-gio" "$pkgname-docs") subdescs=('GStreamer gnome-vfs plugin (Base).' 'GStreamer cdparanoia plugin (Base).' 'GStreamer pango plugin (Base).' \ 'GStreamer alsa plugin (Base).' 'GStreamer theora plugin (Base).' 'GStreamer oil plugin (Base).' \ 'GStreamer libvisual plugin (Base).' 'GStreamer ogg plugin (Base).' 'GStreamer vorbis plugin (Base).' \ - 'GStreamer Plugins Documentation.') + 'GStreamer GIO plugin (Base).' 'GStreamer Plugins Documentation.') subdepends=("gnome-vfs>=2.22.0 $pkgname=$pkgver dbus-glib>=0.74-2 avahi-glib>=0.6.14-2" "cdparanoia $pkgname=$pkgver" \ "pango fontconfig $pkgname=$pkgver" "alsa-lib $pkgname=$pkgver" "libtheora $pkgname=$pkgver" \ "liboil>=0.3.14 $pkgname=$pkgver" "libvisual-plugins $pkgname=$pkgver" "libogg $pkgname=$pkgver" \ - "libvorbis $pkgname=$pkgver" '') + "libvorbis $pkgname=$pkgver" "gvfs $pkgname=$pkgver zlib" '') subgroups=('gnome' 'xmultimedia' 'xmultimedia' 'xmultimedia' 'xmultimedia' \ - 'xmultimedia' 'xmultimedia' 'xmultimedia' 'xmultimedia' 'docs-extra') + 'xmultimedia' 'xmultimedia' 'xmultimedia' 'xmultimedia' 'xmultimedia' 'docs-extra') subarchs=('i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' \ - 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc') + 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc') build() { if [ "$CARCH" == "x86_64" ]; then @@ -42,6 +42,7 @@ build() { fi Fpatchall Fmake \ + --enable-experimental \ --disable-schemas-install \ --disable-gtk-doc \ --disable-debug \ @@ -59,6 +60,7 @@ build() { Fsplit $pkgname-libvisual usr/lib/gstreamer-0.10/libgstlibvisual.* Fsplit $pkgname-ogg usr/lib/gstreamer-0.10/libgstogg.* Fsplit $pkgname-vorbis usr/lib/gstreamer-0.10/libgstvorbis.* + Fsplit $pkgname-gio usr/lib/gstreamer-0.10/libgstgio.* Fsplit $pkgname-docs usr/share/gtk-doc } From vmiklos at frugalware.org Mon Jan 5 01:40:05 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jan 5 01:40:07 2009 Subject: [Frugalware-git] frugalware-current: asciidoc-8.3.3-1-i686 Message-ID: <20090105004005.53AB911B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=85bcf1fdab93fc9c12f096e813f6373689db9f84 commit 85bcf1fdab93fc9c12f096e813f6373689db9f84 Author: Miklos Vajna Date: Mon Jan 5 01:39:53 2009 +0100 asciidoc-8.3.3-1-i686 - version bump diff --git a/source/apps-extra/asciidoc/FrugalBuild b/source/apps-extra/asciidoc/FrugalBuild index af01d02..612fc09 100644 --- a/source/apps-extra/asciidoc/FrugalBuild +++ b/source/apps-extra/asciidoc/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: voroskoi pkgname=asciidoc -pkgver=8.3.2 +pkgver=8.3.3 pkgrel=1 pkgdesc="AsciiDoc is a text document format for writing short documents, articles, books and UNIX man pages." url="http://www.methods.co.nz/asciidoc/index.html" @@ -14,7 +14,7 @@ up2date="lynx -dump http://www.methods.co.nz/asciidoc/downloads.html |Flasttar" source=(http://www.methods.co.nz/asciidoc/asciidoc-$pkgver.tar.gz \ http://ftp.frugalware.org/pub/other/sources/asciidoc/asciidoc-fonts-0.1.tar.bz2 \ README.Frugalware) -sha1sums=('15fba8b985acbd58a7aa06e11367b1d2e97686d0' \ +sha1sums=('6c85063185deaeecee6389cdadafd3e88c5ae160' \ '717779406f876f439ac37c79878f403ecdef3467' \ '31d7a38de67fd8d2492b8a07d64721491b69d1ea') From ryuo at frugalware.org Mon Jan 5 05:42:28 2009 From: ryuo at frugalware.org (James Buren) Date: Mon Jan 5 05:42:30 2009 Subject: [Frugalware-git] frugalware-current: kildclient-2.8.0-1-i686 Message-ID: <20090105044228.17BF611B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0568b150fa20559d3b4284f9df3afc1dac3bb2ba commit 0568b150fa20559d3b4284f9df3afc1dac3bb2ba Author: James Buren Date: Sun Jan 4 22:45:03 2009 -0600 kildclient-2.8.0-1-i686 * version bump * removed deprecated sourceforge schema option diff --git a/source/games-extra/kildclient/FrugalBuild b/source/games-extra/kildclient/FrugalBuild index e78cb3d..1805982 100644 --- a/source/games-extra/kildclient/FrugalBuild +++ b/source/games-extra/kildclient/FrugalBuild @@ -2,17 +2,16 @@ # Maintainer: James Buren pkgname=kildclient -pkgver=2.7.0 +pkgver=2.8.0 pkgrel=1 -pkgdesc="a mud client built with GTK2, supports modern mud protocols" +pkgdesc="A mud client built with GTK2, supports modern mud protocols." depends=('libglade' 'freetype2' 'libxau' 'libxdmcp' 'gtkspell' 'gnutls' 'libgcrypt' 'libxdamage' 'libxext' 'libgcc') rodepends=('perl-gettext') -_F_sourceforge_broken_up2date="1" Finclude sourceforge options=('scriptlet') groups=('games-extra') archs=('i686' 'x86_64') Fconfopts="$Fconfopts --with-gtkspell --with-libgnutls --with-docs" -sha1sums=('2cf531d127cce70eca72487f3f69f01f19ee69fa') +sha1sums=('dec252f8013b31d1bf3120385150c7d614b0dbfb') # optimization OK From priyank at frugalware.org Mon Jan 5 06:52:36 2009 From: priyank at frugalware.org (Priyank) Date: Mon Jan 5 06:52:39 2009 Subject: [Frugalware-git] frugalwareutils: raidconfig.c: Fixed a memory leak Message-ID: <20090105055236.A464A11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalwareutils.git;a=commitdiff;h=b8f7b3991a28dbd0473ab50d159fc5c5d7e58005 commit b8f7b3991a28dbd0473ab50d159fc5c5d7e58005 Author: Priyank Date: Mon Jan 5 11:22:28 2009 +0530 raidconfig.c: Fixed a memory leak diff --git a/raidconfig/raidconfig.c b/raidconfig/raidconfig.c index 20f4af9..b4ae100 100644 --- a/raidconfig/raidconfig.c +++ b/raidconfig/raidconfig.c @@ -97,6 +97,7 @@ GList *add_devices() dlg_clear(); ret = dialog_menu(_("Selecting devices"), dptr, 0, 0, 0, g_list_length(partlist)/2, partarray); + free(dptr); if (ret == DLG_EXIT_CANCEL) break; devlist = g_list_append(devlist, strdup(buf)); From priyank at frugalware.org Mon Jan 5 07:25:18 2009 From: priyank at frugalware.org (Priyank) Date: Mon Jan 5 07:25:18 2009 Subject: [Frugalware-git] frugalwareutils: netconfig.c: Fixed another memory leak Message-ID: <20090105062518.0A2D211B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalwareutils.git;a=commitdiff;h=453b5f38d2d6280ff10de09cf5db65efd33c430a commit 453b5f38d2d6280ff10de09cf5db65efd33c430a Author: Priyank Date: Mon Jan 5 11:36:19 2009 +0530 netconfig.c: Fixed another memory leak diff --git a/netconfig/netconfig.c b/netconfig/netconfig.c index dd0c58e..8383ffc 100644 --- a/netconfig/netconfig.c +++ b/netconfig/netconfig.c @@ -321,9 +321,11 @@ int run(int argc, char **argv) else if ((!strcmp("status", argv[optind])) && fn) { printf(_("Current profile: %s\n"), fn); + FWUTIL_FREE(fn); return(0); } profile = fwnet_parseprofile(fn); + FWUTIL_FREE(fn); if(profile!=NULL) // unload the old profile for (i=0; iinterfaces); i++) From priyank at frugalware.org Mon Jan 5 07:25:18 2009 From: priyank at frugalware.org (Priyank) Date: Mon Jan 5 07:25:20 2009 Subject: [Frugalware-git] frugalwareutils: netconfig.c: Fixed a couple of memleaks Message-ID: <20090105062518.2019711B8630@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalwareutils.git;a=commitdiff;h=59a69cafc53b787755d454459eaaa4ad680cd4f8 commit 59a69cafc53b787755d454459eaaa4ad680cd4f8 Author: Priyank Date: Mon Jan 5 11:40:40 2009 +0530 netconfig.c: Fixed a couple of memleaks diff --git a/netconfig/netconfig.c b/netconfig/netconfig.c index 8383ffc..d70ade3 100644 --- a/netconfig/netconfig.c +++ b/netconfig/netconfig.c @@ -327,6 +327,7 @@ int run(int argc, char **argv) profile = fwnet_parseprofile(fn); FWUTIL_FREE(fn); if(profile!=NULL) + { // unload the old profile for (i=0; iinterfaces); i++) { @@ -334,6 +335,8 @@ int run(int argc, char **argv) if(!iface || !strcmp(iface, j->name)) fwnet_ifdown(j, profile); } + FWUTIL_FREE(profile); + } if(!strcmp("stop", argv[optind])) { if(!fwutil_dryrun) @@ -361,6 +364,7 @@ int run(int argc, char **argv) if(!fwutil_dryrun) fwnet_setlastprofile(fn); FWUTIL_FREE(fn); + FWUTIL_FREE(profile); } else dialog_config(argc, argv); From priyank at frugalware.org Mon Jan 5 07:26:51 2009 From: priyank at frugalware.org (Priyank) Date: Mon Jan 5 07:26:52 2009 Subject: [Frugalware-git] frugalwareutils: libfwgrubconfig.c: Closed some open file handles Message-ID: <20090105062651.84F7711B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalwareutils.git;a=commitdiff;h=51dc84cd9c1cfe9b77ecc6fb2bf05545838f17b3 commit 51dc84cd9c1cfe9b77ecc6fb2bf05545838f17b3 Author: Priyank Date: Mon Jan 5 11:56:38 2009 +0530 libfwgrubconfig.c: Closed some open file handles diff --git a/libfwgrubconfig/libfwgrubconfig.c b/libfwgrubconfig/libfwgrubconfig.c index 959ac96..a4d68ce 100644 --- a/libfwgrubconfig/libfwgrubconfig.c +++ b/libfwgrubconfig/libfwgrubconfig.c @@ -305,10 +305,11 @@ int fwgrub_install(int mode) return(1); ptr = grub_convert(dev, 0); fprintf(pp, "root %s\n", ptr); - free (ptr); + free(ptr); ptr = grub_convert(dev, 1); fprintf(pp, "setup %s\n", ptr); - free (ptr); + free(ptr); + fclose(pp); } } /* else if(mode==1) @@ -327,10 +328,11 @@ int fwgrub_install(int mode) return(1); ptr = grub_convert(dev, 0); fprintf(pp, "root %s\n", ptr); - free (ptr); + free(ptr); ptr = grub_convert(dev, 0); fprintf(pp, "setup %s\n", ptr); - free (ptr); + free(ptr); + fclose(pp); } } } From janny at frugalware.org Mon Jan 5 07:28:40 2009 From: janny at frugalware.org (Janos Kovacs) Date: Mon Jan 5 07:28:42 2009 Subject: [Frugalware-git] frugalware-current: gimp-2.6.4-1-i686 Message-ID: <20090105062840.8C5FF11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1ab8c5e165e8081fbea0115b626b33b5e18cf04d commit 1ab8c5e165e8081fbea0115b626b33b5e18cf04d Author: Janos Kovacs Date: Mon Jan 5 07:28:19 2009 +0100 gimp-2.6.4-1-i686 - version bump diff --git a/source/xapps/gimp/FrugalBuild b/source/xapps/gimp/FrugalBuild index 0eaf2dc..d202649 100644 --- a/source/xapps/gimp/FrugalBuild +++ b/source/xapps/gimp/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: VMiklos pkgname=gimp -pkgver=2.6.3 +pkgver=2.6.4 pkgrel=1 pkgdesc="The GNU Image Manipulation Program" url="http://www.gimp.org/" @@ -14,7 +14,7 @@ archs=('i686' 'x86_64' 'ppc') makedepends=('gimp-print' 'perl-xml-parser') up2date="lynx -dump $url/downloads/|grep tar.bz2|sed -n 's/.*-\(.*\)\.t.*/\1/;$ p'" source=(ftp://ftp.gimp.org/pub/gimp/v2.6/$pkgname-$pkgver.tar.bz2) -sha1sums=('5e64c03d9d05fa28656c6041039c26cd7c09deab') +sha1sums=('f68ca1e1dce7ef8c100ce74e0c1ee5c493a589a1') options=('scriptlet' 'force') _F_gnome_desktop="y" Finclude gnome-scriptlet From priyank at frugalware.org Mon Jan 5 07:32:48 2009 From: priyank at frugalware.org (Priyank) Date: Mon Jan 5 07:32:49 2009 Subject: [Frugalware-git] frugalwareutils: libfwgrubconfig.c: oops we should use pclose() instead of fclose() for popened streams Message-ID: <20090105063248.54ABB11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalwareutils.git;a=commitdiff;h=04c23c14bd5f1ff25b551be456f393b5902193fe commit 04c23c14bd5f1ff25b551be456f393b5902193fe Author: Priyank Date: Mon Jan 5 12:02:41 2009 +0530 libfwgrubconfig.c: oops we should use pclose() instead of fclose() for popened streams diff --git a/libfwgrubconfig/libfwgrubconfig.c b/libfwgrubconfig/libfwgrubconfig.c index a4d68ce..49c8dc2 100644 --- a/libfwgrubconfig/libfwgrubconfig.c +++ b/libfwgrubconfig/libfwgrubconfig.c @@ -309,7 +309,7 @@ int fwgrub_install(int mode) ptr = grub_convert(dev, 1); fprintf(pp, "setup %s\n", ptr); free(ptr); - fclose(pp); + pclose(pp); } } /* else if(mode==1) @@ -332,7 +332,7 @@ int fwgrub_install(int mode) ptr = grub_convert(dev, 0); fprintf(pp, "setup %s\n", ptr); free(ptr); - fclose(pp); + pclose(pp); } } } From janny at frugalware.org Mon Jan 5 07:46:57 2009 From: janny at frugalware.org (Janos Kovacs) Date: Mon Jan 5 07:46:58 2009 Subject: [Frugalware-git] frugalware-current: clamtk-4.08-1-i686 Message-ID: <20090105064657.D7BF011B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1b35c8ca3eb27c243af385c93bba991752021cf1 commit 1b35c8ca3eb27c243af385c93bba991752021cf1 Author: Janos Kovacs Date: Mon Jan 5 07:46:22 2009 +0100 clamtk-4.08-1-i686 - version bump diff --git a/source/xapps-extra/clamtk/FrugalBuild b/source/xapps-extra/clamtk/FrugalBuild index 0a840f3..9f94652 100644 --- a/source/xapps-extra/clamtk/FrugalBuild +++ b/source/xapps-extra/clamtk/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Janos Kovacs pkgname=clamtk -pkgver=4.07 +pkgver=4.08 pkgrel=1 pkgdesc="ClamTk is a GUI front-end for ClamAV using gtk2-perl" rodepends=('perl-gtk2' 'clamav' 'perl-date-calc' 'perl-file-find-rule' 'perl-gettext') @@ -10,7 +10,7 @@ groups=('xapps-extra') archs=('i686' 'x86_64') Finclude sourceforge url="http://clamtk.sourceforge.net/" -sha1sums=('d1465f01075e0d14d7b2411de731b36c57b21c00') +sha1sums=('2f6cd136e0975f980f32628d908d1686b49f948a') build() { Fcd From j3d1f0x at free.fr Mon Jan 5 08:02:48 2009 From: j3d1f0x at free.fr (gholafox) Date: Mon Jan 5 08:02:51 2009 Subject: [Frugalware-git] frugalware-current: ffmpegthumbnailer-1.4.0-1-i686 Message-ID: <20090105070248.BFB4111B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=abc23dd5db9bc2b0f558b2c49fda256a7a55c343 commit abc23dd5db9bc2b0f558b2c49fda256a7a55c343 Author: gholafox Date: Mon Jan 5 08:02:36 2009 +0100 ffmpegthumbnailer-1.4.0-1-i686 * Version bump diff --git a/source/xapps-extra/ffmpegthumbnailer/FrugalBuild b/source/xapps-extra/ffmpegthumbnailer/FrugalBuild index 7800ab0..1c1c202 100644 --- a/source/xapps-extra/ffmpegthumbnailer/FrugalBuild +++ b/source/xapps-extra/ffmpegthumbnailer/FrugalBuild @@ -3,13 +3,13 @@ # Contributor: detto pkgname=ffmpegthumbnailer -pkgver=1.3.0 +pkgver=1.4.0 pkgrel=1 pkgdesc="Creates thumbnails for your video files" Finclude googlecode archs=('i686' 'x86_64') groups=('xapps-extra') depends=('ffmpeg' 'libpng') -sha1sums=('8b29dde56dece30ebc351611ea40fcff83e1d317') +sha1sums=('78c5e241a4b85069086914994e0899e59482d669') # optimization OK From priyank at frugalware.org Mon Jan 5 08:18:54 2009 From: priyank at frugalware.org (Priyank) Date: Mon Jan 5 08:18:55 2009 Subject: [Frugalware-git] frugalwareutils: libfwgrubconfig.c: use pclose() for closing popened streams. vmiklos, is it ok ? Message-ID: <20090105071854.4472E11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalwareutils.git;a=commitdiff;h=3526d6657a76e35c5404704b3c1c4b3d4b4c94c8 commit 3526d6657a76e35c5404704b3c1c4b3d4b4c94c8 Author: Priyank Date: Mon Jan 5 12:48:51 2009 +0530 libfwgrubconfig.c: use pclose() for closing popened streams. vmiklos, is it ok ? diff --git a/libfwgrubconfig/libfwgrubconfig.c b/libfwgrubconfig/libfwgrubconfig.c index 49c8dc2..8588363 100644 --- a/libfwgrubconfig/libfwgrubconfig.c +++ b/libfwgrubconfig/libfwgrubconfig.c @@ -290,7 +290,7 @@ int fwgrub_install(int mode) if(!pp) return(1); fprintf(pp, "quit\n"); - fclose(pp); + pclose(pp); if(mode==0) { // mbr From priyank at frugalware.org Mon Jan 5 08:35:38 2009 From: priyank at frugalware.org (Priyank) Date: Mon Jan 5 08:35:39 2009 Subject: [Frugalware-git] frugalwareutils: netconfig.c: Fixed a couple of memleaks Message-ID: <20090105073538.8F76511B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalwareutils.git;a=commitdiff;h=e28033fc9d2b35714cc3c6fb7b95ae1d4c39f34d commit e28033fc9d2b35714cc3c6fb7b95ae1d4c39f34d Author: Priyank Date: Mon Jan 5 13:02:35 2009 +0530 netconfig.c: Fixed a couple of memleaks diff --git a/netconfig/netconfig.c b/netconfig/netconfig.c index d70ade3..712e8b3 100644 --- a/netconfig/netconfig.c +++ b/netconfig/netconfig.c @@ -114,6 +114,7 @@ int dsl_hook(fwnet_profile_t *profile, int confirm) "If unsure, just hit enter.\n" "Enter interface name:")); snprintf(profile->adsl_interface, IF_NAMESIZE, iface); + FWUTIL_FREE(iface); if(nco_fast) { fwutil_system("mkdir /var/run"); @@ -162,6 +163,7 @@ int dialog_config(int argc, char **argv) "If unsure, just hit enter.\n" "Select interface:")); snprintf(newinterface->name, IF_NAMESIZE, iface); + FWUTIL_FREE(iface); newprofile->interfaces = g_list_append(newprofile->interfaces, newinterface); } From iron at frugalware.org Mon Jan 5 10:31:30 2009 From: iron at frugalware.org (Krisztian VASAS) Date: Mon Jan 5 10:31:31 2009 Subject: [Frugalware-git] xorg74: xrdb-1.0.5-1-i686 Message-ID: <20090105093130.962FE11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=63eca18484b9d0240b1582b83339d366e8ff099f commit 63eca18484b9d0240b1582b83339d366e8ff099f Author: Krisztian VASAS Date: Mon Jan 5 10:29:41 2009 +0100 xrdb-1.0.5-1-i686 - version bump diff --git a/source/x11/xrdb/FrugalBuild b/source/x11/xrdb/FrugalBuild index 7699ec4..20fbf63 100644 --- a/source/x11/xrdb/FrugalBuild +++ b/source/x11/xrdb/FrugalBuild @@ -2,14 +2,14 @@ # Maintainer: Christian Hamar alias krix pkgname=xrdb -pkgver=1.0.4 +pkgver=1.0.5 pkgrel=1 pkgdesc="X.Org xrdb application" url="http://xorg.freedesktop.org" groups=('x11' 'xorg-core' 'xorg-apps') archs=('i686' 'x86_64' 'ppc') -depends=('libxmu>=1.0.3-2' 'libx11>=1.1.3') -makedepends=('inputproto>=1.4.2.1') +depends=('libxmu>=1.0.4' 'libx11>=1.1.99.2') +makedepends=('inputproto>=1.5.0') Finclude xorg -sha1sums=('82260670ee3d90111935590e27e93b582f05acb3') +sha1sums=('31251ce7a835aa5c0a4860ee735c7facb99ef958') # optimization OK From vmiklos at frugalware.org Mon Jan 5 10:33:06 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jan 5 10:33:07 2009 Subject: [Frugalware-git] frugalware-current: fakeroot-1.12-1-i686 Message-ID: <20090105093306.1F1BD11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d69827fd6454cdafaad6c8a154cfe2d461cc99dc commit d69827fd6454cdafaad6c8a154cfe2d461cc99dc Author: Miklos Vajna Date: Mon Jan 5 10:32:55 2009 +0100 fakeroot-1.12-1-i686 - version bump diff --git a/source/devel/fakeroot/FrugalBuild b/source/devel/fakeroot/FrugalBuild index 39c4dc3..111800e 100644 --- a/source/devel/fakeroot/FrugalBuild +++ b/source/devel/fakeroot/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: Miklos Vajna pkgname=fakeroot -pkgver=1.11 +pkgver=1.12 pkgrel=1 pkgdesc="Gives a fake root environment" url="http://packages.debian.org/unstable/utils/fakeroot" @@ -13,7 +13,7 @@ groups=('devel' 'devel-core') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump http://ftp.debian.org/debian/pool/main/f/fakeroot/?M=A|grep gz$|sed -n 's/.*_\(.*\)\.t.*/\1/;$ p'" source=(http://ftp.debian.org/debian/pool/main/f/fakeroot/${pkgname}_$pkgver.tar.gz) -sha1sums=('ed00713fe70d41be278f06f32de12bc420f61f1c') +sha1sums=('bdb6d5b4ea2916e0e56efc99542e56c3a659a16b') build() { From iron at frugalware.org Mon Jan 5 10:38:13 2009 From: iron at frugalware.org (Krisztian VASAS) Date: Mon Jan 5 10:38:15 2009 Subject: [Frugalware-git] xorg74: xdm-1.1.8-1-i686 Message-ID: <20090105093813.68FB711B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=98e3823d6d3e3594ad55f8f66de2f76da43f8ece commit 98e3823d6d3e3594ad55f8f66de2f76da43f8ece Author: Krisztian VASAS Date: Mon Jan 5 10:37:58 2009 +0100 xdm-1.1.8-1-i686 - version bump diff --git a/source/x11/xdm/FrugalBuild b/source/x11/xdm/FrugalBuild index 3757ed6..2372e74 100644 --- a/source/x11/xdm/FrugalBuild +++ b/source/x11/xdm/FrugalBuild @@ -2,20 +2,20 @@ # Maintainer: Christian Hamar alias krix pkgname=xdm -pkgver=1.1.6 +pkgver=1.1.8 pkgrel=1 pkgdesc="X.Org xdm application" url="http://xorg.freedesktop.org" groups=('x11' 'xorg-core' 'xorg-apps') archs=('i686' 'x86_64') -depends=('xrdb>=1.0.4' 'libxdmcp>=1.0.2-2' 'libxaw>=1.0.4' 'xinit>=1.0.5' 'libx11>=1.1.3' 'libxft>=2.1.12-2' 'xorg-server>=1.4') -makedepends=('xproto>=7.0.11') +depends=('xrdb>=1.0.5' 'libxdmcp>=1.0.2-2' 'libxaw>=1.0.5' 'xinit>=1.1.1' 'libx11>=1.1.99.2' 'libxft>=2.1.13' 'xorg-server>=1.5.99.3') +makedepends=('xproto>=7.0.14') backup=('etc/X11/xdm/Xsession') Finclude xorg source=(${source[@]} Xsession) build() { - Fbuild --enable-xprint --with-default-vt=vt12 \ + Fbuild --disable-xprint --with-default-vt=vt12 \ --with-xdmconfigdir=/etc/X11/xdm --enable-ipv6 Fexe /etc/X11/xdm/Xsession Fln /etc/X11/xdm/Xsession /usr/lib/X11/xdm/Xsession @@ -28,6 +28,6 @@ build() { Fsed '/usr/X11R6/bin/sessreg' '/usr/bin/sessreg' $Fdestdir/usr/lib/X11/xdm/Xreset } -sha1sums=('9b5642407f01bbdaa8ad699e2d2417bd26372c53' \ +sha1sums=('619d810d9cd60e193be72365791cdb4057fc56ce' \ 'e0dc8db0d88be2bcb6f1b746e5079ffbc0416693') # optimization OK From devil505linux at gmail.com Mon Jan 5 10:42:35 2009 From: devil505linux at gmail.com (Devil505) Date: Mon Jan 5 10:42:36 2009 Subject: [Frugalware-git] frugalware-current: bleachbit-0.2.1-1-i686 Message-ID: <20090105094235.A32C911B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=288ccebf48cae01857f9210f58daf047b6b68110 commit 288ccebf48cae01857f9210f58daf047b6b68110 Author: Devil505 Date: Mon Jan 5 10:39:39 2009 +0100 bleachbit-0.2.1-1-i686 * version bump * using Fsed to install in correct path diff --git a/source/xapps-extra/bleachbit/FrugalBuild b/source/xapps-extra/bleachbit/FrugalBuild index 053b1c8..3014ca9 100644 --- a/source/xapps-extra/bleachbit/FrugalBuild +++ b/source/xapps-extra/bleachbit/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Devil505 pkgname=bleachbit -pkgver=0.2.0 +pkgver=0.2.1 pkgrel=1 pkgdesc="BleachBit deletes unnecessary files to free valuable disk space and maintain privacy." depends=('pygtk') @@ -11,4 +11,9 @@ _F_sourceforge_ext=".tar.bz2" Finclude sourceforge groups=('xapps-extra') archs=('i686' 'x86_64') -sha1sums=('07248104850568b258f7c84950a9e4ef079ddce9') +sha1sums=('5cb091c033cec9ccbace8b24c06adc3d249f1973') + +build() { + Fsed "prefix ?= /usr/local" "prefix ?= /usr" Makefile + Fbuild +} From vmiklos at frugalware.org Mon Jan 5 10:46:15 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jan 5 10:46:17 2009 Subject: [Frugalware-git] frugalware-current: kexec-tools-2.0.0-1-i686 Message-ID: <20090105094615.5ADC811B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=34f74ff4a1e24dd1929e27c1bc09ea7d15f9299a commit 34f74ff4a1e24dd1929e27c1bc09ea7d15f9299a Author: Miklos Vajna Date: Mon Jan 5 10:45:56 2009 +0100 kexec-tools-2.0.0-1-i686 - version bump - url, up2date fix diff --git a/source/apps-extra/kexec-tools/FrugalBuild b/source/apps-extra/kexec-tools/FrugalBuild index 4e34a80..366a7ed 100644 --- a/source/apps-extra/kexec-tools/FrugalBuild +++ b/source/apps-extra/kexec-tools/FrugalBuild @@ -2,15 +2,17 @@ # Maintainer: Miklos Vajna pkgname=kexec-tools -pkgver=1.101 +pkgver=2.0.0 pkgrel=1 pkgdesc="Loads a kernel in memory and reboot into it using the kexec system call." -url="http://www.xmission.com/~ebiederm/files/kexec/" +url="http://www.kernel.org/pub/linux/kernel/people/horms/kexec-tools/" depends=('zlib') groups=('apps-extra') archs=('i686' 'x86_64') -up2date="lynx -dump $url |grep gz$|sed 's/.*-\(.*\)\.t.*/\1/;q'" +up2date="Flasttar $url" source=($url/kexec-tools-$pkgver.tar.gz README.Frugalware) +sha1sums=('8cde488c8d3c1c35b6263de63bff2c3773719537' \ + '23f3232267361284ed0c120de930a3142342560b') build() { @@ -21,5 +23,4 @@ build() Fdoc README.Frugalware } -sha1sums=('65234ec68ca19c5d444375b923fecbb9ce28b255' \ - '41ef61da70e88d8e2fe4b191596e444c5b9b1dbc') +# optimization OK From iron at frugalware.org Mon Jan 5 10:47:28 2009 From: iron at frugalware.org (Krisztian VASAS) Date: Mon Jan 5 10:47:29 2009 Subject: [Frugalware-git] xorg74: xrandr-1.2.99.3-1-i686 Message-ID: <20090105094728.0E85011B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=6907c930b96514c149fae4e2cd82f96547b2752d commit 6907c930b96514c149fae4e2cd82f96547b2752d Author: Krisztian VASAS Date: Mon Jan 5 10:47:18 2009 +0100 xrandr-1.2.99.3-1-i686 - version bump diff --git a/source/x11/xrandr/FrugalBuild b/source/x11/xrandr/FrugalBuild index 4aedb43..a538174 100644 --- a/source/x11/xrandr/FrugalBuild +++ b/source/x11/xrandr/FrugalBuild @@ -2,14 +2,14 @@ # Maintainer: Christian Hamar alias krix pkgname=xrandr -pkgver=1.2.2 +pkgver=1.2.99.3 pkgrel=1 pkgdesc="X.Org xrandr application" url="http://xorg.freedesktop.org" groups=('x11' 'xorg-core' 'xorg-apps') archs=('i686' 'x86_64' 'ppc') -depends=('libx11>=1.1.3' 'libxrandr>=1.2.2') -makedepends=('inputproto>=1.4.2.1') +depends=('libx11>=1.1.99.2' 'libxrandr>=1.2.99.4') +makedepends=('inputproto>=1.5.0') Finclude xorg -sha1sums=('26d9284f2634d2029a44adb29a335240e75cbe98') +sha1sums=('bc5ee2b8e35b02ce04afdef7b513fec7442a64a1') # optimization OK From iron at frugalware.org Mon Jan 5 10:49:27 2009 From: iron at frugalware.org (Krisztian VASAS) Date: Mon Jan 5 10:49:28 2009 Subject: [Frugalware-git] xorg74: xmodmap-1.0.3-2-i686 Message-ID: <20090105094927.1D80911B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=abfd5bc9900a1a319e109256cd89827d45f73bf9 commit abfd5bc9900a1a319e109256cd89827d45f73bf9 Author: Krisztian VASAS Date: Mon Jan 5 10:49:12 2009 +0100 xmodmap-1.0.3-2-i686 - rebuilt with new xorg diff --git a/source/x11/xmodmap/FrugalBuild b/source/x11/xmodmap/FrugalBuild index e3aa337..2507ff0 100644 --- a/source/x11/xmodmap/FrugalBuild +++ b/source/x11/xmodmap/FrugalBuild @@ -3,13 +3,13 @@ pkgname=xmodmap pkgver=1.0.3 -pkgrel=1 +pkgrel=2 pkgdesc="utility for modifying keymaps and pointer button mappings in X" url="http://xorg.freedesktop.org" groups=('x11' 'xorg-core' 'xorg-apps') archs=('i686' 'x86_64') -depends=('libx11>=1.1.3') -makedepends=('inputproto>=1.4.2.1') +depends=('libx11>=1.1.99.2') +makedepends=('inputproto>=1.5.0') Finclude xorg sha1sums=('5ad0f99735a13d6bb75ce63b2285f4c9c11be51b') From iron at frugalware.org Mon Jan 5 10:51:26 2009 From: iron at frugalware.org (Krisztian VASAS) Date: Mon Jan 5 10:51:28 2009 Subject: [Frugalware-git] xorg74: xlsfonts-1.0.2-2-i686 Message-ID: <20090105095126.AF36E11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=7b224669952707996a30802d86bea21101e89764 commit 7b224669952707996a30802d86bea21101e89764 Author: Krisztian VASAS Date: Mon Jan 5 10:51:12 2009 +0100 xlsfonts-1.0.2-2-i686 - rebuilt with new xorg diff --git a/source/x11/xlsfonts/FrugalBuild b/source/x11/xlsfonts/FrugalBuild index f7bd39c..a1528a2 100644 --- a/source/x11/xlsfonts/FrugalBuild +++ b/source/x11/xlsfonts/FrugalBuild @@ -3,13 +3,13 @@ pkgname=xlsfonts pkgver=1.0.2 -pkgrel=1 +pkgrel=2 pkgdesc="X.Org xlsfonts application" url="http://xorg.freedesktop.org" groups=('x11' 'xorg-core' 'xorg-apps') archs=('i686' 'x86_64') -depends=('libx11>=1.1.3') -makedepends=('inputproto>=1.4.2.1') +depends=('libx11>=1.1.99.2') +makedepends=('inputproto>=1.5.0') _F_xorg_ind=1 Finclude xorg sha1sums=('556c8b94002e834cf61e08ea4f5551a039e2d5c9') From ryuo at frugalware.org Mon Jan 5 13:42:16 2009 From: ryuo at frugalware.org (James Buren) Date: Mon Jan 5 13:42:18 2009 Subject: [Frugalware-git] xcmenu: compile.sh Message-ID: <20090105124216.E722011B8630@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xcmenu.git;a=commitdiff;h=29f2b4f22e6b6a434077e74f5e5dbd4f4f964822 commit 29f2b4f22e6b6a434077e74f5e5dbd4f4f964822 Author: James Buren Date: Mon Jan 5 06:45:29 2009 -0600 compile.sh * import shell script for compiling code diff --git a/compile.sh b/compile.sh new file mode 100755 index 0000000..02f29d6 --- /dev/null +++ b/compile.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +[ -f "xcmenu" ] && rm -f xcmenu +exec gcc -O0 -pedantic -Wall -Werror -std=gnu89 xcmenu.c -o xcmenu From ryuo at frugalware.org Mon Jan 5 13:42:16 2009 From: ryuo at frugalware.org (James Buren) Date: Mon Jan 5 13:42:19 2009 Subject: [Frugalware-git] xcmenu: xcmenu.c Message-ID: <20090105124216.CAEDC11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xcmenu.git;a=commitdiff;h=1cc042e6edfb7d47b6fd54c49e7de181bdb3f822 commit 1cc042e6edfb7d47b6fd54c49e7de181bdb3f822 Author: James Buren Date: Mon Jan 5 06:43:13 2009 -0600 xcmenu.c * initialize part of the code diff --git a/xcmenu.c b/xcmenu.c index 8b13789..2fbc40d 100644 --- a/xcmenu.c +++ b/xcmenu.c @@ -1 +1,17 @@ +/* define some useful stuff */ +#define BUFFER 256 +/* include some essential header files */ +#include +#include + +/* initialize some useful global variables */ + +/* define some functions */ + +/* stop defining functions */ + +int main() +{ + return(0); +} From ryuo at frugalware.org Mon Jan 5 13:50:38 2009 From: ryuo at frugalware.org (James Buren) Date: Mon Jan 5 13:50:39 2009 Subject: [Frugalware-git] xcmenu: xcmenu.c Message-ID: <20090105125038.A1E5A11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xcmenu.git;a=commitdiff;h=4720b527dfb9842a15c0e271111429d3d9421ad3 commit 4720b527dfb9842a15c0e271111429d3d9421ad3 Author: James Buren Date: Mon Jan 5 06:53:52 2009 -0600 xcmenu.c * add an error function diff --git a/xcmenu.c b/xcmenu.c index 2fbc40d..64c30ce 100644 --- a/xcmenu.c +++ b/xcmenu.c @@ -9,6 +9,22 @@ /* define some functions */ +static void error(const char *str1,const char *str2) +{ + char buffer[BUFFER]; + size_t size = sizeof(buffer); + if (str1&&str2) + snprintf(buffer,size,"%s%s",str1,str2); + else if (str1&&!str2) + snprintf(buffer,size,"%s",str1); + else if (!str1&&str2) + snprintf(buffer,size,"%s",str2); + else + snprintf(buffer,size,"No error message supplied?"); + printf("%s\n",buffer); + exit(1); +} + /* stop defining functions */ int main() From priyank at frugalware.org Mon Jan 5 13:54:41 2009 From: priyank at frugalware.org (Priyank) Date: Mon Jan 5 13:54:43 2009 Subject: [Frugalware-git] frugalwareutils: timeconfig.c: Fixed a memleak Message-ID: <20090105125441.F103411B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalwareutils.git;a=commitdiff;h=5d99c879794b2f0762b5ba6ab5fa8ec3e5cfbc3d commit 5d99c879794b2f0762b5ba6ab5fa8ec3e5cfbc3d Author: Priyank Date: Mon Jan 5 18:24:37 2009 +0530 timeconfig.c: Fixed a memleak diff --git a/timeconfig/timeconfig.c b/timeconfig/timeconfig.c index a3bd6e9..5314ac2 100644 --- a/timeconfig/timeconfig.c +++ b/timeconfig/timeconfig.c @@ -132,6 +132,7 @@ int run(int argc, char **argv) zones = zone_scan(ZONEDIR); ptr = ask_zone(zones); symlink(ptr, ZONEFILE); + free(ptr); if(argv!=NULL) end_dialog(); From ryuo at frugalware.org Mon Jan 5 13:56:26 2009 From: ryuo at frugalware.org (James Buren) Date: Mon Jan 5 13:56:28 2009 Subject: [Frugalware-git] xcmenu: xcmenu.c Message-ID: <20090105125626.0A70A11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xcmenu.git;a=commitdiff;h=5ddea10a3aa4a70c4a0697fa3117322f7789b0f4 commit 5ddea10a3aa4a70c4a0697fa3117322f7789b0f4 Author: James Buren Date: Mon Jan 5 06:59:23 2009 -0600 xcmenu.c * implement the beginning of an init function diff --git a/xcmenu.c b/xcmenu.c index 64c30ce..585bec4 100644 --- a/xcmenu.c +++ b/xcmenu.c @@ -7,8 +7,11 @@ /* initialize some useful global variables */ +static char *home; + /* define some functions */ +/* print an error and flip out, dude! */ static void error(const char *str1,const char *str2) { char buffer[BUFFER]; @@ -25,9 +28,18 @@ static void error(const char *str1,const char *str2) exit(1); } +/* lets get this party started! :D */ +static void init() +{ + home = getenv("HOME"); + if (!home) + error("Failed to retrieve HOME environmental variable.",NULL); +} + /* stop defining functions */ int main() { + init(); return(0); } From ryuo at frugalware.org Mon Jan 5 14:16:52 2009 From: ryuo at frugalware.org (James Buren) Date: Mon Jan 5 14:16:53 2009 Subject: [Frugalware-git] xcmenu: xcmenu.c Message-ID: <20090105131652.81EE211B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xcmenu.git;a=commitdiff;h=0cda5381c21dc338bfffa5fb83041040e89f1052 commit 0cda5381c21dc338bfffa5fb83041040e89f1052 Author: James Buren Date: Mon Jan 5 07:19:48 2009 -0600 xcmenu.c * implement a filechk function * define some more macros * extended init some diff --git a/xcmenu.c b/xcmenu.c index 585bec4..4989b57 100644 --- a/xcmenu.c +++ b/xcmenu.c @@ -1,9 +1,13 @@ /* define some useful stuff */ #define BUFFER 256 +#define TRUE 1 +#define FALSE 0 +#define FERROR "No such file or directory: " /* include some essential header files */ #include #include +#include /* initialize some useful global variables */ @@ -28,12 +32,23 @@ static void error(const char *str1,const char *str2) exit(1); } +/* check if a file need to be commited to the nut house */ +static int filechk(const char *filename) +{ + struct stat file; + if (stat(filename,&file)<0) + return(FALSE); + return(TRUE); +} + /* lets get this party started! :D */ static void init() { home = getenv("HOME"); if (!home) error("Failed to retrieve HOME environmental variable.",NULL); + if (!filechk(home)) + error(FERROR,home); } /* stop defining functions */ From ryuo at frugalware.org Mon Jan 5 14:27:30 2009 From: ryuo at frugalware.org (James Buren) Date: Mon Jan 5 14:27:32 2009 Subject: [Frugalware-git] xcmenu: xcmenu.c Message-ID: <20090105132730.6418411B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xcmenu.git;a=commitdiff;h=ccb23a4e030d9b714cbfe72dae6d19128b800c93 commit ccb23a4e030d9b714cbfe72dae6d19128b800c93 Author: James Buren Date: Mon Jan 5 07:30:21 2009 -0600 xcmenu.c * implement the makings for the main directory in HOME diff --git a/xcmenu.c b/xcmenu.c index 4989b57..a600061 100644 --- a/xcmenu.c +++ b/xcmenu.c @@ -3,6 +3,7 @@ #define TRUE 1 #define FALSE 0 #define FERROR "No such file or directory: " +#define PATH "/.xcmenu/" /* include some essential header files */ #include @@ -12,6 +13,7 @@ /* initialize some useful global variables */ static char *home; +static char path[BUFFER]; /* define some functions */ @@ -47,8 +49,11 @@ static void init() home = getenv("HOME"); if (!home) error("Failed to retrieve HOME environmental variable.",NULL); + snprintf(path,sizeof(path),"%s%s",home,PATH); if (!filechk(home)) error(FERROR,home); + if (!filechk(path)) + error(FERROR,path); } /* stop defining functions */ From priyank at frugalware.org Mon Jan 5 14:30:22 2009 From: priyank at frugalware.org (Priyank) Date: Mon Jan 5 14:30:24 2009 Subject: [Frugalware-git] frugalware-current: pdfedit-0.4.2-1-i686 Message-ID: <20090105133022.97CF911B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=51fe73cb9c18ba294e48ed87b5b91b2ec060f4b3 commit 51fe73cb9c18ba294e48ed87b5b91b2ec060f4b3 Author: Priyank Date: Mon Jan 5 18:57:35 2009 +0530 pdfedit-0.4.2-1-i686 * Version bump diff --git a/source/xapps-extra/pdfedit/FrugalBuild b/source/xapps-extra/pdfedit/FrugalBuild index 4482643..324e564 100644 --- a/source/xapps-extra/pdfedit/FrugalBuild +++ b/source/xapps-extra/pdfedit/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Priyank Gosalia pkgname=pdfedit -pkgver=0.4.1 -pkgrel=3 +pkgver=0.4.2 +pkgrel=1 pkgdesc="PDFedit is an editor for manipulating PDF files." depends=('qt' 't1lib' 'libboost-mt>=1.37.0') makedepends=('boost>=1.37.0') @@ -16,8 +16,8 @@ _F_desktop_icon="pdfedit.png" _F_desktop_categories="Qt;GNOME;KDE;Utility" options=('scriptlet') source=($source gcc43.patch) -sha1sums=('5c3822da15f0c1c00e911fe7b29654032818aac1' \ - '32bffd1047a4c4ae989f07ee288eff3aea250bdf') +sha1sums=('10e9d2201327528cf886d0cfe6487ea24ea4a1fb' \ + 'ce5401ddb2c8884a1f596b9166cc3d7aaa687b0e') build() { diff --git a/source/xapps-extra/pdfedit/gcc43.patch b/source/xapps-extra/pdfedit/gcc43.patch index 7d0bdbc..ebbcaca 100644 --- a/source/xapps-extra/pdfedit/gcc43.patch +++ b/source/xapps-extra/pdfedit/gcc43.patch @@ -9,32 +9,3 @@ #include #include #include ---- a/src/kernel/cpdf.cc -+++ b/src/kernel/cpdf.cc -@@ -2347,7 +2347,7 @@ using namespace std; - instance->file = file; - kernelPrintDbg(debug::DBG_INFO, "Instance created successfully openMode=" << openMode); - return instance; -- }catch(exception &e) -+ }catch(std::exception &e) - { - kernelPrintDbg(DBG_CRIT, "Pdf instance creation failed. cause="<second->invalidate(); -- }catch(exception & e) -+ }catch(std::exception & e) - { - kernelPrintDbg(DBG_CRIT, "Unexpected error. cause="< Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xcmenu.git;a=commitdiff;h=fc7785cd88ffe52acad78377e2c55e81f2ba972b commit fc7785cd88ffe52acad78377e2c55e81f2ba972b Author: James Buren Date: Mon Jan 5 07:37:34 2009 -0600 xcmenu.c * extend pathing for themes directory diff --git a/xcmenu.c b/xcmenu.c index a600061..20d2451 100644 --- a/xcmenu.c +++ b/xcmenu.c @@ -4,6 +4,7 @@ #define FALSE 0 #define FERROR "No such file or directory: " #define PATH "/.xcmenu/" +#define THEME "themes/current/" /* include some essential header files */ #include @@ -14,6 +15,7 @@ static char *home; static char path[BUFFER]; +static char theme[BUFFER]; /* define some functions */ @@ -50,10 +52,13 @@ static void init() if (!home) error("Failed to retrieve HOME environmental variable.",NULL); snprintf(path,sizeof(path),"%s%s",home,PATH); + snprintf(theme,sizeof(theme),"%s%s",path,THEME); if (!filechk(home)) error(FERROR,home); if (!filechk(path)) error(FERROR,path); + if (!filechk(theme)) + error(FERROR,theme); } /* stop defining functions */ From vmiklos at frugalware.org Mon Jan 5 19:02:19 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jan 5 19:02:22 2009 Subject: [Frugalware-git] frugalware-current: git-1.6.1-1-i686 Message-ID: <20090105180219.412BB11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=816ba00f1ab87956dc7f006fb0cd1cc7271a700b commit 816ba00f1ab87956dc7f006fb0cd1cc7271a700b Author: Miklos Vajna Date: Mon Jan 5 19:02:02 2009 +0100 git-1.6.1-1-i686 - update up2date, url and source diff --git a/source/devel-extra/git/FrugalBuild b/source/devel-extra/git/FrugalBuild index 0b4f1c6..d8c42c9 100644 --- a/source/devel-extra/git/FrugalBuild +++ b/source/devel-extra/git/FrugalBuild @@ -12,16 +12,15 @@ pkgver=1.6.1 Fuse $USE_DEVEL && pkgver=1.6.1.rc1.35.gae26e7c pkgrel=1 pkgdesc="A fast, scalable, distributed revision control system." -url="http://git.or.cz/" -pkgurl="http://www.eu.kernel.org/pub/software/scm/git/" +url="http://git-scm.com/" depends=('curl>=7.19.0' 'openssl' 'perl-error') backup=(etc/sysconfig/git) makedepends=('asciidoc' 'docbook-xsl>=1.73.0-2' 'docbook-xml' 'docbook2x' 'sgml-common' 'xmlto' 'cpio') groups=('devel-extra') archs=('i686' 'x86_64' 'ppc') -up2date="lynx -dump $pkgurl |Flasttar" +up2date="Flasttar $url" if ! Fuse $USE_DEVEL; then - source=($pkgurl/$pkgname-$pkgver.tar.bz2) + source=(http://www.kernel.org/pub/software/scm/git/$pkgname-$pkgver.tar.bz2) signatures=(${source[0]}.sign '' '' '' '' '') fi source=(${source[@]} gitweb.modules.d gitweb.conf README.Frugalware rc.git git.sysconfig) From priyank at frugalware.org Mon Jan 5 20:25:25 2009 From: priyank at frugalware.org (Priyank) Date: Mon Jan 5 20:25:27 2009 Subject: [Frugalware-git] frugalware-current: gimmix-0.5.5-1-i686 Message-ID: <20090105192525.7247511B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d4ae9e61706a0d54d8a7072636d2166deedf6a5d commit d4ae9e61706a0d54d8a7072636d2166deedf6a5d Author: Priyank Date: Tue Jan 6 00:54:47 2009 +0530 gimmix-0.5.5-1-i686 * Version bump diff --git a/source/xapps-extra/gimmix/FrugalBuild b/source/xapps-extra/gimmix/FrugalBuild index 0793aac..a1d719c 100644 --- a/source/xapps-extra/gimmix/FrugalBuild +++ b/source/xapps-extra/gimmix/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Priyank Gosalia pkgname=gimmix -pkgver=0.5.4 +pkgver=0.5.5 pkgrel=1 pkgdesc="Gimmix is a graphical music player daemon (MPD) client." _F_berlios_ext=".tar.bz2" @@ -13,6 +13,6 @@ depends=('gtk+2' 'libglade' 'libmpd>=0.16.1' 'libnxml' 'taglib') makedepends=('intltool') groups=('xapps-extra') archs=('i686' 'x86_64') -sha1sums=('492fba0f3bcf5c36f76384d228d277a35cb249ad') +sha1sums=('44e848d8177fcb079038e07c746f2b0c33a2e4f8') # optimization OK From bouleetbil at frogdev.info Mon Jan 5 21:19:10 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Mon Jan 5 21:19:12 2009 Subject: [Frugalware-git] frugalware-current: sound-juicer-2.24.0-2-i686 Message-ID: <20090105201910.D7A1C11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ba9fac7f25be53cac963f4d98f3e8948116e3076 commit ba9fac7f25be53cac963f4d98f3e8948116e3076 Author: bouleetbil Date: Mon Jan 5 21:12:53 2009 +0100 sound-juicer-2.24.0-2-i686 *added depend gst-plugins-base-gio for works diff --git a/source/gnome-extra/sound-juicer/FrugalBuild b/source/gnome-extra/sound-juicer/FrugalBuild index 4098337..0e1a006 100644 --- a/source/gnome-extra/sound-juicer/FrugalBuild +++ b/source/gnome-extra/sound-juicer/FrugalBuild @@ -4,11 +4,11 @@ pkgname=sound-juicer pkgver=2.24.0 -pkgrel=1 +pkgrel=2 pkgdesc="Sound Juicer is a CD ripper for GNOME 2" depends=('libstdc++' 'libcdio' 'gnome-media>=2.24.0.1' 'gst-plugins-base' 'gst-plugins-good' 'libmusicbrainz' 'taglib' \ 'gst-plugins-base-cdparanoia' 'gst-plugins-base-gnomevfs' 'gst-plugins-good-flac' 'gst-plugins-base-pango' \ - gst-plugins-base-vorbis) + 'gst-plugins-base-vorbis' 'gst-plugins-base-gio') makedepends=('gnome-doc-utils' 'perl-xml-parser' 'intltool') groups=('gnome-extra') archs=('i686' 'x86_64' 'ppc') From priyank at frugalware.org Tue Jan 6 06:37:02 2009 From: priyank at frugalware.org (Priyank) Date: Tue Jan 6 06:37:05 2009 Subject: [Frugalware-git] frugalware-current: brasero-0.9.0-1-i686 Message-ID: <20090106053702.D216211B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=df8a891c4dabfd2b11386347e05da6650a9e9d7e commit df8a891c4dabfd2b11386347e05da6650a9e9d7e Author: Priyank Date: Tue Jan 6 11:05:24 2009 +0530 brasero-0.9.0-1-i686 * Version bump diff --git a/source/gnome-extra/brasero/FrugalBuild b/source/gnome-extra/brasero/FrugalBuild index a31d821..b911e91 100644 --- a/source/gnome-extra/brasero/FrugalBuild +++ b/source/gnome-extra/brasero/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Priyank Gosalia pkgname=brasero -pkgver=0.8.4 +pkgver=0.9.0 pkgrel=1 pkgdesc="A CD/DVD Burning application for the GNOME desktop." url="http://www.gnome.org/projects/brasero/" @@ -22,7 +22,7 @@ _F_gnome_iconcache="y" _F_gnome_devel="y" Finclude gnome gnome-scriptlet Fconfopts="$Fconfopts --enable-search --enable-playlist --enable-preview --enable-inotify --enable-libnotify --disable-schemas-install --enable-caches=no" -sha1sums=('f22308786c2ad66bfcdafa074a5d4a42a944982c') +sha1sums=('c1ef349d10fbbe15a7c88eeb26fc6a4f3d3cd930') # optimization OK From ryuo at frugalware.org Tue Jan 6 13:06:14 2009 From: ryuo at frugalware.org (James Buren) Date: Tue Jan 6 13:06:16 2009 Subject: [Frugalware-git] xcmenu: xcmenu.c Message-ID: <20090106120614.80B7211B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xcmenu.git;a=commitdiff;h=0d0e7ec37e1ef307c145f3038d4f9ea7c5a0cd5c commit 0d0e7ec37e1ef307c145f3038d4f9ea7c5a0cd5c Author: James Buren Date: Tue Jan 6 06:09:25 2009 -0600 xcmenu.c * implement a trim function for sanitizing user input data diff --git a/xcmenu.c b/xcmenu.c index 20d2451..53822ef 100644 --- a/xcmenu.c +++ b/xcmenu.c @@ -9,6 +9,8 @@ /* include some essential header files */ #include #include +#include +#include #include /* initialize some useful global variables */ @@ -36,6 +38,21 @@ static void error(const char *str1,const char *str2) exit(1); } +/* cut the balls off of whitespace! :D */ +static void trim(char **ptr) +{ + if (ptr&&*ptr) + { + char *str; + str = *ptr; + while (isspace(str[0])) + str++; + while (isspace(str[strlen(str)-1])) + str[strlen(str)-1] = '\0'; + *ptr = str; + } +} + /* check if a file need to be commited to the nut house */ static int filechk(const char *filename) { @@ -51,6 +68,7 @@ static void init() home = getenv("HOME"); if (!home) error("Failed to retrieve HOME environmental variable.",NULL); + trim(&home); snprintf(path,sizeof(path),"%s%s",home,PATH); snprintf(theme,sizeof(theme),"%s%s",path,THEME); if (!filechk(home)) From ryuo at frugalware.org Tue Jan 6 13:39:16 2009 From: ryuo at frugalware.org (James Buren) Date: Tue Jan 6 13:39:18 2009 Subject: [Frugalware-git] xcmenu: xcmenu.c Message-ID: <20090106123916.9A9AA11B8630@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xcmenu.git;a=commitdiff;h=1c8775f0cafe00a1c308ce42903f905f2ef62aba commit 1c8775f0cafe00a1c308ce42903f905f2ef62aba Author: James Buren Date: Tue Jan 6 06:42:20 2009 -0600 xcmenu.c * extend to include a themefile diff --git a/xcmenu.c b/xcmenu.c index 53822ef..7eedd2d 100644 --- a/xcmenu.c +++ b/xcmenu.c @@ -1,10 +1,11 @@ /* define some useful stuff */ -#define BUFFER 256 -#define TRUE 1 -#define FALSE 0 -#define FERROR "No such file or directory: " -#define PATH "/.xcmenu/" -#define THEME "themes/current/" +#define BUFFER 256 +#define TRUE 1 +#define FALSE 0 +#define FERROR "No such file or directory: " +#define PATH "/.xcmenu/" +#define THEME "themes/current/" +#define THEMEFILE "theme.cfg" /* include some essential header files */ #include @@ -18,6 +19,7 @@ static char *home; static char path[BUFFER]; static char theme[BUFFER]; +static char themefile[BUFFER]; /* define some functions */ @@ -71,12 +73,15 @@ static void init() trim(&home); snprintf(path,sizeof(path),"%s%s",home,PATH); snprintf(theme,sizeof(theme),"%s%s",path,THEME); + snprintf(themefile,sizeof(themefile),"%s%s",theme,THEMEFILE); if (!filechk(home)) error(FERROR,home); if (!filechk(path)) error(FERROR,path); if (!filechk(theme)) error(FERROR,theme); + if (!filechk(themefile)) + error(FERROR,themefile); } /* stop defining functions */ From ryuo at frugalware.org Tue Jan 6 13:52:51 2009 From: ryuo at frugalware.org (James Buren) Date: Tue Jan 6 13:52:52 2009 Subject: [Frugalware-git] xcmenu: Makefile/config.mk Message-ID: <20090106125251.957D511B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xcmenu.git;a=commitdiff;h=5519166b4e5eb484f06b487346a22f9c9f73c81d commit 5519166b4e5eb484f06b487346a22f9c9f73c81d Author: James Buren Date: Tue Jan 6 06:55:58 2009 -0600 Makefile/config.mk * removed compile.sh and implement the beginnings of a Makefile diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..528f024 --- /dev/null +++ b/Makefile @@ -0,0 +1,15 @@ + +include config.mk + +SOURCE = xcmenu.c +TARGET = xcmenu + +all: xcmenu + +xcmenu: + @echo ${CC} ${CFLAGS} ${SOURCE} -o ${TARGET} + @${CC} ${CFLAGS} ${SOURCE} -o ${TARGET} + +clean: + @echo Cleaning up... + @rm -rf ${TARGET} diff --git a/compile.sh b/compile.sh deleted file mode 100755 index 02f29d6..0000000 --- a/compile.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -[ -f "xcmenu" ] && rm -f xcmenu -exec gcc -O0 -pedantic -Wall -Werror -std=gnu89 xcmenu.c -o xcmenu diff --git a/config.mk b/config.mk new file mode 100644 index 0000000..fe73288 --- /dev/null +++ b/config.mk @@ -0,0 +1,3 @@ + +CC = gcc +CFLAGS = -O0 -Wall -pedantic -std=gnu89 -Werror From ryuo at frugalware.org Tue Jan 6 14:54:32 2009 From: ryuo at frugalware.org (James Buren) Date: Tue Jan 6 14:54:33 2009 Subject: [Frugalware-git] xcmenu: config.mk Message-ID: <20090106135432.1FE9D11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xcmenu.git;a=commitdiff;h=5e2cc8df2b9f51474a66181c83b5a8a7ce4b78bc commit 5e2cc8df2b9f51474a66181c83b5a8a7ce4b78bc Author: James Buren Date: Tue Jan 6 07:44:51 2009 -0600 config.mk * update diff --git a/config.mk b/config.mk index fe73288..98b8a5d 100644 --- a/config.mk +++ b/config.mk @@ -1,3 +1,4 @@ CC = gcc CFLAGS = -O0 -Wall -pedantic -std=gnu89 -Werror +LDFLAGS = -lconfig From ryuo at frugalware.org Tue Jan 6 14:54:32 2009 From: ryuo at frugalware.org (James Buren) Date: Tue Jan 6 14:54:34 2009 Subject: [Frugalware-git] xcmenu: Makefile Message-ID: <20090106135432.34C9711B8630@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xcmenu.git;a=commitdiff;h=7def00e36b61e424442702963c7aac53177a8b87 commit 7def00e36b61e424442702963c7aac53177a8b87 Author: James Buren Date: Tue Jan 6 07:45:04 2009 -0600 Makefile * update diff --git a/Makefile b/Makefile index 528f024..bca0fc8 100644 --- a/Makefile +++ b/Makefile @@ -7,8 +7,8 @@ TARGET = xcmenu all: xcmenu xcmenu: - @echo ${CC} ${CFLAGS} ${SOURCE} -o ${TARGET} - @${CC} ${CFLAGS} ${SOURCE} -o ${TARGET} + @echo ${CC} ${CFLAGS} ${LDFLAGS} ${SOURCE} -o ${TARGET} + @${CC} ${CFLAGS} ${LDFLAGS} ${SOURCE} -o ${TARGET} clean: @echo Cleaning up... From ryuo at frugalware.org Tue Jan 6 14:54:32 2009 From: ryuo at frugalware.org (James Buren) Date: Tue Jan 6 14:54:34 2009 Subject: [Frugalware-git] xcmenu: xcmenu.c Message-ID: <20090106135432.49EE811B8631@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xcmenu.git;a=commitdiff;h=8db5d8206f21e2412ac276d1a7e7a5f770a9d78d commit 8db5d8206f21e2412ac276d1a7e7a5f770a9d78d Author: James Buren Date: Tue Jan 6 07:57:41 2009 -0600 xcmenu.c * implement initial usage of libconfig diff --git a/xcmenu.c b/xcmenu.c index 7eedd2d..3dad96b 100644 --- a/xcmenu.c +++ b/xcmenu.c @@ -13,6 +13,7 @@ #include #include #include +#include /* initialize some useful global variables */ @@ -64,6 +65,19 @@ static int filechk(const char *filename) return(TRUE); } +/* parse */ +static void parse() +{ + config_t cfg; + config_init(&cfg); + if (!config_read_file(&cfg,themefile)) + { + config_destroy(&cfg); + error("Failed to parse theme file.",NULL); + } + config_destroy(&cfg); +} + /* lets get this party started! :D */ static void init() { @@ -82,6 +96,7 @@ static void init() error(FERROR,theme); if (!filechk(themefile)) error(FERROR,themefile); + parse(); } /* stop defining functions */ From ryuo at frugalware.org Tue Jan 6 16:28:21 2009 From: ryuo at frugalware.org (James Buren) Date: Tue Jan 6 16:28:23 2009 Subject: [Frugalware-git] homepage-ng: xcmenu Message-ID: <20090106152821.D291A11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=7ab9c7735a788e5c1ed80b9ba2f13d22a246e236 commit 7ab9c7735a788e5c1ed80b9ba2f13d22a246e236 Author: James Buren Date: Tue Jan 6 09:31:20 2009 -0600 xcmenu * add a git repo diff --git a/git/repos/xcmenu b/git/repos/xcmenu new file mode 120000 index 0000000..78f2086 --- /dev/null +++ b/git/repos/xcmenu @@ -0,0 +1 @@ +../../../people/ryuo/xcmenu \ No newline at end of file From ryuo at frugalware.org Tue Jan 6 16:32:35 2009 From: ryuo at frugalware.org (James Buren) Date: Tue Jan 6 16:32:36 2009 Subject: [Frugalware-git] xcmenu: xcmenu.c Message-ID: <20090106153235.1CC8511B8630@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xcmenu.git;a=commitdiff;h=d1d6225fcbd15d83d8e04b5012184d95c7fbf827 commit d1d6225fcbd15d83d8e04b5012184d95c7fbf827 Author: James Buren Date: Tue Jan 6 08:22:40 2009 -0600 xcmenu.c * extend linking to include cairo diff --git a/config.mk b/config.mk index 98b8a5d..6ea1a6c 100644 --- a/config.mk +++ b/config.mk @@ -1,4 +1,4 @@ CC = gcc CFLAGS = -O0 -Wall -pedantic -std=gnu89 -Werror -LDFLAGS = -lconfig +LDFLAGS = -lconfig -lcairo From ryuo at frugalware.org Tue Jan 6 16:32:34 2009 From: ryuo at frugalware.org (James Buren) Date: Tue Jan 6 16:32:37 2009 Subject: [Frugalware-git] xcmenu: xcmenu.c Message-ID: <20090106153234.F412311B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xcmenu.git;a=commitdiff;h=7d1a0cc291d586487f848d58f92829f9ec8fecc7 commit 7d1a0cc291d586487f848d58f92829f9ec8fecc7 Author: James Buren Date: Tue Jan 6 08:20:42 2009 -0600 xcmenu.c * remove trim function, includes, etc, related to it diff --git a/xcmenu.c b/xcmenu.c index 3dad96b..ed85090 100644 --- a/xcmenu.c +++ b/xcmenu.c @@ -10,8 +10,6 @@ /* include some essential header files */ #include #include -#include -#include #include #include @@ -41,21 +39,6 @@ static void error(const char *str1,const char *str2) exit(1); } -/* cut the balls off of whitespace! :D */ -static void trim(char **ptr) -{ - if (ptr&&*ptr) - { - char *str; - str = *ptr; - while (isspace(str[0])) - str++; - while (isspace(str[strlen(str)-1])) - str[strlen(str)-1] = '\0'; - *ptr = str; - } -} - /* check if a file need to be commited to the nut house */ static int filechk(const char *filename) { @@ -84,7 +67,6 @@ static void init() home = getenv("HOME"); if (!home) error("Failed to retrieve HOME environmental variable.",NULL); - trim(&home); snprintf(path,sizeof(path),"%s%s",home,PATH); snprintf(theme,sizeof(theme),"%s%s",path,THEME); snprintf(themefile,sizeof(themefile),"%s%s",theme,THEMEFILE); From vmiklos at frugalware.org Tue Jan 6 20:57:37 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jan 6 20:57:39 2009 Subject: [Frugalware-git] frugalware-current: sysvinit-2.86-30-i686 Message-ID: <20090106195737.B233C11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0cf7e4c32fdf652f84dbb0aaec176c1b7dddbbf8 commit 0cf7e4c32fdf652f84dbb0aaec176c1b7dddbbf8 Author: Miklos Vajna Date: Tue Jan 6 20:55:21 2009 +0100 sysvinit-2.86-30-i686 - make service foo status exit code reflect the output (0 for 'on', 1 for 'off') diff --git a/source/base/sysvinit/FrugalBuild b/source/base/sysvinit/FrugalBuild index 0c1c8e6..ce76157 100644 --- a/source/base/sysvinit/FrugalBuild +++ b/source/base/sysvinit/FrugalBuild @@ -3,7 +3,7 @@ pkgname=sysvinit pkgver=2.86 -pkgrel=29 +pkgrel=30 pkgdesc="Init, the parent of all processes" url="ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/" depends=('shadow>=4.1.2.1-2' 'util-linux-ng>=2.14-2' 'coreutils>=6.12-2' 'glibc>=2.8-3' 'gawk>=3.1.6-3') @@ -18,7 +18,7 @@ source=(ftp://ftp.cistron.nl/pub/people/miquels/$pkgname/$pkgname-$pkgver.tar.gz rc.S rc.single rc.single-{de,hu}.po rc.sysvinit sysvinit-2.86.diff \ killall_exclude_pids.patch) sha1sums=('3e78df609a2ff0fea6304cb662a7f10298d03667' \ - '536e9aa8439e6216e2b65aadf3097f16e48fa9cd' \ + '05a469d19798c45bb0b8e477992d3c5f56e7ea7e' \ '2da5b17f95c2331eda19daa6aede672a4d872b73' \ '83e5879898d7750b157552606a62f0f7bf1f0c97' \ 'f16abb4a07b323a739b5b12d24d793559a22192d' \ diff --git a/source/base/sysvinit/functions b/source/base/sysvinit/functions index 4edf9b3..ddb8a7c 100644 --- a/source/base/sysvinit/functions +++ b/source/base/sysvinit/functions @@ -76,8 +76,10 @@ rc_status() status_msg if [[ "$(eval $pid)" == "" ]] ; then ok 998 + exit 1 else ok 997 + exit 0 fi } From bouleetbil at frogdev.info Tue Jan 6 22:10:09 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue Jan 6 22:10:11 2009 Subject: [Frugalware-git] frugalware-current: telepathy-salut-0.3.7-1-i686 Message-ID: <20090106211009.6236911B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a7801d16388d21f7af9bdd11903b0f397e7108f5 commit a7801d16388d21f7af9bdd11903b0f397e7108f5 Author: bouleetbil Date: Tue Jan 6 21:04:04 2009 +0100 telepathy-salut-0.3.7-1-i686 *new package diff --git a/source/lib-extra/telepathy-salut/FrugalBuild b/source/lib-extra/telepathy-salut/FrugalBuild new file mode 100644 index 0000000..1413ef3 --- /dev/null +++ b/source/lib-extra/telepathy-salut/FrugalBuild @@ -0,0 +1,15 @@ +# Compiling Time: 0.13 SBU +# Maintainer: bouleetbil + +pkgname=telepathy-salut +pkgver=0.3.7 +pkgrel=1 +pkgdesc="Provide Link-local Jabber functionality for Telepathy" +url="http://telepathy.freedesktop.org/releases/$pkgname" +up2date="lynx -dump $url | Flasttar" +source=("http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz") +depends=('telepathy-glib' 'avahi-glib' 'libasyncns' 'libsoup' 'cyrus-sasl') +makedepends=('libxslt' 'gtk-doc') +groups=('lib-extra') +archs=('i686') +sha1sums=('c9c2e2e9b37405df0b45cbd0624cd171fc99e1aa') From bouleetbil at frogdev.info Tue Jan 6 22:12:35 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue Jan 6 22:12:37 2009 Subject: [Frugalware-git] frugalware-current: telepathy-haze-0.2.1-1-i686 Message-ID: <20090106211235.99B5B11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=fea63bf20ab182be9f4d01f3834e5226335ba027 commit fea63bf20ab182be9f4d01f3834e5226335ba027 Author: bouleetbil Date: Tue Jan 6 21:06:55 2009 +0100 telepathy-haze-0.2.1-1-i686 *new package diff --git a/source/xlib-extra/telepathy-haze/FrugalBuild b/source/xlib-extra/telepathy-haze/FrugalBuild new file mode 100644 index 0000000..5340c7c --- /dev/null +++ b/source/xlib-extra/telepathy-haze/FrugalBuild @@ -0,0 +1,16 @@ +# Compiling Time: 0.04 SBU +# Maintainer: bouleetbil + +pkgname=telepathy-haze +pkgver=0.2.1 +pkgrel=1 +pkgdesc="A telepathy connection manager that use libpurple" +url="http://telepathy.freedesktop.org/releases/$pkgname" +up2date="lynx -dump $url | Flasttar" +source=("http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz") +depends=('telepathy-glib' 'pidgin') +groups=('xlib-extra') +archs=('i686') +sha1sums=('b638be6c8278235f7adef8fbddb28734067409cd') + +# optimization OK From boobaa at frugalware.org Tue Jan 6 23:09:09 2009 From: boobaa at frugalware.org (CSÉCSY László) Date: Tue Jan 6 23:09:10 2009 Subject: [Frugalware-git] frugalware-current: drupal-imageapi-5.x_1.4-1-i686 Message-ID: <20090106220909.7BF6D11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=14f795f61dcdbe7ed6454033bb8de42b72961648 commit 14f795f61dcdbe7ed6454033bb8de42b72961648 Author: CSÉCSY László Date: Tue Jan 6 23:08:50 2009 +0100 drupal-imageapi-5.x_1.4-1-i686 version bump diff --git a/source/network-extra/drupal-imageapi/FrugalBuild b/source/network-extra/drupal-imageapi/FrugalBuild index e9cff88..3c12724 100644 --- a/source/network-extra/drupal-imageapi/FrugalBuild +++ b/source/network-extra/drupal-imageapi/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: CSÉCSY László _F_drupal_module=imageapi -pkgver=5.x_1.2 +pkgver=5.x_1.4 pkgrel=1 pkgdesc="A non writing image manipulation API for Drupal" Finclude drupal -sha1sums=('e6c542088d4e4c1f76b98944a076013ea0a284c1') +sha1sums=('6545fbbaddff4254f928b788690551caac97d4c0') From boobaa at frugalware.org Tue Jan 6 23:10:21 2009 From: boobaa at frugalware.org (CSÉCSY László) Date: Tue Jan 6 23:10:23 2009 Subject: [Frugalware-git] frugalware-current: drupal-imagecache-5.x_2.3-1-i686 Message-ID: <20090106221021.832FD11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b3b4a0229405f69314b8023d0769a719b57748a1 commit b3b4a0229405f69314b8023d0769a719b57748a1 Author: CSÉCSY László Date: Tue Jan 6 23:10:14 2009 +0100 drupal-imagecache-5.x_2.3-1-i686 version bump diff --git a/source/network-extra/drupal-imagecache/FrugalBuild b/source/network-extra/drupal-imagecache/FrugalBuild index 073a465..1e4f89f 100644 --- a/source/network-extra/drupal-imagecache/FrugalBuild +++ b/source/network-extra/drupal-imagecache/FrugalBuild @@ -2,9 +2,9 @@ # Maintainer: CSÉCSY László _F_drupal_module=imagecache -pkgver=5.x_2.2 +pkgver=5.x_2.3 pkgrel=1 pkgdesc="Allows setting up presets for image processing in Drupal" rodepends=('drupal-imageapi') Finclude drupal -sha1sums=('1a473990af0aaf98764adae0e19c7ea11bfc4841') +sha1sums=('97e299251f355893e9e62a2b295c1ff6e2d9afdb') From vmiklos at frugalware.org Tue Jan 6 23:38:46 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jan 6 23:38:48 2009 Subject: [Frugalware-git] frugalware-current: groff-1.20-1-i686 Message-ID: <20090106223846.53A7F11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4076c21a87f53324f0366ad1fbf03a489b8df873 commit 4076c21a87f53324f0366ad1fbf03a489b8df873 Author: Miklos Vajna Date: Tue Jan 6 23:38:07 2009 +0100 groff-1.20-1-i686 - version bump - added netpbm to makedepends (omg, next time they'll depend on amarok?) diff --git a/source/base/groff/FrugalBuild b/source/base/groff/FrugalBuild index 59e8c56..41c3d07 100644 --- a/source/base/groff/FrugalBuild +++ b/source/base/groff/FrugalBuild @@ -2,16 +2,17 @@ # Maintainer: Miklos Vajna pkgname=groff -pkgver=1.19.2 -pkgrel=4 +pkgver=1.20 +pkgrel=1 pkgdesc="GNU troff text-formatting system" url="http://www.gnu.org/software/groff/groff.html" depends=('perl>=5.10.0-8' 'libstdc++>=4.3.1-3') +makedepends=('netpbm') groups=('base') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump http://ftp.gnu.org/gnu/groff/|grep tar.gz$|sed 's/.*-\(.*\)\.t.*/\1/'|Fsort|sed -n '$ p'" source=(ftp://ftp.gnu.org/gnu/groff/groff-$pkgver.tar.gz) -sha1sums=('cfad99a5c52933a6a9180e394bd94fbaec0ac956') +sha1sums=('f5305a98b740d08e1db2d42ffff3168cccaa7fc9') build() { From vmiklos at frugalware.org Wed Jan 7 01:45:00 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Jan 7 01:45:02 2009 Subject: [Frugalware-git] frugalware-current: bitlbee-skype-0.7.0-1-i686 Message-ID: <20090107004500.6015911B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a05f83a5fe5ae902c517179d11a9348028a67801 commit a05f83a5fe5ae902c517179d11a9348028a67801 Author: Miklos Vajna Date: Wed Jan 7 01:41:17 2009 +0100 bitlbee-skype-0.7.0-1-i686 - version bump diff --git a/source/network-extra/bitlbee-skype/FrugalBuild b/source/network-extra/bitlbee-skype/FrugalBuild index 81e0b76..84c425b 100644 --- a/source/network-extra/bitlbee-skype/FrugalBuild +++ b/source/network-extra/bitlbee-skype/FrugalBuild @@ -2,16 +2,16 @@ # Maintainer: Miklos Vajna pkgname=bitlbee-skype -pkgver=0.6.3 +pkgver=0.7.0 pkgrel=1 pkgdesc="A Skype plugin for BitlBee" url="http://vmiklos.hu/project/bitlbee-skype/" -depends=('bitlbee>=1.2.2' 'skype4py') +depends=('bitlbee>=1.2.2' 'skype4py' 'pygobject' 'python-gnutls') rodepends=('python-gnutls') backup=(etc/skyped/skyped.{cnf,conf}) groups=('network-extra') archs=('i686') -up2date="lynx -dump $url|Flasttar" +up2date="Flasttar $url" source=($url/$pkgname-$pkgver.tar.gz README.Frugalware) signatures=(${source[0]}.asc '') # optimization OK From priyank at frugalware.org Wed Jan 7 07:01:31 2009 From: priyank at frugalware.org (Priyank) Date: Wed Jan 7 07:01:33 2009 Subject: [Frugalware-git] frugalware-current: inadyn-1.96.2-3-i686 Message-ID: <20090107060131.B4D6711B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f0ef6e17ee01cf0fa3922c77b4d074977c9c3cec commit f0ef6e17ee01cf0fa3922c77b4d074977c9c3cec Author: Priyank Date: Wed Jan 7 11:29:42 2009 +0530 inadyn-1.96.2-3-i686 * support 'status' checking in rc.inadyn diff --git a/source/network-extra/inadyn/FrugalBuild b/source/network-extra/inadyn/FrugalBuild index ce1e5be..9844dc5 100644 --- a/source/network-extra/inadyn/FrugalBuild +++ b/source/network-extra/inadyn/FrugalBuild @@ -3,7 +3,7 @@ pkgname=inadyn pkgver=1.96.2 -pkgrel=2 +pkgrel=3 pkgdesc="Inadyn is a free DynDNS client." url="http://www.inatech.eu/" depends=() @@ -15,7 +15,7 @@ source=($url/$pkgname/$pkgname.v$pkgver.zip inadyn.conf rc.inadyn) sha1sums=('d5fe03ee4cfbc8e702d38d80527264a29297b6cf' \ '0b34e1b3ab258ba670272b7239ff7ac24cda316b' \ - '8f7fc941a02dd1b3e3155a463129b5576183957e') + '5589989c4bf492d0869fb3b1cdef82aba62af2d2') ## should be replaced by this -> http://sourceforge.net/projects/inadyn-mt build() diff --git a/source/network-extra/inadyn/rc.inadyn b/source/network-extra/inadyn/rc.inadyn index 97dee29..a2949d1 100644 --- a/source/network-extra/inadyn/rc.inadyn +++ b/source/network-extra/inadyn/rc.inadyn @@ -12,7 +12,7 @@ source /etc/inadyn.conf TEXTDOMAIN=inadyn TEXTDOMAINDIR=/lib/initscripts/messages -actions=(restart start stop) +actions=(restart status start stop) daemon=$"INADYN daemon" pid="pidof inadyn 2> /dev/null" From boobaa at frugalware.org Wed Jan 7 07:28:36 2009 From: boobaa at frugalware.org (CSÉCSY László) Date: Wed Jan 7 07:28:37 2009 Subject: [Frugalware-git] frugalware-current: drupal-filefield-5.x_2.4-1-i686 Message-ID: <20090107062836.2DE1F11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2489ecb517adefdf443d3812e0df1b8717a0b0a5 commit 2489ecb517adefdf443d3812e0df1b8717a0b0a5 Author: CSÉCSY László Date: Wed Jan 7 07:28:26 2009 +0100 drupal-filefield-5.x_2.4-1-i686 version bump diff --git a/source/network-extra/drupal-filefield/FrugalBuild b/source/network-extra/drupal-filefield/FrugalBuild index e9fc163..00b5508 100644 --- a/source/network-extra/drupal-filefield/FrugalBuild +++ b/source/network-extra/drupal-filefield/FrugalBuild @@ -2,9 +2,9 @@ # Maintainer: CSÉCSY László _F_drupal_module=filefield -pkgver=5.x_2.3 +pkgver=5.x_2.4 pkgrel=1 pkgdesc="Provides a generic file upload field for Drupal's content.module (CCK)." rodepends=('drupal-cck' 'drupal-mimedetect') Finclude drupal -sha1sums=('815e640765679e904616db6548ee1a034a0653c6') +sha1sums=('700713e9984cfc49a47aa03a4d1e7288d9265449') From boobaa at frugalware.org Wed Jan 7 07:30:08 2009 From: boobaa at frugalware.org (CSÉCSY László) Date: Wed Jan 7 07:30:10 2009 Subject: [Frugalware-git] frugalware-current: rss2email-2.65-1-i686 Message-ID: <20090107063008.AEADC11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=62c658cc17ea33e6f66de890767fcbbb7e5ae0bd commit 62c658cc17ea33e6f66de890767fcbbb7e5ae0bd Author: CSÉCSY László Date: Wed Jan 7 07:29:56 2009 +0100 rss2email-2.65-1-i686 version bump diff --git a/source/network-extra/rss2email/FrugalBuild b/source/network-extra/rss2email/FrugalBuild index 98d8ff1..8fc64cb 100644 --- a/source/network-extra/rss2email/FrugalBuild +++ b/source/network-extra/rss2email/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: CSÉCSY László pkgname=rss2email -pkgver=2.64 +pkgver=2.65 pkgrel=1 pkgdesc="read newsfeeds from your email client" url="http://rss2email.infogami.com/" @@ -16,8 +16,8 @@ source=(http://$pkgname.infogami.com/$pkgname.py \ http://feedparser.org/feedparser.py \ http://lindsey.smith.googlepages.com/r2e \ README.Frugalware) -sha1sums=('14287eff7d2391c909f60ed429bc088b9a44ae3d' \ - 'f749a35b0c7cece033aed64630710cef890d9c54' \ +sha1sums=('8fe6c6c1bfe56164fba64378fc1f0b8295b1b8d9' \ + '00b7d520429340b7861f8d312c495eafd89281ca' \ 'f9c2a4b3a4b2a586e74da8fdcf1760fe3a96c818' \ 'd2b9524e7558bb95ab2bc2c458f4123cfceab7b4' \ 'b7200b4072ffc1ad56b62c94ab284246f73316bc') From vmiklos at frugalware.org Wed Jan 7 15:21:31 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Jan 7 15:21:33 2009 Subject: [Frugalware-git] frugalware-current: mpd-0.14-1-i686 Message-ID: <20090107142131.C027311B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=fac9fc737f63603620e96d95b9cb0a0d5ed4f640 commit fac9fc737f63603620e96d95b9cb0a0d5ed4f640 Author: Miklos Vajna Date: Wed Jan 7 15:20:15 2009 +0100 mpd-0.14-1-i686 - version bump - rc.mpd now supports the status command diff --git a/source/multimedia/mpd/FrugalBuild b/source/multimedia/mpd/FrugalBuild index 5a25299..a6af859 100644 --- a/source/multimedia/mpd/FrugalBuild +++ b/source/multimedia/mpd/FrugalBuild @@ -2,24 +2,27 @@ # Maintainer: Miklos Vajna pkgname=mpd -pkgver=0.13.2 +pkgver=0.14 pkgrel=1 pkgdesc="the Music Player Daemon" +_F_sourceforge_dirname="musicpd" +_F_sourceforge_ext=".tar.bz2" +Finclude sourceforge url="http://musicpd.org" depends=('libmikmod>=3.1.7' 'flac>=1.1.3' 'libao' 'audiofile>=0.1.7' 'libvorbis' \ 'faad2' 'libid3tag' 'libmad' 'libshout' 'libmpcdec') backup=('etc/mpd.conf') groups=('multimedia') archs=('i686' 'x86_64') -up2date="lynx -dump $url/files.shtml|grep Current|sed -n 's/.*s \(.*\)/\1/;1 p'" -source=(http://musicpd.org/uploads/files/mpd-$pkgver.tar.bz2 rc.mpd) -sha1sums=('3b826bc75c314e6db6715a978c9b405775d3478c' \ - '3c7de283c3a659b99d5eb6fe64dc0245eab87855') +up2date="Flasttar $url" +source=($source rc.mpd rc.mpd-hu.po) +sha1sums=('e9de568ffd9c1d414ffaca6f84671891bfe03158' \ + '030b26c9c77ff862af13086e8099aa8ffe4454a6' \ + 'b5813f55e9e895d977b869c77667daa85c303e57') build() { Fbuild --enable-ao - Frcd Ffilerel doc/mpdconf.example /etc/mpd.conf Fmv /usr/share/doc/$pkgname /usr/share/doc/$pkgname-$pkgver } diff --git a/source/multimedia/mpd/messages/mpd.de b/source/multimedia/mpd/messages/mpd.de deleted file mode 100644 index e0fed02..0000000 --- a/source/multimedia/mpd/messages/mpd.de +++ /dev/null @@ -1,3 +0,0 @@ -stopmpd="Stoppe Music Player Daemon" -startmpd="Starte Music Player Daemon" -updatempd="Update Music Player Daemon's Datenbank" diff --git a/source/multimedia/mpd/messages/mpd.en b/source/multimedia/mpd/messages/mpd.en deleted file mode 100644 index 26d2b14..0000000 --- a/source/multimedia/mpd/messages/mpd.en +++ /dev/null @@ -1,3 +0,0 @@ -stopmpd="Stopping Music Player Daemon" -startmpd="Starting Music Player Daemon" -updatempd="Updating Music Player Daemon's database" diff --git a/source/multimedia/mpd/messages/mpd.hu b/source/multimedia/mpd/messages/mpd.hu deleted file mode 100644 index 243b84e..0000000 --- a/source/multimedia/mpd/messages/mpd.hu +++ /dev/null @@ -1,3 +0,0 @@ -stopmpd="A zenelejátszó démon leállítása" -startmpd="A zenelejátszó démon indítása" -updatempd="A zenelejátszó démon adatbázisának frissítése" diff --git a/source/multimedia/mpd/rc.mpd b/source/multimedia/mpd/rc.mpd index a20643c..15b6954 100644 --- a/source/multimedia/mpd/rc.mpd +++ b/source/multimedia/mpd/rc.mpd @@ -1,24 +1,50 @@ -#!/bin/sh +#!/bin/bash -# (c) 2005-2006 Miklos Vajna +# (c) 2005 Marcus Habermehl +# (c) 2005 Miklos Vajna # rc.mpd for Frugalware # distributed under GPL License -. /etc/rc.d/rc.functions - # chkconfig: 2345 44 56 # description: Start / stop the Music Player Daemon -if [ "$1" = "stop" ]; then - stop "$stopmpd" - killall mpd - ok $? -elif [ "$1" = "restart" ]; then - "$0" stop - sleep 1 - "$0" start -else # start - start "$startmpd" - mpd /etc/mpd.conf &>/dev/null +source /lib/initscripts/functions +TEXTDOMAIN=mpd + +actions=(restart start status stop update) +daemon=$"Music Player Daemon" + +pid="$(pidof mpd 2> /dev/null)" + +rc_start() +{ + start_msg + if [ -z ${pid} ] ; then + mpd /etc/mpd.conf > /dev/null + ok $? + else + ok 999 + fi +} + +rc_stop() +{ + stop_msg + if [ ! -z ${pid} ] ; then + killall mpd + ok $? + else + ok 999 + fi +} + +rc_update() +{ + msg $"Updating the Music Player Daemon's database" + mpd --update-db /etc/mpd.conf >> /var/log/mpd.db-update ok $? -fi +} + +rc_exec $1 + +# vim: ft=sh diff --git a/source/multimedia/mpd/rc.mpd-hu.po b/source/multimedia/mpd/rc.mpd-hu.po new file mode 100644 index 0000000..fbd0919 --- /dev/null +++ b/source/multimedia/mpd/rc.mpd-hu.po @@ -0,0 +1,25 @@ +# Hungarian translations for PACKAGE package. +# Copyright (C) 2009 THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# , 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-01-07 15:08+0100\n" +"PO-Revision-Date: 2009-01-07 15:08+0100\n" +"Last-Translator: \n" +"Language-Team: Hungarian\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-2\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: rc.mpd:15 +msgid "Music Player Daemon" +msgstr "zenelejátszó démon" + +#: rc.mpd:43 +msgid "Updating the Music Player Daemon's database" +msgstr "A zenelejátszó démon adatbázisának frissítése" diff --git a/source/multimedia/mpd/rc.mpd.new b/source/multimedia/mpd/rc.mpd.new deleted file mode 100644 index f5f02a1..0000000 --- a/source/multimedia/mpd/rc.mpd.new +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# (c) 2005 Marcus Habermehl -# (c) 2005 Miklos Vajna -# rc.mpd for Frugalware -# distributed under GPL License - -# chkconfig: 2345 44 56 -# description: Start / stop the Music Player Daemon - -source /lib/initscripts/functions -TEXTDOMAIN=mpd - -actions=(restart start status stop update) -daemon=$"Music Player Daemon" - -pid="$(pidof mpd 2> /dev/null)" - -rc_start() -{ - start_msg - if [ -z ${pid} ] ; then - mpd /etc/mpd.conf > /dev/null - ok $? - else - ok 999 - fi -} - -rc_stop() -{ - stop_msg - if [ ! -z ${pid} ] ; then - killall mpd - ok $? - else - ok 999 - fi -} - -rc_update() -{ - msg $"Updating ${daemon}'s database" - mpd --update-db /etc/mpd.conf >> /var/log/mpd.db-update - ok $? -} - -rc_exec $1 - -# vim: ft=sh diff --git a/source/multimedia/mpd/rc.mpd.pot b/source/multimedia/mpd/rc.mpd.pot new file mode 100644 index 0000000..3b5d4e0 --- /dev/null +++ b/source/multimedia/mpd/rc.mpd.pot @@ -0,0 +1,25 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-01-07 15:08+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: rc.mpd:15 +msgid "Music Player Daemon" +msgstr "" + +#: rc.mpd:43 +msgid "Updating the Music Player Daemon's database" +msgstr "" From vmiklos at frugalware.org Wed Jan 7 15:29:28 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Jan 7 15:29:30 2009 Subject: [Frugalware-git] frugalware-current: portmap-5beta-8-i686 Message-ID: <20090107142928.E86F511B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=539aafe1aba066ef6d305fa7baecd45d6d9327e2 commit 539aafe1aba066ef6d305fa7baecd45d6d9327e2 Author: Miklos Vajna Date: Wed Jan 7 15:28:57 2009 +0100 portmap-5beta-8-i686 - rc.portmap rewritten, now supports the status command and gettext diff --git a/source/base/portmap/FrugalBuild b/source/base/portmap/FrugalBuild index bed88af..7560e15 100644 --- a/source/base/portmap/FrugalBuild +++ b/source/base/portmap/FrugalBuild @@ -4,7 +4,7 @@ pkgname=portmap pkgver=5beta -pkgrel=7 +pkgrel=8 pkgdesc="RPC connection manager" url="ftp://ftp.porcupine.org/pub/security" depends=('glibc>=2.8-3') @@ -15,7 +15,7 @@ up2date="wget --passive-ftp -O - -q ftp://ftp.porcupine.org/pub/security/|grep ' source=($url/${pkgname}_${pkgver}.tar.gz $pkgname-$pkgver.diff rc.portmap) sha1sums=('783a322ca9220e4830664f94195ff923ce8a09d6' \ '63901011ef1eb163ad2bd8dd2a7e9af242f31482' \ - 'bdd14477543527bd1aded1d750ebee86ff7bf74d') + 'e758781304516fd887c51ab2eda264c5cbf68337') build() { @@ -24,7 +24,6 @@ build() Fsed '-O2' "$CFLAGS" Makefile Fmake Fmakeinstall - Frcd } diff --git a/source/base/portmap/messages/portmap.en b/source/base/portmap/messages/portmap.en deleted file mode 100644 index 3454337..0000000 --- a/source/base/portmap/messages/portmap.en +++ /dev/null @@ -1,2 +0,0 @@ -startportmap="Starting RPC portmapper" - stopportmap="Stopping RPC portmapper" diff --git a/source/base/portmap/messages/portmap.hu b/source/base/portmap/messages/portmap.hu deleted file mode 100644 index a21c8b0..0000000 --- a/source/base/portmap/messages/portmap.hu +++ /dev/null @@ -1,2 +0,0 @@ -startportmap="RPC portmapper indítása" - stopportmap="RPC portmapper leállítása" diff --git a/source/base/portmap/portmap.install b/source/base/portmap/portmap.install index fc12dfa..e919069 100644 --- a/source/base/portmap/portmap.install +++ b/source/base/portmap/portmap.install @@ -1,20 +1,7 @@ -# arg 1: the new package version post_install() { chkconfig --add rc.portmap } -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - /bin/true -} - -# arg 1: the old package version -pre_remove() { - /bin/true -} - -# arg 1: the old package version post_remove() { chkconfig --del rc.portmap } diff --git a/source/base/portmap/rc.portmap b/source/base/portmap/rc.portmap index 23375fd..05f1cb7 100644 --- a/source/base/portmap/rc.portmap +++ b/source/base/portmap/rc.portmap @@ -1,27 +1,47 @@ -#!/bin/sh +#!/bin/bash -# (c) 2003 Vajna Miklos -# rc.portmap for FrugalWare +# (c) 2005 Marcus Habermehl +# (c) 2003, 2009 Vajna Miklos +# rc.portmap for Frugalware # distributed under GPL License -. /etc/rc.d/rc.functions - # chkconfig: 345 13 87 # description: The portmapper manages RPC connections, which are used by \ # protocols such as NFS and NIS. The portmap server must be \ # running on machines which act as servers for protocols which \ # make use of the RPC mechanism. -if [ "$1" = "stop" ]; then - stop "$stopportmap" - killall portmap 2> /dev/null - ok $? -elif [ "$1" = "restart" ]; then - "$0" stop - sleep 1 - "$0" start -else # start - start "$startportmap" - /sbin/portmap - ok $? -fi +source /lib/initscripts/functions +TEXTDOMAIN=crond +TEXTDOMAINDIR=/lib/initscripts/messages + +actions=(restart start status stop) +daemon=$"RPC portmapper" + +pid="cat /var/run/portmap.pid 2>/dev/null" + +rc_start() +{ + start_msg + if [ -z "$(eval $pid)" ]; then + /sbin/portmap + pidof portmap >/var/run/portmap.pid + ok $? + else + ok 999 + fi +} + +rc_stop() +{ + stop_msg + if [ -n "$(eval $pid)" ]; then + kill "$(eval $pid)" + rm -f /var/run/portmap.pid + ok $? + else + ok 999 + fi +} + +rc_exec $1 From vmiklos at frugalware.org Wed Jan 7 15:42:01 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Jan 7 15:42:04 2009 Subject: [Frugalware-git] frugalware-current: sysklogd-1.5-4-i686 Message-ID: <20090107144201.B5F2711B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=974c7c355f31ae40700d0adadad47246047abb5a commit 974c7c355f31ae40700d0adadad47246047abb5a Author: Miklos Vajna Date: Wed Jan 7 15:41:34 2009 +0100 sysklogd-1.5-4-i686 - rc.syslog rewritten, now supports the status command and gettext diff --git a/source/base/sysklogd/FrugalBuild b/source/base/sysklogd/FrugalBuild index e9b4a8b..6abce0b 100644 --- a/source/base/sysklogd/FrugalBuild +++ b/source/base/sysklogd/FrugalBuild @@ -4,21 +4,22 @@ pkgname=sysklogd pkgver=1.5 -pkgrel=3 +pkgrel=4 pkgdesc="Linux system logging utilities" -url="http://www.ibiblio.org/pub/Linux/system/daemons/!INDEX" +url="http://www.ibiblio.org/pub/Linux/system/daemons/" backup=(etc/syslog.conf etc/logrotate.d/syslog) depends=('glibc>=2.8-3') rodepends=('netkit-base>=0.17-6') groups=('base') archs=('i686' 'x86_64' 'ppc') -up2date="lynx -dump 'http://ftp.ibiblio.org/pub/Linux/system/daemons/?M=D'|grep sysklogd.*tar.gz$|sed -n 's/.*-\(.*\)\.t.*/\1/;1 p'" -source=(http://ftp.ibiblio.org/pub/Linux/system/daemons/$pkgname-$pkgver.tar.gz \ - rc.syslog \ +up2date="Flasttar $url" +source=($url/$pkgname-$pkgver.tar.gz \ + rc.syslog{,-hu.po} \ syslog \ syslog.conf) sha1sums=('070cce745b023f2ce7ca7d9888af434d6d61c236' \ - 'eef1e35b68be04f9674d53e02beee5fcbdd23ecf' \ + '91c54ba080778788ad1ef2487669b62c9e065a10' \ + '94c71ed2057354a9a39b0a1408c923328be79f89' \ 'e22daf241394779478c113c23bdc294fa2f858bc' \ '839f714f0ac9df71ef9f5955fec953048bbd699c') @@ -31,7 +32,7 @@ build() make BINDIR=$Fdestdir/usr/sbin MANDIR=$Fdestdir/usr/man install Ffile /etc/syslog.conf Ffile /etc/logrotate.d/syslog - Frcd syslog + Frcd2 syslog } # optimization ok diff --git a/source/base/sysklogd/messages/syslog.en b/source/base/sysklogd/messages/syslog.en deleted file mode 100644 index 4af64d2..0000000 --- a/source/base/sysklogd/messages/syslog.en +++ /dev/null @@ -1,2 +0,0 @@ -stopsyslog="Stopping logging" -startsyslog="Starting logging" diff --git a/source/base/sysklogd/messages/syslog.hu b/source/base/sysklogd/messages/syslog.hu deleted file mode 100644 index 0bd634b..0000000 --- a/source/base/sysklogd/messages/syslog.hu +++ /dev/null @@ -1,2 +0,0 @@ -stopsyslog="A naplózás leállítása" -startsyslog="A naplózás indítása" diff --git a/source/base/sysklogd/rc.syslog b/source/base/sysklogd/rc.syslog index ac752f9..e957f55 100644 --- a/source/base/sysklogd/rc.syslog +++ b/source/base/sysklogd/rc.syslog @@ -1,35 +1,59 @@ -#!/bin/sh +#!/bin/bash -# (c) 2003-2004 Vajna Miklos +# (c) 2003, 2004, 2009 Vajna Miklos # (c) 2005 Laszlo Dvornik +# (c) 2005 Marcus Habermehl # rc.syslog for Frugalware # distributed under GPL License -. /etc/rc.d/rc.functions - # chkconfig: 2345 12 88 # description: Syslog is the facility by which many daemons use to log \ -# messages to various system log files. It is a good idea to \ -# always run syslog. - -if [ "$1" = "stop" ]; then - stop "$stopsyslog" - killall syslogd 2> /dev/null - killall klogd 2> /dev/null - ok $? -elif [ "$1" = "restart" ]; then - "$0" stop - sleep 1 - "$0" start -else # start - start "$startsyslog" - /usr/sbin/syslogd - # This prevents syslogd/klogd race condition on SMP kernels. - if [ `grep ^processor /proc/cpuinfo|sed -n 's/.*: \(.*\)/\1/;$ p'` -ge '1' ]; then - sleep 1 +# messages to various system log files. It is a good idea to \ +# always run syslog. + +source /lib/initscripts/functions +TEXTDOMAIN=syslog +TEXTDOMAINDIR=/lib/initscripts/messages + +actions=(restart start status stop) +daemon=$"logging" + +# It's enough to check for syslogd, klog runs on top of syslogd +pid="cat /var/run/syslogd.pid 2> /dev/null" + +rc_start() +{ + start_msg + if [ -z "$(eval $pid)"]; then + /usr/sbin/syslogd + pidof syslogd > /var/run/syslogd.pid + # This prevents syslogd/klogd race condition on SMP + # kernels. + if [ `grep ^processor /proc/cpuinfo|sed -n 's/.*: \(.*\)/\1/;$ p'` -ge '1' ]; then + sleep 1 + fi + # '-c 3' = display level 'error' or higher messages on + # console + # '-x' = turn off broken EIP translation + /usr/sbin/klogd -c 3 -x + pidof klogd > /var/run/klogd.pid + ok $? + else + ok 999 + fi +} + +rc_stop() +{ + stop_msg + if [ -n "$(eval $pid)"]; then + kill "$(eval $pid)" + kill $(cat /var/run/klogd.pid) + rm -f /var/run/{sys,k}logd.pid + ok $? + else + ok 999 fi - # '-c 3' = display level 'error' or higher messages on console - # '-x' = turn off broken EIP translation - /usr/sbin/klogd -c 3 -x - ok $? -fi +} + +rc_exec $1 diff --git a/source/base/sysklogd/rc.syslog-hu.po b/source/base/sysklogd/rc.syslog-hu.po new file mode 100644 index 0000000..612dd89 --- /dev/null +++ b/source/base/sysklogd/rc.syslog-hu.po @@ -0,0 +1,21 @@ +# Hungarian translations for PACKAGE package. +# Copyright (C) 2009 THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# , 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-01-07 15:37+0100\n" +"PO-Revision-Date: 2009-01-07 15:37+0100\n" +"Last-Translator: \n" +"Language-Team: Hungarian\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-2\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: rc.syslog:19 +msgid "logging" +msgstr "naplózás" diff --git a/source/base/sysklogd/rc.syslog.pot b/source/base/sysklogd/rc.syslog.pot new file mode 100644 index 0000000..469c63d --- /dev/null +++ b/source/base/sysklogd/rc.syslog.pot @@ -0,0 +1,21 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-01-07 15:37+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: rc.syslog:19 +msgid "logging" +msgstr "" From ryuo at frugalware.org Wed Jan 7 16:03:40 2009 From: ryuo at frugalware.org (James Buren) Date: Wed Jan 7 16:03:41 2009 Subject: [Frugalware-git] xcmenu: xcmenu.c Message-ID: <20090107150340.0D1DA11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xcmenu.git;a=commitdiff;h=17ae9b7e6d1d52d2162d6bacf7cc19af273002f8 commit 17ae9b7e6d1d52d2162d6bacf7cc19af273002f8 Author: James Buren Date: Wed Jan 7 09:06:45 2009 -0600 xcmenu.c * add a bunch of usage of libconfig * implement the beginnings of cairo usage * other changes diff --git a/xcmenu.c b/xcmenu.c index ed85090..4bbef3e 100644 --- a/xcmenu.c +++ b/xcmenu.c @@ -12,6 +12,7 @@ #include #include #include +#include /* initialize some useful global variables */ @@ -19,9 +20,40 @@ static char *home; static char path[BUFFER]; static char theme[BUFFER]; static char themefile[BUFFER]; +static config_t cfg; +static cairo_surface_t *bg; +static cairo_surface_t *le; +static cairo_surface_t *re; +static cairo_surface_t *la; +static cairo_surface_t *ra; +static cairo_surface_t *stbg; +static cairo_surface_t *stle; +static cairo_surface_t *stre; /* define some functions */ +/* clean up that mess you made, dude! */ +static void cleanup() +{ + config_destroy(&cfg); + if (bg) + cairo_surface_destroy(bg); + if (le) + cairo_surface_destroy(le); + if (re) + cairo_surface_destroy(re); + if (la) + cairo_surface_destroy(la); + if (ra) + cairo_surface_destroy(ra); + if (stbg) + cairo_surface_destroy(stbg); + if (stle) + cairo_surface_destroy(stle); + if (stre) + cairo_surface_destroy(stre); +} + /* print an error and flip out, dude! */ static void error(const char *str1,const char *str2) { @@ -36,6 +68,7 @@ static void error(const char *str1,const char *str2) else snprintf(buffer,size,"No error message supplied?"); printf("%s\n",buffer); + cleanup(); exit(1); } @@ -48,16 +81,55 @@ static int filechk(const char *filename) return(TRUE); } -/* parse */ -static void parse() +/* wrap cairo calls for my own uses :D */ +static void load_png(const char *png,cairo_surface_t **ptr) +{ + *ptr = cairo_image_surface_create_from_png(png); + if (cairo_surface_status(*ptr)) + error("Failed to load png file: ",png); +} + +/* parse the theme file, dude :D */ +static void parse_theme() { - config_t cfg; + char background[BUFFER],leftend[BUFFER],rightend[BUFFER],leftarrow[BUFFER]; + char rightarrow[BUFFER],selectedbackground[BUFFER],selectedleftend[BUFFER]; + char selectedrightend[BUFFER]; config_init(&cfg); if (!config_read_file(&cfg,themefile)) - { - config_destroy(&cfg); error("Failed to parse theme file.",NULL); - } + snprintf(background,sizeof(background),"%s%s",theme,config_lookup_string(&cfg,"theme.background")); + snprintf(leftend,sizeof(leftend),"%s%s",theme,config_lookup_string(&cfg,"theme.leftend")); + snprintf(rightend,sizeof(rightend),"%s%s",theme,config_lookup_string(&cfg,"theme.rightend")); + snprintf(leftarrow,sizeof(leftarrow),"%s%s",theme,config_lookup_string(&cfg,"theme.leftarrow")); + snprintf(rightarrow,sizeof(rightarrow),"%s%s",theme,config_lookup_string(&cfg,"theme.rightarrow")); + snprintf(selectedbackground,sizeof(selectedbackground),"%s%s",theme,config_lookup_string(&cfg,"theme.selectedbackground")); + snprintf(selectedleftend,sizeof(selectedleftend),"%s%s",theme,config_lookup_string(&cfg,"theme.selectedleftend")); + snprintf(selectedrightend,sizeof(selectedrightend),"%s%s",theme,config_lookup_string(&cfg,"theme.selectedrightend")); + if (!filechk(background)) + error(FERROR,background); + if (!filechk(leftend)) + error(FERROR,leftend); + if (!filechk(rightend)) + error(FERROR,rightend); + if (!filechk(leftarrow)) + error(FERROR,leftarrow); + if (!filechk(rightarrow)) + error(FERROR,rightarrow); + if (!filechk(selectedbackground)) + error(FERROR,selectedbackground); + if (!filechk(selectedleftend)) + error(FERROR,selectedleftend); + if (!filechk(selectedrightend)) + error(FERROR,selectedrightend); + load_png(background,&bg); + load_png(leftend,&le); + load_png(rightend,&re); + load_png(leftarrow,&la); + load_png(rightarrow,&ra); + load_png(selectedbackground,&stbg); + load_png(selectedleftend,&stle); + load_png(selectedrightend,&stre); config_destroy(&cfg); } @@ -78,7 +150,7 @@ static void init() error(FERROR,theme); if (!filechk(themefile)) error(FERROR,themefile); - parse(); + parse_theme(); } /* stop defining functions */ @@ -86,5 +158,6 @@ static void init() int main() { init(); + cleanup(); return(0); } From bouleetbil at frogdev.info Wed Jan 7 16:39:50 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Wed Jan 7 16:39:52 2009 Subject: [Frugalware-git] frugalware-current: telepathy-gabble-0.7.18-1-i686 Message-ID: <20090107153950.4AC1411B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e2943fa6fd753d25dfc16d864fdaaf281fa55fbc commit e2943fa6fd753d25dfc16d864fdaaf281fa55fbc Author: bouleetbil Date: Wed Jan 7 15:33:41 2009 +0100 telepathy-gabble-0.7.18-1-i686 *version bump diff --git a/source/lib-extra/telepathy-gabble/FrugalBuild b/source/lib-extra/telepathy-gabble/FrugalBuild index e03b5f3..f40513f 100644 --- a/source/lib-extra/telepathy-gabble/FrugalBuild +++ b/source/lib-extra/telepathy-gabble/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: AlexExtreme pkgname=telepathy-gabble -pkgver=0.7.17 +pkgver=0.7.18 pkgrel=1 pkgdesc="Telepathy is a D-Bus framework for unifying real time communication." url="http://telepathy.freedesktop.org/" @@ -13,6 +13,6 @@ groups=('lib-extra') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump http://telepathy.freedesktop.org/releases/telepathy-gabble | Flasttar" source=(http://telepathy.freedesktop.org/releases/telepathy-gabble/$pkgname-$pkgver.tar.gz) -sha1sums=('076e72fe54dcdc58c9c12111f2b458fca581031b') +sha1sums=('d5ec712bd598fc332d092251690ca2e7d05dd14b') # optimization OK From bouleetbil at frogdev.info Wed Jan 7 16:42:55 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Wed Jan 7 16:42:56 2009 Subject: [Frugalware-git] frugalware-current: telepathy-python-0.15.5-1-i686 Message-ID: <20090107154255.130B411B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8e48e0ff09746452ed48ae93bf9140b7067f5583 commit 8e48e0ff09746452ed48ae93bf9140b7067f5583 Author: bouleetbil Date: Wed Jan 7 15:37:08 2009 +0100 telepathy-python-0.15.5-1-i686 *version bump diff --git a/source/devel-extra/telepathy-python/FrugalBuild b/source/devel-extra/telepathy-python/FrugalBuild index 330d8c4..5a1a2ad 100644 --- a/source/devel-extra/telepathy-python/FrugalBuild +++ b/source/devel-extra/telepathy-python/FrugalBuild @@ -2,13 +2,21 @@ # Maintainer: bouleetbil pkgname=telepathy-python -pkgver=0.15.3 -pkgrel=2 +pkgver=0.15.5 +pkgrel=1 pkgdesc="Base classes for use in connection managers, and proxy classes for use in clients." url="http://telepathy.freedesktop.org/releases/$pkgname" up2date="lynx -dump $url | Flasttar" -source=("http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz") +source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz utils.py) depends=('dbus-python' 'libtelepathy') groups=('devel-extra') archs=('i686' 'x86_64' 'ppc') -sha1sums=('50e99b05ba50cee7b89018158881c6218193cf53') +sha1sums=('25f4b59ee28c635711006f73fd87176133235b25' \ + '784920fdde7d4e348f479cb524c9aa8f968ca08f') + +build() { + #they forgot to add the file to archive + Fcd + cp ../utils.py src/utils.py || Fdie + Fbuild +} diff --git a/source/devel-extra/telepathy-python/utils.py b/source/devel-extra/telepathy-python/utils.py new file mode 100644 index 0000000..ac4b204 --- /dev/null +++ b/source/devel-extra/telepathy-python/utils.py @@ -0,0 +1,54 @@ +# telepathy-python - Base classes defining the interfaces of the Telepathy framework +# +# Copyright (C) 2008 Collabora Limited +# +# This library 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.1 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 +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +import os +import sys + +def debug_divert_messages(filename): + """debug_divert_messages: + @filename: A file to which to divert stdout and stderr or None to do + nothing. + + Open the given file for writing and duplicate its file descriptor to + be used for stdout and stderr. This has the effect of closing the previous + stdout and stderr, and sending all messages that would have gone there + to the given file instead. + + By default the file is truncated and hence overwritten each time the + process is executed. + If the filename is prefixed with '+' then the file is not truncated and + output is added at the end of the file. + Passing None to this function is guaranteed to have no effect. This is + so you can call it with the recommended usage + debug_divert_messages (os.getenv('MYAPP_LOGFILE')) + and it won't do anything if the environment variable is not set.""" + + if filename is None: + return + + try: + if filename.startswith('+'): + logfile = open(filename[1:], 'a') + else: + logfile = open(filename, 'w') + except IOError, e: + print "Can't open logfile '%s' : '%s'" % (filename, e) + return + + sys.stdout = logfile + sys.stderr = logfile From bouleetbil at frogdev.info Wed Jan 7 16:44:40 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Wed Jan 7 16:44:41 2009 Subject: [Frugalware-git] frugalware-current: telepathy-butterfly-0.3.3-1-i686 Message-ID: <20090107154440.61EC811B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=104748d06404de7b1c3c72452e2391e8285d39f6 commit 104748d06404de7b1c3c72452e2391e8285d39f6 Author: bouleetbil Date: Wed Jan 7 15:38:59 2009 +0100 telepathy-butterfly-0.3.3-1-i686 *version bump diff --git a/source/lib-extra/telepathy-butterfly/FrugalBuild b/source/lib-extra/telepathy-butterfly/FrugalBuild index 1e6bcd2..ae43b63 100644 --- a/source/lib-extra/telepathy-butterfly/FrugalBuild +++ b/source/lib-extra/telepathy-butterfly/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: bouleetbil pkgname=telepathy-butterfly -pkgver=0.3.2 -pkgrel=2 +pkgver=0.3.3 +pkgrel=1 pkgdesc="An MSN connection manager for Telepathy" url="http://telepathy.freedesktop.org/releases/$pkgname" up2date="lynx -dump $url | Flasttar" @@ -11,7 +11,7 @@ source=("http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar depends=('telepathy-python' 'pymsn') groups=('lib-extra') archs=('i686' 'x86_64' 'ppc') -sha1sums=('e2718a28d06c8b4e307dffd4c33d8d5ff2c190ce') +sha1sums=('94362905e011cc422e4a241ca0e09ccaae1a7934') build() { Fcd From bouleetbil at frogdev.info Wed Jan 7 16:47:35 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Wed Jan 7 16:47:36 2009 Subject: [Frugalware-git] frugalware-current: gst-plugins-farsight-0.12.10-1-i686 Message-ID: <20090107154735.B700C11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=37d7ecee1bb01192bd4b6545add08f3c62784d69 commit 37d7ecee1bb01192bd4b6545add08f3c62784d69 Author: bouleetbil Date: Wed Jan 7 15:41:51 2009 +0100 gst-plugins-farsight-0.12.10-1-i686 *version bump diff --git a/source/xmultimedia-extra/gst-plugins-farsight/FrugalBuild b/source/xmultimedia-extra/gst-plugins-farsight/FrugalBuild index 0425923..966d08b 100644 --- a/source/xmultimedia-extra/gst-plugins-farsight/FrugalBuild +++ b/source/xmultimedia-extra/gst-plugins-farsight/FrugalBuild @@ -3,16 +3,16 @@ # Contributor: AlexExtreme pkgname=gst-plugins-farsight -pkgver=0.12.9 +pkgver=0.12.10 pkgrel=1 pkgdesc="GStreamer plugin for Farsight" url="http://farsight.freedesktop.org/" -depends=('dbus-glib>=0.71-2' 'gst-plugins-base' 'gst-plugins-good' 'libjingle-tapioca>=0.3.11-2' 'jasper' 'libmimic') +depends=('dbus-glib>=0.78-2' 'gst-plugins-base' 'gst-plugins-good' 'libjingle-tapioca>=0.3.11-2' 'jasper' 'libmimic') groups=('xmultimedia-extra') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump http://farsight.freedesktop.org/releases/$pkgname | Flasttar" source=(http://farsight.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) -sha1sums=('1b7d4945388691569989fc469eddfc17581ff6ac') +sha1sums=('3ebc59e6eb27ee070eacebc1a93bcc6b641a158b') build() { export PKG_CONFIG_PATH=/usr/lib/jingle-tapioca/lib/pkgconfig:$PKG_CONFIG_PATH From bouleetbil at frogdev.info Wed Jan 7 16:49:05 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Wed Jan 7 16:49:07 2009 Subject: [Frugalware-git] bouleetbiltesting: telepathy-inspector-0.5.3-1-i686 Message-ID: <20090107154905.AF1FB11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbiltesting.git;a=commitdiff;h=401878c36065e0387a079a70be80cbd9a537972f commit 401878c36065e0387a079a70be80cbd9a537972f Author: bouleetbil Date: Wed Jan 7 15:43:23 2009 +0100 telepathy-inspector-0.5.3-1-i686 *new package diff --git a/source/xapps-extra/telepathy-inspector/FrugalBuild b/source/xapps-extra/telepathy-inspector/FrugalBuild new file mode 100644 index 0000000..c8ed058 --- /dev/null +++ b/source/xapps-extra/telepathy-inspector/FrugalBuild @@ -0,0 +1,16 @@ +# Compiling Time: 0 SBU +# Maintainer: bouleetbil + +pkgname=telepathy-inspector +pkgver=0.5.3 +pkgrel=1 +pkgdesc="debugging tool for Telepathy developers" +url="http://telepathy.freedesktop.org/releases/$pkgname" +up2date="lynx -dump $url | Flasttar" +source=("http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz") +depends=('telepathy-stream-engine' 'gtk+2') +groups=('xapps-extra') +archs=('i686') +sha1sums=('dc622bbf62550691cae0bad3471531641b412028') + +# optimization OK From bouleetbil at frogdev.info Wed Jan 7 16:50:15 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Wed Jan 7 16:50:16 2009 Subject: [Frugalware-git] bouleetbiltesting: telepathy-pinocchio-0.3.1-1-i686 Message-ID: <20090107155015.750B211B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbiltesting.git;a=commitdiff;h=86030bcb9943a12335eaca9cd4ea199c6d1254de commit 86030bcb9943a12335eaca9cd4ea199c6d1254de Author: bouleetbil Date: Wed Jan 7 15:44:36 2009 +0100 telepathy-pinocchio-0.3.1-1-i686 *new package diff --git a/source/xapps-extra/telepathy-pinocchio/FrugalBuild b/source/xapps-extra/telepathy-pinocchio/FrugalBuild new file mode 100644 index 0000000..e20efce --- /dev/null +++ b/source/xapps-extra/telepathy-pinocchio/FrugalBuild @@ -0,0 +1,14 @@ +# Compiling Time: 0 SBU +# Maintainer: bouleetbil + +pkgname=telepathy-pinocchio +pkgver=0.3.1 +pkgrel=1 +pkgdesc="Telepathy-pinocchio is a connection manager meant for testing Telepathy application" +url="http://telepathy.freedesktop.org/releases/$pkgname" +up2date="lynx -dump $url | Flasttar" +source=("http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz") +depends=('telepathy-stream-engine') +groups=('xapps-extra') +archs=('i686') +sha1sums=('2f193ea3e5b932794abd7f4cfb233dbe408982be') From bouleetbil at frogdev.info Wed Jan 7 16:51:10 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Wed Jan 7 16:51:12 2009 Subject: [Frugalware-git] bouleetbiltesting: telepathy-spec-0.17.17-1-i686 Message-ID: <20090107155110.99A0711B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbiltesting.git;a=commitdiff;h=b43ca763ceb176b07d371b5d99040c8e3bfa8f1f commit b43ca763ceb176b07d371b5d99040c8e3bfa8f1f Author: bouleetbil Date: Wed Jan 7 15:45:30 2009 +0100 telepathy-spec-0.17.17-1-i686 *new package diff --git a/source/lib-extra/telepathy-spec/FrugalBuild b/source/lib-extra/telepathy-spec/FrugalBuild new file mode 100644 index 0000000..f8c6d97 --- /dev/null +++ b/source/lib-extra/telepathy-spec/FrugalBuild @@ -0,0 +1,21 @@ +# Compiling Time: 0.03 SBU +# Maintainer: bouleetbil + +pkgname=telepathy-spec +pkgver=0.17.17 +pkgrel=1 +pkgdesc="telepathy-spec is the canonical description of the Telepathy D-Bus API" +url="http://telepathy.freedesktop.org/" +depends=() +makedepends=('libxslt' 'docutils') +groups=('lib-extra') +archs=('i686') +up2date="lynx -dump http://telepathy.freedesktop.org/releases/$pkgname | Flasttar" +source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) +sha1sums=('aff3e7f73bab549e0dcf56dc72586c7265623eb3') + +build() { + Fmake + Fmkdir usr/share/$pkgname + Fcp $pkgname-$pkgver/doc/*.html usr/share/$pkgname/ +} From boobaa at frugalware.org Wed Jan 7 20:06:59 2009 From: boobaa at frugalware.org (CSÉCSY László) Date: Wed Jan 7 20:07:01 2009 Subject: [Frugalware-git] frugalware-current: php-5.2.6-5-i686 Message-ID: <20090107190659.425D311B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=eddd1db4d5eb9c7f7f7c2437c636f883a81ec16f commit eddd1db4d5eb9c7f7f7c2437c636f883a81ec16f Author: CSÉCSY László Date: Wed Jan 7 20:05:46 2009 +0100 php-5.2.6-5-i686 release bump, closes #3486 ok by vmiklos@, with his close supervision diff --git a/source/devel/php/FrugalBuild b/source/devel/php/FrugalBuild index 6580c4e..04690d8 100644 --- a/source/devel/php/FrugalBuild +++ b/source/devel/php/FrugalBuild @@ -4,7 +4,7 @@ pkgname=php pkgver=5.2.6 -pkgrel=4 +pkgrel=5 pkgdesc="A widely-used general-purpose scripting language" url="http://www.php.net" backup=(etc/{php.ini,httpd/conf/modules.d/$pkgname.conf}) @@ -17,7 +17,7 @@ groups=('devel') archs=('i686' 'x86_64') up2date="lynx -dump http://www.php.net/downloads.php |grep 'Complete Source Code' -3|sed -n 's/.*P \(.*\)/\1/;2 p'" source=(http://www.php.net/distributions/$pkgname-$pkgver.tar.gz \ - php.ini php.conf README.Frugalware freetds-compat.patch) + php.ini php.conf README.Frugalware freetds-compat.patch phpize.in.patch) subpkgs=("$pkgname-cgi") suboptions=('nodocs') ## its depends on PHP and the same files are installed etc @@ -134,11 +134,13 @@ build() Ffile /etc/httpd/conf/modules.d/$pkgname.conf Ffile /etc/php.ini Fln /etc/php.ini /usr/lib/php.ini + cat /usr/share/aclocal/libtool.m4 > $Fdestdir/usr/lib/php/build/libtool.m4 } sha1sums=('54058c73eb5a314eb2b31925477f298d898b520a' \ '9ba6e9430bdba5f6ab2bad15e7cc354d0ea3fd58' \ '0850ef23512a02e8460dc36f08f453d148dcd9df' \ '40ae88f0721e02a2c75de76be342c51c85bf734d' \ - '383fe3f8550d73f0cc0e386d41c90d5648240e91') + '383fe3f8550d73f0cc0e386d41c90d5648240e91' \ + '4c598e1c8683518090f7a0e9fef01c57593137c8') # optimization OK diff --git a/source/devel/php/phpize.in.patch b/source/devel/php/phpize.in.patch new file mode 100644 index 0000000..a42cc41 --- /dev/null +++ b/source/devel/php/phpize.in.patch @@ -0,0 +1,17 @@ +diff -Naur php-5.2.6.orig/scripts/phpize.in php-5.2.6/scripts/phpize.in +--- php-5.2.6.orig/scripts/phpize.in 2007-06-28 21:10:35.000000000 -0400 ++++ php-5.2.6/scripts/phpize.in 2008-10-14 15:15:24.000000000 -0400 +@@ -128,8 +128,13 @@ + (cd "$phpdir" && cp $FILES_BUILD "$builddir"/build) + (cd "$phpdir" && cp $FILES "$builddir") + (cd "$builddir" && cat acinclude.m4 ./build/libtool.m4 > aclocal.m4) ++ (cd "$builddir" && cat "/usr/share/aclocal/ltsugar.m4" >> aclocal.m4) ++ (cd "$builddir" && cat "/usr/share/aclocal/ltversion.m4" >> aclocal.m4) ++ (cd "$builddir" && cat "/usr/share/aclocal/lt~obsolete.m4" >> aclocal.m4) ++ (cd "$builddir" && cat "/usr/share/aclocal/ltoptions.m4" >> aclocal.m4) + } + ++ + phpize_replace_prefix() + { + $SED \ From boobaa at frugalware.org Wed Jan 7 20:16:16 2009 From: boobaa at frugalware.org (CSÉCSY László) Date: Wed Jan 7 20:16:19 2009 Subject: [Frugalware-git] frugalware-current: php-pecl-pdo-1.0.3-1-i686 Message-ID: <20090107191616.55F3311B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d17265d4befcf4797621c444cad658619f48bd60 commit d17265d4befcf4797621c444cad658619f48bd60 Author: CSÉCSY László Date: Wed Jan 7 20:16:04 2009 +0100 php-pecl-pdo-1.0.3-1-i686 new package / initial import diff --git a/source/devel-extra/php-pecl-pdo/FrugalBuild b/source/devel-extra/php-pecl-pdo/FrugalBuild new file mode 100644 index 0000000..d6d8e3f --- /dev/null +++ b/source/devel-extra/php-pecl-pdo/FrugalBuild @@ -0,0 +1,20 @@ +# Compiling Time: 0.13 SBU +# Maintainer: CSÉCSY László + +_F_pecl_name="pdo" +pkgver=1.0.3 +pkgdesc="provides a uniform data access interface" +depends=('php>=5.2.6') +Finclude pecl +pkgrel=1 +sha1sums=('93f627b4b3fc053d8a00042217fc6bf3666c170c') +up2date="lynx -dump http://pecl.php.net/package/$_F_pecl_name |grep -m1 '[0-9.]\{3,\}\.tgz$'|sed 's/.*-\(.*\)\.t.*/\1/'" + +build() { + Fcd PDO-$pkgver + Fbuildpecl +# Fmkdir usr/share/doc/$pkgname-$pkgver/ +# Fcpr $_F_pecl_name-$pkgver/examples usr/share/doc/$pkgname-$pkgver/ +} + +# optimization OK From boobaa at frugalware.org Wed Jan 7 20:18:31 2009 From: boobaa at frugalware.org (CSÉCSY László) Date: Wed Jan 7 20:18:32 2009 Subject: [Frugalware-git] frugalware-current: php-pecl-pdo-1.0.3-1-i686 Message-ID: <20090107191831.5A48F11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a47dd5296fe7df0f1847f202821c14401bd093f9 commit a47dd5296fe7df0f1847f202821c14401bd093f9 Author: CSÉCSY László Date: Wed Jan 7 20:17:35 2009 +0100 php-pecl-pdo-1.0.3-1-i686 removing unneeded rubbish diff --git a/source/devel-extra/php-pecl-pdo/FrugalBuild b/source/devel-extra/php-pecl-pdo/FrugalBuild index d6d8e3f..f0ce06c 100644 --- a/source/devel-extra/php-pecl-pdo/FrugalBuild +++ b/source/devel-extra/php-pecl-pdo/FrugalBuild @@ -13,8 +13,6 @@ up2date="lynx -dump http://pecl.php.net/package/$_F_pecl_name |grep -m1 '[0-9.]\ build() { Fcd PDO-$pkgver Fbuildpecl -# Fmkdir usr/share/doc/$pkgname-$pkgver/ -# Fcpr $_F_pecl_name-$pkgver/examples usr/share/doc/$pkgname-$pkgver/ } # optimization OK From boobaa at frugalware.org Wed Jan 7 20:22:49 2009 From: boobaa at frugalware.org (CSÉCSY László) Date: Wed Jan 7 20:22:50 2009 Subject: [Frugalware-git] frugalware-current: php-pecl-memcache-3.0.2-1-i686 Message-ID: <20090107192249.030A911B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a670507bdbf4035b904ea0bbce1cdbd7ee7bf968 commit a670507bdbf4035b904ea0bbce1cdbd7ee7bf968 Author: CSÉCSY László Date: Wed Jan 7 20:22:36 2009 +0100 php-pecl-memcache-3.0.2-1-i686 new package / initial import diff --git a/source/devel-extra/php-pecl-memcache/FrugalBuild b/source/devel-extra/php-pecl-memcache/FrugalBuild new file mode 100644 index 0000000..4ab6d22 --- /dev/null +++ b/source/devel-extra/php-pecl-memcache/FrugalBuild @@ -0,0 +1,17 @@ +# Compiling Time: 0.13 SBU +# Maintainer: CSÉCSY László + +_F_pecl_name="memcache" +pkgver=3.0.2 +pkgdesc="allows you to work with memcached through handy OO and procedural interfaces" +depends=('php>=5.2.6') +Finclude pecl +pkgrel=1 +sha1sums=('6815671a37da0413107b4a1f3e45acac8f49bc62') +up2date="lynx -dump http://pecl.php.net/package/$_F_pecl_name |grep -m1 '[0-9.]\{3,\}\.tgz$'|sed 's/.*-\(.*\)\.t.*/\1/'" + +build() { + Fbuildpecl +} + +# optimization OK From bouleetbil at frogdev.info Wed Jan 7 20:28:59 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Wed Jan 7 20:29:00 2009 Subject: [Frugalware-git] frugalware-current: telepathy-python-0.15.6-1-i686 Message-ID: <20090107192859.4F01011B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0e9267341bb15988323df2d67ef66e5c96fbb377 commit 0e9267341bb15988323df2d67ef66e5c96fbb377 Author: bouleetbil Date: Wed Jan 7 20:22:12 2009 +0100 telepathy-python-0.15.6-1-i686 *version bump *bug report fix 2h great :) diff --git a/source/devel-extra/telepathy-python/FrugalBuild b/source/devel-extra/telepathy-python/FrugalBuild index 5a1a2ad..a512728 100644 --- a/source/devel-extra/telepathy-python/FrugalBuild +++ b/source/devel-extra/telepathy-python/FrugalBuild @@ -2,21 +2,13 @@ # Maintainer: bouleetbil pkgname=telepathy-python -pkgver=0.15.5 +pkgver=0.15.6 pkgrel=1 pkgdesc="Base classes for use in connection managers, and proxy classes for use in clients." url="http://telepathy.freedesktop.org/releases/$pkgname" up2date="lynx -dump $url | Flasttar" -source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz utils.py) +source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) depends=('dbus-python' 'libtelepathy') groups=('devel-extra') archs=('i686' 'x86_64' 'ppc') -sha1sums=('25f4b59ee28c635711006f73fd87176133235b25' \ - '784920fdde7d4e348f479cb524c9aa8f968ca08f') - -build() { - #they forgot to add the file to archive - Fcd - cp ../utils.py src/utils.py || Fdie - Fbuild -} +sha1sums=('7ab4c0c7fb251e3bcd16bff2f3fae9329adaa318') diff --git a/source/devel-extra/telepathy-python/utils.py b/source/devel-extra/telepathy-python/utils.py deleted file mode 100644 index ac4b204..0000000 --- a/source/devel-extra/telepathy-python/utils.py +++ /dev/null @@ -1,54 +0,0 @@ -# telepathy-python - Base classes defining the interfaces of the Telepathy framework -# -# Copyright (C) 2008 Collabora Limited -# -# This library 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.1 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 -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -import os -import sys - -def debug_divert_messages(filename): - """debug_divert_messages: - @filename: A file to which to divert stdout and stderr or None to do - nothing. - - Open the given file for writing and duplicate its file descriptor to - be used for stdout and stderr. This has the effect of closing the previous - stdout and stderr, and sending all messages that would have gone there - to the given file instead. - - By default the file is truncated and hence overwritten each time the - process is executed. - If the filename is prefixed with '+' then the file is not truncated and - output is added at the end of the file. - Passing None to this function is guaranteed to have no effect. This is - so you can call it with the recommended usage - debug_divert_messages (os.getenv('MYAPP_LOGFILE')) - and it won't do anything if the environment variable is not set.""" - - if filename is None: - return - - try: - if filename.startswith('+'): - logfile = open(filename[1:], 'a') - else: - logfile = open(filename, 'w') - except IOError, e: - print "Can't open logfile '%s' : '%s'" % (filename, e) - return - - sys.stdout = logfile - sys.stderr = logfile From bouleetbil at frogdev.info Wed Jan 7 21:49:54 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Wed Jan 7 21:49:56 2009 Subject: [Frugalware-git] frugalware-current: pidgin-2.5.3-2-i686 Message-ID: <20090107204954.7956F11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7262efc8596555081f91bacd671713074f3c7ae0 commit 7262efc8596555081f91bacd671713074f3c7ae0 Author: bouleetbil Date: Wed Jan 7 21:41:53 2009 +0100 pidgin-2.5.3-2-i686 *split for add libpurple diff --git a/source/xapps/pidgin/FrugalBuild b/source/xapps/pidgin/FrugalBuild index 0df1888..f1b32db 100644 --- a/source/xapps/pidgin/FrugalBuild +++ b/source/xapps/pidgin/FrugalBuild @@ -4,12 +4,13 @@ pkgname=pidgin pkgver=2.5.3 -pkgrel=1 +pkgrel=2 pkgdesc="A multi-protocol instant messaging (IM) client" -depends=('gtk+2>=2.12.1' 'libao' 'audiofile' 'gtkspell' 'nss>=3.12' 'startup-notification>=0.9' \ - 'avahi-compat>=0.6.21' 'gnutls>=2.4' 'libxml2' 'libxslt' 'libxscrnsaver' \ - 'dbus-glib>=0.74' 'dbus-x11' 'gstreamer' 'avahi-glib>=0.6.21') -makedepends=('evolution-data-server>=1.12.0' 'doxygen' 'tk' 'perl-xml-parser' 'intltool' 'sqlite3') +depends=('gtk+2>=2.12.1' 'libao' 'audiofile' 'gtkspell' 'startup-notification>=0.9' \ + 'libxscrnsaver' 'dbus-x11' 'gstreamer') +makedepends=('evolution-data-server>=1.12.0' 'doxygen' 'tk' 'perl-xml-parser' 'intltool' 'sqlite3' \ + 'avahi-compat>=0.6.21' 'dbus-glib>=0.74' 'avahi-glib>=0.6.21' 'gnutls>=2.4' 'libxml2' 'libxslt' 'nss>=3.12') +rodepends=('libpurple') conflicts=('gaim') provides=('gaim') replaces=('gaim') @@ -23,6 +24,12 @@ options=('scriptlet') sha1sums=('bd3f6eca0a0c9b221be8a664e904450db8589314' \ '54a38213ee7cf04989fe7a0707dac471b13893d8') +subpkgs=("libpurple") +subdescs=('Library intended to be used by programmers seeking to write an IM client that connects to many IM networks.') +subdepends=("avahi-compat>=0.6.21 dbus-glib>=0.74 avahi-glib>=0.6.21 gnutls>=2.4 libxml2 libxslt nss>=3.12") +subgroups=('lib-extra') +subarchs=('i686 x86_64 ppc') + build() { Fpatchall Fmake \ @@ -40,6 +47,13 @@ build() { Fmakeinstall Fmkdir usr/share/doc/$pkgname-$pkgver/html/ Fdocrel doc/html + + Fsplit libpurple /usr/share/aclocal/purple.m4 + Fsplit libpurple /usr/lib/purple-2/tcl.so + Fsplit libpurple /usr/lib/purple-2/* + Fsplit libpurple /usr/include/libpurple/* + Fsplit libpurple /usr/lib/pkgconfig/purple.pc + Fsplit libpurple /usr/lib/libpurple* } # optimization OK From bouleetbil at frogdev.info Wed Jan 7 21:54:31 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Wed Jan 7 21:54:33 2009 Subject: [Frugalware-git] frugalware-current: pidgin-2.5.3-2-i686 Message-ID: <20090107205431.B89BD11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2df98124e95007491d660f8798a6213fef78dfd5 commit 2df98124e95007491d660f8798a6213fef78dfd5 Author: bouleetbil Date: Wed Jan 7 21:46:11 2009 +0100 pidgin-2.5.3-2-i686 *change the group to libpurple for lib diff --git a/source/xapps/pidgin/FrugalBuild b/source/xapps/pidgin/FrugalBuild index f1b32db..cd5ded1 100644 --- a/source/xapps/pidgin/FrugalBuild +++ b/source/xapps/pidgin/FrugalBuild @@ -27,7 +27,7 @@ sha1sums=('bd3f6eca0a0c9b221be8a664e904450db8589314' \ subpkgs=("libpurple") subdescs=('Library intended to be used by programmers seeking to write an IM client that connects to many IM networks.') subdepends=("avahi-compat>=0.6.21 dbus-glib>=0.74 avahi-glib>=0.6.21 gnutls>=2.4 libxml2 libxslt nss>=3.12") -subgroups=('lib-extra') +subgroups=('lib') subarchs=('i686 x86_64 ppc') build() { From bouleetbil at frogdev.info Wed Jan 7 22:07:58 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Wed Jan 7 22:07:59 2009 Subject: [Frugalware-git] frugalware-current: telepathy-haze-0.2.1-2-i686 Message-ID: <20090107210758.3594111B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c529cd855239c1f98bca14d9ba7d0b4825b9e466 commit c529cd855239c1f98bca14d9ba7d0b4825b9e466 Author: bouleetbil Date: Wed Jan 7 21:55:17 2009 +0100 telepathy-haze-0.2.1-2-i686 *moved to lib-extra change depend for libpurple diff --git a/source/lib-extra/telepathy-haze/FrugalBuild b/source/lib-extra/telepathy-haze/FrugalBuild new file mode 100644 index 0000000..efd7976 --- /dev/null +++ b/source/lib-extra/telepathy-haze/FrugalBuild @@ -0,0 +1,16 @@ +# Compiling Time: 0.04 SBU +# Maintainer: bouleetbil + +pkgname=telepathy-haze +pkgver=0.2.1 +pkgrel=2 +pkgdesc="A telepathy connection manager that use libpurple" +url="http://telepathy.freedesktop.org/releases/$pkgname" +up2date="lynx -dump $url | Flasttar" +source=("http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz") +depends=('telepathy-glib' 'libpurple') +groups=('lib-extra') +archs=('i686') +sha1sums=('b638be6c8278235f7adef8fbddb28734067409cd') + +# optimization OK diff --git a/source/xlib-extra/telepathy-haze/FrugalBuild b/source/xlib-extra/telepathy-haze/FrugalBuild deleted file mode 100644 index 5340c7c..0000000 --- a/source/xlib-extra/telepathy-haze/FrugalBuild +++ /dev/null @@ -1,16 +0,0 @@ -# Compiling Time: 0.04 SBU -# Maintainer: bouleetbil - -pkgname=telepathy-haze -pkgver=0.2.1 -pkgrel=1 -pkgdesc="A telepathy connection manager that use libpurple" -url="http://telepathy.freedesktop.org/releases/$pkgname" -up2date="lynx -dump $url | Flasttar" -source=("http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz") -depends=('telepathy-glib' 'pidgin') -groups=('xlib-extra') -archs=('i686') -sha1sums=('b638be6c8278235f7adef8fbddb28734067409cd') - -# optimization OK From boobaa at frugalware.org Wed Jan 7 22:51:00 2009 From: boobaa at frugalware.org (CSÉCSY László) Date: Wed Jan 7 22:51:01 2009 Subject: [Frugalware-git] frugalware-current: php-pecl-imagick-2.2.1-1-i686 Message-ID: <20090107215100.62F5011B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7a5a4cefc72c47a7b5a9857651f5cdf214617535 commit 7a5a4cefc72c47a7b5a9857651f5cdf214617535 Author: CSÉCSY László Date: Wed Jan 7 22:50:40 2009 +0100 php-pecl-imagick-2.2.1-1-i686 version bump diff --git a/source/devel-extra/php-pecl-imagick/FrugalBuild b/source/devel-extra/php-pecl-imagick/FrugalBuild index 405db9b..97897b2 100644 --- a/source/devel-extra/php-pecl-imagick/FrugalBuild +++ b/source/devel-extra/php-pecl-imagick/FrugalBuild @@ -2,13 +2,13 @@ # Maintainer: CSÉCSY László _F_pecl_name="imagick" -pkgver=2.2.0 +pkgver=2.2.1 pkgdesc="a native php extension to create and modify images using the ImageMagick API" depends=('php>=5.2.6' 'imagemagick>=6.4.0') Finclude pecl pkgrel=1 archs=(${archs[@]} 'x86_64') -sha1sums=('6ed3da6c250d9e4ae7fd9b27b08f659d57a69220') +sha1sums=('bf0d7378d5d343905c3d0af70a02221c76554e7f') up2date="lynx -dump http://pecl.php.net/package/$_F_pecl_name |grep -m1 '[0-9.]\{3,\}\.tgz$'|sed 's/.*-\(.*\)\.t.*/\1/'" build() { From vmiklos at frugalware.org Thu Jan 8 01:15:18 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Jan 8 01:15:22 2009 Subject: [Frugalware-git] frugalware-current: mysql-5.0.75-2-i686 Message-ID: <20090108001518.E88B211B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=57908858eccb5c26e0f377a672dc1268f500abe9 commit 57908858eccb5c26e0f377a672dc1268f500abe9 Author: Miklos Vajna Date: Thu Jan 8 01:02:40 2009 +0100 mysql-5.0.75-2-i686 - rewrite rc script, add gettext/status support diff --git a/source/apps-extra/mysql/FrugalBuild b/source/apps-extra/mysql/FrugalBuild index 75dbe44..087383a 100644 --- a/source/apps-extra/mysql/FrugalBuild +++ b/source/apps-extra/mysql/FrugalBuild @@ -3,7 +3,7 @@ pkgname=mysql pkgver=5.0.75 -pkgrel=1 +pkgrel=2 extrapkgver= pkgdesc="A fast SQL database server" url="http://www.mysql.com/" @@ -52,7 +52,7 @@ build() Fln mysql/libmysqlclient.so.15 /usr/lib/ Fln mysql/libmysqlclient_r.so.15 /usr/lib/ Ffile my.cnf /etc/my.cnf - Frcd mysqld + Frcd2 mysqld Ffile /etc/sysconfig/mysqld Fmkdir /var/run/mysql chown 27.27 $Fdestdir/var/run/mysql || Fdie diff --git a/source/apps-extra/mysql/messages/mysqld.en b/source/apps-extra/mysql/messages/mysqld.en deleted file mode 100644 index 68c7c67..0000000 --- a/source/apps-extra/mysql/messages/mysqld.en +++ /dev/null @@ -1,2 +0,0 @@ -stopmysqld="Stopping MySQL Daemon" -startmysqld="Starting MySQL Daemon" diff --git a/source/apps-extra/mysql/messages/mysqld.hu b/source/apps-extra/mysql/messages/mysqld.hu deleted file mode 100644 index 1ec2471..0000000 --- a/source/apps-extra/mysql/messages/mysqld.hu +++ /dev/null @@ -1,2 +0,0 @@ -stopmysqld="A MySQL Daemon leállítása" -startmysqld="A MySQL Daemon indítása" diff --git a/source/apps-extra/mysql/rc.mysqld b/source/apps-extra/mysql/rc.mysqld index b78063b..8b80179 100644 --- a/source/apps-extra/mysql/rc.mysqld +++ b/source/apps-extra/mysql/rc.mysqld @@ -1,11 +1,10 @@ -#!/bin/sh +#!/bin/bash -# (c) 2003-2004 Vajna Miklos -# rc.mysqld for FrugalWare +# (c) 2003, 2004, 2009 Vajna Miklos +# (c) 2005 Marcus Habermehl +# rc.mysqld for Frugalware # distributed under GPL License -. /etc/rc.d/rc.functions - # chkconfig: 2345 78 12 # description: MySQL database server. @@ -15,44 +14,61 @@ # mysqladmin -u root -h $hostname password 'new-password' # See the manual for more instructions. -# before start - +# pre-start block if [ ! `egrep '^mysql:' /etc/group` ]; then - echo "Adding mysql group" - groupadd -g 89 mysql + echo "Adding mysql group" + groupadd -g 89 mysql fi if [ ! `egrep '^mysql:' /etc/passwd` ]; then - echo "Adding mysql user" - useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql - [ -d /var/lib/mysql ] && chown -R mysql.mysql /var/lib/mysql + echo "Adding mysql user" + useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql + [ -d /var/lib/mysql ] && chown -R mysql.mysql /var/lib/mysql fi if [ ! -d /var/lib/mysql ]; then - mkdir /var/lib/mysql - /usr/bin/mysql_install_db --datadir=/var/lib/mysql --user=mysql - chown -R mysql.mysql /var/lib/mysql + mkdir /var/lib/mysql + /usr/bin/mysql_install_db --datadir=/var/lib/mysql --user=mysql + chown -R mysql.mysql /var/lib/mysql fi if [ ! -e /var/log/mysqld.log ]; then - touch /var/log/mysqld.log - chown mysql /var/log/mysqld.log + touch /var/log/mysqld.log + chown mysql /var/log/mysqld.log fi [ -e /etc/sysconfig/mysqld ] && . /etc/sysconfig/mysqld +# end of pre-start block -# checking what to do now - -if [ "$1" = "stop" ]; then - stop "$stopmysqld" - killall mysqld - ok $? -elif [ "$1" = "restart" ]; then - "$0" stop - sleep 1 - "$0" start -else # start - start "$startmysqld" - /usr/bin/mysqld_safe $MYSQL_OPTS &>/dev/null & - ok $? -fi +source /lib/initscripts/functions +TEXTDOMAIN=mysqld +TEXTDOMAINDIR=/lib/initscripts/messages + +actions=(restart start status stop) +daemon=$"MySQL Daemon" + +pid="cat /var/lib/mysql/*.pid 2> /dev/null" + +rc_start() +{ + start_msg + if [ -z "$(eval $pid)" ]; then + /usr/bin/mysqld_safe $MYSQL_OPTS &>/dev/null & + ok $? + else + ok 999 + fi +} + +rc_stop() +{ + stop_msg + if [ -n "$(eval $pid)" ]; then + kill "$(eval $pid)" + ok $? + else + ok 999 + fi +} + +rc_exec $1 From vmiklos at frugalware.org Thu Jan 8 01:15:19 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Jan 8 01:15:23 2009 Subject: [Frugalware-git] frugalware-current: sysklogd-1.5-5-i686 Message-ID: <20090108001519.087D411B8630@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c8b72b30bba1b7d6e857af7c599c44266cc832f0 commit c8b72b30bba1b7d6e857af7c599c44266cc832f0 Author: Miklos Vajna Date: Thu Jan 8 01:14:57 2009 +0100 sysklogd-1.5-5-i686 - use the upstream pidfile in the rc script diff --git a/source/base/sysklogd/FrugalBuild b/source/base/sysklogd/FrugalBuild index 6abce0b..e0ff0c4 100644 --- a/source/base/sysklogd/FrugalBuild +++ b/source/base/sysklogd/FrugalBuild @@ -4,7 +4,7 @@ pkgname=sysklogd pkgver=1.5 -pkgrel=4 +pkgrel=5 pkgdesc="Linux system logging utilities" url="http://www.ibiblio.org/pub/Linux/system/daemons/" backup=(etc/syslog.conf etc/logrotate.d/syslog) @@ -18,7 +18,7 @@ source=($url/$pkgname-$pkgver.tar.gz \ syslog \ syslog.conf) sha1sums=('070cce745b023f2ce7ca7d9888af434d6d61c236' \ - '91c54ba080778788ad1ef2487669b62c9e065a10' \ + '934a8113be5d61078f81667ec6f2d49b829a14d7' \ '94c71ed2057354a9a39b0a1408c923328be79f89' \ 'e22daf241394779478c113c23bdc294fa2f858bc' \ '839f714f0ac9df71ef9f5955fec953048bbd699c') diff --git a/source/base/sysklogd/rc.syslog b/source/base/sysklogd/rc.syslog index e957f55..30067e7 100644 --- a/source/base/sysklogd/rc.syslog +++ b/source/base/sysklogd/rc.syslog @@ -26,7 +26,6 @@ rc_start() start_msg if [ -z "$(eval $pid)"]; then /usr/sbin/syslogd - pidof syslogd > /var/run/syslogd.pid # This prevents syslogd/klogd race condition on SMP # kernels. if [ `grep ^processor /proc/cpuinfo|sed -n 's/.*: \(.*\)/\1/;$ p'` -ge '1' ]; then @@ -49,7 +48,6 @@ rc_stop() if [ -n "$(eval $pid)"]; then kill "$(eval $pid)" kill $(cat /var/run/klogd.pid) - rm -f /var/run/{sys,k}logd.pid ok $? else ok 999 From vmiklos at frugalware.org Thu Jan 8 03:50:18 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Jan 8 03:50:20 2009 Subject: [Frugalware-git] frugalware-current: firefox-firebug-1.3.0-1-i686 Message-ID: <20090108025018.884A811B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=badb66638def3d465118b340e3fa03687333a9da commit badb66638def3d465118b340e3fa03687333a9da Author: Miklos Vajna Date: Thu Jan 8 03:42:18 2009 +0100 firefox-firebug-1.3.0-1-i686 - version bump diff --git a/source/xapps-extra/firefox-firebug/FrugalBuild b/source/xapps-extra/firefox-firebug/FrugalBuild index db15cc2..7a53a3c 100644 --- a/source/xapps-extra/firefox-firebug/FrugalBuild +++ b/source/xapps-extra/firefox-firebug/FrugalBuild @@ -1,7 +1,7 @@ # Compiling Time: 0.01 SBU # Maintainer: Miklos Vajna -pkgver=1.2.1 +pkgver=1.3.0 pkgrel=1 pkgdesc="Display WML (Wireless Markup Language) content." url="https://addons.mozilla.org/firefox/1843/" @@ -14,5 +14,5 @@ _F_firefox_id="firebug@software.joehewitt.com" _F_firefox_name="$_F_firefox_ext-$pkgver-fx.xpi" _F_firefox_nocurly=1 Finclude firefox-extension -sha1sums=('f4f9c5053c283124c72f135e6a8b7c8350920ea0' \ +sha1sums=('9abb9f24e637db995fc3e3e0b65a6e2af371f8b0' \ 'bd28013296ba44b61bc73f367fbaa536ddfdf933') From boobaa at frugalware.org Thu Jan 8 09:45:43 2009 From: boobaa at frugalware.org (CSÉCSY László) Date: Thu Jan 8 09:45:44 2009 Subject: [Frugalware-git] frugalware-current: phpmyadmin-3.1.1-1-i686 Message-ID: <20090108084543.3584011B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=934fc2a44f4abc85d5960fc345d02aa5752f42a9 commit 934fc2a44f4abc85d5960fc345d02aa5752f42a9 Author: CSÉCSY László Date: Thu Jan 8 09:45:21 2009 +0100 phpmyadmin-3.1.1-1-i686 up2date fix diff --git a/source/network-extra/phpmyadmin/FrugalBuild b/source/network-extra/phpmyadmin/FrugalBuild index ed1a106..625437e 100644 --- a/source/network-extra/phpmyadmin/FrugalBuild +++ b/source/network-extra/phpmyadmin/FrugalBuild @@ -13,7 +13,7 @@ rodepends=('php') backup=(var/www/html/phpmyadmin/libraries/config.default.php) groups=('network-extra') archs=('i686' 'x86_64') -up2date="lynx -dump $url |grep -m1 released | sed 's/.*n \([0-9\.]\+\) .*/\1/'" +up2date="lynx -dump $url | grep -m1 'http.*Admin' | sed 's/.*Admin-\(.*\)-all.*/\1/'" source=(${source/phpmyadmin-/phpMyAdmin-}) build() From ryuo at frugalware.org Thu Jan 8 11:25:45 2009 From: ryuo at frugalware.org (James Buren) Date: Thu Jan 8 11:25:46 2009 Subject: [Frugalware-git] frugalware-current: yeahlaunch-0.2-2-i686 Message-ID: <20090108102545.394E411B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b58a174f4aace77334c9f893e17a519457cc5e16 commit b58a174f4aace77334c9f893e17a519457cc5e16 Author: James Buren Date: Thu Jan 8 04:25:50 2009 -0600 yeahlaunch-0.2-2-i686 * removing package and replacing diff --git a/source/x11-extra/yeahlaunch/FrugalBuild b/source/x11-extra/yeahlaunch/FrugalBuild deleted file mode 100644 index d7550a6..0000000 --- a/source/x11-extra/yeahlaunch/FrugalBuild +++ /dev/null @@ -1,25 +0,0 @@ -# Compiling Time: 0.01 SBU -# Maintainer: James Buren - -pkgname=yeahlaunch -pkgver=0.2 -pkgrel=2 -pkgdesc="Yeahlaunch is a very simple application launcher with horizontal menu." -url="http://www.phrat.de/" -depends=('libx11' 'glibc') -groups=('x11-extra') -archs=('i686' 'x86_64') -up2date="Flasttar $url/downloads.html" -source=($url/$pkgname-$pkgver.tar.gz $pkgname-$pkgver-label.patch) -sha1sums=('a58790be639b48f81eb19d5c5eb12dc66f229eaf' \ - 'c4e2e75c6b542a79ba6f9d3ab3c027e249cda087') - -build() -{ - Fsed "-Os" "${CFLAGS}" Makefile - Fpatchall - Fmake - Fexerel /usr/bin/yeahlaunch -} - -# optimization OK diff --git a/source/x11-extra/yeahlaunch/yeahlaunch-0.2-label.patch b/source/x11-extra/yeahlaunch/yeahlaunch-0.2-label.patch deleted file mode 100644 index 7e826ad..0000000 --- a/source/x11-extra/yeahlaunch/yeahlaunch-0.2-label.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- yeahlaunch-0.2/yeahlaunch.c 2004-12-18 04:46:10.000000000 -0600 -+++ yeahlaunch-0.2-2/yeahlaunch.c 2008-07-24 01:01:04.000000000 -0500 -@@ -120,7 +120,7 @@ - if (!strncmp(argv[i], "-", 1) && i + 1 < argc) - i++; - else if (i + 1 < argc) -- make_new_tab(argv[++i], argv[i]); -+ make_new_tab(argv[i], argv[i++]); - } - for (t = head_tab; t; t = t->next) - width += t->width; From ryuo at frugalware.org Thu Jan 8 11:25:45 2009 From: ryuo at frugalware.org (James Buren) Date: Thu Jan 8 11:25:47 2009 Subject: [Frugalware-git] frugalware-current: tablaunch-0.6-1-i686 Message-ID: <20090108102545.5123411B8630@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4795e84483c38267cd3aea454ee301059f7570c9 commit 4795e84483c38267cd3aea454ee301059f7570c9 Author: James Buren Date: Thu Jan 8 04:28:26 2009 -0600 tablaunch-0.6-1-i686 * new package that is replacing yeahlaunch diff --git a/source/x11-extra/tablaunch/FrugalBuild b/source/x11-extra/tablaunch/FrugalBuild new file mode 100644 index 0000000..d4e08aa --- /dev/null +++ b/source/x11-extra/tablaunch/FrugalBuild @@ -0,0 +1,29 @@ +# Compiling Time: 0.01 SBU +# Maintainer: James Buren + +pkgname=tablaunch +pkgver=0.6 +pkgrel=1 +pkgdesc="A tab launcher originally derived from yeahlaunch." +Finclude sourceforge +depends=('libx11' 'glibc' 'imlib2' 'libice') +conflicts=('yeahlaunch') +replaces=('yeahlaunch') +provides=('yeahlaunch') +groups=('x11-extra') +archs=('i686') +sha1sums=('813560c0df658ba4a0f6daa135bfd60011bedd24') +_F_cd_path="$pkgname-$pkgver/src" + +build() +{ + Fsed "-lgif" "-lungif" Makefile + Fsed "-Os" "${CFLAGS}" Makefile + make using.imlib2 || Fdie + Fexerel /usr/bin/$pkgname + Fdocrel ../readme.html + Ffilerel ../example/{.,}$pkgname* /usr/share/doc/$pkgname-$pkgver/example + Frm /usr/share/doc/$pkgname-$pkgver/example/$pkgname +} + +# optimization OK From ryuo at frugalware.org Thu Jan 8 12:02:09 2009 From: ryuo at frugalware.org (James Buren) Date: Thu Jan 8 12:02:11 2009 Subject: [Frugalware-git] frugalware-current: qlbar-0.1.4-1-i686 Message-ID: <20090108110209.C23F211B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b8594e96932861bc17f484a19bef3602572461aa commit b8594e96932861bc17f484a19bef3602572461aa Author: James Buren Date: Thu Jan 8 05:05:41 2009 -0600 qlbar-0.1.4-1-i686 * new package diff --git a/source/x11-extra/qlbar/FrugalBuild b/source/x11-extra/qlbar/FrugalBuild new file mode 100644 index 0000000..48fd295 --- /dev/null +++ b/source/x11-extra/qlbar/FrugalBuild @@ -0,0 +1,28 @@ +# Compiling Time: 0.01 SBU +# Maintainer: James Buren + +pkgname=qlbar +pkgver=0.1.4 +pkgrel=1 +pkgdesc="$pkgname is a toolbar launcher for X11." +url="http://prokop.ae.krakow.pl/projects/$pkgname.html" +depends=('libx11' 'imlib2' 'libstdc++') +groups=('x11-extra') +archs=('i686') +up2date="Flasttar $url" +source=(http://prokop.ae.krakow.pl/projects/download/$pkgname-$pkgver.tar.bz2\ + $pkgname-$pkgver-gcc4.patch) +sha1sums=('4ad7277d428ab4eed9741c942905ed2522c32658' \ + '7ad2c68349927177613c32051a322f94c6a92aa1') + +build() +{ + Fpatchall + Fmake + Fexerel src/$pkgname /usr/bin/$pkgname + Fmanrel man/$pkgname.8 + Fdocrel man/$pkgname{.pdf,.dvi,\_man.html} + Ffilerel conf/* /usr/share/$pkgname-$pkgver/example +} + +# optimization OK diff --git a/source/x11-extra/qlbar/qlbar-0.1.4-gcc4.patch b/source/x11-extra/qlbar/qlbar-0.1.4-gcc4.patch new file mode 100644 index 0000000..1528be7 --- /dev/null +++ b/source/x11-extra/qlbar/qlbar-0.1.4-gcc4.patch @@ -0,0 +1,42 @@ +diff -aur qlbar-0.1.4/src/main.cc qlbar-0.1.4-2/src/main.cc +--- qlbar-0.1.4/src/main.cc 2008-08-13 13:08:24.000000000 -0500 ++++ qlbar-0.1.4-2/src/main.cc 2009-01-08 04:43:21.000000000 -0600 +@@ -1,4 +1,5 @@ + #include ++#include + #include + #include + +diff -aur qlbar-0.1.4/src/qlbar.cc qlbar-0.1.4-2/src/qlbar.cc +--- qlbar-0.1.4/src/qlbar.cc 2008-08-13 13:08:24.000000000 -0500 ++++ qlbar-0.1.4-2/src/qlbar.cc 2009-01-08 04:43:21.000000000 -0600 +@@ -1,7 +1,7 @@ + #include + #include + #include +- ++#include + #include "constants.h" + #include "qlbar.h" + +diff -aur qlbar-0.1.4/src/qlconf.cc qlbar-0.1.4-2/src/qlconf.cc +--- qlbar-0.1.4/src/qlconf.cc 2008-08-14 12:42:59.000000000 -0500 ++++ qlbar-0.1.4-2/src/qlconf.cc 2009-01-08 04:43:21.000000000 -0600 +@@ -1,6 +1,7 @@ + #include + #include + #include ++#include + #include + + #include "qlconf.h" +diff -aur qlbar-0.1.4/src/qlitem.cc qlbar-0.1.4-2/src/qlitem.cc +--- qlbar-0.1.4/src/qlitem.cc 2008-08-13 13:08:24.000000000 -0500 ++++ qlbar-0.1.4-2/src/qlitem.cc 2009-01-08 04:43:21.000000000 -0600 +@@ -1,4 +1,6 @@ + #include ++#include ++#include + #include + #include + #include From ryuo at frugalware.org Thu Jan 8 16:43:32 2009 From: ryuo at frugalware.org (James Buren) Date: Thu Jan 8 16:43:34 2009 Subject: [Frugalware-git] xcmenu: xcmenu.c Message-ID: <20090108154332.75CA611B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xcmenu.git;a=commitdiff;h=548aa1437f5bc98a924697ad7e942dabdd0cf932 commit 548aa1437f5bc98a924697ad7e942dabdd0cf932 Author: James Buren Date: Thu Jan 8 09:46:38 2009 -0600 xcmenu.c * add a check for image height and a way to determine the required height automatically diff --git a/xcmenu.c b/xcmenu.c index 4bbef3e..d354194 100644 --- a/xcmenu.c +++ b/xcmenu.c @@ -21,6 +21,7 @@ static char path[BUFFER]; static char theme[BUFFER]; static char themefile[BUFFER]; static config_t cfg; +static unsigned int hg; static cairo_surface_t *bg; static cairo_surface_t *le; static cairo_surface_t *re; @@ -81,6 +82,17 @@ static int filechk(const char *filename) return(TRUE); } +/* check if a png file's height is sane */ +static void chkhg(cairo_surface_t *png) +{ + unsigned int height; + height = cairo_image_surface_get_height(png); + if (!hg) + hg = height; + else if (hg!=height) + error("All theme images must be of the same height.",NULL); +} + /* wrap cairo calls for my own uses :D */ static void load_png(const char *png,cairo_surface_t **ptr) { @@ -130,6 +142,14 @@ static void parse_theme() load_png(selectedbackground,&stbg); load_png(selectedleftend,&stle); load_png(selectedrightend,&stre); + chkhg(bg); + chkhg(le); + chkhg(re); + chkhg(la); + chkhg(ra); + chkhg(stbg); + chkhg(stle); + chkhg(stre); config_destroy(&cfg); } From vmiklos at frugalware.org Thu Jan 8 16:51:34 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Jan 8 16:51:37 2009 Subject: [Frugalware-git] frugalware-current: lxml-2.1.5-1-i686 Message-ID: <20090108155134.85CC411B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=59f2c376c903a4afb8a36f8f43871341978a9d4d commit 59f2c376c903a4afb8a36f8f43871341978a9d4d Author: Miklos Vajna Date: Thu Jan 8 15:44:20 2009 +0100 lxml-2.1.5-1-i686 - version bump diff --git a/source/devel-extra/lxml/FrugalBuild b/source/devel-extra/lxml/FrugalBuild index cfde6dc..7db8461 100644 --- a/source/devel-extra/lxml/FrugalBuild +++ b/source/devel-extra/lxml/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Miklos Vajna pkgname=lxml -pkgver=2.1.4 -pkgrel=2 +pkgver=2.1.5 +pkgrel=1 pkgdesc="Easy-to-use library for working with XML and HTML in Python." url="http://codespeak.net/lxml/" depends=('python' 'libxslt') @@ -11,7 +11,7 @@ groups=('devel-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url |grep latest|sed 's/.*lxml \(.*\), .*/\1/;q'" source=(http://cheeseshop.python.org/packages/source/l/lxml/lxml-$pkgver.tar.gz) -sha1sums=('c2cbccaad4c0073955e4206f378ef597881e66fb') +sha1sums=('fa80e756e15bfcce3eb8551a36f950b00162190c') build() { From vmiklos at frugalware.org Thu Jan 8 16:51:34 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Jan 8 16:51:39 2009 Subject: [Frugalware-git] frugalware-current: php-pecl-xdebug-2.0.4-1-i686 Message-ID: <20090108155134.9A33011B8630@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=293e31443051afe76896902eddb748542ce1f8c3 commit 293e31443051afe76896902eddb748542ce1f8c3 Author: Miklos Vajna Date: Thu Jan 8 15:45:01 2009 +0100 php-pecl-xdebug-2.0.4-1-i686 - version bump - kudos go to boobaa, for fixing php so that this bump is now possible ;) diff --git a/source/devel-extra/php-pecl-xdebug/FrugalBuild b/source/devel-extra/php-pecl-xdebug/FrugalBuild index 4c7ce86..ce56917 100644 --- a/source/devel-extra/php-pecl-xdebug/FrugalBuild +++ b/source/devel-extra/php-pecl-xdebug/FrugalBuild @@ -2,10 +2,10 @@ # Maintainer: Miklos Vajna _F_pecl_name="xdebug" -pkgver=2.0.3 +pkgver=2.0.4 pkgdesc="Provides functions for function traces and profiling" depends=('php>=5.2.6') Finclude pecl -pkgrel=2 +pkgrel=1 archs=('i686' 'x86_64') -sha1sums=('fb172b0a48203759facd499f6825527c6112e275') +sha1sums=('6a6d8c9e8c84a8371fd7528b39d7960d936f6000') From vmiklos at frugalware.org Thu Jan 8 16:51:34 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Jan 8 16:51:39 2009 Subject: [Frugalware-git] frugalware-current: docs/ids: add tape/dialout groups Message-ID: <20090108155134.AE5D311B8631@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2b68b9eb140faae080cd6f1cb5ffa1469685935e commit 2b68b9eb140faae080cd6f1cb5ffa1469685935e Author: Miklos Vajna Date: Thu Jan 8 15:56:13 2009 +0100 docs/ids: add tape/dialout groups - these will be provided by the next shadow package and will be required by the next udev one diff --git a/docs/ids.txt b/docs/ids.txt index 207e131..f04e482 100644 --- a/docs/ids.txt +++ b/docs/ids.txt @@ -57,8 +57,8 @@ ID User Package Group Package 049 050 ftp shadow 051 telnetd shadow -052 -053 +052 tape shadow +053 dialout shadow 054 055 056 From vmiklos at frugalware.org Thu Jan 8 16:51:34 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Jan 8 16:51:40 2009 Subject: [Frugalware-git] frugalware-current: shadow-4.1.2.2-2-i686 Message-ID: <20090108155134.BF4CC11B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=aea8e6a9d547280d4196e9154e14826056393b1a commit aea8e6a9d547280d4196e9154e14826056393b1a Author: Miklos Vajna Date: Thu Jan 8 15:57:00 2009 +0100 shadow-4.1.2.2-2-i686 - add tape/dialout groups. these will be used by some exotic devices, so the list of default groups in adduser is untouched diff --git a/source/base/shadow/FrugalBuild b/source/base/shadow/FrugalBuild index 3a431ee..0696edb 100644 --- a/source/base/shadow/FrugalBuild +++ b/source/base/shadow/FrugalBuild @@ -3,7 +3,7 @@ pkgname=shadow pkgver=4.1.2.2 -pkgrel=1 +pkgrel=2 pkgdesc="Shadow password file utilities" url="http://pkg-shadow.alioth.debian.org/" pkgurl="ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow" diff --git a/source/base/shadow/group b/source/base/shadow/group index bf7fd7f..34c34d4 100644 --- a/source/base/shadow/group +++ b/source/base/shadow/group @@ -31,6 +31,8 @@ gdm::42: shadow::43: ftp::50: telnetd::51: +tape::52: +dialout::53: pop::90:pop nobody::98:nobody nogroup::99: diff --git a/source/base/shadow/shadow.install b/source/base/shadow/shadow.install index 4f07188..aab58da 100644 --- a/source/base/shadow/shadow.install +++ b/source/base/shadow/shadow.install @@ -1,3 +1,9 @@ +post_upgrade() +{ + getent group tape >/dev/null || /usr/sbin/groupadd -g 52 tape + getent group dialout >/dev/null || /usr/sbin/groupadd -g 53 dialout +} + post_remove() { # Remove the backup files From vmiklos at frugalware.org Thu Jan 8 16:51:34 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Jan 8 16:51:40 2009 Subject: [Frugalware-git] frugalware-current: udev-136-1-i686 Message-ID: <20090108155134.D355A11B887D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3a168601d2fee21272a60a7ee8f9abf632f0bdd5 commit 3a168601d2fee21272a60a7ee8f9abf632f0bdd5 Author: Miklos Vajna Date: Thu Jan 8 15:58:08 2009 +0100 udev-136-1-i686 - version bump diff --git a/source/base/udev/FrugalBuild b/source/base/udev/FrugalBuild index af3c181..7ae7eb4 100644 --- a/source/base/udev/FrugalBuild +++ b/source/base/udev/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Miklos Vajna pkgname=udev -pkgver=135 -pkgrel=2 +pkgver=136 +pkgrel=1 pkgdesc="A userspace implementation of devfs" url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/" backup=(etc/sysconfig/blacklist) From vmiklos at frugalware.org Thu Jan 8 16:51:34 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Jan 8 16:51:41 2009 Subject: [Frugalware-git] frugalware-current: rdiff-backup-1.2.5-1-i686 Message-ID: <20090108155134.F3BE611B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=25612c297ee536db0256282ecd2345fe820dfa41 commit 25612c297ee536db0256282ecd2345fe820dfa41 Author: Miklos Vajna Date: Thu Jan 8 16:12:58 2009 +0100 rdiff-backup-1.2.5-1-i686 - version bump diff --git a/source/apps-extra/rdiff-backup/FrugalBuild b/source/apps-extra/rdiff-backup/FrugalBuild index 85b6c81..f8fa814 100644 --- a/source/apps-extra/rdiff-backup/FrugalBuild +++ b/source/apps-extra/rdiff-backup/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Miklos Vajna pkgname=rdiff-backup -pkgver=1.2.4 +pkgver=1.2.5 pkgrel=1 pkgdesc="Backs up one directory to another, possibly over a network." url="http://www.nongnu.org/rdiff-backup/" @@ -12,4 +12,4 @@ archs=('i686' 'x86_64') up2date="lynx -dump $url|grep stable |sed 's/.*n \(.*\), r.*/\1/;q'" source=(http://savannah.nongnu.org/download/rdiff-backup/rdiff-backup-$pkgver.tar.gz) # optimization OK -sha1sums=('ff96ed9308eb96fb90f13b92dc84478e21a2a7ed') +sha1sums=('8cb52ca90faa0910a76a8d862096aabef3a3efc1') From vmiklos at frugalware.org Thu Jan 8 16:51:35 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Jan 8 16:51:41 2009 Subject: [Frugalware-git] frugalware-current: bind-9.6.0-2-i686 Message-ID: <20090108155135.19AF311B8630@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b10c6d4b7d75c87ded6b4e1ca08bf0b3dab20eed commit b10c6d4b7d75c87ded6b4e1ca08bf0b3dab20eed Author: Miklos Vajna Date: Thu Jan 8 16:51:15 2009 +0100 bind-9.6.0-2-i686 - version bump diff --git a/source/network/bind/FrugalBuild b/source/network/bind/FrugalBuild index e250dee..f366fda 100644 --- a/source/network/bind/FrugalBuild +++ b/source/network/bind/FrugalBuild @@ -3,8 +3,8 @@ pkgname=bind pkgver=9.6.0 -pkgextraver= -pkgrel=1 +pkgextraver=-P1 +pkgrel=2 pkgdesc="DNS server and utilities" url="http://www.isc.org/index.pl?/sw/bind/" backup=(etc/named.conf etc/logrotate.d/named) From ryuo at frugalware.org Thu Jan 8 17:03:17 2009 From: ryuo at frugalware.org (James Buren) Date: Thu Jan 8 17:03:19 2009 Subject: [Frugalware-git] xcmenu: xcmenu.c Message-ID: <20090108160317.B428311B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xcmenu.git;a=commitdiff;h=41c1386f97ba668ec9bb1bee3f0dde027bae08d0 commit 41c1386f97ba668ec9bb1bee3f0dde027bae08d0 Author: James Buren Date: Thu Jan 8 10:06:40 2009 -0600 xcmenu.c * add additional information for when a parsing error occurs diff --git a/xcmenu.c b/xcmenu.c index d354194..0d24018 100644 --- a/xcmenu.c +++ b/xcmenu.c @@ -109,7 +109,11 @@ static void parse_theme() char selectedrightend[BUFFER]; config_init(&cfg); if (!config_read_file(&cfg,themefile)) - error("Failed to parse theme file.",NULL); + { + char buffer[BUFFER]; + snprintf(buffer,sizeof(buffer),"Failed to parse theme file: %s at line %d",config_error_text(&cfg),config_error_line(&cfg)); + error(buffer,NULL); + } snprintf(background,sizeof(background),"%s%s",theme,config_lookup_string(&cfg,"theme.background")); snprintf(leftend,sizeof(leftend),"%s%s",theme,config_lookup_string(&cfg,"theme.leftend")); snprintf(rightend,sizeof(rightend),"%s%s",theme,config_lookup_string(&cfg,"theme.rightend")); From bouleetbil at frogdev.info Thu Jan 8 21:18:10 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Thu Jan 8 21:18:13 2009 Subject: [Frugalware-git] frugalware-current: vala-0.5.4-1-i686 Message-ID: <20090108201810.8549811B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7cefbcaacb8a07c58e48d7c61005a320e2425273 commit 7cefbcaacb8a07c58e48d7c61005a320e2425273 Author: bouleetbil Date: Thu Jan 8 21:11:41 2009 +0100 vala-0.5.4-1-i686 *version bump diff --git a/source/devel-extra/vala/FrugalBuild b/source/devel-extra/vala/FrugalBuild index ab0ad16..ce5baae 100644 --- a/source/devel-extra/vala/FrugalBuild +++ b/source/devel-extra/vala/FrugalBuild @@ -3,15 +3,15 @@ # Contributor: jedifox pkgname=vala -pkgver=0.5.3 -pkgrel=2 +pkgver=0.5.4 +pkgrel=1 pkgdesc="Vala is a prgramming language that aims to bring modern programming language features to GNOME developers" depends=('glib2>=2.18.3') groups=('devel-extra') archs=('i686' 'x86_64') _F_gnome_devel="y" Finclude gnome -sha1sums=('f10872d207b61d82a79a2e2bfdfbc1a7b92ec435') +sha1sums=('049f13bab0fed25bfe71cc3af23d68a256e8fb29') Fconfopts="${Fconfopts[@]} --enable-vapigen" # optimization OK From bouleetbil at frogdev.info Thu Jan 8 22:39:45 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Thu Jan 8 22:39:47 2009 Subject: [Frugalware-git] bouleetbiltesting: pulseaudio-0.9.13-7-i686 Message-ID: <20090108213945.EB55F11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbiltesting.git;a=commitdiff;h=62ec1250a3d4492916cc7801cf4be2b58ca4623e commit 62ec1250a3d4492916cc7801cf4be2b58ca4623e Author: bouleetbil Date: Thu Jan 8 22:31:14 2009 +0100 pulseaudio-0.9.13-7-i686 *change the gid group new shadow have the same gid diff --git a/source/multimedia/pulseaudio/FrugalBuild b/source/multimedia/pulseaudio/FrugalBuild index 54a8f7c..038bf33 100644 --- a/source/multimedia/pulseaudio/FrugalBuild +++ b/source/multimedia/pulseaudio/FrugalBuild @@ -3,7 +3,7 @@ pkgname=pulseaudio pkgver=0.9.13 -pkgrel=6 +pkgrel=7 pkgdesc="PulseAudio is a sound server with an advanced plugin system" url="http://pulseaudio.org/" depends=('speex' 'liboil' 'audiofile' 'libsndfile' 'libtool' 'libatomic_ops' 'libsamplerate' 'flac' 'glib2' \ diff --git a/source/multimedia/pulseaudio/pulseaudio.install b/source/multimedia/pulseaudio/pulseaudio.install index 8b7dad1..c456e0b 100644 --- a/source/multimedia/pulseaudio/pulseaudio.install +++ b/source/multimedia/pulseaudio/pulseaudio.install @@ -1,11 +1,11 @@ post_install() { if ! grep -q 'realtime' /etc/group; then #create groups - /usr/sbin/groupadd -g 52 realtime 2>/dev/null - /usr/sbin/groupadd -g 53 pulse-access 2>/dev/null - /usr/sbin/groupadd -g 54 pulse 2>/dev/null + /usr/sbin/groupadd -g 57 realtime 2>/dev/null + /usr/sbin/groupadd -g 58 pulse-access 2>/dev/null + /usr/sbin/groupadd -g 59 pulse 2>/dev/null #create user - /usr/sbin/useradd -s /bin/false -c "daemon system user pulseaudio" -d /var/run/pulse -u 54 -g pulse pulse 2>/dev/null + /usr/sbin/useradd -s /bin/false -c "daemon system user pulseaudio" -d /var/run/pulse -u 59 -g pulse pulse 2>/dev/null fi # Create the state directory mkdir -p /var/run/pulse @@ -21,11 +21,11 @@ post_upgrade() { if ! grep -q 'realtime' /etc/group; then #create groups - /usr/sbin/groupadd -g 52 realtime 2>/dev/null - /usr/sbin/groupadd -g 53 pulse-access 2>/dev/null - /usr/sbin/groupadd -g 54 pulse 2>/dev/null + /usr/sbin/groupadd -g 57 realtime 2>/dev/null + /usr/sbin/groupadd -g 58 pulse-access 2>/dev/null + /usr/sbin/groupadd -g 59 pulse 2>/dev/null #create user - /usr/sbin/useradd -s /bin/false -c "daemon system user pulseaudio" -d /var/run/pulse -u 54 -g pulse pulse 2>/dev/null + /usr/sbin/useradd -s /bin/false -c "daemon system user pulseaudio" -d /var/run/pulse -u 59 -g pulse pulse 2>/dev/null fi # Create the state directory mkdir -p /var/run/pulse From bouleetbil at frogdev.info Thu Jan 8 22:45:28 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Thu Jan 8 22:45:30 2009 Subject: [Frugalware-git] bouleetbiltesting: abiword-2.6.5-1-i686 Message-ID: <20090108214528.8BDD211B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbiltesting.git;a=commitdiff;h=832829e074063d856dfe213504949d6aa8cbf00f commit 832829e074063d856dfe213504949d6aa8cbf00f Author: bouleetbil Date: Thu Jan 8 22:36:11 2009 +0100 abiword-2.6.5-1-i686 *version bump *moved to xapp-extra (disable gnome print support) *added abiword-gnome for print *added subkpg plugins diff --git a/source/xapps-extra/abiword/FrugalBuild b/source/xapps-extra/abiword/FrugalBuild new file mode 100644 index 0000000..c7961be --- /dev/null +++ b/source/xapps-extra/abiword/FrugalBuild @@ -0,0 +1,97 @@ +# Compiling Time: 2.82 SBU +# Maintainer: Christian Hamar alias krix + +pkgname=abiword +pkgver=2.6.5 +#for now same version +pkgverplugin=2.6.5 +abivers=2.6 +pkgrel=1 +pkgdesc="AbiWord is a free word processing program similar to Microsoft(R) Word." +url="http://www.abisource.com" +groups=('xapps-extra') +archs=('i686' 'x86_64') +depends=('pango' 'libpng' 'fontconfig' 'freetype2' 'libxft' \ + 'enchant' 'perl' 'fribidi' 'wv' 'atk' 'cairo' 'libxau' 'libxdmcp' \ + 'libsm' 'libxdamage' 'libxinerama' 'libxi' 'libxrandr' \ + 'libxcursor' 'openssl' 'libjpeg' 'libglade') +makedepends=('libgnomeprintui' 'goffice' 'boost'\ + 'libgda' 'libgnomedb' 'loudmouth' 'gtkmathview') +options=('scriptlet') +_F_gnome_desktop="y" +_F_gnome_mime="y" +Finclude gnome-scriptlet +up2date="lynx -dump http://www.abisource.com/|grep -m1 'stable release is'|tr -d '[:alpha:] [:blank:]' |sed 's/\(.*\)./\1/;s/.//6'" +source=($url/downloads/$pkgname/$pkgver/source/$pkgname-$pkgver.tar.gz \ + $url/downloads/abiword/$pkgver/source/abiword-plugins-$pkgverplugin.tar.gz ) +sha1sums=('f848e82bcda6b0ece5ce206b516a475af9aa5fa7' \ + '2572bdfe0d19390ff839310102cef75802ba7fa8') +license="GPL2" +conflicts=('abiword-gnome') + +subpkgs=("abiword-gnome" "abiword-plugins-gnome" "abiword-plugins" "abiword-plugins-mathview" "abiword-plugins-xmmp") +subconflicts=('abiword' '' '' '' '') +subprovides=('abiword' '' '' '' '') +subdescs=('Abiword with gnome printing support' 'Abiword gnome plugins' 'Abiword plugins' \ + 'Abiword plugins mathview' 'Abiword plugins xmmp') +subdepends=("pango libpng fontconfig freetype2 libxft \ + enchant perl fribidi wv atk cairo libxau libxdmcp \ + libsm libxdamage libxinerama libxi libxrandr \ + libxcursor openssl libjpeg libglade libgnomeprintui goffice" \ + "abiword-gnome libgnomedb libgda" "abiword" \ + "abiword gtkmathview" "abiword loudmouth") +subgroups=('gnome-extra' 'gnome-extra' 'xlib-extra' 'xlib-extra' 'xlib-extra') +subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64') +subinstall=("$_F_gnome_scriptlet" "" "" "" "") + +#Todo +#When we bump it verify if abiscan is already broken +#If not add it to abiword-plugin-gnome + +build() { + unset MAKEFLAGS + + #first build plugins + Fcd + cd ../abiword-plugins-$pkgverplugin || Fdie + #plugin abiscan broken with new 'gnome-scan' + Fbuild --with-abiword=../abiword-$pkgver -disable-abiscan + + #gnome plugins + Fsplit abiword-plugins-gnome /usr/lib/abiword-$abivers/plugins/libLoadBindings* + Fsplit abiword-plugins-gnome /usr/lib/abiword-$abivers/plugins/libAbiCommand* + Fsplit abiword-plugins-gnome /usr/lib/abiword-$abivers/plugins/libPresentation* + + Fsplit abiword-plugins-xmmp /usr/lib/abiword-$abivers/plugins/libAbiCollab* + + Fsplit abiword-plugins-mathview /usr/lib/abiword-$abivers/plugins/libAbiMathView* + + #plugins don't depend gnome* + Fsplit abiword-plugins /usr + + #build abiword + cd ../$pkgname-$pkgver || Fdie + Fsed 'icondir = $(datadir)/icons' 'icondir = $(datadir)/pixmaps' GNUmakefile.in + Fmake --enable-libabiword \ + --enable-threads \ + --enable-scripting \ + --enable-printing --enable-gucharmap + Fmakeinstall + Fsplit abiword-gnome /usr + Fbuild_gnome_scriptlet + + make clean + #broken configure + Fsed "print=true" "print=false" configure + Fmake --enable-libabiword \ + --enable-threads \ + --enable-scripting \ + --disable-embedded \ + --disable-printing --disable-gucharmap \ + --disable-gnomevfs --disable-gnomeui + Fmakeinstall + Fbuild_gnome_scriptlet + +} + +# optimization OK From vmiklos at frugalware.org Fri Jan 9 05:02:42 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Jan 9 05:02:44 2009 Subject: [Frugalware-git] frugalware-current: openssl-0.9.8-16-i686 Message-ID: <20090109040242.69C3411B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1680c094ecab738d73707a5fde57aa4e5c34aa3f commit 1680c094ecab738d73707a5fde57aa4e5c34aa3f Author: Miklos Vajna Date: Fri Jan 9 05:02:25 2009 +0100 openssl-0.9.8-16-i686 - bump to patchlevel 'j' - closes #3557 diff --git a/source/base/openssl/FrugalBuild b/source/base/openssl/FrugalBuild index 7c7e89b..fe7db31 100644 --- a/source/base/openssl/FrugalBuild +++ b/source/base/openssl/FrugalBuild @@ -4,8 +4,8 @@ pkgname=openssl pkgver=0.9.8 -pkgextraver=i -pkgrel=15 +pkgextraver=j +pkgrel=16 pkgdesc="The Open Source toolkit for Secure Sockets Layer and Transport Layer Security" url="http://www.openssl.org/source/" groups=('base' 'chroot-core') From vmiklos at frugalware.org Fri Jan 9 05:28:00 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Jan 9 05:28:01 2009 Subject: [Frugalware-git] frugalware-current: tablaunch-0.6-1-x86_64 Message-ID: <20090109042800.18AB011B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9d8b05216f7d01adbfc8b0be94d642690a616835 commit 9d8b05216f7d01adbfc8b0be94d642690a616835 Author: Miklos Vajna Date: Fri Jan 9 05:27:49 2009 +0100 tablaunch-0.6-1-x86_64 added x86_64 to archs() diff --git a/source/x11-extra/tablaunch/FrugalBuild b/source/x11-extra/tablaunch/FrugalBuild index d4e08aa..e3c31ca 100644 --- a/source/x11-extra/tablaunch/FrugalBuild +++ b/source/x11-extra/tablaunch/FrugalBuild @@ -11,7 +11,7 @@ conflicts=('yeahlaunch') replaces=('yeahlaunch') provides=('yeahlaunch') groups=('x11-extra') -archs=('i686') +archs=('i686' 'x86_64') sha1sums=('813560c0df658ba4a0f6daa135bfd60011bedd24') _F_cd_path="$pkgname-$pkgver/src" From vmiklos at frugalware.org Fri Jan 9 05:33:21 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Jan 9 05:33:22 2009 Subject: [Frugalware-git] frugalware-current: proftpd-1.3.1-7-i686 Message-ID: <20090109043321.7131711B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=cf55a8714a562951e7fe14b8d7c4d78e6661468d commit cf55a8714a562951e7fe14b8d7c4d78e6661468d Author: Miklos Vajna Date: Fri Jan 9 05:31:44 2009 +0100 proftpd-1.3.1-7-i686 - rebuilt with openssl - up2date fix diff --git a/source/network/proftpd/FrugalBuild b/source/network/proftpd/FrugalBuild index bcf9a8f..7410475 100644 --- a/source/network/proftpd/FrugalBuild +++ b/source/network/proftpd/FrugalBuild @@ -5,15 +5,16 @@ pkgname=proftpd pkgver=1.3.1 pkgextraver= -pkgrel=6 +pkgrel=7 pkgdesc="Highly configurable GPL-licensed FTP server software" url="http://www.proftpd.org/" groups=('network') archs=('i686' 'x86_64') -depends=('ncurses' 'libmysqlclient' 'openssl=0.9.8-15') +depends=('ncurses' 'libmysqlclient' 'openssl=0.9.8-16') makedepends=('tcp_wrappers' 'mysql') backup=(etc/{proftpd.conf,ftpusers}) -up2date="lynx -dump $url | Flasttar" +_F_archive_grepv="rc[0-9]" +up2date="Flasttar $url" source=(ftp://ftp.proftpd.org/distrib/source/$pkgname-$pkgver$pkgextraver.tar.bz2 \ rc.proftpd proftpd.conf ftpusers compile.patch CVE-2008-4242.diff) signatures=($source.asc '' '' '' '' '') From ryuo at frugalware.org Fri Jan 9 06:48:05 2009 From: ryuo at frugalware.org (James Buren) Date: Fri Jan 9 06:48:07 2009 Subject: [Frugalware-git] frugalware-current: qlbar-0.1.4-2-i686 Message-ID: <20090109054805.30C6E11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7f2531f37b11d6833818cde8137384ee2bf0578c commit 7f2531f37b11d6833818cde8137384ee2bf0578c Author: James Buren Date: Thu Jan 8 23:50:44 2009 -0600 qlbar-0.1.4-2-i686 * adjust default config file font path * correct config file location diff --git a/source/x11-extra/qlbar/FrugalBuild b/source/x11-extra/qlbar/FrugalBuild index 48fd295..433addd 100644 --- a/source/x11-extra/qlbar/FrugalBuild +++ b/source/x11-extra/qlbar/FrugalBuild @@ -3,7 +3,7 @@ pkgname=qlbar pkgver=0.1.4 -pkgrel=1 +pkgrel=2 pkgdesc="$pkgname is a toolbar launcher for X11." url="http://prokop.ae.krakow.pl/projects/$pkgname.html" depends=('libx11' 'imlib2' 'libstdc++') @@ -22,7 +22,9 @@ build() Fexerel src/$pkgname /usr/bin/$pkgname Fmanrel man/$pkgname.8 Fdocrel man/$pkgname{.pdf,.dvi,\_man.html} - Ffilerel conf/* /usr/share/$pkgname-$pkgver/example + # change default font path in the config file + Fsed "/usr/X11/lib/X11/fonts/TTF" "/usr/lib/X11/fonts/TTF" + Ffilerel conf/* /usr/share/doc/$pkgname-$pkgver/example } # optimization OK From vmiklos at frugalware.org Fri Jan 9 17:20:21 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Jan 9 17:20:22 2009 Subject: [Frugalware-git] frugalware-current: mpd-0.14-2-i686 Message-ID: <20090109162021.045FE11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6c9783be87ca974a804726de5b71bd3ad62ce669 commit 6c9783be87ca974a804726de5b71bd3ad62ce669 Author: Miklos Vajna Date: Fri Jan 9 17:20:00 2009 +0100 mpd-0.14-2-i686 - fix broken rc_status() diff --git a/source/multimedia/mpd/FrugalBuild b/source/multimedia/mpd/FrugalBuild index a6af859..60ea699 100644 --- a/source/multimedia/mpd/FrugalBuild +++ b/source/multimedia/mpd/FrugalBuild @@ -3,7 +3,7 @@ pkgname=mpd pkgver=0.14 -pkgrel=1 +pkgrel=2 pkgdesc="the Music Player Daemon" _F_sourceforge_dirname="musicpd" _F_sourceforge_ext=".tar.bz2" @@ -17,7 +17,7 @@ archs=('i686' 'x86_64') up2date="Flasttar $url" source=($source rc.mpd rc.mpd-hu.po) sha1sums=('e9de568ffd9c1d414ffaca6f84671891bfe03158' \ - '030b26c9c77ff862af13086e8099aa8ffe4454a6' \ + '794436bf1041023f903c0b908ed0da161c276595' \ 'b5813f55e9e895d977b869c77667daa85c303e57') build() diff --git a/source/multimedia/mpd/rc.mpd b/source/multimedia/mpd/rc.mpd index 15b6954..1c2fb1b 100644 --- a/source/multimedia/mpd/rc.mpd +++ b/source/multimedia/mpd/rc.mpd @@ -14,7 +14,7 @@ TEXTDOMAIN=mpd actions=(restart start status stop update) daemon=$"Music Player Daemon" -pid="$(pidof mpd 2> /dev/null)" +pid="pidof mpd 2> /dev/null" rc_start() { From vmiklos at frugalware.org Fri Jan 9 19:58:44 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Jan 9 19:58:46 2009 Subject: [Frugalware-git] frugalware-current: mpd-0.14-3-i686 Message-ID: <20090109185844.A64BC11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9abf9a3b0d9a99043b7483810f9f1d71e227c772 commit 9abf9a3b0d9a99043b7483810f9f1d71e227c772 Author: Miklos Vajna Date: Fri Jan 9 19:57:59 2009 +0100 mpd-0.14-3-i686 - blah, my rc_status() fix broke rc_start() and rc_stop(). this really should fix it now. - thanks priyank for pointint it out. diff --git a/source/multimedia/mpd/FrugalBuild b/source/multimedia/mpd/FrugalBuild index 60ea699..e5a0a6b 100644 --- a/source/multimedia/mpd/FrugalBuild +++ b/source/multimedia/mpd/FrugalBuild @@ -3,7 +3,7 @@ pkgname=mpd pkgver=0.14 -pkgrel=2 +pkgrel=3 pkgdesc="the Music Player Daemon" _F_sourceforge_dirname="musicpd" _F_sourceforge_ext=".tar.bz2" @@ -17,7 +17,7 @@ archs=('i686' 'x86_64') up2date="Flasttar $url" source=($source rc.mpd rc.mpd-hu.po) sha1sums=('e9de568ffd9c1d414ffaca6f84671891bfe03158' \ - '794436bf1041023f903c0b908ed0da161c276595' \ + '729f3b2ee9e8003343c8df49394e1c5762dae5ce' \ 'b5813f55e9e895d977b869c77667daa85c303e57') build() diff --git a/source/multimedia/mpd/rc.mpd b/source/multimedia/mpd/rc.mpd index 1c2fb1b..81e0317 100644 --- a/source/multimedia/mpd/rc.mpd +++ b/source/multimedia/mpd/rc.mpd @@ -1,7 +1,7 @@ #!/bin/bash # (c) 2005 Marcus Habermehl -# (c) 2005 Miklos Vajna +# (c) 2005, 2009 Miklos Vajna # rc.mpd for Frugalware # distributed under GPL License @@ -19,7 +19,7 @@ pid="pidof mpd 2> /dev/null" rc_start() { start_msg - if [ -z ${pid} ] ; then + if [ -z "$(eval $pid)" ]; then mpd /etc/mpd.conf > /dev/null ok $? else @@ -30,8 +30,8 @@ rc_start() rc_stop() { stop_msg - if [ ! -z ${pid} ] ; then - killall mpd + if [ -n "$(eval $pid)" ]; then + kill "$(eval $pid)" ok $? else ok 999 @@ -46,5 +46,3 @@ rc_update() } rc_exec $1 - -# vim: ft=sh From vmiklos at frugalware.org Fri Jan 9 22:08:03 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Jan 9 22:08:05 2009 Subject: [Frugalware-git] frugalware: update to 1.0pre2 Message-ID: <20090109210803.5A25F11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware.git;a=commitdiff;h=bd11ff59bf78e284d0c44da20190d814373edfd9 commit bd11ff59bf78e284d0c44da20190d814373edfd9 Author: Miklos Vajna Date: Fri Jan 9 22:07:59 2009 +0100 update to 1.0pre2 diff --git a/Makefile b/Makefile index 61971ac..1b42935 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # Makefile for frugalware # -# Copyright (C) 2007, 2008 Miklos Vajna +# Copyright (C) 2007, 2008, 2009 Miklos Vajna # # 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 @@ -16,7 +16,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -VERSION = 1.0pre1 +VERSION = 1.0pre2 CODENAME = Anacreon FRUGALWARE_LANGS = de hu it From vmiklos at frugalware.org Fri Jan 9 22:09:27 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Jan 9 22:09:28 2009 Subject: [Frugalware-git] frugalware-current: frugalware-1.0pre2-1-i686 Message-ID: <20090109210927.CC18811B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6c212c93b9c2f74dbe86a180e298f40522b82800 commit 6c212c93b9c2f74dbe86a180e298f40522b82800 Author: Miklos Vajna Date: Fri Jan 9 22:09:11 2009 +0100 frugalware-1.0pre2-1-i686 - version bump diff --git a/source/base/frugalware/FrugalBuild b/source/base/frugalware/FrugalBuild index fae228f..9909a60 100644 --- a/source/base/frugalware/FrugalBuild +++ b/source/base/frugalware/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Miklos Vajna pkgname=frugalware -pkgver=1.0pre1 +pkgver=1.0pre2 pkgrel=1 pkgdesc="Basic Frugalware Linux filesystem package" url="http://ftp.frugalware.org/pub/other/frugalware/" From vmiklos at frugalware.org Fri Jan 9 22:12:37 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Jan 9 22:12:38 2009 Subject: [Frugalware-git] setup: updates for 0.9.7 Message-ID: <20090109211237.7B14411B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=setup.git;a=commitdiff;h=3b06b84fbcdd81a02acf1c63c97ca9c5d24659d8 commit 3b06b84fbcdd81a02acf1c63c97ca9c5d24659d8 Author: Miklos Vajna Date: Fri Jan 9 22:12:29 2009 +0100 updates for 0.9.7 diff --git a/NEWS b/NEWS index bb29211..101d03b 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,6 @@ VERSION DESCRIPTION ----------------------------------------------------------------------------- +0.9.7 - documentation/help improvements, no code changes 0.9.6 - fixed cd/dvd seach on eee pc - initial ppc support 0.9.5 - add back libparted support which was removed accidently diff --git a/configure b/configure index 9477087..83fa1e5 100755 --- a/configure +++ b/configure @@ -20,7 +20,7 @@ elif os.uname()[-1] == 'ppc': packages.extend(['mac-fdisk']) # when releasing a new setup, please update this. -version = "0.9.6" +version = "0.9.7" # parse our options parser = OptionParser(version="configure for Frugalware Setup v%s" % (version)) From vmiklos at frugalware.org Fri Jan 9 22:16:18 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Jan 9 22:16:19 2009 Subject: [Frugalware-git] frugalware-current: fwsetup-0.9.7-1-i686 Message-ID: <20090109211618.E617911B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b654a90cc42082ae764f9e9a01e0907ea00e0804 commit b654a90cc42082ae764f9e9a01e0907ea00e0804 Author: Miklos Vajna Date: Fri Jan 9 22:16:04 2009 +0100 fwsetup-0.9.7-1-i686 - version bump - updated depends, up2date cleanup diff --git a/source/devel-extra/fwsetup/FrugalBuild b/source/devel-extra/fwsetup/FrugalBuild index 0ad610a..acbc132 100644 --- a/source/devel-extra/fwsetup/FrugalBuild +++ b/source/devel-extra/fwsetup/FrugalBuild @@ -4,14 +4,14 @@ USE_DEVEL=${USE_DEVEL:-"n"} pkgname=fwsetup -pkgver=0.9.6 +pkgver=0.9.7 Fuse $USE_DEVEL && pkgver=0.8.8.9.gd348556 -pkgrel=3 +pkgrel=1 pkgdesc="Frugalware Setup" url="http://ftp.frugalware.org/pub/other/setup/" depends=() makedepends=('dialog' 'parted' 'pacman-g2>=3.5.5' 'module-init-tools' \ - 'frugalware>=1.0pre1' 'busybox>=1.12.1-2') + 'frugalware>=1.0pre2' 'busybox>=1.12.1-2') if [ "$CARCH" != "ppc" ]; then Fconfopts="$Fconfopts --enable-tftp" makedepends=(${makedepends[@]} 'grub') @@ -21,7 +21,7 @@ fi groups=('devel-extra') archs=('i686' 'x86_64' 'ppc') _F_archive_nosort=y -up2date="lynx -dump $url/releases/ |Flasttar" +up2date="Flasttar $url/releases" if ! Fuse $USE_DEVEL; then source=($url/releases/$pkgname-$pkgver.tar.gz) signatures=("$source.asc") From vmiklos at frugalware.org Sat Jan 10 03:20:17 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Jan 10 03:20:18 2009 Subject: [Frugalware-git] frugalware-current: TAG 1.0pre2 Message-ID: <20090110022017.151C211B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=74d7b6e2337b714d89901353a2a17d323ec0d4ce commit 74d7b6e2337b714d89901353a2a17d323ec0d4ce Author: Miklos Vajna Date: Sat Jan 10 03:20:12 2009 +0100 TAG 1.0pre2 From priyank at frugalware.org Sat Jan 10 08:55:45 2009 From: priyank at frugalware.org (Priyank) Date: Sat Jan 10 08:55:48 2009 Subject: [Frugalware-git] gservice: Services can now be started/stopped Message-ID: <20090110075545.DD35411B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gservice.git;a=commitdiff;h=d18fa82ae32be56235c3a165518c99d80411bd4c commit d18fa82ae32be56235c3a165518c99d80411bd4c Author: Priyank Date: Sat Jan 10 13:24:58 2009 +0530 Services can now be started/stopped diff --git a/src/gservice-about.c b/src/gservice-about.c index 13e2181..2a05650 100644 --- a/src/gservice-about.c +++ b/src/gservice-about.c @@ -1,5 +1,5 @@ /* - * gservice-about.c for gservice + * gservice-about.c for gService * * Copyright (C) 2008-2009 by Priyank Gosalia * diff --git a/src/gservice-backend.c b/src/gservice-backend.c index c3ccfcf..4be3f43 100644 --- a/src/gservice-backend.c +++ b/src/gservice-backend.c @@ -308,6 +308,42 @@ gsvc_glist_to_string (GList *list) return ret; } +/* strips ON/OFF/FAILED from a cmd line output */ +gchar * +gsvc_strip_service_status (const char *line) +{ + char *temp = NULL; + char *ptr = NULL; + char *ret = NULL; + + temp = g_strdup (line); + ptr = g_strdup (g_strstrip(g_strcanon(line,"ON",' '))); + if (!strcmp(ptr,"ON")) + { + ret = g_strdup (ptr); + g_free (temp); + return ret; + } + temp = g_strdup (line); + ptr = g_strdup (g_strstrip(g_strcanon(line,"OFF",' '))); + if (!strcmp(ptr,"OFF")) + { + ret = g_strdup (ptr); + g_free (temp); + return ret; + } + temp = g_strdup (line); + ptr = g_strdup (g_strstrip(g_strcanon(line,"FAILED",' '))); + if (!strcmp(ptr,"FAILED")) + { + ret = g_strdup (ptr); + g_free (temp); + return ret; + } + + return ret; +} + /* returns the status of service GSVC_ON or GSVC_OFF */ /* returns GSVC_ERR if status not supported */ gint @@ -318,23 +354,83 @@ gsvc_get_service_status (const char *name) char line[PATH_MAX+1]; char *tmp = NULL; gint ret; + gint status = -1; + /* some special services that shouldn't be touched */ + if (!strcmp(name,"reboot")) + { + return GSVC_OFF; + } + else + if (!strcmp(name,"halt")) + { + return GSVC_OFF; + } + else + if (!strcmp(name,"single")) + { + return GSVC_OFF; + } + else + if (!strcmp(name,"splash")) + { + return GSVC_OFF; + } + else + if (!strcmp(name,"zz-splash")) + { + return GSVC_OFF; + } + else + if (!strcmp(name,"random")) + { + return GSVC_ON; + } + else + if (!strcmp(name,"keymap")) + { + return GSVC_ON; + } + else + if (!strcmp(name,"sysctl")) + { + return GSVC_ON; + } + else + if (!strcmp(name,"rmount")) + { + return GSVC_OFF; + } cmd = g_strdup_printf ("service %s status", name); g_print ("%s\n", cmd); - pp = popen (cmd, "r"); - fgets (line, PATH_MAX, pp); - printf ("%s\n", line); - tmp = strtok (line, "["); - tmp = strtok (NULL, "["); + status = system (cmd); + g_free (cmd); + switch (status) + { + case 0: ret = GSVC_ON; + break; + case 1: ret = GSVC_OFF; + break; + case -1: ret = GSVC_ERR; + default: ret = GSVC_OFF; + } + //pp = popen (cmd, "r"); + //fgets (line, PATH_MAX, pp); + //printf ("LINE: %s\n", line); + //tmp = gsvc_strip_service_status (line); + //g_print ("PTR: %s\n", tmp); + + /* + con: if (tmp != NULL) { g_print ("scanning service %s\n", name); - g_strstrip (tmp); + //g_strstrip (tmp); printf ("%s: %s\n", name, tmp); if (!strcmp(tmp,"ON")) { ret = GSVC_ON; - g_print ("%s is ON\n", name); + g_print ("%s is ON\n", name); } else if (!strcmp(tmp,"OFF")) @@ -342,14 +438,76 @@ gsvc_get_service_status (const char *name) else if (!strcmp(tmp,"FAILED")) ret = GSVC_ERR; + else + ret = GSVC_ERR; } else { ret = GSVC_ERR; } - g_free (cmd); + pclose (pp); + */ return ret; } +char * +gsvc_service_start (const char *service, int *retval) +{ + FILE *pp = NULL; + char *cmd = NULL; + char line[PATH_MAX+1] = ""; + char *ret = NULL; + + if (!service) + { + return NULL; + } + GString *string = g_string_new (""); + cmd = g_strdup_printf ("service %s start", service); + pp = popen (cmd, "r"); + while (fgets (line,PATH_MAX,pp)) + { + string = g_string_append (string, line); + } + if (retval) + { + *retval = gsvc_get_service_status (service); + } + ret = g_strdup (string->str); + g_string_free (string, TRUE); + + return ret; +} + +char * +gsvc_service_stop (const char *service, int *retval) +{ + FILE *pp = NULL; + char *cmd = NULL; + char line[PATH_MAX+1] = ""; + char *ret = NULL; + + if (!service) + { + return NULL; + } + GString *string = g_string_new (""); + cmd = g_strdup_printf ("service %s stop", service); + pp = popen (cmd, "r"); + while (fgets (line,PATH_MAX,pp)) + { + string = g_string_append (string, line); + } + if (retval) + { + *retval = gsvc_get_service_status (service); + } + ret = g_strdup (string->str); + g_string_free (string, TRUE); + + return ret; +} + + diff --git a/src/gservice-backend.h b/src/gservice-backend.h index 1054587..c7aa7fe 100644 --- a/src/gservice-backend.h +++ b/src/gservice-backend.h @@ -27,5 +27,13 @@ char *gsvc_glist_to_string (GList *list); /* returns the status of service GSVC_ON or GSVC_OFF */ gint gsvc_get_service_status (const char *name); +/* starts a service and return the output of the service command */ +/* return value of the service command is specified in retval */ +char * gsvc_service_start (const char *service, int *retval); + +/* stops a service and return the output of the service command */ +/* return value of the service command is specified in retval */ +char * gsvc_service_stop (const char *service, int *retval); + #endif diff --git a/src/gservice-interface.c b/src/gservice-interface.c index 71acd89..6421717 100644 --- a/src/gservice-interface.c +++ b/src/gservice-interface.c @@ -44,6 +44,8 @@ static void cb_gsvc_r3_toggled (GtkCellRendererToggle *toggle, gchar *path_str, static void cb_gsvc_r4_toggled (GtkCellRendererToggle *toggle, gchar *path_str, gpointer data); static void cb_gsvc_r5_toggled (GtkCellRendererToggle *toggle, gchar *path_str, gpointer data); static void cb_gsvc_r6_toggled (GtkCellRendererToggle *toggle, gchar *path_str, gpointer data); +static void cb_gsvc_button_start_clicked (GtkButton *button, gpointer data); +static void cb_gsvc_button_stop_clicked (GtkButton *button, gpointer data); static void cb_gsvc_service_selected (GtkTreeSelection *selection, gpointer data); static GtkWidget * @@ -73,7 +75,7 @@ gservice_setup_treeview (void) GtkTreeSelection *selection = NULL; GtkTreeViewColumn *column = NULL; - store = gtk_list_store_new (10, + store = gtk_list_store_new (11, GDK_TYPE_PIXBUF, /* status icon */ G_TYPE_STRING, /* service name & description */ G_TYPE_INT, /* runlevel 0 */ @@ -83,7 +85,8 @@ gservice_setup_treeview (void) G_TYPE_INT, /* runlevel 4 */ G_TYPE_INT, /* runlevel 5 */ G_TYPE_INT, /* runlevel 6 */ - G_TYPE_BOOLEAN); /* status */ + G_TYPE_BOOLEAN, /* status */ + G_TYPE_STRING); /* service name for internal use */ renderer = gtk_cell_renderer_pixbuf_new (); column = gtk_tree_view_column_new_with_attributes (_("Status"), @@ -249,6 +252,7 @@ gservice_populate_services (void) 6, e->runlevel[4], 7, e->runlevel[5], 8, e->runlevel[6], + 10, (char*)e->name, -1); //gtk_list_store_append (store, &iter); if (e->enabled) @@ -263,6 +267,7 @@ gservice_populate_services (void) gtk_list_store_set (store, &iter, 0, pixbuf_off); } g_free (desc); + g_free (namedesc); temp = g_list_next (temp); } gtk_tree_view_set_model (GTK_TREE_VIEW(gsvc_treeview_services), GTK_TREE_MODEL(store)); @@ -274,6 +279,41 @@ gservice_populate_services (void) } void +gservice_adjust_service_buttons_from_status (int status) +{ + switch (status) + { + case GSVC_ON: + { + printf ("GOT GSVC_ON\n"); + gtk_widget_set_sensitive (gsvc_button_start, FALSE); + gtk_widget_set_sensitive (gsvc_button_stop, TRUE); + break; + } + case GSVC_OFF: + { + printf ("GOT GSVC_OFF\n"); + gtk_widget_set_sensitive (gsvc_button_start, TRUE); + gtk_widget_set_sensitive (gsvc_button_stop, FALSE); + break; + } + case GSVC_ERR: + { + printf ("GOT GSVC_ERR\n"); + gtk_widget_set_sensitive (gsvc_button_start, TRUE); + gtk_widget_set_sensitive (gsvc_button_stop, TRUE); + break; + } + default: + { + break; + } + } + + return; +} + +void gservice_interface_init (void) { gsvc_main_window = gservice_get_widget ("gsvc_main_window"); @@ -294,6 +334,14 @@ gservice_interface_init (void) "activate", G_CALLBACK(gservice_about), NULL); + g_signal_connect (G_OBJECT(gsvc_button_start), + "clicked", + G_CALLBACK(cb_gsvc_button_start_clicked), + NULL); + g_signal_connect (G_OBJECT(gsvc_button_stop), + "clicked", + G_CALLBACK(cb_gsvc_button_stop_clicked), + NULL); /* alrite, lets display the main window */ gtk_widget_show (gsvc_main_window); @@ -305,6 +353,56 @@ gservice_interface_init (void) /* callback definitions */ static void +cb_gsvc_button_start_clicked (GtkButton *button, gpointer data) +{ + GtkTreeSelection *selection = NULL; + GtkTreeModel *model = NULL; + GtkListStore *store = NULL; + GtkTreeIter iter; + + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW(gsvc_treeview_services)); + if (gtk_tree_selection_get_selected(selection,&model,&iter)) + { + char *service = NULL; + char *status = NULL; + int retval = 0; + gtk_tree_model_get (model, &iter, 10, &service, -1); + if (service) + { + status = gsvc_service_start (service, &retval); + gservice_adjust_service_buttons_from_status (retval); + } + } + + return; +} + +static void +cb_gsvc_button_stop_clicked (GtkButton *button, gpointer data) +{ + GtkTreeSelection *selection = NULL; + GtkTreeModel *model = NULL; + GtkListStore *store = NULL; + GtkTreeIter iter; + + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW(gsvc_treeview_services)); + if (gtk_tree_selection_get_selected(selection,&model,&iter)) + { + char *service = NULL; + char *status = NULL; + int retval = 0; + gtk_tree_model_get (model, &iter, 10, &service, -1); + if (service) + { + status = gsvc_service_stop (service, &retval); + gservice_adjust_service_buttons_from_status (retval); + } + } + + return; +} + +static void cb_gsvc_r0_toggled (GtkCellRendererToggle *toggle, gchar *path_str, gpointer data) { return; @@ -357,7 +455,8 @@ cb_gsvc_service_selected (GtkTreeSelection *selection, gpointer data) if (gtk_tree_selection_get_selected(selection, &model, &iter)) { GList *list = gsvc_service_list; - gtk_tree_model_get (model, &iter, 1, &service, -1); + gtk_tree_model_get (model, &iter, 10, &service, -1); + g_print ("selected service: %s\n", service); while (list != NULL) { entry = list->data; @@ -365,25 +464,14 @@ cb_gsvc_service_selected (GtkTreeSelection *selection, gpointer data) break; list = g_list_next (list); } - /* enable/disable the 'start' and 'stop' buttons depending on status */ - /* - switch (gsvc_get_service_status(entry->name)) - { - case GSVC_ON: - gtk_widget_set_sensitive (gsvc_button_start, FALSE); - gtk_widget_set_sensitive (gsvc_button_stop, TRUE); - break; - case GSVC_OFF: - gtk_widget_set_sensitive (gsvc_button_start, TRUE); - gtk_widget_set_sensitive (gsvc_button_stop, FALSE); - break; - case GSVC_ERR: - gtk_widget_set_sensitive (gsvc_button_start, TRUE); - gtk_widget_set_sensitive (gsvc_button_stop, TRUE); - break; - } - */ - /* enable/disable the 'activate' and 'deactivate' buttons depending on status */ + + gtk_widget_set_sensitive (gsvc_button_start, TRUE); + gtk_widget_set_sensitive (gsvc_button_stop, TRUE); + g_print ("==> got %s\n", entry->name); + /* enable/disable the 'start' and 'stop' buttons depending on service status */ + gservice_adjust_service_buttons_from_status (gsvc_get_service_status(entry->name)); + + /* enable/disable the 'activate' and 'deactivate' buttons depending on service status */ if (entry->enabled) { gtk_widget_set_sensitive (gsvc_button_activate, FALSE); From russelldickenson at gmail.com Sat Jan 10 13:56:25 2009 From: russelldickenson at gmail.com (Russell Dickenson (phayz)) Date: Sat Jan 10 13:56:27 2009 Subject: [Frugalware-git] homepage-ng: Newsletter issue 37 Message-ID: <20090110125625.05AD811B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=1834889bb92e2a94ed2c8dc81fb0725a59e1a696 commit 1834889bb92e2a94ed2c8dc81fb0725a59e1a696 Author: Russell Dickenson (phayz) Date: Sat Jan 10 22:40:16 2009 +1000 Newsletter issue 37 new file: frugalware/images/interviews/emilpoe_desktop.png new file: frugalware/images/interviews/emilpoe_view.jpg new file: frugalware/images/newsletter/issue37_frozen-bubble_screenshot.png new file: frugalware/weeklynews/issue37.html modified: frugalware/xml/news.xml diff --git a/frugalware/images/interviews/emilpoe_desktop.png b/frugalware/images/interviews/emilpoe_desktop.png new file mode 100644 index 0000000..4f86f8f Binary files /dev/null and b/frugalware/images/interviews/emilpoe_desktop.png differ diff --git a/frugalware/images/interviews/emilpoe_view.jpg b/frugalware/images/interviews/emilpoe_view.jpg new file mode 100644 index 0000000..e29e87e Binary files /dev/null and b/frugalware/images/interviews/emilpoe_view.jpg differ diff --git a/frugalware/images/newsletter/issue37_frozen-bubble_screenshot.png b/frugalware/images/newsletter/issue37_frozen-bubble_screenshot.png new file mode 100644 index 0000000..b14d9af Binary files /dev/null and b/frugalware/images/newsletter/issue37_frozen-bubble_screenshot.png differ diff --git a/frugalware/weeklynews/issue37.html b/frugalware/weeklynews/issue37.html new file mode 100755 index 0000000..898ca9d --- /dev/null +++ b/frugalware/weeklynews/issue37.html @@ -0,0 +1,226 @@ +

Frugalware Linux Newsletter - Issue 37

+ +

...to inform...to educate...to entertain

+ +

You've got to do your own growing, no matter how tall your grandfather was.
Irish Proverb

+ + +

Welcome

 +

The newsletter's aim is to keep you up to date with what's happened recently in the world of the Linux distribution 'Frugalware'.

+ +

Features of this issue include: +

    +
  • Happy New Year!
    • +
  • When is a Linux distribution like a cake?
    • +
  • Frugalware 1.0pre2 is almost here
    • +
  • Frugalware's users are people too - emilpoe
    • +
  • Focus On Package(s) - Frozen Bubble
    • +
+

+ + +

Events

 + +

Here's a selection of events which have occurred since the previous newsletter:

+ +
    +
  • +

    Happy New Year!

    +

    In case you hadn't noticed ( :P ) a new year has begun. We all hope that 2009 is as successful a year for Frugalware as was 2008.

    +
    • +
  • +

    Do developers ever sleep? :)

    +

    The rate at which packages are updated or added seems to get faster as times goes by. When Frugalware 0.9 was released I thought the developers might relax a little but instead it seems they began working harder. Do they ever sleep?

    +
    • +
  • +

    Bouleetbil - Barista

    +

    When reviewing the Frugalware changelog I noticed that bouleetbil was maintaining many Java-related packages. On IRC once day I asked him if he liked coffee, and jokingly suggested that he change his IRC nickname to "barista". He told me that he does drink a lot of coffee. I wonder though, is he using Java because he drinks coffee, or did he first use Java and then start drinking coffee? For those who don't already know, 'java' is an old American (USA) slang word for coffee.

    +
    • +
  • +

    When is a Linux distribution like a cake?

    +

    A Linux distribution is a very complex system. Each layer is dependent upon the one below it, with the Linux kernel being the base of the "cake". (Hmmm...cake... :P) Those who maintain packages are responsible for making sure that, as each piece is upgraded, everything else still works.

    +

    I recently read a conversation between ryuo and crazy about the difficulty of upgrading X. For GUI applications, X is the next layer on top of the Linux kernel, so it's a critical piece. Although I didn't understand some of what was discussed, it was obvious that you have to be careful when upgrading it. After the conversation I had to take a few headache tablets and lie down for a while. :)

    +

    Next time you boot Frugalware, give thanks to all those who keep it running.

    +
    • +
  • +

    Bugs? Squash them!

    +

    I subscribe to the Frugalware BTS (bug tracking system) mailing list and so see each bug report and request that is made. I have been surprised recently to see many reports and requests coming from people whose names I haven't seen before. It's great to know that there are many more people using Frugalware than those in the IRC channels and forums. Many thanks to all those who take the time to report the bugs they find. The development team appreciate these reports because as each bug is squashed, the quality of Frugalware is improved.

    +
    • +
  • +

    More artwork!

    +

    Artwork for a CD case and cover has been added to the collection of artwork for Frugalware 1.0's release. Well done to the artwork team.

    +
    • +
  • +

    Frugalware 1.0pre2 is almost here

    +

    This release is due on Tuesday, 13 January 2009. If you can spare the time and bandwidth, please download and test it.

    +
    • +
+ + +

Upgrades

 + +

Here's a selection of packages which have been upgraded since the previous newsletter:

+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
PackageUpgrade VersionComments
Python2.6.1-2Since there are many packages which depend upon Python, these have also been updated.
VirtualBox2.1.0-1There are several new features in this version, including experimental OpenGL support.
Kernel2.6.27-4A kernel upgrade requires that any packages which is dependent upon a particular kernel version must also be updated - e.g. NVidia drivers, VirtualBox.
Bitlbee Skype0.7.0-1Version bump.
+ + +

Frugalware's users are people too - emilpoe

 + +

I'm excited to introduce a new feature of the newsletter - interviews with users of Frugalware. I thought that, with most Frugalware developer and contributor interviews complete, it would be interesting to know a little about Frugalware's users. I hope you enjoy the very first of this series...

+ +
+
What's your name?
+

Maurice

+ +
What's your IRC/Jabber/forum nickname?
+

emilpoe

+ +
In what country do you live?
+

France

+ +
In what country were you born?
+

France

+ +
What do you like the most about where you live (the town/city and country)?
+

The liberty of the mountains (The Alps).

+ +
What operating system(s) did you use before FW ?
+

Mandrake, openSUSE, Kubuntu, Kanotix (not Windows).

+ +
When did you start to use Linux (Frugalware)?
+

September 2005, Frugalware in December 2006 (I think).

+ +
What do you like most about Frugalware?
+

Its speed.

+ +
What would you like to see changed in Frugalware?
+

I wish KDE to be better maintained than other desktop environments, because it's not been the case for more than one year... A better installer (I heard it was on the way)

+ +
Do you do something active in order to spread the knowledge of Frugalware?
+

Yes. I manage a French-language wiki about Linux, Linuxpedia http://linuxpedia.fr

+ +
For what purpose(s) do you use Frugalware?
+

To do everything possible with a PC.

+ +
How did you find Frugalware - e.g. a friend/Google search?
+

[humour] I gave up against Devil505's harassment [/humour] and I have no regrets ;)

+ +
What do you do when you're not using Frugalware?
+

I live, I sleep, I work. More seriously I follow the evolution of gNewSense, my second Linux distribution. Less seriously I try to be informed about Kubuntu, openSUSE and Mandriva which are the three distributions I install on friends' computers.

+ +
Please show us a screenshot of your desktop(s)
+

+ +
What's the view from your front door? (please provide a photograph, with no people in view)
+

+
+ + +

Getting To Know You

 + +

In this section of the newsletter, we get to know Frugalware Linux a little at a time. This is not meant to replace the official documentation but instead make it easier to read. This should suit those people who, like me, have short attention spans. :)

+ +

"Are we there yet ?"

+

Anyone who has children has experienced the horror of starting on a journey and hearing this question just 1 minute after starting off. Frugalware is also on a journey and it's interesting to some to know just where we're headed and some of the sights we'll see a long the way. In Frugalware's Bug Tracking System (BTS) a roadmap for the next version is maintained. If you need to ask "Are we there yet?", simply look at the roadmap. You might also be interested to read the roadmap which is a schedule of each release, including the pre-releases and release candidates.

+ + +

Tips and tricks

 + + Disclaimer - Be aware that the hints & tips provided here have NOT been tested and so come with no warranty. +
    +
  • +

    Liberation (fonts) - submitted by 'phayz'

    +

    I know we're all grateful to Microsoft for introducing to the world such wonderful fonts as Arial and Times New Roman. They're so wonderful that many web developers chose them as the default font(s) for their web sites. If you don't have these fonts installed on your PC - if you're running Linux for example - the web sites don't look as their designer intended. One option is to use font substitution so that another font is used when "Arial" is required. The problem is that the web site still won't look quite right. RedHat have done their best to fix this problem by releasing the Liberation Fonts. These are free fonts, licenced under the GPL, which are a replacement for Arial, Times News Roman and others. With these fonts installed, they'll be substituted for the Microsoft version and the web site will look closer to how the designer wanted it to look.

    +
    • +
+

This section relies on your contributions! If have some tips and tricks that you would like to be shown in the newsletter, please post them on the forums.

+ + +

Focus On Package(s)

 + +

Frozen Bubble

+ + + +

For those who haven't seen Frozen Bubble game it's a like upside down Tetris. You control a bubble gun, located at the bottom of the screen. At the top of the screen are some coloured bubbles. The aim of the game is to pop all the bubbles. You do this by shooting a coloured bubble so that it hits one or more bubbles of the same colour. If a bubble pops, any other bubbles of the same colour that are next to it also pop. If you pop all the bubbles on the screen you move to the next level. A platform at the top of the screen slowly pushes the bubbles down toward you and if they touch you, you become frozen. Frozen Bubble is very easy to play and is a favourite amongst children and adults. The artwork is excellent, thanks to the graphics artist "ayo". You can see more of his work here.

+ + +

Bug fixes

 + +

The following table gives you a overview of activity on bugs and feature requests as at FIXME. In each cell of the table is a link to a detailed list of the relevant bugs or feature requests.

+ + + + + + + + + + + + + + + + + + + + + + +
ActivityBugsFeature
Requests
Open221210
Opened since the last newsletter1711
Closed since the previous newsletter246
+ + +

Security announcements

 + +

Remember - According to the normal support arrangements for Frugalware, the release of 0.9 ("Solaria") means that no further security or bug fixes will be released for Frugalware 0.8 ("Kalgan") or earlier releases.

+ +

Here is a list of security issues which have been discovered and fixed in the 0.9 release since the previous newsletter.

+ + + + + + + +
FSAPackageFSA DescriptionUpgrade To
FSA563horde-webmailThis is a minor security release that adds another check to the XSS filter for an Internet Explorer exploit and fixes unescaped output in the test.php scriptshorde-webmail-1.2.1-1solaria1
FSA562wiresharkTwo vulnerabilities have been reported in Wireshark, which can be exploited by malicious people to cause a DoS (Denial of Service)wireshark-1.0.5-1solaria1
FSA561drupal6Some vulnerabilities have been reported in Drupal 6, which can be exploited by malicious people to conduct cross-site request forgery and cross-site scripting attacksdrupal6-6.7-1solaria1
FSA560drupalSome vulnerabilities have been reported in Drupal, which can be exploited by malicious people to conduct cross-site request forgery and cross-site scripting attacksdrupal-5.13-1solaria1
FSA559wordpressJeremias Reith has reported a vulnerability in WordPress, which can be exploited by malicious people to conduct script insertion attackswordpress-2.6.5-1solaria1
FSA558kernelSome vulnerabilities have been reported in the Linux kernel, which potentially can be exploited by malicious people to compromise a vulnerable systemkernel-2.6.26-2solaria1
+ + +

About the newsletter

 + +

Author

+

The Frugalware newsletter is written and edited by Russell Dickenson (AKA phayz). Credit for the Frugalware distribution goes to the development team.

+

Translations

+

The newsletter is currently translated into French and Danish. The French translation is provided by the French Frugalware community. The Danish translation is provided by the Danish Frugalware community. Thanks to all those involved in providing and hosting these translations.

+

Release

+

To allow time for review and corrections, each newsletter is written ahead of its release date. Therefore it may not mention events which occurred in the few days before its release - e.g. security fixes. To be sure that you've got the very latest information on these topics, go to the appropriate page of the Frugalware web site.

+

Feedback

+

If you have feedback about the Frugalware newsletter - whether good or bad - please provide it via the forums. Your feedback is valuable because we want the newsletter to meet the needs of Frugalware's users.

From russelldickenson at gmail.com Sat Jan 10 14:10:07 2009 From: russelldickenson at gmail.com (Russell Dickenson (phayz)) Date: Sat Jan 10 14:10:08 2009 Subject: [Frugalware-git] homepage-ng: Added to news.xml announcement of newsletter issue 37 Message-ID: <20090110131007.1FAAB11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=e08300b29475757ce0136c9f4b2553ba5ea73b3a commit e08300b29475757ce0136c9f4b2553ba5ea73b3a Author: Russell Dickenson (phayz) Date: Sat Jan 10 23:07:12 2009 +1000 Added to news.xml announcement of newsletter issue 37 modified: frugalware/xml/news.xml diff --git a/frugalware/xml/news.xml b/frugalware/xml/news.xml index 4430056..025640a 100644 --- a/frugalware/xml/news.xml +++ b/frugalware/xml/news.xml @@ -22,6 +22,26 @@ Example: Mon, 07 Aug 2006 12:34:56 -0600 --> + 122 + Frugalware Newsletter Issue 37 + Sat, 10 Jan 2009 22:33:48 +1000 + phayz + 0 + + Features of this issue include: +
    +
  • Happy New Year!
    • +
  • When is a Linux distribution like a cake?
    • +
  • Frugalware 1.0pre2 is almost here
    • +
  • Frugalware's users are people too - emilpoe
    • +
  • Focus On Package(s) - Frozen Bubble
    • +
+ You can read it here. We hope you like it! + ]]> + + + 121 Happy New Year! Wed, 31 Dec 2008 22:30:41 +1000 From devil505linux at gmail.com Sat Jan 10 14:17:28 2009 From: devil505linux at gmail.com (Devil505) Date: Sat Jan 10 14:17:30 2009 Subject: [Frugalware-git] homepage-ng: * french translation of newsletter#37 announcement Message-ID: <20090110131728.E5EFB11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=ca86a6ac68d13e53dba1229f6743ad3af1f5192f commit ca86a6ac68d13e53dba1229f6743ad3af1f5192f Author: Devil505 Date: Sat Jan 10 14:16:40 2009 +0100 * french translation of newsletter#37 announcement diff --git a/frugalware/xml/news_fr.xml b/frugalware/xml/news_fr.xml index 1e82c17..a4caca3 100644 --- a/frugalware/xml/news_fr.xml +++ b/frugalware/xml/news_fr.xml @@ -22,6 +22,26 @@ Example: Mon, 07 Aug 2006 12:34:56 -0600 --> + 122 + Lettre d'information Frugalware numéro 37 + Sat, 10 Jan 2009 22:33:48 +1000 + phayz + 0 + + Dans ce numéro: +
    +
  • Bonne Année!
    • +
  • Quand est-ce que Linux est du gâteau?
    • +
  • Frugalware 1.0pre2 est bientôt là
    • +
  • Les utilisateurs de Frugalware sont des personnes également - emilpoe
    • +
  • Détails sur un(des) paquet(s) - Frozen Bubble
    • +
+ Vous pouvez la lire ici (anglais). Nous espérons que vous l'apprécierez! + ]]> + + + 121 Bonne Année! Wed, 31 Dec 2008 22:30:41 +1000 From bouleetbil at frogdev.info Sat Jan 10 14:27:51 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Sat Jan 10 14:27:52 2009 Subject: [Frugalware-git] bouleetbiltesting: webkit-39737-1-i686 Message-ID: <20090110132751.7269011B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbiltesting.git;a=commitdiff;h=a0b30ebbd9e85ad3a45d4b9102716868cb82b59e commit a0b30ebbd9e85ad3a45d4b9102716868cb82b59e Author: bouleetbil Date: Sat Jan 10 14:21:07 2009 +0100 webkit-39737-1-i686 *version bump *new version can use gst without gnome \o/ delete useless subpkg *swfdec-mozilla works as flashplugin (tested with youtube) *its beginning to be well diff --git a/source/xlib-extra/webkit/FrugalBuild b/source/xlib-extra/webkit/FrugalBuild index 831c89f..2324531 100644 --- a/source/xlib-extra/webkit/FrugalBuild +++ b/source/xlib-extra/webkit/FrugalBuild @@ -2,48 +2,33 @@ # Maintainer: bouleetbil pkgname=webkit -pkgver=38850 +pkgver=39737 pkgrel=1 pkgdesc="Open source web browser engine that's used by Safari" url="http://www.webkit.org" -depends=('sqlite3' 'gtk+2' 'icu' 'curl' 'libpng' 'gperf'\ - 'cairo' 'libxml2' 'pango') -makedepends=('bison' 'flex' 'gnome-vfs' 'gst-plugins-base') +depends=('sqlite3' 'gtk+2' 'icu' 'curl' 'libpng' 'gperf' + 'cairo' 'libxml2' 'pango' 'gst-plugins-base') +makedepends=('bison' 'flex') groups=('xlib-extra') archs=('i686') source=(http://nightly.webkit.org/files/trunk/src/WebKit-r$pkgver.tar.bz2 fix-bison-incompatibility.patch) up2date="lynx -dump http://nightly.webkit.org/builds/trunk/src/1 | grep WebKit-r | cut -d '-' -f 2 | head -1 | cut -d_ -f1 | cut -d 'r' -f 2 | cut -d '.' -f 1" options=('scriptlet') _F_cd_path="WebKit-r$pkgver" -sha1sums=('079a32b6ae6d50d8b77f50b147cd5e288bf69c08' \ +conflicts=('webkit-gnome') +provides=('webkit-gnome') +replaces=('webkit-gnome') +Fconfopts="${Fconfopts[@]} --enable-icon-database --enable-svg \ + --enable-video \ + OUTPUT_DIR=$Fdestir \ + WEBKIT_INC_DIR=/usr/include/WebKit \ + WEBKIT_LIB_DIR=/usr/lib" +sha1sums=('9ee3600815ad610ececd215d61252fb02af76ac8' \ 'a6dde368a0ed5b551d94bd52281bdd1b9e32d032') - -subpkgs=("webkit-gnome") -subdescs=("Open source web browser engine that's used by Safari with gnome support") -subdepends=("sqlite3 gtk+2 icu curl libpng gperf gst-plugins-base \ - cairo libxml2 pango gnome-vfs gst-plugins-base") -subgroups=('gnome-extra') -subarchs=('i686') -subconflicts=('webkit') -subprovides=('webkit') - build() { Fcd - Fpatchall ./autogen.sh $Fconfopts || Fdie - Fmake --enable-icon-database --enable-svg --enable-video - OUTPUT_DIR=$Fdestir \ - WEBKIT_INC_DIR=/usr/include/WebKit \ - WEBKIT_LIB_DIR=/usr/lib - Fmakeinstall - Fsplit webkit-gnome /usr - Fmake --enable-icon-database \ - --enable-svg \ - --disable-video \ - OUTPUT_DIR=$Fdestir \ - WEBKIT_INC_DIR=/usr/include/WebKit \ - WEBKIT_LIB_DIR=/usr/lib - Fmakeinstall + Fbuild } # optimization OK From bouleetbil at frogdev.info Sat Jan 10 14:54:55 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Sat Jan 10 14:54:58 2009 Subject: [Frugalware-git] bouleetbiltesting: unique-1.0.6-1-i686 Message-ID: <20090110135455.B0FA011B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbiltesting.git;a=commitdiff;h=b879c829c746c569205c9be966cbcbc5f1706073 commit b879c829c746c569205c9be966cbcbc5f1706073 Author: bouleetbil Date: Sat Jan 10 14:49:02 2009 +0100 unique-1.0.6-1-i686 *version bump diff --git a/source/xlib-extra/unique/FrugalBuild b/source/xlib-extra/unique/FrugalBuild index 268c238..889141a 100644 --- a/source/xlib-extra/unique/FrugalBuild +++ b/source/xlib-extra/unique/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: bouleetbil pkgname=unique -pkgver=1.0.2 +pkgver=1.0.6 pkgrel=1 pkgdesc="a library for writing single instance application" depends=('gtk+2' 'glibc' 'libxau' 'libxdmcp' 'freetype2' 'dbus-glib' 'libxdamage' 'libxext') @@ -13,6 +13,6 @@ up2date="Flasttar http://www.gnome.org/~ebassi/source/" options=('scriptlet') groups=('xlib-extra') archs=('i686') -sha1sums=('95ec36eb3adbc1b9c055281a5a99c2e64ab8c288') +sha1sums=('c68d1a47e9c2326a671f054c5373d41fc296f2d6') # optimization OK From russelldickenson at gmail.com Sat Jan 10 15:05:01 2009 From: russelldickenson at gmail.com (Russell Dickenson (phayz)) Date: Sat Jan 10 15:05:03 2009 Subject: [Frugalware-git] homepage-ng: Newsletter issue 37 - resized user interview images. Message-ID: <20090110140501.EB33711B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=81acce565cf3f0459c347074a2297f671d36a54d commit 81acce565cf3f0459c347074a2297f671d36a54d Author: Russell Dickenson (phayz) Date: Sun Jan 11 00:00:16 2009 +1000 Newsletter issue 37 - resized user interview images. diff --git a/frugalware/images/interviews/emilpoe_desktop.jpg b/frugalware/images/interviews/emilpoe_desktop.jpg new file mode 100644 index 0000000..eb612af Binary files /dev/null and b/frugalware/images/interviews/emilpoe_desktop.jpg differ diff --git a/frugalware/images/interviews/emilpoe_desktop.png b/frugalware/images/interviews/emilpoe_desktop.png deleted file mode 100644 index 4f86f8f..0000000 Binary files a/frugalware/images/interviews/emilpoe_desktop.png and /dev/null differ diff --git a/frugalware/images/interviews/emilpoe_view.jpg b/frugalware/images/interviews/emilpoe_view.jpg index e29e87e..0d53737 100644 Binary files a/frugalware/images/interviews/emilpoe_view.jpg and b/frugalware/images/interviews/emilpoe_view.jpg differ From bouleetbil at frogdev.info Sat Jan 10 15:08:01 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Sat Jan 10 15:08:02 2009 Subject: [Frugalware-git] bouleetbiltesting: midori-20091001-1-i686 Message-ID: <20090110140801.53A0011B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbiltesting.git;a=commitdiff;h=c8ed727c846f3f20cf3cc2184f597079480844e4 commit c8ed727c846f3f20cf3cc2184f597079480844e4 Author: bouleetbil Date: Sat Jan 10 15:02:02 2009 +0100 midori-20091001-1-i686 *version bump *added new depend diff --git a/source/xapps-extra/midori/FrugalBuild b/source/xapps-extra/midori/FrugalBuild index 0f683b9..fb0432d 100644 --- a/source/xapps-extra/midori/FrugalBuild +++ b/source/xapps-extra/midori/FrugalBuild @@ -1,28 +1,41 @@ # Compiling Time: 0.05 SBU # Maintainer: bouleetbil +USE_DEVEL=${USE_DEVEL:-"y"} + pkgname=midori -pkgver=20081210 +pkgver=20091001 pkgrel=1 pkgdesc="a browser with webkit engine" url="http://software.twotoasts.de/?page=midori" -depends=('libsexy' 'gtk+2' 'libxml2' 'webkit-gnome') +depends=('libsexy' 'gtk+2' 'libxml2' 'webkit' 'unique' 'libsoup') groups=('xapps-extra') archs=('i686') -options=('scriptlet') -_F_scm_type="git" -_F_scm_url="git://git.xfce.org/kalikiana/midori" _F_gnome_desktop="y" _F_gnome_iconcache="y" _F_desktop_icon="/usr/share/icons/hicolor/22x22/apps/midori.png" _F_desktop_categories="Network;WebBrowser;" -Finclude scm gnome-scriptlet +options=('scriptlet') +if Fuse $USE_DEVEL; then + _F_scm_type="git" + _F_scm_url="git://git.xfce.org/kalikiana/$pkgname/" + Finclude scm gnome-scriptlet + makedepends=('intltool' 'gnome-doc-utils') +else + up2date="lynx --dump --source $url | Flasttarbz2" + source=(http://goodies.xfce.org/releases/$pkgname/$pkgname-0.1.1.tar.bz2) + Finclude gnome-scriptlet + sha1sums=('df1176aa584369f04e5e7e76bc4e193af0580ab0') +fi + Fconfopts="--prefix=$Fprefix" build() { - Funpack_scm - Fcd $pkgname + if Fuse $USE_DEVEL; then + Funpack_scm + Fcd $pkgname + fi Fbuild Fbuild_gnome_scriptlet Fdesktop2 From bouleetbil at frogdev.info Sat Jan 10 15:37:58 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Sat Jan 10 15:38:00 2009 Subject: [Frugalware-git] bouleetbiltesting: monodevelop-debugger-gdb-1.9.1-1-i686 Message-ID: <20090110143758.17A0611B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbiltesting.git;a=commitdiff;h=a39b4dbc75be94eeaec45c60fb3500caa3755cbf commit a39b4dbc75be94eeaec45c60fb3500caa3755cbf Author: bouleetbil Date: Sat Jan 10 15:30:54 2009 +0100 monodevelop-debugger-gdb-1.9.1-1-i686 *new package diff --git a/source/gnome-extra/monodevelop-debugger-gdb/FrugalBuild b/source/gnome-extra/monodevelop-debugger-gdb/FrugalBuild new file mode 100644 index 0000000..2cbbd48 --- /dev/null +++ b/source/gnome-extra/monodevelop-debugger-gdb/FrugalBuild @@ -0,0 +1,27 @@ +# Compiling time: 0 SBU +# Maintainer: bouleetbil + +pkgname=monodevelop-debugger-gdb +pkgver=1.9.1 +pkgrel=1 +pkgdesc="Debugger-gdb Extension for MonoDevelop" +url="http://www.mono-project.com/" +depends=('monodevelop>=1.9.1' 'mono-debugger>=2.0-1-1') +makedepends=('intltool' 'perl-xml-parser') +groups=('gnome-extra') +archs=('i686') +up2date="Flasttar http://www.go-mono.com/sources-stable/" +source=(http://ftp.novell.com/pub/mono/sources/$pkgname/$pkgname-$pkgver.tar.bz2) +options=('scriptlet') +_F_mono_aot=0 +Finclude mono +sha1sums=('623120f39e4fc9377a2f498458ba669d28d716c3') + +build() { + Fcd + Fsed "\$prefix" "$Fdestdir" configure + unset MAKEFLAGS + Fmonoexport + Fbuild + Fmonocleanup +} From priyank at frugalware.org Sat Jan 10 15:48:58 2009 From: priyank at frugalware.org (Priyank) Date: Sat Jan 10 15:48:59 2009 Subject: [Frugalware-git] gservice: renamed some functions for consistency Message-ID: <20090110144858.1A86911B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gservice.git;a=commitdiff;h=9ce97df470c427ee2237b39073cbf7cc2227a104 commit 9ce97df470c427ee2237b39073cbf7cc2227a104 Author: Priyank Date: Sat Jan 10 20:18:34 2009 +0530 renamed some functions for consistency diff --git a/src/gservice-backend.c b/src/gservice-backend.c index 4be3f43..720e7f4 100644 --- a/src/gservice-backend.c +++ b/src/gservice-backend.c @@ -139,7 +139,7 @@ gsvc_get_service_description (const char *name) /* gets the runlevel information for a service entry */ /* returns TRUE on success, FALSE on error */ static gboolean -gsvc_get_service_runlevel_info (gservice_entry_t *service) +gsvc_service_get_runlevel_info (gservice_entry_t *service) { gchar *cmd = NULL; gchar *sname = NULL; @@ -209,7 +209,7 @@ gsvc_get_active_service_list (void) } GList * -gsvc_get_service_list (void) +gsvc_service_get_list (void) { GDir *dir = NULL; GList *ret = NULL; @@ -248,7 +248,7 @@ gsvc_get_service_list (void) entry->name[i] = ' '; g_strstrip (entry->name); entry->description = gsvc_get_service_description (entry->name); - gsvc_get_service_runlevel_info (entry); + gsvc_service_get_runlevel_info (entry); entry->enabled = FALSE; /* if (strcmp(entry->name,"single")) @@ -347,7 +347,7 @@ gsvc_strip_service_status (const char *line) /* returns the status of service GSVC_ON or GSVC_OFF */ /* returns GSVC_ERR if status not supported */ gint -gsvc_get_service_status (const char *name) +gsvc_service_get_status (const char *name) { gchar *cmd = NULL; FILE *pp = NULL; @@ -414,40 +414,6 @@ gsvc_get_service_status (const char *name) case -1: ret = GSVC_ERR; default: ret = GSVC_OFF; } - //pp = popen (cmd, "r"); - //fgets (line, PATH_MAX, pp); - //printf ("LINE: %s\n", line); - //tmp = gsvc_strip_service_status (line); - //g_print ("PTR: %s\n", tmp); - - /* - con: - if (tmp != NULL) - { - g_print ("scanning service %s\n", name); - //g_strstrip (tmp); - printf ("%s: %s\n", name, tmp); - if (!strcmp(tmp,"ON")) - { - ret = GSVC_ON; - g_print ("%s is ON\n", name); - } - else - if (!strcmp(tmp,"OFF")) - ret = GSVC_OFF; - else - if (!strcmp(tmp,"FAILED")) - ret = GSVC_ERR; - else - ret = GSVC_ERR; - } - else - { - ret = GSVC_ERR; - } - - pclose (pp); - */ return ret; } diff --git a/src/gservice-backend.h b/src/gservice-backend.h index c7aa7fe..9bd5762 100644 --- a/src/gservice-backend.h +++ b/src/gservice-backend.h @@ -25,7 +25,7 @@ GList *gsvc_get_service_list (void); char *gsvc_glist_to_string (GList *list); /* returns the status of service GSVC_ON or GSVC_OFF */ -gint gsvc_get_service_status (const char *name); +gint gsvc_service_get_status (const char *name); /* starts a service and return the output of the service command */ /* return value of the service command is specified in retval */ diff --git a/src/gservice-interface.c b/src/gservice-interface.c index 6421717..2c02882 100644 --- a/src/gservice-interface.c +++ b/src/gservice-interface.c @@ -233,7 +233,7 @@ gservice_populate_services (void) store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(gsvc_treeview_services))); gtk_list_store_clear (store); /* populate a fresh service list */ - gsvc_service_list = gsvc_get_service_list (); + gsvc_service_list = gsvc_service_get_list (); temp = gsvc_service_list; while (temp != NULL) { @@ -314,10 +314,17 @@ gservice_adjust_service_buttons_from_status (int status) } void +gservice_push_status (const char *status) +{ + if (!status) + return; +} + +void gservice_interface_init (void) { gsvc_main_window = gservice_get_widget ("gsvc_main_window"); - gsvc_treeview_services = gservice_get_widget ("gsvc_treeview_services"); + gsvc_treeview_services = gservice_get_widget ("gsvc_treeview_services"); gsvc_textview_status = gservice_get_widget ("gsvc_textview_status"); gsvc_button_start = gservice_get_widget ("gsvc_button_start"); gsvc_button_stop = gservice_get_widget ("gsvc_button_stop"); @@ -469,7 +476,7 @@ cb_gsvc_service_selected (GtkTreeSelection *selection, gpointer data) gtk_widget_set_sensitive (gsvc_button_stop, TRUE); g_print ("==> got %s\n", entry->name); /* enable/disable the 'start' and 'stop' buttons depending on service status */ - gservice_adjust_service_buttons_from_status (gsvc_get_service_status(entry->name)); + gservice_adjust_service_buttons_from_status (gsvc_service_get_status(entry->name)); /* enable/disable the 'activate' and 'deactivate' buttons depending on service status */ if (entry->enabled) From priyank at frugalware.org Sat Jan 10 15:48:58 2009 From: priyank at frugalware.org (Priyank) Date: Sat Jan 10 15:49:01 2009 Subject: [Frugalware-git] gservice: fix some memory leaks Message-ID: <20090110144858.3092B11B8630@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gservice.git;a=commitdiff;h=1bc6d98bdabb3e2f2324d8bee5486c664529ba6e commit 1bc6d98bdabb3e2f2324d8bee5486c664529ba6e Author: Priyank Date: Sat Jan 10 20:18:49 2009 +0530 fix some memory leaks diff --git a/src/gservice-backend.c b/src/gservice-backend.c index 720e7f4..3b0a0f7 100644 --- a/src/gservice-backend.c +++ b/src/gservice-backend.c @@ -432,6 +432,7 @@ gsvc_service_start (const char *service, int *retval) } GString *string = g_string_new (""); cmd = g_strdup_printf ("service %s start", service); + g_print ("%s\n", cmd); pp = popen (cmd, "r"); while (fgets (line,PATH_MAX,pp)) { @@ -439,10 +440,11 @@ gsvc_service_start (const char *service, int *retval) } if (retval) { - *retval = gsvc_get_service_status (service); + *retval = gsvc_service_get_status (service); } ret = g_strdup (string->str); g_string_free (string, TRUE); + g_free (cmd); return ret; } @@ -468,10 +470,11 @@ gsvc_service_stop (const char *service, int *retval) } if (retval) { - *retval = gsvc_get_service_status (service); + *retval = gsvc_service_get_status (service); } ret = g_strdup (string->str); g_string_free (string, TRUE); + g_free (cmd); return ret; } diff --git a/src/gservice-interface.c b/src/gservice-interface.c index 2c02882..01eacdb 100644 --- a/src/gservice-interface.c +++ b/src/gservice-interface.c @@ -376,8 +376,12 @@ cb_gsvc_button_start_clicked (GtkButton *button, gpointer data) gtk_tree_model_get (model, &iter, 10, &service, -1); if (service) { + g_print ("STARTING: %s\n", service); status = gsvc_service_start (service, &retval); gservice_adjust_service_buttons_from_status (retval); + g_print ("STATUS: \n%s\n", status); + g_free (status); + } } @@ -401,8 +405,11 @@ cb_gsvc_button_stop_clicked (GtkButton *button, gpointer data) gtk_tree_model_get (model, &iter, 10, &service, -1); if (service) { + g_print ("STOPPING: %s\n", service); status = gsvc_service_stop (service, &retval); gservice_adjust_service_buttons_from_status (retval); + g_print ("STATUS: \n%s\n", status); + g_free (status); } } From bouleetbil at frogdev.info Sat Jan 10 17:08:47 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Sat Jan 10 17:08:49 2009 Subject: [Frugalware-git] bouleetbiltesting: syncevolution-0.8.1-1-i686 Message-ID: <20090110160847.8967811B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbiltesting.git;a=commitdiff;h=ef25bb27c988dd27e9ffc409b196a34e904577ce commit ef25bb27c988dd27e9ffc409b196a34e904577ce Author: bouleetbil Date: Sat Jan 10 17:02:53 2009 +0100 syncevolution-0.8.1-1-i686 *new package diff --git a/source/gnome-extra/syncevolution/FrugalBuild b/source/gnome-extra/syncevolution/FrugalBuild new file mode 100644 index 0000000..c3234e1 --- /dev/null +++ b/source/gnome-extra/syncevolution/FrugalBuild @@ -0,0 +1,17 @@ +# Compiling Time: 0.05 SBU +# Maintainer: bouleetbil + +pkgname=syncevolution +pkgver=0.8.1 +pkgrel=1 +pkgdesc="Synchronizes personal information management (PIM) data like contacts, calenders, tasks and memos via the SyncML" +up2date="Flasttar http://www.estamos.de/download/$pkgname/sources/" +source=(http://www.estamos.de/download/$pkgname/sources/$pkgname-$pkgver.tar.gz) +url="http://www.estamos.de/projects/SyncML/index.html" +depends=('evolution' 'libsyncml') +groups=('gnome-extra') +archs=('i686') +options=('scriptlet') +sha1sums=('8b9ad5e39b315e5cd7a4bc5d62219b4a6b07c365') + +# optimization OK From bouleetbil at frogdev.info Sat Jan 10 18:06:29 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Sat Jan 10 18:06:32 2009 Subject: [Frugalware-git] bouleetbiltesting: webkit-39737-2-i686 Message-ID: <20090110170629.8A63411B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbiltesting.git;a=commitdiff;h=afda7da0f8d939a48eb8c7aeceeb20b1a137c2c9 commit afda7da0f8d939a48eb8c7aeceeb20b1a137c2c9 Author: bouleetbil Date: Sat Jan 10 17:59:39 2009 +0100 webkit-39737-2-i686 *enable some options diff --git a/source/xlib-extra/webkit/FrugalBuild b/source/xlib-extra/webkit/FrugalBuild index 2324531..9727b47 100644 --- a/source/xlib-extra/webkit/FrugalBuild +++ b/source/xlib-extra/webkit/FrugalBuild @@ -3,7 +3,7 @@ pkgname=webkit pkgver=39737 -pkgrel=1 +pkgrel=2 pkgdesc="Open source web browser engine that's used by Safari" url="http://www.webkit.org" depends=('sqlite3' 'gtk+2' 'icu' 'curl' 'libpng' 'gperf' @@ -19,7 +19,8 @@ conflicts=('webkit-gnome') provides=('webkit-gnome') replaces=('webkit-gnome') Fconfopts="${Fconfopts[@]} --enable-icon-database --enable-svg \ - --enable-video \ + --enable-video --enable-svg-use-element \ + --enable-coverage --enable-svg-filters \ OUTPUT_DIR=$Fdestir \ WEBKIT_INC_DIR=/usr/include/WebKit \ WEBKIT_LIB_DIR=/usr/lib" From bouleetbil at frogdev.info Sat Jan 10 18:26:50 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Sat Jan 10 18:26:52 2009 Subject: [Frugalware-git] bouleetbiltesting: genesis-sync-0.4-1-i686 Message-ID: <20090110172650.573B011B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbiltesting.git;a=commitdiff;h=b4e21a16ec045b06cd088d40dc96e7818bff1740 commit b4e21a16ec045b06cd088d40dc96e7818bff1740 Author: bouleetbil Date: Sat Jan 10 18:20:55 2009 +0100 genesis-sync-0.4-1-i686 *new package diff --git a/source/gnome-extra/genesis-sync/FrugalBuild b/source/gnome-extra/genesis-sync/FrugalBuild new file mode 100644 index 0000000..7c28f77 --- /dev/null +++ b/source/gnome-extra/genesis-sync/FrugalBuild @@ -0,0 +1,22 @@ +# Compiling Time: 0 SBU +# Maintainer: bouleetbil + +pkgname=genesis-sync +pkgver=0.4 +pkgrel=1 +pkgdesc="Genesis is a graphical frontend for SyncEvolution written in PyGTK." +up2date="Flasttar http://ppa.launchpad.net/frederik-elwert/ubuntu/pool/main/g/$pkgname/" +source=(http://ppa.launchpad.net/frederik-elwert/ubuntu/pool/main/g/$pkgname/${pkgname}_${pkgver}.tar.gz) +url="https://launchpad.net/genesis-sync" +depends=('python') +rodepends=('syncevolution' 'pygtk') +makedepends=('setuptools') +options=('scriptlet') +_F_gnome_iconcache="y" +_F_gnome_desktop="y" +Finclude gnome-scriptlet +groups=('gnome-extra') +archs=('i686') +sha1sums=('5fa4d681184e23bd79750100a6219f85c4db2c1a') +_F_cd_path=new-config +Fpkgversep="_" From bouleetbil at frogdev.info Sat Jan 10 21:46:47 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Sat Jan 10 21:46:49 2009 Subject: [Frugalware-git] bouleetbiltesting: libuser-0.56.9-1-i686 Message-ID: <20090110204647.D82B211B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbiltesting.git;a=commitdiff;h=7b8c488bcf99cee1a10c343a5fd75338bf515470 commit 7b8c488bcf99cee1a10c343a5fd75338bf515470 Author: bouleetbil Date: Sat Jan 10 21:40:53 2009 +0100 libuser-0.56.9-1-i686 *new package diff --git a/source/lib-extra/libuser/FrugalBuild b/source/lib-extra/libuser/FrugalBuild new file mode 100644 index 0000000..817bd74 --- /dev/null +++ b/source/lib-extra/libuser/FrugalBuild @@ -0,0 +1,25 @@ +# Compiling Time: 0.01 SBU +# Maintainer: bouleetbil + +pkgname=libuser +pkgver=0.56.9 +pkgrel=1 +pkgdesc="A user and group account administration library" +url="https://fedorahosted.org/libuser/" +up2date="elinks https://fedorahosted.org/libuser/wiki/LibuserDownloads | Flasttar" +source=(https://fedorahosted.org/libuser/attachment/wiki/LibuserDownloads/$pkgname-$pkgver.tar.bz2?format=raw \ + disablepam.diff) +depends=('cyrus-sasl' 'glib2' 'popt') +makedepends=('perl-xml-parser' 'openldap') +groups=('lib-extra') +archs=('i686') +sha1sums=('37878adb500cb9f61c08e78fe5ed05d9d898dcfd' \ + '28e8d7810f9e93346beb19ba22fad006b9d58b12') + +build() { + mv $pkgname-$pkgver.tar.bz2?format=raw $pkgname-$pkgver.tar.bz2 || Fdie + Fextract $pkgname-$pkgver.tar.bz2 + Fbuild +} + +# optimization OK diff --git a/source/lib-extra/libuser/disablepam.diff b/source/lib-extra/libuser/disablepam.diff new file mode 100644 index 0000000..dd788d5 --- /dev/null +++ b/source/lib-extra/libuser/disablepam.diff @@ -0,0 +1,153 @@ +--- libuser-0.56.9/apps/_apputil.c 2008-04-09 23:14:41.000000000 +0200 ++++ libuser-0.56.9/apps/apputil.c 2009-01-10 21:27:29.000000000 +0100 +@@ -29,8 +29,6 @@ + #include + #include + #include +-#include +-#include + #include + #include + #include +@@ -553,121 +551,9 @@ + void + lu_authenticate_unprivileged(const char *user, const char *appname) + { +- pam_handle_t *pamh; +- struct pam_conv conv; +- const void *puser; +- int ret; + +-#if 0 +- struct conv_data data; +- /* Don't bother if none of the modules makes use of elevated +- * privileges. */ +- if (lu_uses_elevated_privileges(ctx) == FALSE) { +- /* Great! We can drop privileges. */ +- if (setegid(getgid()) == -1) { +- fprintf(stderr, _("Failed to drop privileges.\n")); +- goto err; +- } +- if (seteuid(getuid()) == -1) { +- fprintf(stderr, _("Failed to drop privileges.\n")); +- goto err; +- } +- return; +- } +- +- /* Get the address of the glue conversation function. */ +- lu_get_prompter(ctx, &data.prompt, &data.callback_data); +- if (data.prompt == NULL) { +- fprintf(stderr, _("Internal error.\n")); +- goto err; +- } +- +- conv.conv = lu_converse; +- conv.appdata_ptr = &data; +- +-#endif +- conv.conv = misc_conv; +- conv.appdata_ptr = NULL; +- +-#ifdef WITH_SELINUX +- if (is_selinux_enabled() > 0) { +- /* FIXME: PASSWD_CHSH, PASSWD_PASSWD ? */ +- if (getuid() == 0 && check_access(user, PASSWD__CHFN) != 0) { +- security_context_t user_context; +- +- if (getprevcon(&user_context) < 0) +- user_context = NULL; +- /* FIXME: "change the finger info?" */ +- fprintf(stderr, +- _("%s is not authorized to change the finger " +- "info of %s\n"), user_context ? user_context +- : _("Unknown user context"), user); +- if (user_context != NULL) +- freecon(user_context); +- goto err; +- } +- /* FIXME: is this right for lpasswd? */ +- if (!lu_util_fscreate_from_file("/etc/passwd", NULL)) { +- fprintf(stderr, +- _("Can't set default context for " +- "/etc/passwd\n")); +- goto err; +- } +- } +-#endif +- +- /* Start up PAM. */ +- if (pam_start(appname, user, &conv, &pamh) != PAM_SUCCESS) { +- fprintf(stderr, _("Error initializing PAM.\n")); +- goto err; +- } +- +- /* Use PAM to authenticate the user. */ +- ret = pam_authenticate(pamh, 0); +- if (ret != PAM_SUCCESS) { +- if (pam_get_item(pamh, PAM_USER, &puser) != PAM_SUCCESS +- || puser == NULL) +- puser = user; +- fprintf(stderr, _("Authentication failed for %s.\n"), +- (const char *)puser); +- goto err_pam; +- } +- +- /* Make sure we authenticated the user we wanted to authenticate. */ +- ret = pam_get_item(pamh, PAM_USER, &puser); +- if (ret != PAM_SUCCESS) { +- fprintf(stderr, _("Internal PAM error `%s'.\n"), +- pam_strerror(pamh, ret)); +- goto err_pam; +- } +- if (puser == NULL) { +- fprintf(stderr, _("Unknown user authenticated.\n")); +- goto err_pam; +- } +- if (strcmp(puser, user) != 0) { +- fprintf(stderr, _("User mismatch.\n")); +- goto err_pam; +- } +- +- /* Check if the user is allowed to run this program. */ +- ret = pam_acct_mgmt(pamh, 0); +- if (ret != PAM_SUCCESS) { +- if (pam_get_item(pamh, PAM_USER, &puser) != PAM_SUCCESS +- || puser == NULL) +- puser = user; +- fprintf(stderr, _("Authentication failed for %s.\n"), +- (const char *)puser); +- goto err_pam; +- } +- +- /* Clean up -- we're done. */ +- pam_end(pamh, PAM_SUCCESS); + return; + +-err_pam: +- pam_end(pamh, ret); +-err: +- exit(1); + } + + /* Send nscd an arbitrary signal. */ +--- libuser-0.56.9/Makefile.in 2008-04-09 23:14:57.000000000 +0200 ++++ libuser-0.56.9/Makefile.in 2009-01-10 21:29:23.000000000 +0100 +@@ -509,7 +509,7 @@ + AM_CPPFLAGS = $(GOBJECT_CFLAGS) + LOCALEDIR_CPPFLAGS = -DLOCALEDIR='"$(localedir)"' + PYTHON_CPPFLAGS = -I/usr/include/python$(PYTHON_VERSION) +-SUBDIRS = po docs ++SUBDIRS = po + TESTS = tests/config_test.sh tests/files_test tests/pwhash_test \ + tests/utils_test $(am__append_1) + EXTRA_DIST = \ +@@ -546,7 +546,7 @@ + dist_noinst_SCRIPTS = python/ldap-script python/test-script + noinst_HEADERS = python/admin.c python/ent.c python/misc.c + apps_libapputil_la_SOURCES = apps/apputil.c apps/apputil.h +-apps_libapputil_la_LDFLAGS = $(GOBJECT_LIBS) -lpam -lpam_misc $(SELINUX_LIBS) ++apps_libapputil_la_LDFLAGS = $(GOBJECT_LIBS) $(SELINUX_LIBS) + apps_lchage_CPPFLAGS = $(AM_CPPFLAGS) $(LOCALEDIR_CPPFLAGS) + apps_lchage_LDADD = apps/libapputil.la lib/libuser.la $(LTLIBINTL) + apps_lchage_LDFLAGS = $(GMODULE_LIBS) -lpopt From janny at frugalware.org Sun Jan 11 12:10:28 2009 From: janny at frugalware.org (Janos Kovacs) Date: Sun Jan 11 12:10:30 2009 Subject: [Frugalware-git] fwlive_pkgs: kernel-fwlive-2.6.27-4-i686 Message-ID: <20090111111028.4152511B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive_pkgs.git;a=commitdiff;h=96a650d7dd3e98bf20c5211f720c51e52890131c commit 96a650d7dd3e98bf20c5211f720c51e52890131c Author: Janos Kovacs Date: Sun Jan 11 12:08:28 2009 +0100 kernel-fwlive-2.6.27-4-i686 - version bump diff --git a/source/base-extra/kernel-fwlive/FrugalBuild b/source/base-extra/kernel-fwlive/FrugalBuild index 8353ba0..147e6cc 100644 --- a/source/base-extra/kernel-fwlive/FrugalBuild +++ b/source/base-extra/kernel-fwlive/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Janny pkgver=2.6.27 -pkgrel=2 -_F_kernel_stable=7 +pkgrel=4 +_F_kernel_stable=8 _F_kernel_name="-fwlive" _F_kernel_uname="-fw$pkgrel" _F_kernel_patches=(http://frugalware.org/~janny/patches/kernel/${pkgver}/splice-2.6.23.patch \ diff --git a/source/base-extra/kernel-fwlive/config.i686 b/source/base-extra/kernel-fwlive/config.i686 index 25c2b40..98fdfde 100644 --- a/source/base-extra/kernel-fwlive/config.i686 +++ b/source/base-extra/kernel-fwlive/config.i686 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.27.7 -# Fri Nov 21 14:08:21 2008 +# Linux kernel version: 2.6.27.8 +# Fri Dec 12 12:27:51 2008 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -3023,17 +3023,17 @@ CONFIG_FONT_8x16=y # CONFIG_FONT_SUN12x22 is not set # CONFIG_FONT_10x18 is not set # CONFIG_LOGO is not set -CONFIG_SOUND=y -CONFIG_SND=y -CONFIG_SND_TIMER=y -CONFIG_SND_PCM=y +CONFIG_SOUND=m +CONFIG_SND=m +CONFIG_SND_TIMER=m +CONFIG_SND_PCM=m CONFIG_SND_HWDEP=m CONFIG_SND_RAWMIDI=m CONFIG_SND_SEQUENCER=m CONFIG_SND_SEQ_DUMMY=m CONFIG_SND_OSSEMUL=y -CONFIG_SND_MIXER_OSS=y -CONFIG_SND_PCM_OSS=y +CONFIG_SND_MIXER_OSS=m +CONFIG_SND_PCM_OSS=m CONFIG_SND_PCM_OSS_PLUGINS=y CONFIG_SND_SEQUENCER_OSS=y # CONFIG_SND_DYNAMIC_MINORS is not set @@ -3259,7 +3259,7 @@ CONFIG_USB_WDM=m # # may also be needed; see USB_STORAGE Help for more information # -CONFIG_USB_STORAGE=m +CONFIG_USB_STORAGE=y # CONFIG_USB_STORAGE_DEBUG is not set CONFIG_USB_STORAGE_DATAFAB=y CONFIG_USB_STORAGE_FREECOM=y @@ -4035,8 +4035,7 @@ CONFIG_HAS_IOPORT=y CONFIG_HAS_DMA=y CONFIG_CHECK_SIGNATURE=y +# +# Live extra section +# CONFIG_SQUASHFS=n -CONFIG_LOGO=y -CONFIG_LOGO_LINUX_MONO=y -CONFIG_LOGO_LINUX_VGA16=y -CONFIG_LOGO_LINUX_CLUT224=y From bouleetbil at frogdev.info Sun Jan 11 13:47:39 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Sun Jan 11 13:47:41 2009 Subject: [Frugalware-git] bouleetbiltesting: glib2-2.18.4-1-i686 Message-ID: <20090111124739.3CBD111B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbiltesting.git;a=commitdiff;h=55579533648542999b7dc92e41916e1930d05764 commit 55579533648542999b7dc92e41916e1930d05764 Author: bouleetbil Date: Sun Jan 11 13:41:00 2009 +0100 glib2-2.18.4-1-i686 *version bump diff --git a/source/base/glib2/FrugalBuild b/source/base/glib2/FrugalBuild index b82bd3b..a29680a 100644 --- a/source/base/glib2/FrugalBuild +++ b/source/base/glib2/FrugalBuild @@ -4,30 +4,29 @@ USE_DOC=${USE_DOC:-"y"} pkgname=glib2 -pkgver=2.18.2 +pkgver=2.18.4 pkgrel=1 pkgdesc="Common C routines used by GTK+2 and other libraries" url="http://www.gtk.org/" -depends=('glibc>=2.8-6') -makedepends=('libgcrypt>=1.4.1-2') +depends=('glibc>=2.8-9') +makedepends=('libgcrypt>=1.4.3-1') groups=('base' 'chroot-core') archs=('i686' 'x86_64' 'ppc') -options=('scriptlet' 'nobuild') +options=('scriptlet') _F_gnome_name="glib" _F_gnome_devel="n" Finclude gnome _F_cd_path="glib-$pkgver" ## DON'T remove nor change the debug level or it breaks again .. -sha1sums=('4eaf73feda42e8ecf00654f56e38f7fedd6a9266') +sha1sums=('3e21395c6980e3970d5260b46ecb6b87f2482c61') if Fuse $USE_DOC; then - makedepends=("${makedepends[@]}" 'gtk-doc>=1.9') + makedepends=("${makedepends[@]}" 'gtk-doc>=1.10') Fconfopts="$Fconfopts --enable-gtk-doc" subpkgs=("$pkgname-docs") subdescs=("Glib2 Documentation") subdepends=() subgroups=('docs-extra') subarchs=('i686 x86_64 ppc') - suboptions=('nobuild') fi From janny at frugalware.org Sun Jan 11 13:51:55 2009 From: janny at frugalware.org (Janos Kovacs) Date: Sun Jan 11 13:51:56 2009 Subject: [Frugalware-git] fwlive_pkgs: aufs-cvs20081028-3-i686 Message-ID: <20090111125155.1549111B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive_pkgs.git;a=commitdiff;h=e78edfa43fb5b37837624e18e39ab1ab43d849a7 commit e78edfa43fb5b37837624e18e39ab1ab43d849a7 Author: Janos Kovacs Date: Sun Jan 11 13:51:51 2009 +0100 aufs-cvs20081028-3-i686 - release bump diff --git a/source/apps-extra/aufs/FrugalBuild b/source/apps-extra/aufs/FrugalBuild index 2c8aca2..48925d6 100644 --- a/source/apps-extra/aufs/FrugalBuild +++ b/source/apps-extra/aufs/FrugalBuild @@ -3,8 +3,8 @@ pkgname=aufs pkgver=cvs20081028 -kver=2.6.27-2 -pkgrel=2 +kver=2.6.27-4 +pkgrel=3 pkgdesc="Aufs -- Another Unionfs" depends=('zlib' "kernel-fwlive=$kver") makedepends=("kernel-fwlive-source=$kver") From bouleetbil at frogdev.info Sun Jan 11 14:15:37 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Sun Jan 11 14:15:39 2009 Subject: [Frugalware-git] bouleetbiltesting: pygobject-2.16.0-1-i686 Message-ID: <20090111131537.D4E7111B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbiltesting.git;a=commitdiff;h=d98e5af42a1138f321f1f277db54c1ea167380ef commit d98e5af42a1138f321f1f277db54c1ea167380ef Author: bouleetbil Date: Sun Jan 11 14:09:25 2009 +0100 pygobject-2.16.0-1-i686 *version bump *fix detect libffi diff --git a/source/lib/pygobject/FrugalBuild b/source/lib/pygobject/FrugalBuild index adef3c1..bb637c4 100644 --- a/source/lib/pygobject/FrugalBuild +++ b/source/lib/pygobject/FrugalBuild @@ -2,13 +2,27 @@ # Maintainer: Christian Hamar alias krix pkgname=pygobject -pkgver=2.14.2 +pkgver=2.16.0 pkgrel=1 pkgdesc="Python bindings for GObject" -depends=('python' 'glib2>=2.16.3' 'libffi') +depends=('python' 'glib2>=2.18.4' 'libffi') +makedepends=('gvfs') groups=('lib') archs=('i686' 'x86_64' 'ppc') -Finclude gnome -sha1sums=('e891c3f1ad0d6f737d6c51b9be3eb363f7d11cbc') +Finclude gnome python +source=($source detect_libffi.patch) +sha1sums=('bb16032be31b0651160e9a2caf11c1115c69c85a' \ + '1e2a694276e573ed5aa4acd4979f675875849a21') + +subpkgs=("pygobject-gvfs") +subdescs=('Python bindings for gvfs') +subdepends=("pygobject=$pkgver gvfs") +subgroups=('gnome') +subarchs=('i686 x86_64 ppc') + +build() { + Fbuild + Fsplit pygobject-gvfs $_F_python_libdir/gtk-2.0/gio +} # optimization OK diff --git a/source/lib/pygobject/detect_libffi.patch b/source/lib/pygobject/detect_libffi.patch new file mode 100644 index 0000000..ed350ff --- /dev/null +++ b/source/lib/pygobject/detect_libffi.patch @@ -0,0 +1,179 @@ +--- pygobject-2.16.0/configure 2009-01-04 21:34:55.000000000 +0100 ++++ pygobject-2.16.0/configure 2009-01-11 14:02:41.000000000 +0100 +@@ -12491,6 +12491,176 @@ + fi + + ++{ echo "$as_me:$LINENO: checking for ffi.h" >&5 ++echo $ECHO_N "checking for ffi.h... $ECHO_C" >&6; } ++ ++# Check whether --with-libffi was given. ++if test "${with_libffi+set}" = set; then ++ withval=$with_libffi; with_ffi=$withval ++else ++ with_ffi=auto ++fi ++ ++if test x"$with_ffi" = xno ; then ++ pygobject_ffi_h=disabled ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then ++ pygobject_ffi_h=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ pygobject_ffi_h=no ++fi ++ ++rm -f conftest.err conftest.$ac_ext ++ if test $pygobject_ffi_h = yes; then ++ ++cat >>confdefs.h <<\_ACEOF ++#define HAVE_FFI_H 1 ++_ACEOF ++ ++ save_LIBS=$LIBS ++ if test x"$with_ffi" = xyes || test x"$with_ffi" = xauto; then ++ other_LIBS= ++ else ++ other_LIBS=$with_ffi ++ fi ++ { echo "$as_me:$LINENO: checking for library containing ffi_call" >&5 ++echo $ECHO_N "checking for library containing ffi_call... $ECHO_C" >&6; } ++if test "${ac_cv_search_ffi_call+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_func_search_save_LIBS=$LIBS ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char ffi_call (); ++int ++main () ++{ ++return ffi_call (); ++ ; ++ return 0; ++} ++_ACEOF ++for ac_lib in '' ffi; do ++ if test -z "$ac_lib"; then ++ ac_res="none required" ++ else ++ ac_res=-l$ac_lib ++ LIBS="-l$ac_lib $other_LIBS $ac_func_search_save_LIBS" ++ fi ++ rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then ++ ac_cv_search_ffi_call=$ac_res ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext ++ if test "${ac_cv_search_ffi_call+set}" = set; then ++ break ++fi ++done ++if test "${ac_cv_search_ffi_call+set}" = set; then ++ : ++else ++ ac_cv_search_ffi_call=no ++fi ++rm conftest.$ac_ext ++LIBS=$ac_func_search_save_LIBS ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_search_ffi_call" >&5 ++echo "${ECHO_T}$ac_cv_search_ffi_call" >&6; } ++ac_res=$ac_cv_search_ffi_call ++if test "$ac_res" != no; then ++ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" ++ ++else ++ { { echo "$as_me:$LINENO: error: libffi not found" >&5 ++echo "$as_me: error: libffi not found" >&2;} ++ { (exit 1); exit 1; }; } ++fi ++ ++ if test x$"ac_cv_search_ffi_call" = x"none required" ; then ++ FFI_LIBS=$other_LIBS ++ else ++ FFI_LIBS="$ac_cv_search_ffi_call $other_LIBS" ++ fi ++ LIBS=$save_LIBS ++ fi ++fi ++if test x"$with_ffi" != xauto && test x"$pygobject_ffi_h" != xyes ; then ++ { { echo "$as_me:$LINENO: error: libffi requested, but ffi.h not found" >&5 ++echo "$as_me: error: libffi requested, but ffi.h not found" >&2;} ++ { (exit 1); exit 1; }; } ++fi ++{ echo "$as_me:$LINENO: result: $pygobject_ffi_h" >&5 ++echo "${ECHO_T}$pygobject_ffi_h" >&6; } ++ ++ ++if test "$pygobject_ffi_h" = "yes"; then ++ HAVE_LIBFFI_TRUE= ++ HAVE_LIBFFI_FALSE='#' ++ have_libffi=true ++else ++ HAVE_LIBFFI_TRUE='#' ++ HAVE_LIBFFI_FALSE= ++fi + + + From janny at frugalware.org Sun Jan 11 14:28:36 2009 From: janny at frugalware.org (Janos Kovacs) Date: Sun Jan 11 14:28:39 2009 Subject: [Frugalware-git] fwlive_pkgs: squashfs-3.4-2-i686 Message-ID: <20090111132836.CA0A111B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive_pkgs.git;a=commitdiff;h=f89f137621a5ac15b92fc4be834091a137048ad2 commit f89f137621a5ac15b92fc4be834091a137048ad2 Author: Janos Kovacs Date: Sun Jan 11 14:28:33 2009 +0100 squashfs-3.4-2-i686 - release bump diff --git a/source/apps-extra/squashfs/FrugalBuild b/source/apps-extra/squashfs/FrugalBuild index c7aa010..30dbd6c 100644 --- a/source/apps-extra/squashfs/FrugalBuild +++ b/source/apps-extra/squashfs/FrugalBuild @@ -5,9 +5,9 @@ pkgname=squashfs pkgver=3.4 lzmaver=457 -kver=2.6.27-2 +kver=2.6.27-4 kdir=/lib/modules/${kver/-/-fw}/kernel/fs/${pkgname} -pkgrel=1 +pkgrel=2 url="http://www.squashfs-lzma.org" pkgdesc="A highly compressed read-only filesystem for Linux." depends=('zlib' "kernel-fwlive=${kver}") @@ -20,14 +20,16 @@ source=(http://frugalware.org/~janny/source_pkgs/lzma${lzmaver}.tar.bz2 \ http://frugalware.org/~janny/source_pkgs/sqlzma${pkgver}-${lzmaver}.tar.bz2 \ http://frugalware.org/~janny/patches/kernel/${kver/-*/}/sqlzma1-457.patch \ http://frugalware.org/~janny/patches/kernel/${kver/-*/}/sqlzma2u-3.4.patch \ - http://frugalware.org/~janny/patches/kernel/${kver/-*/}/mksquashfs.quiet.patch ) + http://frugalware.org/~janny/patches/kernel/${kver/-*/}/mksquashfs.quiet.patch \ + http://frugalware.org/~janny/patches/kernel/${kver/-*/}/unsquashfs.quiet.patch) options=('scriptlet') sha1sums=('bd1b46ba42fe1ad7351a39c131e8b7657e909001' \ '6933a8f3098d94f93ec4002a54026b15a6e11640' \ - 'c84cfecc4fe912361a99e6d0869beeef88655591' \ + '6f34274e15ae17082d074d7c36b9ba739cb9f2e2' \ '3c910946ea70938b37c2340c56f9b8d78f655f4b' \ - '68d93b58d251d9798b96d12658c4304c2d827162' \ - 'f4a5eb401b39b948724c705de9e6792cc73d7cf4') + '5295d13ac75e6033921f2f257b30068ee95aa1ae' \ + 'f4a5eb401b39b948724c705de9e6792cc73d7cf4' \ + '4060b66239db325f6b4fbecb06438850166ff7cc') build() { @@ -37,7 +39,7 @@ build() Fmessage "copy /usr/src/linux/ ./" cp -a /usr/src/linux/ ./ || Fdie - + Fmessage "patching sqlzma2u-3.4.patch" patch -p0 < sqlzma2u-3.4.patch || Fdie @@ -45,26 +47,27 @@ build() sed -i 's/-Werror//' sqlzma1-${lzmaver}.patch || Fdie sed -i 's/-Werror//' Makefile || Fdie fi - + Fmessage "patching sqlzma1-${lzmaver}.patch" cd lzma${lzmaver} || Fdie patch -p1 < ../sqlzma1-${lzmaver}.patch || Fdie - + Fmessage "patching mksquashfs.quiet.patch" cd ../${pkgname}${pkgver}/squashfs-tools || Fdie patch -p0 < ../../mksquashfs.quiet.patch || Fdie - + patch -p0 < ../../unsquashfs.quiet.patch || Fdie + cd ${Fsrcdir} || Fdie - + Fmessage "sed Makefile" sed -i "s|KDir =.*|KDir = ${Fsrcdir}/linux|" Makefile || Fdie sed -i "s|SqFs =.*|SqFs = ${Fsrcdir}/linux/fs/squashfs|" Makefile || Fdie sed -i "s/LzmaVer =.*/LzmaVer = lzma${lzmaver}/" Makefile || Fdie sed -i "s/C=1/C=0/" Makefile || Fdie - + Fmessage "Compiling" make || Fdie - + Fmessage "Installing files" Fmkdir ${kdir} Ffilerel linux/fs/squashfs/squashfs.ko ${kdir} From bouleetbil at frogdev.info Sun Jan 11 16:25:48 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Sun Jan 11 16:25:50 2009 Subject: [Frugalware-git] bouleetbiltesting: gtk+2-2.14.7-1-i686 Message-ID: <20090111152548.ADF8011B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbiltesting.git;a=commitdiff;h=c7c20559062f0b3d2f296b5e7ea70d51b4a02009 commit c7c20559062f0b3d2f296b5e7ea70d51b4a02009 Author: bouleetbil Date: Sun Jan 11 16:18:20 2009 +0100 gtk+2-2.14.7-1-i686 *version bump diff --git a/source/xlib/gtk+2/FrugalBuild b/source/xlib/gtk+2/FrugalBuild index d35e716..c0e06ac 100644 --- a/source/xlib/gtk+2/FrugalBuild +++ b/source/xlib/gtk+2/FrugalBuild @@ -3,11 +3,11 @@ pkgname=gtk+2 _F_gnome_name=gtk+ -pkgver=2.14.6 +pkgver=2.14.7 pkgrel=1 pkgdesc="The GTK+ Toolkit (2.x series)" depends=('libtiff' 'atk>=1.22.0' 'libxi' 'libxinerama' 'fontconfig' 'libjpeg' \ - 'pango>=1.22.4' 'cairo>=1.8.6' 'libxcursor' 'libxrandr' 'libsm' 'glib2>=2.18.3' \ + 'pango>=1.22.4' 'cairo>=1.8.6' 'libxcursor' 'libxrandr' 'libsm' 'glib2>=2.18.4' \ 'libcups' 'libx11' 'libtiff' 'libpng' 'jasper') rodepends=('gnome-icon-theme' 'shared-mime-info') groups=('xlib') @@ -48,8 +48,8 @@ build() { echo 'gtk-fallback-icon-theme = "gnome"' > $Fdestdir/etc/gtk-2.0/gtkrc || Fdie Fsplit $pkgname-docs usr/share/gtk-doc } -sha1sums=('e888a28be5e062f36abc3e69857d9aa9381ad2c1' \ + +sha1sums=('f4b9c65dbdc78cad6fc9b601640cbad1d3abb57f' \ '7db980e782a5b04d27bffb55e3dc0190ad22e118' \ '783920d179ba0755ccab9186b6bff9f293828a96') - # optimization OK From bouleetbil at frogdev.info Sun Jan 11 21:14:30 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Sun Jan 11 21:14:31 2009 Subject: [Frugalware-git] bouleetbiltesting: gnome-python-2.22.3-1-i686 Message-ID: <20090111201430.B80F411B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbiltesting.git;a=commitdiff;h=bb70df96a3d61b6eb92c89ab9066afcefdda2e19 commit bb70df96a3d61b6eb92c89ab9066afcefdda2e19 Author: bouleetbil Date: Sun Jan 11 21:08:27 2009 +0100 gnome-python-2.22.3-1-i686 *version bump diff --git a/source/gnome/gnome-python/FrugalBuild b/source/gnome/gnome-python/FrugalBuild index 15a4689..2cd981c 100644 --- a/source/gnome/gnome-python/FrugalBuild +++ b/source/gnome/gnome-python/FrugalBuild @@ -2,14 +2,14 @@ # Maintainer: Christian Hamar alias krix pkgname=gnome-python -pkgver=2.22.1 +pkgver=2.22.3 pkgrel=1 pkgdesc="Python bindings for GNOME" url="http://www.daa.com.au/~james/pygtk/" -depends=('pygtk>=2.12.1' 'pyorbit>=2.14.3-3' 'libgnomeui>=2.22.1' 'libbonobo>=2.22.0') +depends=('pygtk>=2.12.1' 'pyorbit>=2.24.0-2' 'libgnomeui>=2.24.0' 'libbonobo>=2.24.0') groups=('gnome') archs=('i686' 'x86_64' 'ppc') Finclude gnome -sha1sums=('91402febafd40d59c0eb3f9da80a3406e4e7a76e') +sha1sums=('35eafe4f5ab9ee003a573dcf26699d3b03d52d5a') # optimization OK From bouleetbil at frogdev.info Sun Jan 11 21:47:12 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Sun Jan 11 21:47:13 2009 Subject: [Frugalware-git] bouleetbiltesting: gnome-python-desktop-2.24.1-1-i686 Message-ID: <20090111204712.4680A11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbiltesting.git;a=commitdiff;h=9637630783d33d64eb54ebc052893a38b1c0b37e commit 9637630783d33d64eb54ebc052893a38b1c0b37e Author: bouleetbil Date: Sun Jan 11 21:40:04 2009 +0100 gnome-python-desktop-2.24.1-1-i686 *version bump diff --git a/source/gnome/gnome-python-desktop/FrugalBuild b/source/gnome/gnome-python-desktop/FrugalBuild index ae639a0..d0cac72 100644 --- a/source/gnome/gnome-python-desktop/FrugalBuild +++ b/source/gnome/gnome-python-desktop/FrugalBuild @@ -3,12 +3,12 @@ # Former Maintainer: AlexExtreme pkgname=gnome-python-desktop -pkgver=2.24.0 +pkgver=2.24.1 pkgrel=1 pkgdesc="Python bindings for GNOME desktop" url="http://www.pygtk.org/" -depends=('gnome-python>=2.22.1') -makedepends=('metacity>=2.24.0' 'gnome-media>=2.24.0' 'gnome-panel>=2.24.0' 'gtksourceview1' 'totem>=2.24.0' \ +depends=('gnome-python>=2.22.3') +makedepends=('metacity>=2.24.0' 'gnome-media>=2.24.0' 'gnome-panel>=2.24.2' 'gtksourceview1' 'totem>=2.24.3' \ 'libgtop>=2.24.0' 'bug-buddy>=2.24.0') groups=('gnome') archs=('i686' 'x86_64' 'ppc') @@ -20,11 +20,11 @@ subdescs=('Gnome panel applet python module' 'Gnome desktop python module' 'Gnom 'Gtksourceview python module' 'Gtop python module' 'Gnome mediaprofiles python module' 'Metacity python module' \ 'Nautilus CD burner python module' 'librsvg python module' 'Totem python module' 'libwnck python module' \ 'Bug Buddy integration module') -subdepends=("$pkgname=$pkgver gnome-panel>=2.20.0" "$pkgname=$pkgver gnome-desktop>=2.20.0" "$pkgname=$pkgver gnome-keyring>=2.20.0" \ +subdepends=("$pkgname=$pkgver gnome-panel>=2.24.2" "$pkgname=$pkgver gnome-desktop>=2.24.2" "$pkgname=$pkgver gnome-keyring>=2.24.0" \ "$pkgname=$pkgver libgnomeprint>=2.18.1 libgnomeprintui>=2.18.1" "$pkgname=$pkgver gtksourceview1 $pkgname-print=$pkgver" \ - "$pkgname=$pkgver libgtop>=2.20.0" "$pkgname=$pkgver gnome-media>=2.20.0" "$pkgname=$pkgver metacity>=2.20.0" \ - "$pkgname=$pkgver nautilus-cd-burner>=2.18.0" "$pkgname=$pkgver librsvg" "$pkgname=$pkgver totem>=2.20.0" \ - "python libxext glibc freetype2 libxau libxdmcp libice libxdamage libxml2 libwnck>=2.20.0" "$pkgname=$pkgver bug-buddy>=2.20.0") + "$pkgname=$pkgver libgtop>=2.24.0" "$pkgname=$pkgver gnome-media>=2.24.0" "$pkgname=$pkgver metacity>=2.24.0" \ + "$pkgname=$pkgver nautilus-cd-burner>=2.24.0" "$pkgname=$pkgver librsvg" "$pkgname=$pkgver totem>=2.24.3" \ + "python libxext glibc freetype2 libxau libxdmcp libice libxdamage libxml2 libwnck>=2.24.0" "$pkgname=$pkgver bug-buddy>=2.20.0") subgroups=('gnome' 'gnome' 'gnome' 'gnome' 'gnome' 'gnome' 'gnome' 'gnome' 'gnome' 'gnome' 'gnome' 'gnome' 'gnome') subarchs=('i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' \ 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc') @@ -105,5 +105,5 @@ build() { # ...phew! } -sha1sums=('a47f2c87c2bde724d46a6464f8ccbcbeb7743ef5') +sha1sums=('97b04ca811670d6cfa208074c1644cee7486ade3') # optimization OK From bouleetbil at frogdev.info Sun Jan 11 22:26:57 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Sun Jan 11 22:26:59 2009 Subject: [Frugalware-git] bouleetbiltesting: xine-lib-1.1.15-3-i686 Message-ID: <20090111212657.88C3511B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbiltesting.git;a=commitdiff;h=dfc66197f51e9853260fdcfbf0b039aab87f1bce commit dfc66197f51e9853260fdcfbf0b039aab87f1bce Author: bouleetbil Date: Sun Jan 11 22:20:24 2009 +0100 xine-lib-1.1.15-3-i686 *rebuild with 'libraw1394>=2.0.0-1' diff --git a/source/xlib/xine-lib/FrugalBuild b/source/xlib/xine-lib/FrugalBuild index d782e20..15b5fc7 100644 --- a/source/xlib/xine-lib/FrugalBuild +++ b/source/xlib/xine-lib/FrugalBuild @@ -4,7 +4,7 @@ pkgname=xine-lib pkgver=1.1.15 -pkgrel=2 +pkgrel=3 pkgdesc="Xine multimedia playback engine libraries" _F_sourceforge_dirname="xine" _F_sourceforge_ext=".tar.bz2" @@ -14,7 +14,7 @@ depends=('imagemagick' 'aalib' 'libmng' 'libtheora' 'libvorbis' \ 'faad2>=2.6' 'flac>=1.1.4' 'libxvmc' 'libxv' \ 'speex' 'wavpack' 'libmpcdec' 'freetype2>=2.3.4' 'fontconfig' \ 'mesa' 'libx11' 'libxxf86vm' 'ffmpeg' 'x264>=20080426' 'libtool' \ - 'libxvmc' 'libxinerama' 'libjpeg' 'libmpcdec' 'libtiff') + 'libxvmc' 'libxinerama' 'libjpeg' 'libmpcdec' 'libtiff' 'libraw1394>=2.0.0-1') options=('scriptlet') makedepends=('arts' 'esd' 'sdl' 'jack') groups=('xlib') From bouleetbil at frogdev.info Sun Jan 11 22:39:42 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Sun Jan 11 22:39:43 2009 Subject: [Frugalware-git] bouleetbiltesting: libsyncml-0.4.5-2-i686 Message-ID: <20090111213942.C111A11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbiltesting.git;a=commitdiff;h=0ac0154dc06644574f3e592bb31af1e14f05bb4e commit 0ac0154dc06644574f3e592bb31af1e14f05bb4e Author: bouleetbil Date: Sun Jan 11 22:33:44 2009 +0100 libsyncml-0.4.5-2-i686 *rebuild with libsoup>=2.24.0 diff --git a/source/lib-extra/libsyncml/FrugalBuild b/source/lib-extra/libsyncml/FrugalBuild index f790f84..b7e0c0d 100644 --- a/source/lib-extra/libsyncml/FrugalBuild +++ b/source/lib-extra/libsyncml/FrugalBuild @@ -3,10 +3,10 @@ pkgname=libsyncml pkgver=0.4.5 -pkgrel=1 +pkgrel=2 pkgdesc="Libsyncml is a implementation of the SyncML protocol." url="http://libsyncml.opensync.org/" -depends=('libsoup' 'openobex' 'wbxml2' 'expat' 'zlib' 'popt') +depends=('libsoup>=2.24.0' 'openobex' 'wbxml2' 'expat' 'zlib' 'popt') groups=('lib-extra') archs=('i686' 'x86_64') up2date="Flasttar http://libsyncml.opensync.org/wiki/download" From voroskoi at frugalware.org Sun Jan 11 22:41:16 2009 From: voroskoi at frugalware.org (András Vöröskői) Date: Sun Jan 11 22:41:18 2009 Subject: [Frugalware-git] frugalware-current: docs/rebuild.txt Message-ID: <20090111214116.AC1CF11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=baac4bb008a75794d26c872484425d307b4d60cb commit baac4bb008a75794d26c872484425d307b4d60cb Author: András Vöröskői Date: Sun Jan 11 22:40:40 2009 +0100 docs/rebuild.txt update gnutls part diff --git a/docs/rebuild.txt b/docs/rebuild.txt index e341ca0..ee95962 100644 --- a/docs/rebuild.txt +++ b/docs/rebuild.txt @@ -59,18 +59,22 @@ about 28 packages at the moment. == gnutls -- weechat +- bitlbee (.so) - lftp -- pidgin +- libpurple (pidgin) - libsoup ( NOTE: first libsoup bump then all the other gnome | gtk* apps ) - * evolution-data-server * bug-buddy + * evolution-data-server * rhythmbox + * vino +- liferea - loudmouth -- wireshark (at least at .sover-change, which is likely) +- msmtp - net6 -- bitlbee (.so) - seahorse +- swfdec +- weechat +- wireshark (.so) == dbus From vmiklos at frugalware.org Mon Jan 12 19:15:32 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jan 12 19:15:39 2009 Subject: [Frugalware-git] homepage-ng: 1.0pre2 draft Message-ID: <20090112181532.B953311B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=59d79d6c903b16199f00c09a0244a9789b0bfba1 commit 59d79d6c903b16199f00c09a0244a9789b0bfba1 Author: Miklos Vajna Date: Mon Jan 12 19:15:06 2009 +0100 1.0pre2 draft diff --git a/frugalware/xml/news.xml b/frugalware/xml/news.xml index 025640a..c4f7acc 100644 --- a/frugalware/xml/news.xml +++ b/frugalware/xml/news.xml @@ -22,6 +22,60 @@ Example: Mon, 07 Aug 2006 12:34:56 -0600 --> + 123 + Frugalware 1.0pre2 (Anacreon) released + FIXME + Miklos Vajna + 1 + announce the immediate availability of Frugalware 1.0pre2, the second technical preview of the upcoming 1.0 stable release.
+ A short and incomplete list of changes since 1.0pre1:
+
    +
  • Improvements: +
      +
    • Setup: support for having /boot on a RAID1 device, improved support for detecting network card names.
      • +
    • Serial ports are now owned by the 'dialout' (instead of 'uucp') group, as a consensus with other distributions.
      • +
    • For virtualbox users who had to download the whole (~10MB) package again and again after each kernel update - it's a good news that now the kernel module is a separate package to stop wasting bandwidth and time.
      • +
    • For pidgin users, an alternative MSN support has been provided in case the default one have problems, the package is called 'msn-pecan'.
      • +
    +
    • +
  • Package updates: +
      +
    • Mono 2.0.1
      • +
    • Python 2.6.1
      • +
    • GNOME 2.24.2
      • +
    • More than 800 other package updates
      • +
    • More than 100 new packages
      • +
    +
    • +
+ Please refer to the Frugalware Anacreon ChangeLog for more information.
+ Download for i686, x86_64 and ppc: See our mirror list. Don't forget to check the integrity of the install images before burning!
+ NOTE: Click here to read more about what media you need for the installation.
+ IMPORTANT: After publishing the installer images, it was noticed that the 'syslog' service fails to start. The next 'pacman-g2 -Syu' update will fix this, or you can manually execute the ,,sed -i 's/"]/" ]/g' rc.syslog'' command to fix the problem.
+ ]]> + + + + 115 + Frugalware Newsletter Issue 33 + Sat, 18 Oct 2008 07:55:56 +100 + phayz + 0 + + Features of this issue include: +
    +
  • Gnome 2.24 has arrived at repo near you
    • +
  • Getting To Know You - pacman-g2 and its cache
    • +
  • Tips and tricks - Midnight Commander
    • +
  • Focus On Package(s) - Secret Maryo Chronicles
    • +
+ You can read it here. We hope you like it! + ]]> + + + 122 Frugalware Newsletter Issue 37 Sat, 10 Jan 2009 22:33:48 +1000 From vmiklos at frugalware.org Mon Jan 12 21:33:35 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jan 12 21:33:40 2009 Subject: [Frugalware-git] homepage-ng: news: remove accidental copy&paste Message-ID: <20090112203335.3CEED11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=31862e364c6720c52f9466528ed7669fd827ccb7 commit 31862e364c6720c52f9466528ed7669fd827ccb7 Author: Miklos Vajna Date: Mon Jan 12 21:33:27 2009 +0100 news: remove accidental copy&paste diff --git a/frugalware/xml/news.xml b/frugalware/xml/news.xml index c4f7acc..dd6d412 100644 --- a/frugalware/xml/news.xml +++ b/frugalware/xml/news.xml @@ -57,25 +57,6 @@ Example: Mon, 07 Aug 2006 12:34:56 -0600 --> - 115 - Frugalware Newsletter Issue 33 - Sat, 18 Oct 2008 07:55:56 +100 - phayz - 0 - - Features of this issue include: -
    -
  • Gnome 2.24 has arrived at repo near you
    • -
  • Getting To Know You - pacman-g2 and its cache
    • -
  • Tips and tricks - Midnight Commander
    • -
  • Focus On Package(s) - Secret Maryo Chronicles
    • -
- You can read it here. We hope you like it! - ]]> - - - 122 Frugalware Newsletter Issue 37 Sat, 10 Jan 2009 22:33:48 +1000 From vmiklos at frugalware.org Tue Jan 13 06:53:21 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jan 13 06:53:23 2009 Subject: [Frugalware-git] homepage-ng: 1.0pre2 is out Message-ID: <20090113055322.0C62111B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=544605bf734a58895b8aba05e33756333fdcefa2 commit 544605bf734a58895b8aba05e33756333fdcefa2 Author: Miklos Vajna Date: Tue Jan 13 06:53:05 2009 +0100 1.0pre2 is out diff --git a/frugalware/xml/news.xml b/frugalware/xml/news.xml index dd6d412..729b123 100644 --- a/frugalware/xml/news.xml +++ b/frugalware/xml/news.xml @@ -24,9 +24,9 @@ Example: Mon, 07 Aug 2006 12:34:56 -0600 --> 123 Frugalware 1.0pre2 (Anacreon) released - FIXME + Tue, 13 Jan 2009 06:52:36 +0100 Miklos Vajna - 1 + 0 announce the immediate availability of Frugalware 1.0pre2, the second technical preview of the upcoming 1.0 stable release.
A short and incomplete list of changes since 1.0pre1:
@@ -36,7 +36,6 @@ Example: Mon, 07 Aug 2006 12:34:56 -0600 -->
  • Setup: support for having /boot on a RAID1 device, improved support for detecting network card names.
  • Serial ports are now owned by the 'dialout' (instead of 'uucp') group, as a consensus with other distributions.
  • For virtualbox users who had to download the whole (~10MB) package again and again after each kernel update - it's a good news that now the kernel module is a separate package to stop wasting bandwidth and time.
    • -
  • For pidgin users, an alternative MSN support has been provided in case the default one have problems, the package is called 'msn-pecan'.
  • Package updates: From boobaa at frugalware.org Tue Jan 13 07:20:08 2009 From: boobaa at frugalware.org (CSÉCSY László) Date: Tue Jan 13 07:20:13 2009 Subject: [Frugalware-git] frugalware-current: drupal6-mollom-6.x_1.7-1-i686 Message-ID: <20090113062008.9428511B8630@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2037af9b03bafd877eda08787bc92c1c767ee28d commit 2037af9b03bafd877eda08787bc92c1c767ee28d Author: CSÉCSY László Date: Mon Jan 12 20:55:14 2009 +0100 drupal6-mollom-6.x_1.7-1-i686 version bump diff --git a/source/network-extra/drupal6-mollom/FrugalBuild b/source/network-extra/drupal6-mollom/FrugalBuild index 6cd77f7..a599398 100644 --- a/source/network-extra/drupal6-mollom/FrugalBuild +++ b/source/network-extra/drupal6-mollom/FrugalBuild @@ -3,8 +3,8 @@ _F_drupal_module=mollom _F_drupal_ver=6.x -pkgver=6.x_1.6 +pkgver=6.x_1.7 pkgrel=1 pkgdesc="Protects against comment and contact form spam in Drupal" Finclude drupal -sha1sums=('acab9c33a04161fec56534e6907d21b9f6faf162') +sha1sums=('fa159de84eabd6adf4bd0ffd0ad0caa57ba36a25') From boobaa at frugalware.org Tue Jan 13 07:20:08 2009 From: boobaa at frugalware.org (CSÉCSY László) Date: Tue Jan 13 07:20:22 2009 Subject: [Frugalware-git] frugalware-current: drupal-mollom-5.x_1.7-1-i686 Message-ID: <20090113062008.76F8511B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=896649689d5ede8713d7400cbb89769ab14d2e99 commit 896649689d5ede8713d7400cbb89769ab14d2e99 Author: CSÉCSY László Date: Mon Jan 12 20:54:49 2009 +0100 drupal-mollom-5.x_1.7-1-i686 version bump diff --git a/source/network-extra/drupal-mollom/FrugalBuild b/source/network-extra/drupal-mollom/FrugalBuild index 5ff8f7d..d39bed2 100644 --- a/source/network-extra/drupal-mollom/FrugalBuild +++ b/source/network-extra/drupal-mollom/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: CSÉCSY László _F_drupal_module=mollom -pkgver=5.x_1.6 +pkgver=5.x_1.7 pkgrel=1 pkgdesc="Helps you stop comment spam, contact form spam, forum spam, fake user accounts, etc. in Drupal" Finclude drupal -sha1sums=('9b1512e23e9aadb2a87a8be6efffdcea126f6825') +sha1sums=('062bc1a642434cbcfc518955e09f0a69b1a7d642') From boobaa at frugalware.org Tue Jan 13 07:20:08 2009 From: boobaa at frugalware.org (CSÉCSY László) Date: Tue Jan 13 07:20:28 2009 Subject: [Frugalware-git] frugalware-current: drupal-webform-5.x_2.4-1-i686 Message-ID: <20090113062008.CBE3411B8631@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=23f1f23c5bba33984f21d4983cbdb8cdf650b931 commit 23f1f23c5bba33984f21d4983cbdb8cdf650b931 Author: CSÉCSY László Date: Mon Jan 12 20:56:34 2009 +0100 drupal-webform-5.x_2.4-1-i686 version bump diff --git a/source/network-extra/drupal-webform/FrugalBuild b/source/network-extra/drupal-webform/FrugalBuild index 08a5e8a..058c8b7 100644 --- a/source/network-extra/drupal-webform/FrugalBuild +++ b/source/network-extra/drupal-webform/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: CSÉCSY László _F_drupal_module=webform -pkgver=5.x_2.3 +pkgver=5.x_2.4 pkgrel=1 pkgdesc="Adds a webform nodetype to your Drupal site" Finclude drupal -sha1sums=('702b050f6a8226a0869473722cd9bbef69a3d5c0') +sha1sums=('c06d7b3d07b271520e64cbb276abd4ca90bec5f1') From boobaa at frugalware.org Tue Jan 13 07:20:09 2009 From: boobaa at frugalware.org (CSÉCSY László) Date: Tue Jan 13 07:20:37 2009 Subject: [Frugalware-git] frugalware-current: drupal6-lightbox2-6.x_1.9-1-i686 Message-ID: <20090113062009.174BB11B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=43e3ce963e0b56579ce238edd118db72eecbab31 commit 43e3ce963e0b56579ce238edd118db72eecbab31 Author: CSÉCSY László Date: Mon Jan 12 20:57:07 2009 +0100 drupal6-lightbox2-6.x_1.9-1-i686 version bump diff --git a/source/network-extra/drupal6-lightbox2/FrugalBuild b/source/network-extra/drupal6-lightbox2/FrugalBuild index aba49ba..bf8b551 100644 --- a/source/network-extra/drupal6-lightbox2/FrugalBuild +++ b/source/network-extra/drupal6-lightbox2/FrugalBuild @@ -3,8 +3,8 @@ _F_drupal_module=lightbox2 _F_drupal_ver=6.x -pkgver=6.x_1.8 +pkgver=6.x_1.9 pkgrel=1 pkgdesc="A simple, unobtrusive script used to overlay images on the current page" Finclude drupal -sha1sums=('b10bba6996052cd31dcbb4af0c3033cd090a8997') +sha1sums=('18d7c6a97bd5b01059e52c39e8c9d0b7bfce2735') From boobaa at frugalware.org Tue Jan 13 07:20:09 2009 From: boobaa at frugalware.org (CSÉCSY László) Date: Tue Jan 13 07:20:44 2009 Subject: [Frugalware-git] frugalware-current: ntp-4.2.4p6-1-i686 Message-ID: <20090113062009.5E63911B887D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ff01b8edf9fb106dadd9f1d35d5188223e11eae5 commit ff01b8edf9fb106dadd9f1d35d5188223e11eae5 Author: CSÉCSY László Date: Mon Jan 12 20:58:39 2009 +0100 ntp-4.2.4p6-1-i686 version bump diff --git a/source/network-extra/ntp/FrugalBuild b/source/network-extra/ntp/FrugalBuild index 740619b..b3d23b9 100644 --- a/source/network-extra/ntp/FrugalBuild +++ b/source/network-extra/ntp/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: Krisztian VASAS pkgname=ntp -pkgver=4.2.4p5 +pkgver=4.2.4p6 pkgrel=1 pkgdesc="The ntp daemon from ntp.org" url="http://www.ntp.org/" @@ -14,7 +14,7 @@ depends=('openssl>=0.9.8-11' 'readline') up2date="lynx -dump http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ | grep -m1 'http.*tar.gz$' | sed 's/.*ntp-\(.*\)\.tar.*/\1/'" source=(http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/$pkgname-$pkgver.tar.gz rc.ntpd rc.ntpd.pot ntp.org.conf) backup=(etc/ntp.org.conf) -sha1sums=('a7add50434b618ee0ef8d3c458c5042c89bb8a83' \ +sha1sums=('ad4b068cc03ce346a6276ed6b31c026b6ffc3d92' \ '2bf638fba95847568e45afc7b2cfdf6d1767b429' \ '6f0275b9c1adcdef0c441408d8b5c4e4c82e1de4' \ '9e116eabff29a0216bfc2c56817ba48d1f3182f6') From bouleetbil at frogdev.info Tue Jan 13 07:26:09 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue Jan 13 07:26:13 2009 Subject: [Frugalware-git] frugalware-current: amsn-0.97.2-2-i686 Message-ID: <20090113062609.8017411B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0a7106b8da50531fd95ca861133b7b14d61478b4 commit 0a7106b8da50531fd95ca861133b7b14d61478b4 Author: bouleetbil Date: Tue Jan 13 07:19:05 2009 +0100 amsn-0.97.2-2-i686 *closed #3541 diff --git a/source/xapps-extra/amsn/Fix_TkCximage.diff b/source/xapps-extra/amsn/Fix_TkCximage.diff new file mode 100644 index 0000000..2b69e84 --- /dev/null +++ b/source/xapps-extra/amsn/Fix_TkCximage.diff @@ -0,0 +1,113 @@ +--- amsn/utils/TkCximage/src/TkCximage.cpp 2008/12/26 16:39:41 10817 ++++ amsn/utils/TkCximage/src/TkCximage.cpp 2008/12/28 21:50:08 10818 +@@ -26,6 +26,65 @@ + char currenttime[30]; + FILE * logfile; + ++#define AVAILABLE_FORMATS 6 ++Tk_PhotoImageFormat cximageFormats[] = { ++ { ++ "cximage", ++ (Tk_ImageFileMatchProc *) ChanMatch, ++ (Tk_ImageStringMatchProc *) ObjMatch, ++ (Tk_ImageFileReadProc *) ChanRead, ++ (Tk_ImageStringReadProc *) ObjRead, ++ (Tk_ImageFileWriteProc *) ChanWrite, ++ (Tk_ImageStringWriteProc *) StringWrite ++ }, ++ { ++ "cxgif", ++ (Tk_ImageFileMatchProc *) ChanMatch, ++ (Tk_ImageStringMatchProc *) ObjMatch, ++ (Tk_ImageFileReadProc *) ChanRead, ++ (Tk_ImageStringReadProc *) ObjRead, ++ (Tk_ImageFileWriteProc *) ChanWrite, ++ (Tk_ImageStringWriteProc *) StringWrite ++ }, ++ { ++ "cxpng", ++ (Tk_ImageFileMatchProc *) ChanMatch, ++ (Tk_ImageStringMatchProc *) ObjMatch, ++ (Tk_ImageFileReadProc *) ChanRead, ++ (Tk_ImageStringReadProc *) ObjRead, ++ (Tk_ImageFileWriteProc *) ChanWrite, ++ (Tk_ImageStringWriteProc *) StringWrite ++ }, ++ { ++ "cxjpg", ++ (Tk_ImageFileMatchProc *) ChanMatch, ++ (Tk_ImageStringMatchProc *) ObjMatch, ++ (Tk_ImageFileReadProc *) ChanRead, ++ (Tk_ImageStringReadProc *) ObjRead, ++ (Tk_ImageFileWriteProc *) ChanWrite, ++ (Tk_ImageStringWriteProc *) StringWrite ++ }, ++ { ++ "cxtga", ++ (Tk_ImageFileMatchProc *) ChanMatch, ++ (Tk_ImageStringMatchProc *) ObjMatch, ++ (Tk_ImageFileReadProc *) ChanRead, ++ (Tk_ImageStringReadProc *) ObjRead, ++ (Tk_ImageFileWriteProc *) ChanWrite, ++ (Tk_ImageStringWriteProc *) StringWrite ++ }, ++ { ++ "cxbmp", ++ (Tk_ImageFileMatchProc *) ChanMatch, ++ (Tk_ImageStringMatchProc *) ObjMatch, ++ (Tk_ImageFileReadProc *) ChanRead, ++ (Tk_ImageStringReadProc *) ObjRead, ++ (Tk_ImageFileWriteProc *) ChanWrite, ++ (Tk_ImageStringWriteProc *) StringWrite ++ } ++}; ++ ++ + int RGB2BGR(Tk_PhotoImageBlock *data, BYTE * pixelPtr) { + int i; + int size = data->height * data->width * data->pixelSize; +@@ -267,10 +326,6 @@ + INITLOGS(); // + LOG("---------------------------------"); // + +- +- int AvailableFromats = 6; +- const char *KnownFormats[] = {"cximage", "cxgif", "cxpng", "cxjpg", "cxtga", "cxbmp"}; +- + //Check Tcl version is 8.3 or higher + if (Tcl_InitStubs(interp, TCL_VERSION, 1) == NULL) { + return TCL_ERROR; +@@ -285,15 +340,6 @@ + + LOG("Tk stub initialized"); // + +- Tk_PhotoImageFormat cximageFormats = { +- NULL, +- (Tk_ImageFileMatchProc *) ChanMatch, +- (Tk_ImageStringMatchProc *) ObjMatch, +- (Tk_ImageFileReadProc *) ChanRead, +- (Tk_ImageStringReadProc *) ObjRead, +- (Tk_ImageFileWriteProc *) ChanWrite, +- (Tk_ImageStringWriteProc *) StringWrite +- }; + + LOG("Creating commands"); // + +@@ -323,14 +369,9 @@ + #endif + + LOG("Adding format : "); // +- for (i = 0; i < AvailableFromats; i++) { +- delete cximageFormats.name; +- cximageFormats.name = new char[strlen(KnownFormats[i]) + 1]; +- strcpy(cximageFormats.name, KnownFormats[i]); +- Tk_CreatePhotoImageFormat(&cximageFormats); +- APPENDLOG(cximageFormats.name); // +- delete cximageFormats.name; +- cximageFormats.name = NULL; ++ for (i = 0; i < AVAILABLE_FORMATS; i++) { ++ Tk_CreatePhotoImageFormat(&cximageFormats[i]); ++ APPENDLOG(cximageFormats[i].name); // + } + + // end of Initialisation diff --git a/source/xapps-extra/amsn/Fix_http.diff b/source/xapps-extra/amsn/Fix_http.diff new file mode 100644 index 0000000..14911e2 --- /dev/null +++ b/source/xapps-extra/amsn/Fix_http.diff @@ -0,0 +1,22 @@ +--- amsn/autoupdate.tcl 2008/03/11 20:50:28 9648 ++++ amsn/autoupdate.tcl 2008/11/14 16:47:29 10726 +@@ -540,7 +540,7 @@ + } + + #/////////////////////////////////////////////////////////////////////// +- package require http ++ package require -exact http 2.4.4 + + proc check_web_version { token } { + global version rcversion weburl +--- amsn/proxy.tcl 2008/10/27 18:05:35 10649 ++++ amsn/proxy.tcl 2008/11/14 16:47:29 10726 +@@ -9,7 +9,7 @@ + ::Version::setSubversionId {$Id$} + + package provide Proxy 0.1 +-package require http ++package require -exact http 2.4.4 + + # This should be converted to a proper package, to use with package require + source socks.tcl ;# SOCKS5 proxy support diff --git a/source/xapps-extra/amsn/FrugalBuild b/source/xapps-extra/amsn/FrugalBuild index 4ef17df..9793804 100644 --- a/source/xapps-extra/amsn/FrugalBuild +++ b/source/xapps-extra/amsn/FrugalBuild @@ -3,7 +3,7 @@ pkgname=amsn pkgver=0.97.2 -pkgrel=1 +pkgrel=2 pkgdesc="AMsN is a great messanger client" depends=('libice' 'libjpeg' 'libx11' 'libsm' 'libstdc++' 'libpng' 'tk>=8.5.0-2') rodepends=('tls') @@ -11,9 +11,11 @@ groups=('xapps-extra') archs=('i686' 'x86_64') options=('force') Finclude sourceforge -source=($source amsn.patch) +source=($source amsn.patch Fix_TkCximage.diff Fix_http.diff) sha1sums=('4be338c01d34f1b776ce6ac51bba11e2adbeda1d' \ - '97a871735cefde7e7d8bdc575ed91bb2700c7f4d') + '97a871735cefde7e7d8bdc575ed91bb2700c7f4d' \ + 'f8432a46dc68f8185167c53540a61ce5d504e4a7' \ + 'bc21fea4362ce49a23538bd57db092f7201f54a9') build() { From boobaa at frugalware.org Tue Jan 13 07:29:44 2009 From: boobaa at frugalware.org (CSÉCSY László) Date: Tue Jan 13 07:29:47 2009 Subject: [Frugalware-git] frugalware-current: perl-xml-rss-1.43-1-i686 Message-ID: <20090113062944.B7BEE11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9ea8dfe2ab965e10153055b5452d91a0e900c3c4 commit 9ea8dfe2ab965e10153055b5452d91a0e900c3c4 Author: CSÉCSY László Date: Tue Jan 13 07:29:06 2009 +0100 perl-xml-rss-1.43-1-i686 version bump diff --git a/source/devel-extra/perl-xml-rss/FrugalBuild b/source/devel-extra/perl-xml-rss/FrugalBuild index 5f69dc1..13a5692 100644 --- a/source/devel-extra/perl-xml-rss/FrugalBuild +++ b/source/devel-extra/perl-xml-rss/FrugalBuild @@ -3,7 +3,7 @@ _F_perl_name=XML-RSS _F_perl_author=S/SH/SHLOMIF -pkgver=1.42 +pkgver=1.43 pkgrel=1 pkgdesc="A perl module to manage RDF Site Summary (RSS) files" url="http://search.cpan.org/dist/XML-RSS/" @@ -12,4 +12,4 @@ makedepends=('perl-test-manifest') groups=('devel-extra') Finclude perl archs=('i686' 'x86_64') -sha1sums=('ba8978b49cfc7251f6b50bac002c8aa00aceda39') +sha1sums=('abf6ba13b8c4cd1f8dbf9d50bf5b672601615d81') From bouleetbil at frogdev.info Tue Jan 13 07:37:28 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue Jan 13 07:37:34 2009 Subject: [Frugalware-git] frugalware-current: libquicktime-1.1.1-1-i686 Message-ID: <20090113063728.DD54311B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=eeaaa763dc6bb6948c16a56abb04b513fdc01cfc commit eeaaa763dc6bb6948c16a56abb04b513fdc01cfc Author: bouleetbil Date: Tue Jan 13 07:30:41 2009 +0100 libquicktime-1.1.1-1-i686 *version bump *closed #3559 diff --git a/source/xlib/libquicktime/FrugalBuild b/source/xlib/libquicktime/FrugalBuild index da60433..c34ef58 100644 --- a/source/xlib/libquicktime/FrugalBuild +++ b/source/xlib/libquicktime/FrugalBuild @@ -2,18 +2,17 @@ # Maintainer: Christian Hamar alias krix pkgname=libquicktime -pkgver=1.0.2 -pkgrel=2 +pkgver=1.1.1 +pkgrel=1 pkgdesc="A library based on quicktime4linux with extensions" -depends=('lame' 'gtk+2' 'alsa-lib' 'libdv' 'libvorbis' 'libavc1394' 'faac>=1.25' 'faad2>=2.5' 'ffmpeg>=20080427') +depends=('lame' 'gtk+2' 'alsa-lib' 'libdv' 'libvorbis' 'libavc1394' 'faac>=1.25' 'faad2>=2.5' 'ffmpeg>=20080427' 'libraw1394>=2.0.0') +makedepends=('cvs' 'doxygen') groups=('xlib') archs=('x86_64' 'i686' 'ppc') options=('scriptlet') Finclude sourceforge url="http://libquicktime.sourceforge.net/" -source=(${source[@]} ffmpeg.diff) -sha1sums=('516bb91af7a8366d3ba25090892940575ae2d7fa' \ - '7b4d54d8af35f16290cb0403c2f6ca4c60001f25') +sha1sums=('13666f7b82d8045a03e925966cf8098674814041') build() { diff --git a/source/xlib/libquicktime/ffmpeg.diff b/source/xlib/libquicktime/ffmpeg.diff deleted file mode 100644 index 84b9269..0000000 --- a/source/xlib/libquicktime/ffmpeg.diff +++ /dev/null @@ -1,48 +0,0 @@ -diff -aur libquicktime-1.0.2/m4/avcodec.m4 fw_libquicktime-1.0.2/m4/avcodec.m4 ---- libquicktime-1.0.2/m4/avcodec.m4 2005-10-28 14:16:40.000000000 +0200 -+++ fw_libquicktime-1.0.2/m4/avcodec.m4 2008-04-29 11:28:10.000000000 +0200 -@@ -12,7 +12,7 @@ - avcodec_ok="false" - AC_TRY_RUN([ - #include -- #include -+ #include - int main() - { - FILE * output; -diff -aur libquicktime-1.0.2/plugins/ffmpeg/ffmpeg.h fw_libquicktime-1.0.2/plugins/ffmpeg/ffmpeg.h ---- libquicktime-1.0.2/plugins/ffmpeg/ffmpeg.h 2007-09-26 20:36:05.000000000 +0200 -+++ fw_libquicktime-1.0.2/plugins/ffmpeg/ffmpeg.h 2008-04-29 11:35:03.000000000 +0200 -@@ -26,7 +26,7 @@ - #define QUICKTIME_FFMPEG_H - - #include --#include -+#include - - void quicktime_init_video_codec_ffmpeg(quicktime_video_map_t *vtrack, - AVCodec *encoder, AVCodec *decoder); -diff -aur libquicktime-1.0.2/plugins/ffmpeg/params.c fw_libquicktime-1.0.2/plugins/ffmpeg/params.c ---- libquicktime-1.0.2/plugins/ffmpeg/params.c 2007-09-26 20:36:05.000000000 +0200 -+++ fw_libquicktime-1.0.2/plugins/ffmpeg/params.c 2008-04-29 11:36:29.000000000 +0200 -@@ -24,7 +24,7 @@ - - #include "lqt_private.h" - #include "params.h" --#include -+#include - #include - - typedef struct -diff -aur libquicktime-1.0.2/plugins/ffmpeg/video.c fw_libquicktime-1.0.2/plugins/ffmpeg/video.c ---- libquicktime-1.0.2/plugins/ffmpeg/video.c 2007-12-19 10:36:03.000000000 +0100 -+++ fw_libquicktime-1.0.2/plugins/ffmpeg/video.c 2008-04-29 11:38:48.000000000 +0200 -@@ -32,7 +32,7 @@ - #define LOG_DOMAIN "ffmpeg_video" - - #ifdef HAVE_LIBSWSCALE --#include -+#include - #endif - - // Enable interlaced encoding (experimental) From priyank at frugalware.org Tue Jan 13 07:40:22 2009 From: priyank at frugalware.org (Priyank) Date: Tue Jan 13 07:40:25 2009 Subject: [Frugalware-git] frugalware-current: dcraw-8.90-1-i686 Message-ID: <20090113064022.88CBE11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0036c3c2106274f813e68588967f316c08423cf6 commit 0036c3c2106274f813e68588967f316c08423cf6 Author: Priyank Date: Tue Jan 13 12:08:29 2009 +0530 dcraw-8.90-1-i686 * Version bump diff --git a/source/apps-extra/dcraw/FrugalBuild b/source/apps-extra/dcraw/FrugalBuild index 73a6e7c..f69d315 100644 --- a/source/apps-extra/dcraw/FrugalBuild +++ b/source/apps-extra/dcraw/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Priyank Gosalia pkgname=dcraw -pkgver=8.89 +pkgver=8.90 pkgrel=1 pkgdesc="A command line based converter for raw digital photos." url="http://www.cybercom.net/~dcoffin/dcraw/" @@ -12,7 +12,7 @@ groups=('apps-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://www.cybercom.net/~dcoffin/dcraw/dcraw.c | grep -m1 VERSION | sed 's/.*N \"\(.*\).\"*/\1/'" source=($url/$pkgname.{c,1}) -sha1sums=('6cae4d77e56519200d65e2d8b3b527d08f58774e' \ +sha1sums=('2dae57a7af977e76eb830cb1c8b9dd106153fd73' \ '6b6e2995f669781af1acfcbb7098d852eccb8e13') build() From bouleetbil at frogdev.info Tue Jan 13 07:50:24 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue Jan 13 07:50:27 2009 Subject: [Frugalware-git] frugalware-current: xine-lib-1.1.15-3-i686 Message-ID: <20090113065024.9FD3411B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=87c246954370ed7ebe1b7514cdad2190934d644d commit 87c246954370ed7ebe1b7514cdad2190934d644d Author: bouleetbil Date: Tue Jan 13 07:43:00 2009 +0100 xine-lib-1.1.15-3-i686 *rebuild libraw1394>=2.0.0-1 *closed #3564 diff --git a/source/xlib/xine-lib/FrugalBuild b/source/xlib/xine-lib/FrugalBuild index d782e20..15b5fc7 100644 --- a/source/xlib/xine-lib/FrugalBuild +++ b/source/xlib/xine-lib/FrugalBuild @@ -4,7 +4,7 @@ pkgname=xine-lib pkgver=1.1.15 -pkgrel=2 +pkgrel=3 pkgdesc="Xine multimedia playback engine libraries" _F_sourceforge_dirname="xine" _F_sourceforge_ext=".tar.bz2" @@ -14,7 +14,7 @@ depends=('imagemagick' 'aalib' 'libmng' 'libtheora' 'libvorbis' \ 'faad2>=2.6' 'flac>=1.1.4' 'libxvmc' 'libxv' \ 'speex' 'wavpack' 'libmpcdec' 'freetype2>=2.3.4' 'fontconfig' \ 'mesa' 'libx11' 'libxxf86vm' 'ffmpeg' 'x264>=20080426' 'libtool' \ - 'libxvmc' 'libxinerama' 'libjpeg' 'libmpcdec' 'libtiff') + 'libxvmc' 'libxinerama' 'libjpeg' 'libmpcdec' 'libtiff' 'libraw1394>=2.0.0-1') options=('scriptlet') makedepends=('arts' 'esd' 'sdl' 'jack') groups=('xlib') From bouleetbil at frogdev.info Tue Jan 13 07:52:45 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue Jan 13 07:52:47 2009 Subject: [Frugalware-git] frugalware-current: libsyncml-0.4.5-2-i686 Message-ID: <20090113065245.5F92711B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=66761656a87b8d6ff6ab8988f7dcc8551e7b7580 commit 66761656a87b8d6ff6ab8988f7dcc8551e7b7580 Author: bouleetbil Date: Tue Jan 13 07:46:39 2009 +0100 libsyncml-0.4.5-2-i686 *rebuild with libsoup>=2.24.0 diff --git a/source/lib-extra/libsyncml/FrugalBuild b/source/lib-extra/libsyncml/FrugalBuild index f790f84..b7e0c0d 100644 --- a/source/lib-extra/libsyncml/FrugalBuild +++ b/source/lib-extra/libsyncml/FrugalBuild @@ -3,10 +3,10 @@ pkgname=libsyncml pkgver=0.4.5 -pkgrel=1 +pkgrel=2 pkgdesc="Libsyncml is a implementation of the SyncML protocol." url="http://libsyncml.opensync.org/" -depends=('libsoup' 'openobex' 'wbxml2' 'expat' 'zlib' 'popt') +depends=('libsoup>=2.24.0' 'openobex' 'wbxml2' 'expat' 'zlib' 'popt') groups=('lib-extra') archs=('i686' 'x86_64') up2date="Flasttar http://libsyncml.opensync.org/wiki/download" From bouleetbil at frogdev.info Tue Jan 13 08:00:04 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue Jan 13 08:00:07 2009 Subject: [Frugalware-git] frugalware-current: farsight2-0.0.7-1-i686 Message-ID: <20090113070004.9DC1111B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=074472e53f13d0b25db8db1d63df40baff68c3a3 commit 074472e53f13d0b25db8db1d63df40baff68c3a3 Author: bouleetbil Date: Tue Jan 13 07:53:49 2009 +0100 farsight2-0.0.7-1-i686 *version bump diff --git a/source/xlib-extra/farsight2/FrugalBuild b/source/xlib-extra/farsight2/FrugalBuild index 627fbfc..6460bde 100644 --- a/source/xlib-extra/farsight2/FrugalBuild +++ b/source/xlib-extra/farsight2/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: bouleetbil pkgname=farsight2 -pkgver=0.0.6 -pkgrel=2 +pkgver=0.0.7 +pkgrel=1 pkgdesc="Farsight2 is an audio/video conferencing framework" url="http://farsight.freedesktop.org/" depends=('dbus-glib>=0.78' 'gst-plugins-farsight>=0.12.9' 'glib2' 'clinkc>=2.3' \ @@ -13,6 +13,6 @@ archs=('i686' 'x86_64' 'ppc') replaces=('farsight') up2date="lynx -dump http://farsight.freedesktop.org/releases/$pkgname | Flasttar" source=(http://farsight.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) -sha1sums=('a031937091ab40be75d8a154f01de081c9fc8615') +sha1sums=('fb7a560a1a00797783bee4d3f8da0c945622c596') # optimization OK From bouleetbil at frogdev.info Tue Jan 13 08:13:43 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue Jan 13 08:13:47 2009 Subject: [Frugalware-git] frugalware-current: vala-0.5.5-1-i686 Message-ID: <20090113071343.911DE11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ff9e24c5c8ade91337348d13c99fabf325ba667a commit ff9e24c5c8ade91337348d13c99fabf325ba667a Author: bouleetbil Date: Tue Jan 13 08:07:17 2009 +0100 vala-0.5.5-1-i686 *version bump diff --git a/source/devel-extra/vala/FrugalBuild b/source/devel-extra/vala/FrugalBuild index ce5baae..85a5068 100644 --- a/source/devel-extra/vala/FrugalBuild +++ b/source/devel-extra/vala/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: jedifox pkgname=vala -pkgver=0.5.4 +pkgver=0.5.5 pkgrel=1 pkgdesc="Vala is a prgramming language that aims to bring modern programming language features to GNOME developers" depends=('glib2>=2.18.3') @@ -11,7 +11,7 @@ groups=('devel-extra') archs=('i686' 'x86_64') _F_gnome_devel="y" Finclude gnome -sha1sums=('049f13bab0fed25bfe71cc3af23d68a256e8fb29') +sha1sums=('fcb66275ca1d931c4178a4019dd38232a4513834') Fconfopts="${Fconfopts[@]} --enable-vapigen" # optimization OK From bouleetbil at frogdev.info Tue Jan 13 08:20:58 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue Jan 13 08:21:00 2009 Subject: [Frugalware-git] frugalware-current: glib2-2.18.4-1-i686 Message-ID: <20090113072058.3265711B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=80b116a37d78947bd392db15cd5dee335628c159 commit 80b116a37d78947bd392db15cd5dee335628c159 Author: bouleetbil Date: Tue Jan 13 08:14:12 2009 +0100 glib2-2.18.4-1-i686 *version bump diff --git a/source/base/glib2/FrugalBuild b/source/base/glib2/FrugalBuild index 5419614..a29680a 100644 --- a/source/base/glib2/FrugalBuild +++ b/source/base/glib2/FrugalBuild @@ -4,7 +4,7 @@ USE_DOC=${USE_DOC:-"y"} pkgname=glib2 -pkgver=2.18.3 +pkgver=2.18.4 pkgrel=1 pkgdesc="Common C routines used by GTK+2 and other libraries" url="http://www.gtk.org/" @@ -18,9 +18,9 @@ _F_gnome_devel="n" Finclude gnome _F_cd_path="glib-$pkgver" ## DON'T remove nor change the debug level or it breaks again .. -sha1sums=('293f639fb85ea47347eb34e122327c60ef7606e4') +sha1sums=('3e21395c6980e3970d5260b46ecb6b87f2482c61') if Fuse $USE_DOC; then - makedepends=("${makedepends[@]}" 'gtk-doc>=1.9') + makedepends=("${makedepends[@]}" 'gtk-doc>=1.10') Fconfopts="$Fconfopts --enable-gtk-doc" subpkgs=("$pkgname-docs") subdescs=("Glib2 Documentation") From priyank at frugalware.org Tue Jan 13 09:59:42 2009 From: priyank at frugalware.org (Priyank) Date: Tue Jan 13 09:59:45 2009 Subject: [Frugalware-git] frugalware-current: pcb-20081128-1-i686 Message-ID: <20090113085942.7925F11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=981c5f159fa301deaca2fa4d536256d19fd8cbf4 commit 981c5f159fa301deaca2fa4d536256d19fd8cbf4 Author: Priyank Date: Tue Jan 13 14:21:15 2009 +0530 pcb-20081128-1-i686 * Version bump * Remove pcb.desktop (now provided by upstream) diff --git a/source/xapps-extra/pcb/FrugalBuild b/source/xapps-extra/pcb/FrugalBuild index b69b218..da74fe0 100644 --- a/source/xapps-extra/pcb/FrugalBuild +++ b/source/xapps-extra/pcb/FrugalBuild @@ -2,21 +2,22 @@ # Maintainer: Priyank Gosalia pkgname=pcb -pkgver=20070912p1 -pkgrel=2 +pkgver=20081128 +pkgrel=1 pkgdesc="Printed Circuit Board layout tool for gEDA." url="http://geda.seul.org/" -depends=('gtk+2' 'tk' 'gd' 'xproto' 'libx11' 'dbus') +makedepends=('intltool') +depends=('gtk+2' 'tk' 'gd' 'xproto' 'libx11' 'dbus' 'desktop-file-utils') groups=('xapps-extra' 'geda-suite') archs=('i686' 'x86_64') up2date="lynx -dump $url/sources.html | grep pcb | grep -m1 tar.gz | Flasttar" source=($url/dist/$pkgname-${pkgver/p1/}.tar.gz $pkgname.png) -_F_desktop_name="PCB" -_F_desktop_icon="pcb.png" -_F_desktop_categories="Electronics;" +_F_gnome_desktop=y +_F_gnome_iconcache=y +Finclude gnome-scriptlet Fconfopts="${Fconfopts[@]} --enable-dependency-tracking \ --enable-gif --enable-dbus --enable-png --enable-jpeg" -sha1sums=('3df27a8c0afaddfef96ef1be4fedd9b5333a8229'\ +sha1sums=('9fbb4feb4e7851b349dfa0fe434e5d5fd822b8df' \ '8c10a89249bd02a61a92450bdd4fd852415e7669') build() @@ -26,7 +27,8 @@ build() Fbuild Fmkdir /usr/share/pixmaps Ficon pcb.png - Fdesktop2 + Fbuild_gnome_scriptlet + Frm /usr/share/applications/mimeinfo.cache } # optimization OK From boobaa at frugalware.org Tue Jan 13 11:41:30 2009 From: boobaa at frugalware.org (CSÉCSY László) Date: Tue Jan 13 11:41:33 2009 Subject: [Frugalware-git] frugalware-current: postfix-2.5.6-1-i686 Message-ID: <20090113104130.CC00711B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=80a38258ce26eb926667e57bdf3543b4d8efb611 commit 80a38258ce26eb926667e57bdf3543b4d8efb611 Author: CSÉCSY László Date: Tue Jan 13 11:40:12 2009 +0100 postfix-2.5.6-1-i686 version bump diff --git a/source/network/postfix/FrugalBuild b/source/network/postfix/FrugalBuild index ffe27f5..c474a42 100644 --- a/source/network/postfix/FrugalBuild +++ b/source/network/postfix/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: VMiklos pkgname=postfix -pkgver=2.5.5 +pkgver=2.5.6 pkgrel=1 vdaver=2.5.5 pkgdesc="A fast, easy to administer, and secure MTA" @@ -26,7 +26,7 @@ source=($mirror/official/$pkgname-$pkgver.tar.gz \ README.Frugalware http://vda.sourceforge.net/VDA/postfix-$vdaver-vda-ng.patch.gz) -sha1sums=('7240be9e362b991bacfcf7e3771ab611e872ac12' \ +sha1sums=('b6aae7ec9996937c9a901f41c6c262eceba44479' \ '2cc54da13d2a73e3027061fd8c4c4ce4ae44a361' \ 'b05736300a01bc6d4d0ca7bb92704de29b68651d' \ '84b3dabc26236121fdc666da4f0fa98cc0cfbe8b') From vmiklos at frugalware.org Tue Jan 13 12:11:36 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jan 13 12:11:38 2009 Subject: [Frugalware-git] frugalware-current: sysklogd-1.5-6-i686 Message-ID: <20090113111136.8A11611B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7531a0e52a4b17de1f32368c00976175d5c33c21 commit 7531a0e52a4b17de1f32368c00976175d5c33c21 Author: Miklos Vajna Date: Tue Jan 13 12:10:53 2009 +0100 sysklogd-1.5-6-i686 - fix typo in init script, thx crazy diff --git a/source/base/sysklogd/FrugalBuild b/source/base/sysklogd/FrugalBuild index e0ff0c4..e60743b 100644 --- a/source/base/sysklogd/FrugalBuild +++ b/source/base/sysklogd/FrugalBuild @@ -4,7 +4,7 @@ pkgname=sysklogd pkgver=1.5 -pkgrel=5 +pkgrel=6 pkgdesc="Linux system logging utilities" url="http://www.ibiblio.org/pub/Linux/system/daemons/" backup=(etc/syslog.conf etc/logrotate.d/syslog) @@ -18,7 +18,7 @@ source=($url/$pkgname-$pkgver.tar.gz \ syslog \ syslog.conf) sha1sums=('070cce745b023f2ce7ca7d9888af434d6d61c236' \ - '934a8113be5d61078f81667ec6f2d49b829a14d7' \ + 'f1cc44ea0ad7eb498ab8904d2d93191eba2291f7' \ '94c71ed2057354a9a39b0a1408c923328be79f89' \ 'e22daf241394779478c113c23bdc294fa2f858bc' \ '839f714f0ac9df71ef9f5955fec953048bbd699c') diff --git a/source/base/sysklogd/rc.syslog b/source/base/sysklogd/rc.syslog index 30067e7..169d87a 100644 --- a/source/base/sysklogd/rc.syslog +++ b/source/base/sysklogd/rc.syslog @@ -24,7 +24,7 @@ pid="cat /var/run/syslogd.pid 2> /dev/null" rc_start() { start_msg - if [ -z "$(eval $pid)"]; then + if [ -z "$(eval $pid)" ]; then /usr/sbin/syslogd # This prevents syslogd/klogd race condition on SMP # kernels. @@ -45,7 +45,7 @@ rc_start() rc_stop() { stop_msg - if [ -n "$(eval $pid)"]; then + if [ -n "$(eval $pid)" ]; then kill "$(eval $pid)" kill $(cat /var/run/klogd.pid) ok $? From vmiklos at frugalware.org Tue Jan 13 12:12:36 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jan 13 12:12:37 2009 Subject: [Frugalware-git] frugalware-current: kernel-2.6.27-4-i686 Message-ID: <20090113111236.48BD711B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=570e3a470eea16de60271221dd557a344d97f7fc commit 570e3a470eea16de60271221dd557a344d97f7fc Author: Miklos Vajna Date: Tue Jan 13 12:12:03 2009 +0100 kernel-2.6.27-4-i686 - no rebuild yet - add oprofile support to configs diff --git a/source/base/kernel/config.i686 b/source/base/kernel/config.i686 index a45c041..daf8979 100644 --- a/source/base/kernel/config.i686 +++ b/source/base/kernel/config.i686 @@ -119,8 +119,9 @@ CONFIG_SLUB_DEBUG=y # CONFIG_SLAB is not set CONFIG_SLUB=y # CONFIG_SLOB is not set -# CONFIG_PROFILING is not set +CONFIG_PROFILING=y # CONFIG_MARKERS is not set +CONFIG_OPROFILE=m CONFIG_HAVE_OPROFILE=y # CONFIG_KPROBES is not set CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y diff --git a/source/base/kernel/config.ppc b/source/base/kernel/config.ppc index cc1daf7..fdd68f7 100644 --- a/source/base/kernel/config.ppc +++ b/source/base/kernel/config.ppc @@ -116,8 +116,9 @@ CONFIG_VM_EVENT_COUNTERS=y CONFIG_SLAB=y # CONFIG_SLUB is not set # CONFIG_SLOB is not set -# CONFIG_PROFILING is not set +CONFIG_PROFILING=y # CONFIG_MARKERS is not set +CONFIG_OPROFILE=m CONFIG_HAVE_OPROFILE=y # CONFIG_KPROBES is not set CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y diff --git a/source/base/kernel/config.x86_64 b/source/base/kernel/config.x86_64 index 789b403..d0c9739 100644 --- a/source/base/kernel/config.x86_64 +++ b/source/base/kernel/config.x86_64 @@ -118,8 +118,9 @@ CONFIG_SLUB_DEBUG=y # CONFIG_SLAB is not set CONFIG_SLUB=y # CONFIG_SLOB is not set -# CONFIG_PROFILING is not set +CONFIG_PROFILING=y # CONFIG_MARKERS is not set +CONFIG_OPROFILE=m CONFIG_HAVE_OPROFILE=y # CONFIG_KPROBES is not set CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y From vmiklos at frugalware.org Tue Jan 13 13:43:01 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jan 13 13:43:03 2009 Subject: [Frugalware-git] bmf: git-1.6.1.87.g1562445-1-i686 Message-ID: <20090113124301.591EA11B8630@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bmf.git;a=commitdiff;h=69a603b71c33b1b7e9618767f7dac47540b7b4a2 commit 69a603b71c33b1b7e9618767f7dac47540b7b4a2 Author: Miklos Vajna Date: Tue Jan 13 13:42:25 2009 +0100 git-1.6.1.87.g1562445-1-i686 - update to newer snapshot, now with user-manual.pdf diff --git a/source/devel-extra/git/FrugalBuild b/source/devel-extra/git/FrugalBuild index 6cf94d2..d41d3c3 100644 --- a/source/devel-extra/git/FrugalBuild +++ b/source/devel-extra/git/FrugalBuild @@ -9,13 +9,13 @@ USE_HTMLMAN=${USE_HTMLMAN:-"y"} pkgname=git pkgver=1.6.1 -Fuse $USE_DEVEL && pkgver=1.6.1.rc1.35.gae26e7c +Fuse $USE_DEVEL && pkgver=1.6.1.87.g1562445 pkgrel=1 pkgdesc="A fast, scalable, distributed revision control system." url="http://git-scm.com/" depends=('curl>=7.19.0' 'openssl' 'perl-error') backup=(etc/sysconfig/git) -makedepends=('asciidoc' 'docbook-xsl>=1.73.0-2' 'docbook-xml' 'docbook2x' 'sgml-common' 'xmlto' 'cpio') +makedepends=('asciidoc' 'docbook-xsl>=1.73.0-2' 'docbook-xml' 'docbook2x' 'sgml-common' 'xmlto' 'dblatex') groups=('devel-extra') archs=('i686' 'x86_64' 'ppc') up2date="Flasttar $url" @@ -61,9 +61,10 @@ build() fi Fconf - build_settings="V=1 ETC_GITCONFIG=/etc/gitconfig htmldir=/usr/share/doc/$pkgname-$pkgver mandir=/usr/share/man" - make $build_settings DOCBOOK2X_TEXI=docbook2texi all doc info || return 1 - Fmakeinstall $build_settings install-doc install-info + build_settings="V=1 ETC_GITCONFIG=/etc/gitconfig htmldir=/usr/share/doc/$pkgname-$pkgver \ + mandir=/usr/share/man pdfdir=/usr/share/doc/$pkgname-$pkgver" + make $build_settings DOCBOOK2X_TEXI=docbook2texi all doc info pdf || return 1 + Fmakeinstall $build_settings install-doc install-info install-pdf make -C Documentation WEBDOC_DEST=$Fdestdir/usr/share/doc/$pkgname-$pkgver install-webdoc || return 1 # broken symlink Frm /usr/share/doc/git-$pkgver/index.html From vmiklos at frugalware.org Tue Jan 13 13:43:01 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jan 13 13:43:08 2009 Subject: [Frugalware-git] bmf: git-1.6.1.rc1.35.gae26e7c-1-i686 Message-ID: <20090113124301.3C10D11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bmf.git;a=commitdiff;h=c53e4ece9502e6eba8162eb100367fc160326079 commit c53e4ece9502e6eba8162eb100367fc160326079 Author: Miklos Vajna Date: Tue Jan 13 13:18:05 2009 +0100 git-1.6.1.rc1.35.gae26e7c-1-i686 - sync with current diff --git a/source/devel-extra/git/FrugalBuild b/source/devel-extra/git/FrugalBuild index c3cc6a2..6cf94d2 100644 --- a/source/devel-extra/git/FrugalBuild +++ b/source/devel-extra/git/FrugalBuild @@ -8,20 +8,19 @@ USE_DEVEL=${USE_DEVEL:-"y"} USE_HTMLMAN=${USE_HTMLMAN:-"y"} pkgname=git -pkgver=1.6.0.4 +pkgver=1.6.1 Fuse $USE_DEVEL && pkgver=1.6.1.rc1.35.gae26e7c pkgrel=1 pkgdesc="A fast, scalable, distributed revision control system." -url="http://git.or.cz/" -pkgurl="http://www.eu.kernel.org/pub/software/scm/git/" +url="http://git-scm.com/" depends=('curl>=7.19.0' 'openssl' 'perl-error') backup=(etc/sysconfig/git) makedepends=('asciidoc' 'docbook-xsl>=1.73.0-2' 'docbook-xml' 'docbook2x' 'sgml-common' 'xmlto' 'cpio') groups=('devel-extra') archs=('i686' 'x86_64' 'ppc') -up2date="lynx -dump $pkgurl|grep -v rc |Flastarchive .tar.bz2" +up2date="Flasttar $url" if ! Fuse $USE_DEVEL; then - source=($pkgurl/$pkgname-$pkgver.tar.bz2) + source=(http://www.kernel.org/pub/software/scm/git/$pkgname-$pkgver.tar.bz2) signatures=(${source[0]}.sign '' '' '' '' '') fi source=(${source[@]} gitweb.modules.d gitweb.conf README.Frugalware rc.git git.sysconfig) From vmiklos at frugalware.org Tue Jan 13 13:57:10 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jan 13 13:57:14 2009 Subject: [Frugalware-git] frugalware-current: groff-1.20.1-1-i686 Message-ID: <20090113125710.B94D111B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bf9d668d1f0b6915aa0ea4edcabc7046c969796c commit bf9d668d1f0b6915aa0ea4edcabc7046c969796c Author: Miklos Vajna Date: Tue Jan 13 13:47:23 2009 +0100 groff-1.20.1-1-i686 - version bump diff --git a/source/base/groff/FrugalBuild b/source/base/groff/FrugalBuild index 41c3d07..3025e07 100644 --- a/source/base/groff/FrugalBuild +++ b/source/base/groff/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Miklos Vajna pkgname=groff -pkgver=1.20 +pkgver=1.20.1 pkgrel=1 pkgdesc="GNU troff text-formatting system" url="http://www.gnu.org/software/groff/groff.html" @@ -12,7 +12,7 @@ groups=('base') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump http://ftp.gnu.org/gnu/groff/|grep tar.gz$|sed 's/.*-\(.*\)\.t.*/\1/'|Fsort|sed -n '$ p'" source=(ftp://ftp.gnu.org/gnu/groff/groff-$pkgver.tar.gz) -sha1sums=('f5305a98b740d08e1db2d42ffff3168cccaa7fc9') +sha1sums=('3066587d73df73c2bda235034f4515cf52d22549') build() { From vmiklos at frugalware.org Tue Jan 13 13:57:10 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jan 13 13:57:16 2009 Subject: [Frugalware-git] frugalware-current: libedit-20090111_3.0-1-i686 Message-ID: <20090113125710.D47F511B8630@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7da594e22535a98a5904e8ce9400c9c5963e3dfa commit 7da594e22535a98a5904e8ce9400c9c5963e3dfa Author: Miklos Vajna Date: Tue Jan 13 13:48:36 2009 +0100 libedit-20090111_3.0-1-i686 - version bump diff --git a/source/lib-extra/libedit/FrugalBuild b/source/lib-extra/libedit/FrugalBuild index 9ae9d58..7b72ae6 100644 --- a/source/lib-extra/libedit/FrugalBuild +++ b/source/lib-extra/libedit/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Miklos Vajna pkgname=libedit -pkgver=20080712_2.11 +pkgver=20090111_3.0 pkgrel=1 pkgdesc="Editline Library" url="http://www.thrysoee.dk/editline/" @@ -11,7 +11,7 @@ groups=('lib-extra') archs=('i686' 'x86_64') up2date="Flasttar $url|sed 's/-/_/'" source=(http://www.thrysoee.dk/editline/libedit-${pkgver/_/-}.tar.gz) -sha1sums=('5d53aa79b73a160436ffd4eda5df08bcd347b6ab') +sha1sums=('ea1c4b010a787e2b906d029fb420e4bf7eaeadb7') _F_cd_path="libedit-${pkgver/_/-}" # optimization OK From vmiklos at frugalware.org Tue Jan 13 13:57:11 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jan 13 13:57:18 2009 Subject: [Frugalware-git] frugalware-current: flowplayer-3.0.3-1-i686 Message-ID: <20090113125711.0870811B8631@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4b5200139bb1b8a07f5a5a4af2ed3965fbab58c5 commit 4b5200139bb1b8a07f5a5a4af2ed3965fbab58c5 Author: Miklos Vajna Date: Tue Jan 13 13:51:12 2009 +0100 flowplayer-3.0.3-1-i686 - version bump diff --git a/source/network-extra/flowplayer/FrugalBuild b/source/network-extra/flowplayer/FrugalBuild index 54bb2e3..80b0f00 100644 --- a/source/network-extra/flowplayer/FrugalBuild +++ b/source/network-extra/flowplayer/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Miklos Vajna pkgname=flowplayer -pkgver=3.0.2 +pkgver=3.0.3 pkgrel=1 pkgdesc="A video player for Flash Video in FLV format." url="http://flowplayer.org/" @@ -14,7 +14,7 @@ _F_archive_grepv="src" up2date="Flastarchive http://flowplayer.org/download/index.html .zip" source=(http://flowplayer.org/releases/flowplayer/flowplayer-$pkgver.zip \ README.Frugalware) -sha1sums=('700be39235c9f39b9a15e0aaf491e9bb379f28dd' \ +sha1sums=('cf41b0e5da743aee64dff169a9915228c55ca174' \ '8ea76d8a45d07c872ca4484b8d9f16c814d64fb9') build() From vmiklos at frugalware.org Tue Jan 13 13:57:11 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jan 13 13:57:19 2009 Subject: [Frugalware-git] frugalware-current: libsamplerate-0.1.5-1-i686 Message-ID: <20090113125711.2BF7411B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=85da024a73a68f0baebafb16c51dfcdb3c16e355 commit 85da024a73a68f0baebafb16c51dfcdb3c16e355 Author: Miklos Vajna Date: Tue Jan 13 13:52:36 2009 +0100 libsamplerate-0.1.5-1-i686 - version bump diff --git a/source/multimedia/libsamplerate/FrugalBuild b/source/multimedia/libsamplerate/FrugalBuild index a99ac49..ff2c199 100644 --- a/source/multimedia/libsamplerate/FrugalBuild +++ b/source/multimedia/libsamplerate/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Miklos Vajna pkgname=libsamplerate -pkgver=0.1.4 +pkgver=0.1.5 pkgrel=1 pkgdesc="Secret Rabbit Code" url="http://www.mega-nerd.com/SRC" @@ -11,6 +11,6 @@ groups=('multimedia') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump $url/download.html|grep tar.gz|sed -n -e 's/.*e-\(.*\)\.t.*/\1/' -e '1 p'" source=(http://www.mega-nerd.com/SRC/$pkgname-$pkgver.tar.gz) -sha1sums=('47837f4ab5f3655f3d59ce2dc9bcf032826e52e8') +sha1sums=('210d2463401cbc3359d46202a03f3e82057bacb2') # optimization OK From vmiklos at frugalware.org Tue Jan 13 13:57:11 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jan 13 13:57:21 2009 Subject: [Frugalware-git] frugalware-current: b2evolution-2.4.6-1-i686 Message-ID: <20090113125711.546CC11B887D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7abfec883cfd4391fe0f51e5ffebd37cc0790a29 commit 7abfec883cfd4391fe0f51e5ffebd37cc0790a29 Author: Miklos Vajna Date: Tue Jan 13 13:56:56 2009 +0100 b2evolution-2.4.6-1-i686 - version bump diff --git a/source/network-extra/b2evolution/FrugalBuild b/source/network-extra/b2evolution/FrugalBuild index bd0609a..ed2570b 100644 --- a/source/network-extra/b2evolution/FrugalBuild +++ b/source/network-extra/b2evolution/FrugalBuild @@ -2,12 +2,12 @@ # Maintainer: Miklos Vajna pkgname=b2evolution -pkgver=2.4.5 +pkgver=2.4.6 pkgrel=1 pkgdesc="A powerful blog tool you can install on your own website." _F_sourceforge_dirname="evocms" # see http://b2evolution.net/downloads/index.html -_F_sourceforge_ext="-stable-2008-09-17.zip" +_F_sourceforge_ext="-stable-2009-01-12.zip" Finclude sourceforge url="http://b2evolution.net/" rodepends=('apache' 'php' 'mysql' 'webappconfig') @@ -17,7 +17,7 @@ archs=('i686' 'x86_64') up2date="lynx -dump http://b2evolution.net/downloads/index.html|grep Stable|sed 's/ \+\([0-9.]*\) .*/\1/;q'" backup=(var/www/b2evolution/blogs/conf/_basic_config.php) source=($source b2evosetup README.Frugalware) -sha1sums=('e5faf409dd3e3e46f639cfde8c1658a57db3b201' \ +sha1sums=('7929652cd46fd342731b7d181f084fbc5ef1a6d6' \ '8341c7f3831489959840a5d0f5eb55c6afb6fc58' \ '3b1583125ff4604da9519c05675e2e7a310681cb') options=('stick') From boobaa at frugalware.org Tue Jan 13 14:33:55 2009 From: boobaa at frugalware.org (CSÉCSY László) Date: Tue Jan 13 14:33:58 2009 Subject: [Frugalware-git] frugalware-current: siege-2.67-1-i686 Message-ID: <20090113133355.225BF11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=20e561cb9d78adb617e77c1c69f5d8a9f4168837 commit 20e561cb9d78adb617e77c1c69f5d8a9f4168837 Author: CSÉCSY László Date: Tue Jan 13 14:33:15 2009 +0100 siege-2.67-1-i686 new package / intial import diff --git a/source/network-extra/siege/FrugalBuild b/source/network-extra/siege/FrugalBuild new file mode 100644 index 0000000..574ccc9 --- /dev/null +++ b/source/network-extra/siege/FrugalBuild @@ -0,0 +1,24 @@ +# Compiling Time: 0.01 SBU +# Maintainer: CSÉCSY László + +pkgname=siege +pkgver=2.67 +pkgrel=1 +pkgdesc="An http regression testing and benchmarking utility." +url="http://www.joedog.org/index/siege-home" +depends=('openssl') +groups=('network-extra') +archs=('i686') +up2date="lynx -dump $url | grep stable | sed 's/.*SIEGE-\([0-9.]\+\) .*/\1/'" +source=(ftp://ftp.joedog.org/pub/$pkgname/$pkgname-$pkgver.tar.gz destdir.patch) +sha1sums=('8beb37a0a2dd5253ae2534903d26fe2b7f34f3fb' \ + 'cda82637ddf7ab09153ee768f83d7406139cae93') + +build() { + Fpatchall + utils/bootstrap || return 1 + Fmake --sysconfdir=/etc/siege + Fmakeinstall +} + +# optimization OK diff --git a/source/network-extra/siege/destdir.patch b/source/network-extra/siege/destdir.patch new file mode 100644 index 0000000..f1dfab8 --- /dev/null +++ b/source/network-extra/siege/destdir.patch @@ -0,0 +1,22 @@ +diff --git a/doc/Makefile.am b/doc/Makefile.am +index de1c679..2d8928a 100644 +--- a/doc/Makefile.am ++++ b/doc/Makefile.am +@@ -44,7 +44,7 @@ DISTCLEANFILES = siegerc $(man_MANS) + + SIEGERC = $(HOME)/.siegerc + +-URLSTXT = $(sysconfdir)/urls.txt ++URLSTXT = $(DESTDIR)$(sysconfdir)/urls.txt + + install-exec-hook: + @if test -f $(SIEGERC); then \ +@@ -70,7 +70,7 @@ install-exec-hook: + echo " It was NOT replaced with this installation."; \ + fi; \ + else \ +- $(mkinstalldirs) $(sysconfdir); \ ++ $(mkinstalldirs) $(DESTDIR)$(sysconfdir); \ + $(INSTALL_DATA) $(srcdir)/urls.txt $(URLSTXT); \ + fi + From vmiklos at frugalware.org Tue Jan 13 16:04:10 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jan 13 16:04:13 2009 Subject: [Frugalware-git] homepage-ng: FSA564-phpmyadmin Message-ID: <20090113150410.DE35D11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=8a181bc45f2257e7eb7561f8f4f3b9376c6f2131 commit 8a181bc45f2257e7eb7561f8f4f3b9376c6f2131 Author: Miklos Vajna Date: Tue Jan 13 16:04:07 2009 +0100 FSA564-phpmyadmin diff --git a/frugalware/xml/security.xml b/frugalware/xml/security.xml index 1ed11c1..b4fdb7e 100644 --- a/frugalware/xml/security.xml +++ b/frugalware/xml/security.xml @@ -26,6 +26,17 @@ + 564 + 2009-01-13 + Miklos Vajna + phpmyadmin + 2.11.9.3-1solaria1 + 2.11.9.4-1solaria1 + http://bugs.frugalware.org/task/3548 + No CVE, see http://sourceforge.net/forum/forum.php?forum_id=896047. + This fixes an SQL injection, see http://www.milw0rm.com/exploits/7382 for more info. + + 563 2008-12-20 Miklos Vajna From vmiklos at frugalware.org Tue Jan 13 16:21:19 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jan 13 16:21:20 2009 Subject: [Frugalware-git] frugalware-0.9: kernel-2.6.26-2solaria2-i686 Message-ID: <20090113152119.8FADF11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.9.git;a=commitdiff;h=c401cee20e6575119a06d8ed5d33f2db21ca4752 commit c401cee20e6575119a06d8ed5d33f2db21ca4752 Author: Miklos Vajna Date: Tue Jan 13 16:20:54 2009 +0100 kernel-2.6.26-2solaria2-i686 - add CVE-2008-5079.patch - closes #3527 diff --git a/source/base/kernel/CVE-2008-5079.patch b/source/base/kernel/CVE-2008-5079.patch new file mode 100644 index 0000000..df46ed5 --- /dev/null +++ b/source/base/kernel/CVE-2008-5079.patch @@ -0,0 +1,42 @@ +From 17b24b3c97498935a2ef9777370b1151dfed3f6f Mon Sep 17 00:00:00 2001 +From: Chas Williams +Date: Thu, 4 Dec 2008 14:58:13 -0800 +Subject: [PATCH] ATM: CVE-2008-5079: duplicate listen() on socket corrupts the vcc table + +As reported by Hugo Dias that it is possible to cause a local denial +of service attack by calling the svc_listen function twice on the same +socket and reading /proc/net/atm/*vc + +Signed-off-by: Chas Williams +Signed-off-by: David S. Miller +--- + net/atm/svc.c | 6 +++++- + 1 files changed, 5 insertions(+), 1 deletions(-) + +diff --git a/net/atm/svc.c b/net/atm/svc.c +index de1e4f2..8fb54dc 100644 +--- a/net/atm/svc.c ++++ b/net/atm/svc.c +@@ -293,7 +293,10 @@ static int svc_listen(struct socket *sock,int backlog) + error = -EINVAL; + goto out; + } +- vcc_insert_socket(sk); ++ if (test_bit(ATM_VF_LISTEN, &vcc->flags)) { ++ error = -EADDRINUSE; ++ goto out; ++ } + set_bit(ATM_VF_WAITING, &vcc->flags); + prepare_to_wait(sk->sk_sleep, &wait, TASK_UNINTERRUPTIBLE); + sigd_enq(vcc,as_listen,NULL,NULL,&vcc->local); +@@ -307,6 +310,7 @@ static int svc_listen(struct socket *sock,int backlog) + goto out; + } + set_bit(ATM_VF_LISTEN,&vcc->flags); ++ vcc_insert_socket(sk); + sk->sk_max_ack_backlog = backlog > 0 ? backlog : ATM_BACKLOG_DEFAULT; + error = -sk->sk_err; + out: +-- +1.6.1 + diff --git a/source/base/kernel/FrugalBuild b/source/base/kernel/FrugalBuild index a8262b1..332a891 100644 --- a/source/base/kernel/FrugalBuild +++ b/source/base/kernel/FrugalBuild @@ -1,6 +1,6 @@ # Compiling Time: 9.14 SBU # Maintainer: Miklos Vajna -_F_kernel_patches=(CVE-2008-5300.patch) +_F_kernel_patches=(CVE-2008-5300.patch CVE-2008-5079.patch) Finclude kernel -pkgrel=2solaria1 +pkgrel=2solaria2 From vmiklos at frugalware.org Tue Jan 13 16:28:01 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jan 13 16:28:03 2009 Subject: [Frugalware-git] frugalware-0.9: openssl-0.9.8-15solaria1-i686 Message-ID: <20090113152801.6059D11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.9.git;a=commitdiff;h=25583816f4f2502fbd01450bad1f5f095da5fece commit 25583816f4f2502fbd01450bad1f5f095da5fece Author: Miklos Vajna Date: Tue Jan 13 16:27:34 2009 +0100 openssl-0.9.8-15solaria1-i686 - add CVE-2008-5077.patch - closes #3557 diff --git a/source/lib/openssl/CVE-2008-5077.patch b/source/lib/openssl/CVE-2008-5077.patch new file mode 100644 index 0000000..b2816c9 --- /dev/null +++ b/source/lib/openssl/CVE-2008-5077.patch @@ -0,0 +1,221 @@ +OpenSSL Security Advisory [07-Jan-2009] + +Incorrect checks for malformed signatures +=========================================== + +Several functions inside OpenSSL incorrectly checked the result after +calling the EVP_VerifyFinal function, allowing a malformed signature +to be treated as a good signature rather than as an error. This issue +affected the signature checks on DSA and ECDSA keys used with +SSL/TLS. + +One way to exploit this flaw would be for a remote attacker who is in +control of a malicious server or who can use a 'man in the middle' +attack to present a malformed SSL/TLS signature from a certificate chain +to a vulnerable client, bypassing validation. + +This vulnerability is tracked as CVE-2008-5077. + +The OpenSSL security team would like to thank the Google Security Team +for reporting this issue. + +Who is affected? +================= + +Everyone using OpenSSL releases prior to 0.9.8j as an SSL/TLS client +when connecting to a server whose certificate contains a DSA or ECDSA key. + +Use of OpenSSL as an SSL/TLS client when connecting to a server whose +certificate uses an RSA key is NOT affected. + +Verification of client certificates by OpenSSL servers for any key type +is NOT affected. + +Recommendations for users of OpenSSL +===================================== + +Users of OpenSSL 0.9.8 should update to the OpenSSL 0.9.8j release +which contains a patch to correct this issue. + +The patch used is also appended to this advisory for users or +distributions who wish to backport this patch to versions they build +from source. + +Recommendations for projects using OpenSSL +=========================================== + +Projects and products using OpenSSL should audit any use of the +routine EVP_VerifyFinal() to ensure that the return code is being +correctly handled. As documented, this function returns 1 for a +successful verification, 0 for failure, and -1 for an error. + +General recommendations +======================== + +Any server that has clients using OpenSSL verifying DSA or ECDSA +certificates, regardless of the software used by the server, should +either ensure that all clients are upgraded or stop using DSA/ECDSA +certificates. Note that unless certificates are revoked (and clients +check for revocation) impersonation will still be possible until the +certificate expires. + +References +=========== + +URL for this Security Advisory: +http://www.openssl.org/news/secadv_20090107.txt + + +diff -ur openssl-0.9.8i-ORIG/apps/speed.c openssl-0.9.8i/apps/speed.c +--- openssl-0.9.8i/apps/speed.c 2007-11-15 13:33:47.000000000 +0000 ++++ openssl-0.9.8i/apps/speed-new.c 2008-12-04 00:00:00.000000000 +0000 +@@ -2132,7 +2132,7 @@ + { + ret=RSA_verify(NID_md5_sha1, buf,36, buf2, + rsa_num, rsa_key[j]); +- if (ret == 0) ++ if (ret <= 0) + { + BIO_printf(bio_err, + "RSA verify failure\n"); +diff -ur openssl-0.9.8i-ORIG/apps/spkac.c openssl-0.9.8i/apps/spkac.c +--- openssl-0.9.8i-ORIG/apps/spkac.c 2005-04-05 19:11:18.000000000 +0000 ++++ openssl-0.9.8i/apps/spkac.c 2008-12-04 00:00:00.000000000 +0000 +@@ -285,7 +285,7 @@ + pkey = NETSCAPE_SPKI_get_pubkey(spki); + if(verify) { + i = NETSCAPE_SPKI_verify(spki, pkey); +- if(i) BIO_printf(bio_err, "Signature OK\n"); ++ if (i > 0) BIO_printf(bio_err, "Signature OK\n"); + else { + BIO_printf(bio_err, "Signature Failure\n"); + ERR_print_errors(bio_err); +diff -ur openssl-0.9.8i-ORIG/apps/verify.c openssl-0.9.8i/apps/verify.c +--- openssl-0.9.8i-ORIG/apps/verify.c 2004-11-29 11:28:07.000000000 +0000 ++++ openssl-0.9.8i/apps/verify.c 2008-12-04 00:00:00.600000000 +0000 +@@ -266,7 +266,7 @@ + + ret=0; + end: +- if (i) ++ if (i > 0) + { + fprintf(stdout,"OK\n"); + ret=1; +@@ -367,4 +367,3 @@ + ERR_clear_error(); + return(ok); + } +- +diff -ur openssl-0.9.8i-ORIG/apps/x509.c openssl-0.9.8i/apps/x509.c +--- openssl-0.9.8i-ORIG/apps/x509.c 2007-10-12 00:00:10.000000000 +0000 ++++ openssl-0.9.8i/apps/x509.c 2008-12-04 00:00:00.400000000 +0000 +@@ -1151,7 +1151,7 @@ + /* NOTE: this certificate can/should be self signed, unless it was + * a certificate request in which case it is not. */ + X509_STORE_CTX_set_cert(&xsc,x); +- if (!reqfile && !X509_verify_cert(&xsc)) ++ if (!reqfile && X509_verify_cert(&xsc) <= 0) + goto end; + + if (!X509_check_private_key(xca,pkey)) +diff -ur openssl-0.9.8i-ORIG/crypto/cms/cms_sd.c openssl-0.9.8i/crypto/cms/cms_sd.c +--- openssl-0.9.8i-ORIG/crypto/cms/cms_sd.c 2008-04-06 16:30:38.000000000 +0000 ++++ openssl-0.9.8i/crypto/cms/cms_sd.c 2008-12-04 00:00:00.400000000 +0000 +@@ -830,7 +830,7 @@ + cms_fixup_mctx(&mctx, si->pkey); + r = EVP_VerifyFinal(&mctx, + si->signature->data, si->signature->length, si->pkey); +- if (!r) ++ if (r <= 0) + CMSerr(CMS_F_CMS_SIGNERINFO_VERIFY, CMS_R_VERIFICATION_FAILURE); + err: + EVP_MD_CTX_cleanup(&mctx); +diff -ur openssl-0.9.8i-ORIG/ssl/s2_clnt.c openssl-0.9.8i/ssl/s2_clnt.c +--- openssl-0.9.8i-ORIG/ssl/s2_clnt.c 2007-09-06 12:43:53.000000000 +0000 ++++ openssl-0.9.8i/ssl/s2_clnt.c 2008-12-04 00:00:00.100000000 +0000 +@@ -1044,7 +1044,7 @@ + + i=ssl_verify_cert_chain(s,sk); + +- if ((s->verify_mode != SSL_VERIFY_NONE) && (!i)) ++ if ((s->verify_mode != SSL_VERIFY_NONE) && (i <= 0)) + { + SSLerr(SSL_F_SSL2_SET_CERTIFICATE,SSL_R_CERTIFICATE_VERIFY_FAILED); + goto err; +diff -ur openssl-0.9.8i-ORIG/ssl/s2_srvr.c openssl-0.9.8i/ssl/s2_srvr.c +--- openssl-0.9.8i-ORIG/ssl/s2_srvr.c 2007-09-06 12:43:53.000000000 +0000 ++++ openssl-0.9.8i/ssl/s2_srvr.c 2008-12-04 00:00:00.900000000 +0000 +@@ -1054,7 +1054,7 @@ + + i=ssl_verify_cert_chain(s,sk); + +- if (i) /* we like the packet, now check the chksum */ ++ if (i > 0) /* we like the packet, now check the chksum */ + { + EVP_MD_CTX ctx; + EVP_PKEY *pkey=NULL; +@@ -1083,7 +1083,7 @@ + EVP_PKEY_free(pkey); + EVP_MD_CTX_cleanup(&ctx); + +- if (i) ++ if (i > 0) + { + if (s->session->peer != NULL) + X509_free(s->session->peer); +diff -ur openssl-0.9.8i-ORIG/ssl/s3_clnt.c openssl-0.9.8i/ssl/s3_clnt.c +--- openssl-0.9.8i-ORIG/ssl/s3_clnt.c 2008-06-16 16:56:41.000000000 +0000 ++++ openssl-0.9.8i/ssl/s3_clnt.c 2008-12-04 00:00:00.100000000 +0000 +@@ -972,7 +972,7 @@ + } + + i=ssl_verify_cert_chain(s,sk); +- if ((s->verify_mode != SSL_VERIFY_NONE) && (!i) ++ if ((s->verify_mode != SSL_VERIFY_NONE) && (i <= 0) + #ifndef OPENSSL_NO_KRB5 + && (s->s3->tmp.new_cipher->algorithms & (SSL_MKEY_MASK|SSL_AUTH_MASK)) + != (SSL_aKRB5|SSL_kKRB5) +@@ -1459,7 +1459,7 @@ + EVP_VerifyUpdate(&md_ctx,&(s->s3->client_random[0]),SSL3_RANDOM_SIZE); + EVP_VerifyUpdate(&md_ctx,&(s->s3->server_random[0]),SSL3_RANDOM_SIZE); + EVP_VerifyUpdate(&md_ctx,param,param_len); +- if (!EVP_VerifyFinal(&md_ctx,p,(int)n,pkey)) ++ if (EVP_VerifyFinal(&md_ctx,p,(int)n,pkey) <= 0) + { + /* bad signature */ + al=SSL_AD_DECRYPT_ERROR; +@@ -1477,7 +1477,7 @@ + EVP_VerifyUpdate(&md_ctx,&(s->s3->client_random[0]),SSL3_RANDOM_SIZE); + EVP_VerifyUpdate(&md_ctx,&(s->s3->server_random[0]),SSL3_RANDOM_SIZE); + EVP_VerifyUpdate(&md_ctx,param,param_len); +- if (!EVP_VerifyFinal(&md_ctx,p,(int)n,pkey)) ++ if (EVP_VerifyFinal(&md_ctx,p,(int)n,pkey) <= 0) + { + /* bad signature */ + al=SSL_AD_DECRYPT_ERROR; +diff -ur openssl-0.9.8i-ORIG/ssl/s3_srvr.c openssl-0.9.8i/ssl/s3_srvr.c +--- openssl-0.9.8i-ORIG/ssl/s3_srvr.c 2008-09-14 18:16:09.000000000 +0000 ++++ openssl-0.9.8i/ssl/s3_srvr.c 2008-12-04 00:00:00.100000000 +0000 +@@ -2560,7 +2560,7 @@ + else + { + i=ssl_verify_cert_chain(s,sk); +- if (!i) ++ if (i <= 0) + { + al=ssl_verify_alarm_type(s->verify_result); + SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE,SSL_R_NO_CERTIFICATE_RETURNED); +diff -ur openssl-0.9.8i-ORIG/ssl/ssltest.c openssl-0.9.8i/ssl/ssltest.c +--- openssl-0.9.8i-ORIG/ssl/ssltest.c 2008-06-16 16:56:42.000000000 +0000 ++++ openssl-0.9.8i/ssl/ssltest.c 2008-12-04 00:00:00.900000000 +0000 +@@ -2093,7 +2093,7 @@ + + if (cb_arg->proxy_auth) + { +- if (ok) ++ if (ok > 0) + { + const char *cond_end = NULL; + + diff --git a/source/lib/openssl/FrugalBuild b/source/lib/openssl/FrugalBuild index 7503e50..68e5179 100644 --- a/source/lib/openssl/FrugalBuild +++ b/source/lib/openssl/FrugalBuild @@ -5,7 +5,7 @@ pkgname=openssl pkgver=0.9.8 pkgextraver=h -pkgrel=14 +pkgrel=15solaria1 pkgdesc="The Open Source toolkit for Secure Sockets Layer and Transport Layer Security" url="http://www.openssl.org/source/" groups=('lib' 'chroot-core') @@ -13,8 +13,8 @@ archs=('i686' 'x86_64' 'ppc') depends=('glibc>=2.8-3') makedepends=('util-linux-ng>=2.14-2') up2date="lynx -source http://www.openssl.org/source/ |grep LATEST|sed -n 's/.*-\(.*\)\.t.*/\1/;s/$pkgextraver//;1 p'" -source=($url$pkgname-$pkgver$pkgextraver.tar.gz man_symlinks.diff) -signatures=("$source.asc" '') +source=($url$pkgname-$pkgver$pkgextraver.tar.gz man_symlinks.diff CVE-2008-5077.patch) +signatures=("$source.asc" '' '') build() { From vmiklos at frugalware.org Tue Jan 13 16:33:13 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jan 13 16:33:15 2009 Subject: [Frugalware-git] frugalware-current: firefox-firebug-1.3.0-1-ppc Message-ID: <20090113153313.D174A11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f1cc8f401f82d2474bc1088c34ce27d01297bcca commit f1cc8f401f82d2474bc1088c34ce27d01297bcca Author: Miklos Vajna Date: Tue Jan 13 16:33:41 2009 +0100 firefox-firebug-1.3.0-1-ppc added ppc to archs() diff --git a/source/xapps-extra/firefox-firebug/FrugalBuild b/source/xapps-extra/firefox-firebug/FrugalBuild index 7a53a3c..556e5dd 100644 --- a/source/xapps-extra/firefox-firebug/FrugalBuild +++ b/source/xapps-extra/firefox-firebug/FrugalBuild @@ -16,3 +16,4 @@ _F_firefox_nocurly=1 Finclude firefox-extension sha1sums=('9abb9f24e637db995fc3e3e0b65a6e2af371f8b0' \ 'bd28013296ba44b61bc73f367fbaa536ddfdf933') +archs=(${archs[@]} 'ppc') From vmiklos at frugalware.org Tue Jan 13 16:34:50 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jan 13 16:34:51 2009 Subject: [Frugalware-git] frugalware-0.9: mplayer-1.0rc2-7solaria2-i686 Message-ID: <20090113153450.7B11B11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.9.git;a=commitdiff;h=c372e501da5c488827a50f6fa9ff8eaead4fe395 commit c372e501da5c488827a50f6fa9ff8eaead4fe395 Author: Miklos Vajna Date: Tue Jan 13 16:34:29 2009 +0100 mplayer-1.0rc2-7solaria2-i686 - add fix-for-vqf-demuxer-crashes.patch (closes #3524) - add ivtv_2.6.24.patch (fixes FTBFS) Conflicts: source/xapps/mplayer/FrugalBuild diff --git a/source/xapps/mplayer/FrugalBuild b/source/xapps/mplayer/FrugalBuild index 19cab0d..830d713 100644 --- a/source/xapps/mplayer/FrugalBuild +++ b/source/xapps/mplayer/FrugalBuild @@ -5,7 +5,7 @@ pkgname=mplayer _F_archive_name=MPlayer pkgver=1.0rc2 pkgextraver= -pkgrel=7solaria1 +pkgrel=7solaria2 pkgdesc="The Movie Player" url="http://www.mplayerhq.hu/" depends=('mesa' 'fontconfig' 'libstdc++' 'libdv' 'termcap' 'libjpeg' 'libmad' \ @@ -31,7 +31,9 @@ source=(http://www.mplayerhq.hu/MPlayer/releases/$_F_archive_name-$pkgver$pkgext http://www.mplayerhq.hu/MPlayer/patches/demux_audio_fix_20080129.diff \ http://www.mplayerhq.hu/MPlayer/patches/stream_cddb_fix_20080120.diff \ CVE-2008-0073.diff \ - http://www.ocert.org/patches/2008-013/mplayer_demux_real.patch) + http://www.ocert.org/patches/2008-013/mplayer_demux_real.patch \ + fix-for-vqf-demuxer-crashes.patch \ + ivtv_2.6.24.patch) sha1sums=('e9b496f3527c552004ec6d01d6b43f196b43ce2d' \ '45e5ee7a5541a5f1cfd2678a6c9b5911ca473cb9' \ 'ccf11dce5d0fb72fd3af97f788b7471cd0cd0b68' \ @@ -43,7 +45,9 @@ sha1sums=('e9b496f3527c552004ec6d01d6b43f196b43ce2d' \ 'e25ba7d8d696d9c6365f105134ba723404adb4e1' \ '8d901c7a88fa120ed26492e741e1ae0fbe57e12d' \ 'df2d0c46a73be32ec5e3d575532c34b939a79d5f' \ - '3139c1c13d411cbacef9a9d050c9df87431aba71') + '3139c1c13d411cbacef9a9d050c9df87431aba71' \ + '19f886cddc59a6f7ef5b9c4c1cdb731ec481fe13' \ + 'dbb1eab7de79cbff3a15eeb8acbe34a853800afa') # To add v4l support. # mknod -m 660 /dev/video0 c 81 0 diff --git a/source/xapps/mplayer/fix-for-vqf-demuxer-crashes.patch b/source/xapps/mplayer/fix-for-vqf-demuxer-crashes.patch new file mode 100644 index 0000000..2356263 --- /dev/null +++ b/source/xapps/mplayer/fix-for-vqf-demuxer-crashes.patch @@ -0,0 +1,55 @@ +--- 1.0rc2/libmpdemux/demux_vqf.c 2007/10/07 16:27:03 24723 ++++ 1.0rc2/libmpdemux/demux_vqf.c 2008/12/14 15:18:41 28150 +@@ -50,11 +50,14 @@ + unsigned chunk_size; + hi->size=chunk_size=stream_read_dword(s); /* include itself */ + stream_read(s,chunk_id,4); ++ if (chunk_size < 8) return NULL; ++ chunk_size -= 8; + if(*((uint32_t *)&chunk_id[0])==mmioFOURCC('C','O','M','M')) + { +- char buf[chunk_size-8]; ++ char buf[BUFSIZ]; + unsigned i,subchunk_size; +- if(stream_read(s,buf,chunk_size-8)!=chunk_size-8) return NULL; ++ if (chunk_size > sizeof(buf) || chunk_size < 20) return NULL; ++ if(stream_read(s,buf,chunk_size)!=chunk_size) return NULL; + i=0; + subchunk_size=be2me_32(*((uint32_t *)&buf[0])); + hi->channelMode=be2me_32(*((uint32_t *)&buf[4])); +@@ -83,13 +86,15 @@ + sh_audio->samplesize = 4; + w->wBitsPerSample = 8*sh_audio->samplesize; + w->cbSize = 0; ++ if (subchunk_size > chunk_size - 4) continue; + i+=subchunk_size+4; +- while(i sizeof(sdata) - 1 || slen > chunk_size - i) break; + if(sid==mmioFOURCC('D','S','I','Z')) + { + hi->Dsiz=be2me_32(*((uint32_t *)&buf[i])); +@@ -141,7 +146,7 @@ + if(*((uint32_t *)&chunk_id[0])==mmioFOURCC('D','A','T','A')) + { + demuxer->movi_start=stream_tell(s); +- demuxer->movi_end=demuxer->movi_start+chunk_size-8; ++ demuxer->movi_end=demuxer->movi_start+chunk_size; + mp_msg(MSGT_DEMUX, MSGL_V, "Found data at %"PRIX64" size %"PRIu64"\n",demuxer->movi_start,demuxer->movi_end); + /* Done! play it */ + break; +@@ -149,7 +154,7 @@ + else + { + mp_msg(MSGT_DEMUX, MSGL_V, "Unhandled chunk '%c%c%c%c' %u bytes\n",((char *)&chunk_id)[0],((char *)&chunk_id)[1],((char *)&chunk_id)[2],((char *)&chunk_id)[3],chunk_size); +- stream_skip(s,chunk_size-8); /*unknown chunk type */ ++ stream_skip(s,chunk_size); /*unknown chunk type */ + } + } + diff --git a/source/xapps/mplayer/ivtv_2.6.24.patch b/source/xapps/mplayer/ivtv_2.6.24.patch new file mode 100644 index 0000000..4e0a3fe --- /dev/null +++ b/source/xapps/mplayer/ivtv_2.6.24.patch @@ -0,0 +1,33 @@ +Patch to account for linux-2.6.24.x including ivtv, but MPlayer won't +build against it. See this link for more information and the origin +of the patch: +http://archives.free.net.ph/message/20080201.201454.1047775e.en.html +Thanks to Robby Workman for pointing me to this one. + +diff -Nur MPlayer-1.0rc2.orig/configure MPlayer-1.0rc2/configure +--- MPlayer-1.0rc2.orig/configure 2007-10-07 21:49:33.000000000 +0200 ++++ MPlayer-1.0rc2/configure 2008-03-10 10:27:29.000000000 +0100 +@@ -4920,7 +4920,7 @@ + echores "$_dxr3" + + +-echocheck "IVTV TV-Out" ++echocheck "IVTV TV-Out (pre linux-2.6.24)" + if test "$_ivtv" = auto ; then + cat > $TMPC << EOF + #include +@@ -4928,7 +4928,13 @@ + #include + #include + #include +-int main(void) { return 0; } ++#include ++int main(void) { ++struct ivtv_cfg_stop_decode sd; ++struct ivtv_cfg_start_decode sd1; ++ioctl (0, IVTV_IOC_START_DECODE, &sd1); ++ioctl (0, IVTV_IOC_STOP_DECODE, &sd); ++return 0; } + EOF + _ivtv=no + cc_check && _ivtv=yes From vmiklos at frugalware.org Tue Jan 13 16:37:18 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jan 13 16:37:19 2009 Subject: [Frugalware-git] frugalware-0.9: mantis-1.1.5-1solaria1-i686 Message-ID: <20090113153718.DDBA811B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.9.git;a=commitdiff;h=9e5998427e057394a30541f6187eff88f5b430c9 commit 9e5998427e057394a30541f6187eff88f5b430c9 Author: Miklos Vajna Date: Tue Jan 13 16:36:51 2009 +0100 mantis-1.1.5-1solaria1-i686 secfix bump closes #3490 in -stable Conflicts: source/network-extra/mantis/FrugalBuild diff --git a/source/network-extra/mantis/FrugalBuild b/source/network-extra/mantis/FrugalBuild index a5ed8e2..2585c6d 100644 --- a/source/network-extra/mantis/FrugalBuild +++ b/source/network-extra/mantis/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: CSÉCSY László pkgname=mantis -pkgver=1.1.4 +pkgver=1.1.5 pkgrel=1solaria1 pkgdesc="a free popular web-based bugtracking system" rodepends=('php>=4.0.6' 'mysql>=3.23.2') @@ -13,20 +13,21 @@ _F_sourceforge_name=mantisbt Finclude sourceforge url="http://www.mantisbt.org/" up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=14963\&package_id=166159|grep -m1 'Latest \[.*\]'|sed 's/.*]\(.*\) \[.*/\1/'" -source=(${source//mantisbt-/mantis-} strings_hungarian.txt email_padding.patch README.Frugalware) +source=($source strings_hungarian.txt email_padding.patch README.Frugalware) options=('stick') backup=('var/www/mantis/config_inc.php') build() { + Fcd ${pkgname}bt-$pkgver Fpatchall Fmkdir /{var/www,usr/share/doc/$pkgname-$pkgver} - Fmv ../src/$pkgname-$pkgver/doc/LICENSE /usr/share/doc/$pkgname-$pkgver/ - Fmv ../src/$pkgname-$pkgver/doc/INSTALL /usr/share/doc/$pkgname-$pkgver/ - Fmv ../src/$pkgname-$pkgver/doc/CREDITS /usr/share/doc/$pkgname-$pkgver/ - Fmv ../src/$pkgname-$pkgver/doc/CUSTOMIZATION /usr/share/doc/$pkgname-$pkgver/ - Fmv ../src/$pkgname-$pkgver/doc/ChangeLog /usr/share/doc/$pkgname-$pkgver/ - Fmv ../src/$pkgname-$pkgver /var/www/$pkgname + Fmv ../src/${pkgname}bt-$pkgver/doc/LICENSE /usr/share/doc/$pkgname-$pkgver/ + Fmv ../src/${pkgname}bt-$pkgver/doc/INSTALL /usr/share/doc/$pkgname-$pkgver/ + Fmv ../src/${pkgname}bt-$pkgver/doc/CREDITS /usr/share/doc/$pkgname-$pkgver/ + Fmv ../src/${pkgname}bt-$pkgver/doc/CUSTOMIZATION /usr/share/doc/$pkgname-$pkgver/ + Fmv ../src/${pkgname}bt-$pkgver/doc/ChangeLog /usr/share/doc/$pkgname-$pkgver/ + Fmv ../src/${pkgname}bt-$pkgver /var/www/$pkgname iconv -f latin2 -t utf8 <$Fsrcdir/strings_hungarian.txt >$Fsrcdir/strings_hungarian.utf8 || Fdie mv $Fsrcdir/strings_hungarian.utf8 $Fsrcdir/strings_hungarian.txt || Fdie sed "s/iso-8859-2';.*/utf-8';/" -i $Fsrcdir/strings_hungarian.txt || Fdie @@ -34,7 +35,7 @@ build() chown nobody:nobody $Fdestdir/var/www/$pkgname -R } -sha1sums=('7e64529508d3e35b98ae49c12b808998e669ef76' \ +sha1sums=('8cdf50c0d7c6e138efe9a59e62effcd94b2a01a8' \ 'e316589c6f369eeeb8a937f4b849aed3c9c73fee' \ '237c023608e8f5b06d0f1864465579786e5876c0' \ 'b1ea33bfe986ee37a61af6424f8ffef52028b2c7') From vmiklos at frugalware.org Tue Jan 13 16:47:17 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jan 13 16:47:18 2009 Subject: [Frugalware-git] frugalware-0.9: thunderbird-2.0.0.17-1-x86_64 Message-ID: <20090113154717.8B16811B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.9.git;a=commitdiff;h=edb3481175c62582e788dee57253bbca5f593a4b commit edb3481175c62582e788dee57253bbca5f593a4b Author: crazy Date: Sat Oct 25 02:52:08 2008 +0200 thunderbird-2.0.0.17-1-x86_64 * Version bump diff --git a/source/xapps/thunderbird/FrugalBuild b/source/xapps/thunderbird/FrugalBuild index 91a75fc..946aa90 100644 --- a/source/xapps/thunderbird/FrugalBuild +++ b/source/xapps/thunderbird/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: Krisztian VASAS pkgname=thunderbird -pkgver=2.0.0.16 +pkgver=2.0.0.17 pkgrel=1 pkgdesc="Mozilla Thunderbird mail and newsgroup client" url="http://www.mozilla.org/products/thunderbird/" From vmiklos at frugalware.org Tue Jan 13 16:47:17 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jan 13 16:47:20 2009 Subject: [Frugalware-git] frugalware-0.9: thunderbird-2.0.0.18-1-x86_64 Message-ID: <20090113154717.9E2EB11B8630@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.9.git;a=commitdiff;h=3621d1a6618e7b21e4706ec2d48fa57d904ffa2b commit 3621d1a6618e7b21e4706ec2d48fa57d904ffa2b Author: crazy Date: Sat Nov 22 23:58:25 2008 +0100 thunderbird-2.0.0.18-1-x86_64 * Version bump diff --git a/source/xapps/thunderbird/FrugalBuild b/source/xapps/thunderbird/FrugalBuild index 946aa90..22e33ec 100644 --- a/source/xapps/thunderbird/FrugalBuild +++ b/source/xapps/thunderbird/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: Krisztian VASAS pkgname=thunderbird -pkgver=2.0.0.17 +pkgver=2.0.0.18 pkgrel=1 pkgdesc="Mozilla Thunderbird mail and newsgroup client" url="http://www.mozilla.org/products/thunderbird/" From vmiklos at frugalware.org Tue Jan 13 16:57:47 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jan 13 16:57:49 2009 Subject: [Frugalware-git] frugalware-0.9: thunderbird-2.0.0.18-1solaria1-i686 Message-ID: <20090113155747.B2D2C11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.9.git;a=commitdiff;h=449a08fcb03ee679f1590330451534f33cb50632 commit 449a08fcb03ee679f1590330451534f33cb50632 Author: Miklos Vajna Date: Tue Jan 13 16:57:21 2009 +0100 thunderbird-2.0.0.18-1solaria1-i686 - secfix bump - closes #3465 diff --git a/source/xapps/thunderbird/FrugalBuild b/source/xapps/thunderbird/FrugalBuild index 22e33ec..d1484c0 100644 --- a/source/xapps/thunderbird/FrugalBuild +++ b/source/xapps/thunderbird/FrugalBuild @@ -4,7 +4,7 @@ pkgname=thunderbird pkgver=2.0.0.18 -pkgrel=1 +pkgrel=1solaria1 pkgdesc="Mozilla Thunderbird mail and newsgroup client" url="http://www.mozilla.org/products/thunderbird/" depends=('gtk+2>=2.12.8' 'nss>=3.12' 'nspr>=4.7.1' 'pango>=1.16.2' 'cairo>=1.4.14' 'libstdc++' 'libxt' 'libidl' 'libxcb') From vmiklos at frugalware.org Tue Jan 13 17:10:41 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jan 13 17:10:42 2009 Subject: [Frugalware-git] frugalware-current: imlib2-1.4.2-2-i686 Message-ID: <20090113161041.1A28711B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=77a410fb2a5d7c222e47da57cbbb8ff884af1544 commit 77a410fb2a5d7c222e47da57cbbb8ff884af1544 Author: Miklos Vajna Date: Tue Jan 13 17:08:51 2009 +0100 imlib2-1.4.2-2-i686 - add imlib2-loader_xpm-CVE-2008-5187.patch - closes #3484 diff --git a/source/xlib/imlib2/FrugalBuild b/source/xlib/imlib2/FrugalBuild index 6e1c059..3d46f15 100644 --- a/source/xlib/imlib2/FrugalBuild +++ b/source/xlib/imlib2/FrugalBuild @@ -3,7 +3,7 @@ pkgname=imlib2 pkgver=1.4.2 -pkgrel=1 +pkgrel=2 pkgdesc="Imlib 2 is the successor to Imlib, it is NOT a newer version" _F_sourceforge_dirname="enlightenment" Finclude sourceforge @@ -13,7 +13,9 @@ depends=('libtiff' 'freetype2' 'libxext' 'libjpeg' \ groups=('xlib') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=2 |grep imlib2-src |sed 's/.*]\([0-9\.]*\) [A-Z].*/\1/;q'" -sha1sums=('769ea1da26774cd7531d1d66432cf8d7d7b30c2b') +source=($source http://trac.enlightenment.org/e/raw-attachment/ticket/136/imlib2-loader_xpm-CVE-2008-5187.patch) +sha1sums=('769ea1da26774cd7531d1d66432cf8d7d7b30c2b' \ + '4c0784e4c08340f99c2898a4b72c915fce7e3e05') if [ "$CARCH" = "i686" ]; then Fconfopts="$Fconfopts --enable-mmx" From vmiklos at frugalware.org Tue Jan 13 17:21:02 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jan 13 17:21:04 2009 Subject: [Frugalware-git] frugalware-0.9: graphviz-2.20.3-1solaria1-i686 Message-ID: <20090113162102.DDCEA11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.9.git;a=commitdiff;h=2dce2ba3b9168e5ced8d33033f41d9917d8805f6 commit 2dce2ba3b9168e5ced8d33033f41d9917d8805f6 Author: Miklos Vajna Date: Mon Oct 20 00:34:22 2008 +0200 graphviz-2.20.3-1solaria1-i686 - secfix bump - closes #3413 diff --git a/source/xapps-extra/graphviz/FrugalBuild b/source/xapps-extra/graphviz/FrugalBuild index d7ed48a..398836c 100644 --- a/source/xapps-extra/graphviz/FrugalBuild +++ b/source/xapps-extra/graphviz/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Christian Hamar alias krix pkgname=graphviz -pkgver=2.20.2 -pkgrel=1 +pkgver=2.20.3 +pkgrel=1solaria1 pkgdesc="Open Source Graph Visualization Software" url="http://www.graphviz.org/" depends=('fontconfig' 'python' 'libjpeg' 'libpng' 'ruby' 'libtool' 'tk' 'guile' 'ocaml' 'libxaw' 'libstdc++' 'pango' 'cairo') @@ -13,7 +13,7 @@ archs=('x86_64' 'i686') options=('scriptlet') up2date="lynx -dump http://www.graphviz.org/pub/graphviz/ARCHIVE/|grep 'graphviz-[0-9\.]*.tar.gz$'|sed -n 's/.*-\(.*\)\.t.*/\1/;$ p'" source=(http://www.graphviz.org/pub/graphviz/ARCHIVE/$pkgname-$pkgver.tar.gz) -sha1sums=('e08cf95b69a51e6c63accbc662075550f915a54c') +sha1sums=('63ae6bdb6b410387477d339225cc4f61c2bc7322') build() { From vmiklos at frugalware.org Tue Jan 13 17:27:15 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jan 13 17:27:16 2009 Subject: [Frugalware-git] frugalware-0.9: ndiswrapper-1.53-6solaria2-i686 Message-ID: <20090113162715.8F08D11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.9.git;a=commitdiff;h=713c8290b982b2c92d69d26fda4cb086caf49724 commit 713c8290b982b2c92d69d26fda4cb086caf49724 Author: Miklos Vajna Date: Tue Jan 13 17:26:56 2009 +0100 ndiswrapper-1.53-6solaria2-i686 - add CVE-2008-4395.patch - closes #3383 Conflicts: source/network/ndiswrapper/FrugalBuild diff --git a/source/network/ndiswrapper/CVE-2008-4395.patch b/source/network/ndiswrapper/CVE-2008-4395.patch new file mode 100644 index 0000000..4ad12f2 --- /dev/null +++ b/source/network/ndiswrapper/CVE-2008-4395.patch @@ -0,0 +1,86 @@ +diff --git a/driver/iw_ndis.c b/driver/iw_ndis.c +index b114ef6..01d3751 100644 +--- a/driver/iw_ndis.c ++++ b/driver/iw_ndis.c +@@ -47,12 +47,7 @@ int set_essid(struct ndis_device *wnd, const char *ssid, int ssid_len) + req.length = ssid_len; + if (ssid_len) + memcpy(&req.essid, ssid, ssid_len); +- DBG_BLOCK(2) { +- char buf[NDIS_ESSID_MAX_SIZE+1]; +- memcpy(buf, ssid, ssid_len); +- buf[ssid_len] = 0; +- TRACE2("ssid = '%s'", buf); +- } ++ TRACE2("ssid = '%.*s'", ssid_len, ssid); + + res = mp_set(wnd, OID_802_11_SSID, &req, sizeof(req)); + if (res) { +@@ -125,7 +120,6 @@ static int iw_get_essid(struct net_device *dev, struct iw_request_info *info, + EXIT2(return -EOPNOTSUPP); + } + memcpy(extra, req.essid, req.length); +- extra[req.length] = 0; + if (req.length > 0) + wrqu->essid.flags = 1; + else +@@ -1000,7 +994,7 @@ static int iw_set_nick(struct net_device *dev, struct iw_request_info *info, + + if (wrqu->data.length > IW_ESSID_MAX_SIZE || wrqu->data.length <= 0) + return -EINVAL; +- memset(wnd->nick, 0, sizeof(wnd->nick)); ++ wnd->nick_len = wrqu->data.length; + memcpy(wnd->nick, extra, wrqu->data.length); + return 0; + } +@@ -1010,7 +1004,7 @@ static int iw_get_nick(struct net_device *dev, struct iw_request_info *info, + { + struct ndis_device *wnd = netdev_priv(dev); + +- wrqu->data.length = strlen(wnd->nick); ++ wrqu->data.length = wnd->nick_len; + memcpy(extra, wnd->nick, wrqu->data.length); + return 0; + } +diff --git a/driver/ndis.h b/driver/ndis.h +index 27ba99e..65d6b0b 100644 +--- a/driver/ndis.h ++++ b/driver/ndis.h +@@ -878,6 +878,7 @@ struct ndis_device { + unsigned long scan_timestamp; + struct encr_info encr_info; + char nick[IW_ESSID_MAX_SIZE]; ++ size_t nick_len; + struct ndis_essid essid; + struct auth_encr_capa capa; + enum ndis_infrastructure_mode infrastructure_mode; +diff --git a/driver/proc.c b/driver/proc.c +index fd5f433..6feff23 100644 +--- a/driver/proc.c ++++ b/driver/proc.c +@@ -97,10 +97,8 @@ static int procfs_read_ndis_encr(char *page, char **start, off_t off, + p += sprintf(p, "\n"); + + res = mp_query(wnd, OID_802_11_SSID, &essid, sizeof(essid)); +- if (!res) { +- essid.essid[essid.length] = '\0'; +- p += sprintf(p, "essid=%s\n", essid.essid); +- } ++ if (!res) ++ p += sprintf(p, "essid=%.*s\n", essid.length, essid.essid); + res = mp_query_int(wnd, OID_802_11_ENCRYPTION_STATUS, &encr_status); + if (!res) { + typeof(&wnd->encr_info.keys[0]) tx_key; +diff --git a/driver/wrapndis.c b/driver/wrapndis.c +index f6e5d46..35ef1cd 100644 +--- a/driver/wrapndis.c ++++ b/driver/wrapndis.c +@@ -2028,7 +2028,7 @@ static wstdcall NTSTATUS NdisAddDevice(struct driver_object *drv_obj, + wnd->attributes = 0; + wnd->dma_map_count = 0; + wnd->dma_map_addr = NULL; +- wnd->nick[0] = 0; ++ wnd->nick_len = 0; + init_timer(&wnd->hangcheck_timer); + wnd->scan_timestamp = 0; + init_timer(&wnd->iw_stats_timer); diff --git a/source/network/ndiswrapper/FrugalBuild b/source/network/ndiswrapper/FrugalBuild index 73245ff..37de377 100644 --- a/source/network/ndiswrapper/FrugalBuild +++ b/source/network/ndiswrapper/FrugalBuild @@ -4,17 +4,19 @@ pkgname=ndiswrapper pkgver=1.53 -pkgrel=6solaria1 +pkgrel=6solaria2 pkgdesc="Wrapper for using Windows drivers for some wireless cards" _F_kernelmod_scriptlet=$pkgname.install Finclude kernel-module sourceforge depends=(${depends[@]} 'pciutils' 'wireless_tools') groups=('network') archs=('i686' 'x86_64') -source=(${source[@]} README.Frugalware ndiswrapper-detect-fix-x86_64.patch) +source=(${source[@]} README.Frugalware ndiswrapper-detect-fix-x86_64.patch \ + CVE-2008-4395.patch) sha1sums=('0d27b2f1d59d6d4bcb6b384cab946f99cb1889d7' \ 'c3f24143cb9814326a2c0c3cbc8d58d953bac268' \ - '7e46cc4bb72520d911f256748e8c3936498f001b') + '7e46cc4bb72520d911f256748e8c3936498f001b' \ + 'f443895af426f77cb32197bd81fbb81a42742c58') build() { From vmiklos at frugalware.org Tue Jan 13 17:30:17 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jan 13 17:30:18 2009 Subject: [Frugalware-git] frugalware-0.9: rails-2.1.1-1solaria1-i686 Message-ID: <20090113163017.4D9B411B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.9.git;a=commitdiff;h=a8f5f9357a35dda58be12ab111702de0be6986d0 commit a8f5f9357a35dda58be12ab111702de0be6986d0 Author: Miklos Vajna Date: Thu Oct 2 15:22:12 2008 +0200 rails-2.1.1-1solaria1-i686 - secfix bump - closes #3368 diff --git a/source/devel-extra/rails/FrugalBuild b/source/devel-extra/rails/FrugalBuild index 7a64656..b25002a 100644 --- a/source/devel-extra/rails/FrugalBuild +++ b/source/devel-extra/rails/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Bence Nagy pkgname=rails -pkgver=2.1.0 -pkgrel=1 +pkgver=2.1.1 +pkgrel=1solaria1 pkgdesc="Ruby on Rails is a web-application and persistance framework" url="http://www.rubyonrails.org/" depends=('actionwebservice' 'actionmailer' 'activerecord' 'ruby-fcgi' 'rake') @@ -31,4 +31,4 @@ build() { # optimization OK -sha1sums=('7c5ab9edba65923d7332d842217e0e7fc6b66404') +sha1sums=('df16906481cd5602ff62df61254f28ab7e485882') From devil505linux at gmail.com Tue Jan 13 18:18:56 2009 From: devil505linux at gmail.com (Devil505) Date: Tue Jan 13 18:18:58 2009 Subject: [Frugalware-git] frugalware-current: python-simplejson-2.0.7-1-i686 Message-ID: <20090113171856.98DF911B8630@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=136291b98313cbd932a79cf7fafb45d8392ef410 commit 136291b98313cbd932a79cf7fafb45d8392ef410 Author: Devil505 Date: Tue Jan 13 18:17:53 2009 +0100 python-simplejson-2.0.7-1-i686 * version bump diff --git a/source/devel-extra/python-simplejson/FrugalBuild b/source/devel-extra/python-simplejson/FrugalBuild index 62159d2..7a4554a 100644 --- a/source/devel-extra/python-simplejson/FrugalBuild +++ b/source/devel-extra/python-simplejson/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Devil505 pkgname=python-simplejson -pkgver=2.0.6 -pkgrel=2 +pkgver=2.0.7 +pkgrel=1 pkgdesc="Simple, fast, extensible JSON encoder/decoder for Python" url="http://undefined.org/python/#simplejson" depends=('python') @@ -13,6 +13,6 @@ archs=('i686' 'x86_64') _F_archive_name="simplejson" up2date="Flasttar http://pypi.python.org/packages/source/s/simplejson/" source=("http://pypi.python.org/packages/source/s/$_F_archive_name/$_F_archive_name-$pkgver.tar.gz") -sha1sums=('c6b1208dba9af6bfecdc17361f80539303a311cc') +sha1sums=('5c3ac8802aa42e63d057bbd024086593dc233dce') # optimization OK From devil505linux at gmail.com Tue Jan 13 18:26:40 2009 From: devil505linux at gmail.com (Devil505) Date: Tue Jan 13 18:26:42 2009 Subject: [Frugalware-git] frugalware-current: yabause-0.9.9-1-i686 Message-ID: <20090113172640.2660D11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7070d6f37c5cef719946d3565f37334923821aba commit 7070d6f37c5cef719946d3565f37334923821aba Author: Devil505 Date: Tue Jan 13 18:24:03 2009 +0100 yabause-0.9.9-1-i686 * version bump diff --git a/source/games-extra/yabause/FrugalBuild b/source/games-extra/yabause/FrugalBuild index ebe9bff..5604164 100644 --- a/source/games-extra/yabause/FrugalBuild +++ b/source/games-extra/yabause/FrugalBuild @@ -2,13 +2,13 @@ # Maintainer: Devil505 pkgname=yabause -pkgver=0.9.8 +pkgver=0.9.9 pkgrel=1 pkgdesc='A Sega Saturn emulator.' depends=('gtkglext' 'libxmu' 'libice' 'libxau' 'libxdmcp' 'freetype2' 'sdl' 'libgcc' 'libxxf86vm' 'libxdamage' 'libdrm' 'libxml2') Finclude sourceforge groups=('games-extra') archs=('i686') -sha1sums=('246e33677d85b7a88a5e3c7383e77f5da0d38ed6') +sha1sums=('e1ed79a0fd2d59f8b86238623360749575761bd5') # optimization OK From bouleetbil at frogdev.info Tue Jan 13 18:35:29 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue Jan 13 18:35:30 2009 Subject: [Frugalware-git] frugalware-current: pygobject-2.16.0-1-i686 Message-ID: <20090113173529.A415D11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2ddc96cffe539abc24304a18984c030cde6dbbd8 commit 2ddc96cffe539abc24304a18984c030cde6dbbd8 Author: bouleetbil Date: Tue Jan 13 18:28:04 2009 +0100 pygobject-2.16.0-1-i686 *version bump *fix detect_libffi.patc *moved pygobject-gvfs to xlib (gvfs isn't into gnome) diff --git a/source/lib/pygobject/FrugalBuild b/source/lib/pygobject/FrugalBuild index b79f700..f26f7e8 100644 --- a/source/lib/pygobject/FrugalBuild +++ b/source/lib/pygobject/FrugalBuild @@ -2,22 +2,22 @@ # Maintainer: Christian Hamar alias krix pkgname=pygobject -pkgver=2.15.4 -pkgrel=2 +pkgver=2.16.0 +pkgrel=1 pkgdesc="Python bindings for GObject" -depends=('python' 'glib2>=2.18.3' 'libffi') +depends=('python' 'glib2>=2.18.4' 'libffi') makedepends=('gvfs') groups=('lib') archs=('i686' 'x86_64' 'ppc') Finclude gnome python source=($source detect_libffi.patch) -sha1sums=('dfc3f04a27243ac4c386bfd19e4c383dd419d040' \ - 'c825944223544dc8821c7b99b084ac2da064aea8') +sha1sums=('bb16032be31b0651160e9a2caf11c1115c69c85a' \ + '1e2a694276e573ed5aa4acd4979f675875849a21') subpkgs=("pygobject-gvfs") subdescs=('Python bindings for gvfs') subdepends=("pygobject=$pkgver gvfs") -subgroups=('gnome') +subgroups=('xlib') subarchs=('i686 x86_64 ppc') build() { diff --git a/source/lib/pygobject/detect_libffi.patch b/source/lib/pygobject/detect_libffi.patch index 1030bd6..ed350ff 100644 --- a/source/lib/pygobject/detect_libffi.patch +++ b/source/lib/pygobject/detect_libffi.patch @@ -1,42 +1,22 @@ ---- pygobject-2.15.4old/configure 2008-09-03 09:51:11.000000000 +0200 -+++ pygobject-2.15.4/configure 2008-12-03 09:56:56.000000000 +0100 -@@ -11475,104 +11475,173 @@ - exec_prefix=$exec_prefix_save - +--- pygobject-2.16.0/configure 2009-01-04 21:34:55.000000000 +0100 ++++ pygobject-2.16.0/configure 2009-01-11 14:02:41.000000000 +0100 +@@ -12491,6 +12491,176 @@ + fi --{ echo "$as_me:$LINENO: checking for ffi" >&5 --echo $ECHO_N "checking for ffi... $ECHO_C" >&6; } --# Check whether --with-ffi was given. --if test "${with_ffi+set}" = set; then -- withval=$with_ffi; with_libffi=$withval +{ echo "$as_me:$LINENO: checking for ffi.h" >&5 +echo $ECHO_N "checking for ffi.h... $ECHO_C" >&6; } + +# Check whether --with-libffi was given. +if test "${with_libffi+set}" = set; then + withval=$with_libffi; with_ffi=$withval - else -- with_libffi=auto ++else + with_ffi=auto - fi - --if test x"$with_libffi" = xno ; then -- have_libffi=false ++fi ++ +if test x"$with_ffi" = xno ; then + pygobject_ffi_h=disabled - else -- --pkg_failed=no --{ echo "$as_me:$LINENO: checking for FFI" >&5 --echo $ECHO_N "checking for FFI... $ECHO_C" >&6; } -- --if test -n "$FFI_CFLAGS"; then -- pkg_cv_FFI_CFLAGS="$FFI_CFLAGS" -- elif test -n "$PKG_CONFIG"; then -- if test -n "$PKG_CONFIG" && \ -- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libffi >= 3.0\"") >&5 -- ($PKG_CONFIG --exists --print-errors "libffi >= 3.0") 2>&5 ++else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF @@ -52,34 +32,22 @@ +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? ++ ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -- pkg_cv_FFI_CFLAGS=`$PKG_CONFIG --cflags "libffi >= 3.0" 2>/dev/null` ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + pygobject_ffi_h=yes - else -- pkg_failed=yes --fi -- else -- pkg_failed=untried ++else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + pygobject_ffi_h=no - fi --if test -n "$FFI_LIBS"; then -- pkg_cv_FFI_LIBS="$FFI_LIBS" -- elif test -n "$PKG_CONFIG"; then -- if test -n "$PKG_CONFIG" && \ -- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libffi >= 3.0\"") >&5 -- ($PKG_CONFIG --exists --print-errors "libffi >= 3.0") 2>&5 ++fi + +rm -f conftest.err conftest.$ac_ext + if test $pygobject_ffi_h = yes; then @@ -137,35 +105,24 @@ +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 - ac_status=$? ++ ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -- pkg_cv_FFI_LIBS=`$PKG_CONFIG --libs "libffi >= 3.0" 2>/dev/null` ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_search_ffi_call=$ac_res - else -- pkg_failed=yes --fi -- else -- pkg_failed=untried --fi -- ++else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - - --if test $pkg_failed = yes; then ++ ++ +fi - --if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -- _pkg_short_errors_supported=yes ++ +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext + if test "${ac_cv_search_ffi_call+set}" = set; then @@ -174,17 +131,9 @@ +done +if test "${ac_cv_search_ffi_call+set}" = set; then + : - else -- _pkg_short_errors_supported=no ++else + ac_cv_search_ffi_call=no - fi -- if test $_pkg_short_errors_supported = yes; then -- FFI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libffi >= 3.0" 2>&1` -- else -- FFI_PKG_ERRORS=`$PKG_CONFIG --print-errors "libffi >= 3.0" 2>&1` -- fi -- # Put the nasty error message in config.log where it belongs -- echo "$FFI_PKG_ERRORS" >&5 ++fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi @@ -193,22 +142,12 @@ +ac_res=$ac_cv_search_ffi_call +if test "$ac_res" != no; then + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -- have_libffi=no --elif test $pkg_failed = untried; then -- have_libffi=no - else -- FFI_CFLAGS=$pkg_cv_FFI_CFLAGS -- FFI_LIBS=$pkg_cv_FFI_LIBS -- { echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6; } -- have_libffi=yes ++ ++else + { { echo "$as_me:$LINENO: error: libffi not found" >&5 +echo "$as_me: error: libffi not found" >&2;} + { (exit 1); exit 1; }; } - fi ++fi + + if test x$"ac_cv_search_ffi_call" = x"none required" ; then + FFI_LIBS=$other_LIBS @@ -217,40 +156,24 @@ + fi + LIBS=$save_LIBS + fi - fi --if test x"$with_libffi" = xyes && test x"$have_libffi" = xno ; then -- { { echo "$as_me:$LINENO: error: ffi requested, but not found" >&5 --echo "$as_me: error: ffi requested, but not found" >&2;} ++fi +if test x"$with_ffi" != xauto && test x"$pygobject_ffi_h" != xyes ; then + { { echo "$as_me:$LINENO: error: libffi requested, but ffi.h not found" >&5 +echo "$as_me: error: libffi requested, but ffi.h not found" >&2;} - { (exit 1); exit 1; }; } - fi --if test x"$have_libffi" = xyes; then ++ { (exit 1); exit 1; }; } ++fi +{ echo "$as_me:$LINENO: result: $pygobject_ffi_h" >&5 +echo "${ECHO_T}$pygobject_ffi_h" >&6; } - --cat >>confdefs.h <<\_ACEOF --#define HAVE_FFI_H 1 --_ACEOF - --fi --{ echo "$as_me:$LINENO: result: $have_libffi" >&5 --echo "${ECHO_T}$have_libffi" >&6; } -- if test "$have_libffi" = "yes"; then ++ ++ +if test "$pygobject_ffi_h" = "yes"; then - HAVE_LIBFFI_TRUE= - HAVE_LIBFFI_FALSE='#' ++ HAVE_LIBFFI_TRUE= ++ HAVE_LIBFFI_FALSE='#' + have_libffi=true - else - HAVE_LIBFFI_TRUE='#' - HAVE_LIBFFI_FALSE= -@@ -11580,8 +11649,6 @@ ++else ++ HAVE_LIBFFI_TRUE='#' ++ HAVE_LIBFFI_FALSE= ++fi -- -- - pkg_failed=no - { echo "$as_me:$LINENO: checking for GIO" >&5 - echo $ECHO_N "checking for GIO... $ECHO_C" >&6; } From devil505linux at gmail.com Tue Jan 13 18:36:08 2009 From: devil505linux at gmail.com (Devil505) Date: Tue Jan 13 18:36:09 2009 Subject: [Frugalware-git] frugalware-current: xcfa-3.4.0-1-i686 Message-ID: <20090113173608.EEE6311B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4bfb82777ac3bacbcfc2b9afb1694cf3f811f9cd commit 4bfb82777ac3bacbcfc2b9afb1694cf3f811f9cd Author: Devil505 Date: Tue Jan 13 18:32:14 2009 +0100 xcfa-3.4.0-1-i686 * version bump diff --git a/source/xapps-extra/xcfa/FrugalBuild b/source/xapps-extra/xcfa/FrugalBuild index 7b6df68..4dc8715 100644 --- a/source/xapps-extra/xcfa/FrugalBuild +++ b/source/xapps-extra/xcfa/FrugalBuild @@ -3,8 +3,8 @@ # Contributor: jedifox pkgname=xcfa -pkgver=3.3.40 -pkgrel=2 +pkgver=3.4.0 +pkgrel=1 pkgdesc="Frontend which use miscellaneous external programs to extract and convert music files" url="http://www.xcfa.tuxfamily.org/" rodepends=('dvd+rw-tools') @@ -15,4 +15,4 @@ archs=('i686' 'x86_64') up2date="lynx -dump http://download.tuxfamily.org/xcfaudio/xcfa_download/src/ | Flasttar" Fconfopts="${Fconfopts[@]} --disable-ansi" source=(http://download.tuxfamily.org/xcfaudio/xcfa_download/src/$pkgname-$pkgver.tar.gz) -sha1sums=('80c34caf20390b66b48719d206fd81890beaf5b4') +sha1sums=('921a224ee5149f569885ba32e89565711a703590') From devil505linux at gmail.com Tue Jan 13 18:36:09 2009 From: devil505linux at gmail.com (Devil505) Date: Tue Jan 13 18:36:12 2009 Subject: [Frugalware-git] frugalware-current: perl-www-mechanize-1.54-1-i686 Message-ID: <20090113173609.22D1C11B8630@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a739100319b49889e60f51e62356c761d1ad5280 commit a739100319b49889e60f51e62356c761d1ad5280 Author: Devil505 Date: Tue Jan 13 18:35:50 2009 +0100 perl-www-mechanize-1.54-1-i686 * version bump diff --git a/source/devel-extra/perl-www-mechanize/FrugalBuild b/source/devel-extra/perl-www-mechanize/FrugalBuild index db0ce31..5b36c75 100644 --- a/source/devel-extra/perl-www-mechanize/FrugalBuild +++ b/source/devel-extra/perl-www-mechanize/FrugalBuild @@ -3,12 +3,12 @@ _F_perl_name=WWW-Mechanize _F_perl_author=P/PE/PETDANCE -pkgver=1.52 +pkgver=1.54 pkgrel=1 pkgdesc="Automates web page form & link interaction." depends=('perl-libwww' 'perl-http-response-encoding' 'perl-io-socket-ssl') Finclude perl groups=('devel-extra') archs=('i686' 'x86_64') -sha1sums=('e5a358e6c5db6936a40651b8ed82f3fb16b7de1c') +sha1sums=('6ae01e188bc195a9e4bb4a71f8b65b971a2e36a2') From bouleetbil at frogdev.info Tue Jan 13 18:38:38 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue Jan 13 18:38:40 2009 Subject: [Frugalware-git] frugalware-current: gtk+2-2.14.7-1-i686 Message-ID: <20090113173838.95AE011B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=161381cb4102c50fdcb5e7bd74b172c2fb641437 commit 161381cb4102c50fdcb5e7bd74b172c2fb641437 Author: bouleetbil Date: Tue Jan 13 18:31:11 2009 +0100 gtk+2-2.14.7-1-i686 *version bump diff --git a/source/xlib/gtk+2/FrugalBuild b/source/xlib/gtk+2/FrugalBuild index 21053fd..c0e06ac 100644 --- a/source/xlib/gtk+2/FrugalBuild +++ b/source/xlib/gtk+2/FrugalBuild @@ -3,11 +3,11 @@ pkgname=gtk+2 _F_gnome_name=gtk+ -pkgver=2.14.6 +pkgver=2.14.7 pkgrel=1 pkgdesc="The GTK+ Toolkit (2.x series)" depends=('libtiff' 'atk>=1.22.0' 'libxi' 'libxinerama' 'fontconfig' 'libjpeg' \ - 'pango>=1.22.4' 'cairo>=1.8.6' 'libxcursor' 'libxrandr' 'libsm' 'glib2>=2.18.3' \ + 'pango>=1.22.4' 'cairo>=1.8.6' 'libxcursor' 'libxrandr' 'libsm' 'glib2>=2.18.4' \ 'libcups' 'libx11' 'libtiff' 'libpng' 'jasper') rodepends=('gnome-icon-theme' 'shared-mime-info') groups=('xlib') @@ -49,7 +49,7 @@ build() { Fsplit $pkgname-docs usr/share/gtk-doc } -sha1sums=('e888a28be5e062f36abc3e69857d9aa9381ad2c1' \ +sha1sums=('f4b9c65dbdc78cad6fc9b601640cbad1d3abb57f' \ '7db980e782a5b04d27bffb55e3dc0190ad22e118' \ '783920d179ba0755ccab9186b6bff9f293828a96') # optimization OK From bouleetbil at frogdev.info Tue Jan 13 18:41:35 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue Jan 13 18:41:36 2009 Subject: [Frugalware-git] frugalware-current: gedit-2.24.3-1-i686 Message-ID: <20090113174135.57D8811B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4162ef9857749b45d0c6a6cc9b455b8033a36016 commit 4162ef9857749b45d0c6a6cc9b455b8033a36016 Author: bouleetbil Date: Tue Jan 13 18:34:54 2009 +0100 gedit-2.24.3-1-i686 *version bump diff --git a/source/gnome/gedit/FrugalBuild b/source/gnome/gedit/FrugalBuild index cc62495..17079d9 100644 --- a/source/gnome/gedit/FrugalBuild +++ b/source/gnome/gedit/FrugalBuild @@ -2,11 +2,11 @@ # Maintainer: Christian Hamar alias krix pkgname=gedit -pkgver=2.24.2 -pkgrel=2 +pkgver=2.24.3 +pkgrel=1 pkgdesc="A text editor for GNOME" url="http://www.gnome.org/" -depends=('rarian' 'desktop-file-utils' 'python>=2.6' 'gtksourceview>=2.2.1' 'dbus-glib>=0.74' 'enchant' 'iso-codes' 'libgnomeui' 'pygobject-gvfs>=2.15.4') +depends=('rarian' 'desktop-file-utils' 'python>=2.6' 'gtksourceview>=2.2.1' 'dbus-glib>=0.74' 'enchant' 'iso-codes' 'libgnomeui' 'pygobject-gvfs>=2.16.0') makedepends=('intltool' 'gnome-doc-utils>=0.14.0' 'gnome-python-desktop-gtksourceview>=2.24.0' 'pygtksourceview>=2.2.0' 'gtk-doc') groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64' 'ppc') @@ -15,7 +15,7 @@ _F_gnome_schemas=('/etc/gconf/schemas/gedit.schemas' \ _F_gnome_scrollkeeper="y" _F_gnome_desktop="y" Finclude gnome gnome-scriptlet -sha1sums=('dd47269990bcf0f1de11d3ab2cbc3e1d2b75f1d5') +sha1sums=('93738961fac2228dbf425009828299520d8bc06e') subpkgs=("$pkgname-python") subdescs=('gedit python plugins') From bouleetbil at frogdev.info Tue Jan 13 18:43:32 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue Jan 13 18:43:34 2009 Subject: [Frugalware-git] frugalware-current: gnome-python-2.22.3-1-i686 Message-ID: <20090113174332.BBF2511B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b0daeb191b1bdb118561c6d7d9d0e928efa806f0 commit b0daeb191b1bdb118561c6d7d9d0e928efa806f0 Author: bouleetbil Date: Tue Jan 13 18:37:35 2009 +0100 gnome-python-2.22.3-1-i686 *version bump diff --git a/source/gnome/gnome-python/FrugalBuild b/source/gnome/gnome-python/FrugalBuild index 12faea9..2cd981c 100644 --- a/source/gnome/gnome-python/FrugalBuild +++ b/source/gnome/gnome-python/FrugalBuild @@ -2,14 +2,14 @@ # Maintainer: Christian Hamar alias krix pkgname=gnome-python -pkgver=2.22.1 -pkgrel=2 +pkgver=2.22.3 +pkgrel=1 pkgdesc="Python bindings for GNOME" url="http://www.daa.com.au/~james/pygtk/" -depends=('pygtk>=2.12.1' 'pyorbit>=2.14.3-3' 'libgnomeui>=2.22.1' 'libbonobo>=2.22.0') +depends=('pygtk>=2.12.1' 'pyorbit>=2.24.0-2' 'libgnomeui>=2.24.0' 'libbonobo>=2.24.0') groups=('gnome') archs=('i686' 'x86_64' 'ppc') Finclude gnome -sha1sums=('91402febafd40d59c0eb3f9da80a3406e4e7a76e') +sha1sums=('35eafe4f5ab9ee003a573dcf26699d3b03d52d5a') # optimization OK From devil505linux at gmail.com Tue Jan 13 18:43:58 2009 From: devil505linux at gmail.com (Devil505) Date: Tue Jan 13 18:44:00 2009 Subject: [Frugalware-git] frugalware-current: guvcview-0.9.7-1-i686 Message-ID: <20090113174358.B27AE11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4c84b6477e3adc5d1b10a670486883c850f21e4a commit 4c84b6477e3adc5d1b10a670486883c850f21e4a Author: Devil505 Date: Tue Jan 13 18:41:14 2009 +0100 guvcview-0.9.7-1-i686 * version bump diff --git a/source/xapps-extra/guvcview/FrugalBuild b/source/xapps-extra/guvcview/FrugalBuild index 722ff6b..27d4095 100644 --- a/source/xapps-extra/guvcview/FrugalBuild +++ b/source/xapps-extra/guvcview/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Devil505 pkgname=guvcview -pkgver=0.9.6 +pkgver=0.9.7 pkgrel=1 pkgdesc="A video viewer and capturer for the linux uvc driver" depends=('gtk+2' 'freetype2' 'libxau' 'libxdmcp' 'sdl' 'portaudio' 'twolame' 'libxdamage' 'libxml2' 'libxext') @@ -14,6 +14,6 @@ Finclude berlios groups=('xapps-extra') archs=('i686' 'x86_64') _F_cd_path="$_F_berlios_name-$pkgver" -sha1sums=('5b94d23947a29a5b1b5cb612694728bff6fbe3a7') +sha1sums=('5ea9f32a5ed5111de22b8b1d0c560cb5ed825907') # optimization OK From bouleetbil at frogdev.info Tue Jan 13 18:47:26 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue Jan 13 18:47:28 2009 Subject: [Frugalware-git] frugalware-current: gnome-python-desktop-2.24.1-1-i686 Message-ID: <20090113174726.B6AE511B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e5bc78ada5d5c623b480e961613c500455d3d39b commit e5bc78ada5d5c623b480e961613c500455d3d39b Author: bouleetbil Date: Tue Jan 13 18:39:20 2009 +0100 gnome-python-desktop-2.24.1-1-i686 *version bump diff --git a/source/gnome/gnome-python-desktop/FrugalBuild b/source/gnome/gnome-python-desktop/FrugalBuild index 8ee9cb4..d0cac72 100644 --- a/source/gnome/gnome-python-desktop/FrugalBuild +++ b/source/gnome/gnome-python-desktop/FrugalBuild @@ -3,12 +3,12 @@ # Former Maintainer: AlexExtreme pkgname=gnome-python-desktop -pkgver=2.24.0 -pkgrel=2 +pkgver=2.24.1 +pkgrel=1 pkgdesc="Python bindings for GNOME desktop" url="http://www.pygtk.org/" -depends=('gnome-python>=2.22.1') -makedepends=('metacity>=2.24.0' 'gnome-media>=2.24.0' 'gnome-panel>=2.24.0' 'gtksourceview1' 'totem>=2.24.0' \ +depends=('gnome-python>=2.22.3') +makedepends=('metacity>=2.24.0' 'gnome-media>=2.24.0' 'gnome-panel>=2.24.2' 'gtksourceview1' 'totem>=2.24.3' \ 'libgtop>=2.24.0' 'bug-buddy>=2.24.0') groups=('gnome') archs=('i686' 'x86_64' 'ppc') @@ -20,11 +20,11 @@ subdescs=('Gnome panel applet python module' 'Gnome desktop python module' 'Gnom 'Gtksourceview python module' 'Gtop python module' 'Gnome mediaprofiles python module' 'Metacity python module' \ 'Nautilus CD burner python module' 'librsvg python module' 'Totem python module' 'libwnck python module' \ 'Bug Buddy integration module') -subdepends=("$pkgname=$pkgver gnome-panel>=2.20.0" "$pkgname=$pkgver gnome-desktop>=2.20.0" "$pkgname=$pkgver gnome-keyring>=2.20.0" \ +subdepends=("$pkgname=$pkgver gnome-panel>=2.24.2" "$pkgname=$pkgver gnome-desktop>=2.24.2" "$pkgname=$pkgver gnome-keyring>=2.24.0" \ "$pkgname=$pkgver libgnomeprint>=2.18.1 libgnomeprintui>=2.18.1" "$pkgname=$pkgver gtksourceview1 $pkgname-print=$pkgver" \ - "$pkgname=$pkgver libgtop>=2.20.0" "$pkgname=$pkgver gnome-media>=2.20.0" "$pkgname=$pkgver metacity>=2.20.0" \ - "$pkgname=$pkgver nautilus-cd-burner>=2.18.0" "$pkgname=$pkgver librsvg" "$pkgname=$pkgver totem>=2.20.0" \ - "python libxext glibc freetype2 libxau libxdmcp libice libxdamage libxml2 libwnck>=2.20.0" "$pkgname=$pkgver bug-buddy>=2.20.0") + "$pkgname=$pkgver libgtop>=2.24.0" "$pkgname=$pkgver gnome-media>=2.24.0" "$pkgname=$pkgver metacity>=2.24.0" \ + "$pkgname=$pkgver nautilus-cd-burner>=2.24.0" "$pkgname=$pkgver librsvg" "$pkgname=$pkgver totem>=2.24.3" \ + "python libxext glibc freetype2 libxau libxdmcp libice libxdamage libxml2 libwnck>=2.24.0" "$pkgname=$pkgver bug-buddy>=2.20.0") subgroups=('gnome' 'gnome' 'gnome' 'gnome' 'gnome' 'gnome' 'gnome' 'gnome' 'gnome' 'gnome' 'gnome' 'gnome' 'gnome') subarchs=('i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' \ 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc' 'i686 x86_64 ppc') @@ -105,5 +105,5 @@ build() { # ...phew! } -sha1sums=('a47f2c87c2bde724d46a6464f8ccbcbeb7743ef5') +sha1sums=('97b04ca811670d6cfa208074c1644cee7486ade3') # optimization OK From devil505linux at gmail.com Tue Jan 13 18:54:44 2009 From: devil505linux at gmail.com (Devil505) Date: Tue Jan 13 18:54:46 2009 Subject: [Frugalware-git] frugalware-current: pidgin-musictracker-0.4.14-1-i686 Message-ID: <20090113175444.8C07D11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0425b96a5c10a7f5c9285cad8528ebf5db230d8b commit 0425b96a5c10a7f5c9285cad8528ebf5db230d8b Author: Devil505 Date: Tue Jan 13 18:50:30 2009 +0100 pidgin-musictracker-0.4.14-1-i686 * version bump diff --git a/source/xapps-extra/pidgin-musictracker/FrugalBuild b/source/xapps-extra/pidgin-musictracker/FrugalBuild index fff1e47..93be02c 100644 --- a/source/xapps-extra/pidgin-musictracker/FrugalBuild +++ b/source/xapps-extra/pidgin-musictracker/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Devil505 pkgname=pidgin-musictracker -pkgver=0.4.13 +pkgver=0.4.14 pkgrel=1 pkgdesc="A plugin for Pidgin which displays the music track currently playing." depends=('gtk+2' 'glibc' 'libxau' 'libxdmcp' 'freetype2' 'dbus-glib' 'pcre' 'libxext' 'libxdamage' 'pidgin') @@ -11,6 +11,6 @@ _F_googlecode_ext=".tar.bz2" Finclude googlecode groups=('xapps-extra') archs=('i686' 'x86_64') -sha1sums=('28c0274fc3958140702582d9e0ca329328083fac') +sha1sums=('4ce2c91b4faa66939dc40ab532605ad1f223e2ad') # optimization OK From bouleetbil at frogdev.info Tue Jan 13 19:07:18 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue Jan 13 19:07:19 2009 Subject: [Frugalware-git] frugalware-current: libsynce-0.13-1-i686 Message-ID: <20090113180718.2CEDD11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ae34a21ab1107e67a281b07add63582e17d0e114 commit ae34a21ab1107e67a281b07add63582e17d0e114 Author: bouleetbil Date: Tue Jan 13 19:01:00 2009 +0100 libsynce-0.13-1-i686 *version bump diff --git a/source/lib-extra/libsynce/FrugalBuild b/source/lib-extra/libsynce/FrugalBuild index c3f5fe7..46fd6c6 100644 --- a/source/lib-extra/libsynce/FrugalBuild +++ b/source/lib-extra/libsynce/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: bouleetbil pkgname=libsynce -pkgver=0.12 +pkgver=0.13 pkgrel=1 pkgdesc="SynCE - common library" groups=('lib-extra') @@ -12,6 +12,6 @@ _F_sourceforge_dirname="synce" _F_sourceforge_realname="SynCE" Finclude sourceforge Fconfopts="${Fconfopts[@]} --enable-desktop-integration" -sha1sums=('08b70c6bbde2c3836adbccac321d2b2f7895c68a') +sha1sums=('40bf028eded7a0bbd531879c78be59823d25811c') # optimization OK From devil505linux at gmail.com Tue Jan 13 19:09:23 2009 From: devil505linux at gmail.com (Devil505) Date: Tue Jan 13 19:09:24 2009 Subject: [Frugalware-git] frugalware-current: galculator-1.3.3-1-i686 Message-ID: <20090113180923.1B9F111B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c4272ac2dd191a5114604620ae8d4d0a5049cd89 commit c4272ac2dd191a5114604620ae8d4d0a5049cd89 Author: Devil505 Date: Tue Jan 13 19:05:57 2009 +0100 galculator-1.3.3-1-i686 * version bump diff --git a/source/xapps-extra/galculator/FrugalBuild b/source/xapps-extra/galculator/FrugalBuild index cbc6e3f..e0a6eff 100644 --- a/source/xapps-extra/galculator/FrugalBuild +++ b/source/xapps-extra/galculator/FrugalBuild @@ -2,21 +2,15 @@ # Maintainer: Devil505 pkgname=galculator -pkgver=1.3.1 -pkgrel=2 +pkgver=1.3.3 +pkgrel=1 pkgdesc="galculator is a GTK 2 based scientific calculator supporting algebraic mode as well as RPN." Finclude sourceforge depends=('libglade' 'glibc' 'freetype2' 'libxau' 'libxdmcp' 'libxdamage' 'libxext') -makedepends=('pkgconfig') +makedepends=('pkgconfig' 'intltool') options=('scriptlet') groups=('xapps-extra') archs=('i686' 'x86_64') -sha1sums=('095765206cab968d6f00c1ae58b1bd8425c454d6') - -build() -{ - Fbuild - Fsed 'gnome-calc2.png' '/usr/share/pixmaps/galculator/galculator_48x48.png' $Fdestdir/usr/share/applications/$pkgname.desktop -} +sha1sums=('3ba7d9bf504e32c3b3e6236d5a2e547cd4934a52') # optimization OK From devil505linux at gmail.com Tue Jan 13 19:18:28 2009 From: devil505linux at gmail.com (Devil505) Date: Tue Jan 13 19:18:30 2009 Subject: [Frugalware-git] frugalware-current: gtk+2-engine-excelsior-4.1.0-1-i686 Message-ID: <20090113181828.E807811B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=fa25fc1769e2aef6ddb49c9b941157eeae97309e commit fa25fc1769e2aef6ddb49c9b941157eeae97309e Author: Devil505 Date: Tue Jan 13 19:15:16 2009 +0100 gtk+2-engine-excelsior-4.1.0-1-i686 * version bump diff --git a/source/gnome-extra/gtk+2-engine-excelsior/FrugalBuild b/source/gnome-extra/gtk+2-engine-excelsior/FrugalBuild index e498424..b6ff95d 100644 --- a/source/gnome-extra/gtk+2-engine-excelsior/FrugalBuild +++ b/source/gnome-extra/gtk+2-engine-excelsior/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Devil505 pkgname=gtk+2-engine-excelsior -pkgver=4.0.0 +pkgver=4.1.0 pkgrel=1 pkgdesc="A Theme Engine based on Clearlooks." url="http://www.nanolx.org/index.php" @@ -14,7 +14,7 @@ _F_archive_name="excelsior" up2date="lynx -dump http://www.nanolx.org/free/ | Flasttar" source=(http://www.nanolx.org/free/$_F_archive_name-$pkgver.tar.bz2) _F_cd_path="$_F_archive_name" -sha1sums=('3781c70ca054e6d56712c9234c8b226b08c34578') +sha1sums=('867dce7d64376b991915aac034a218b4c0c0f3b3') # optimization OK From bouleetbil at frogdev.info Tue Jan 13 19:20:51 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue Jan 13 19:20:53 2009 Subject: [Frugalware-git] frugalware-current: liborange-0.4-1-i686 Message-ID: <20090113182051.A614F11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2de2b63c6879ff89df6bb1573051ab5a536926c2 commit 2de2b63c6879ff89df6bb1573051ab5a536926c2 Author: bouleetbil Date: Tue Jan 13 19:14:41 2009 +0100 liborange-0.4-1-i686 *version bump diff --git a/source/lib-extra/liborange/FrugalBuild b/source/lib-extra/liborange/FrugalBuild index 0f2779c..72d71ef 100644 --- a/source/lib-extra/liborange/FrugalBuild +++ b/source/lib-extra/liborange/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: bouleetbil pkgname=liborange -pkgver=0.3.2 +pkgver=0.4 pkgrel=1 pkgdesc="extracts CAB files from self-extracting installers" groups=('lib-extra') @@ -11,6 +11,6 @@ depends=('libdynamite' 'libsynce' 'cabextract' 'unzip' 'unshield') _F_sourceforge_realname="Orange" _F_sourceforge_dirname="synce" Finclude sourceforge -sha1sums=('b8656b3fd9c71f42f43a0baf21f881e8e25634c3') +sha1sums=('70028d570b9ed9831303a36c6ff60e74a5c7f3c9') # optimization OK From bouleetbil at frogdev.info Tue Jan 13 20:26:42 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue Jan 13 20:26:45 2009 Subject: [Frugalware-git] frugalware-current: librapi2-0.13-1-i686 Message-ID: <20090113192642.A107D11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=117e1976ab44336a09902b63fff3886c7c7dc8ac commit 117e1976ab44336a09902b63fff3886c7c7dc8ac Author: bouleetbil Date: Tue Jan 13 20:20:28 2009 +0100 librapi2-0.13-1-i686 *version bump *added patch for pyrex diff --git a/source/lib-extra/librapi2/Fix_pyrex.diff b/source/lib-extra/librapi2/Fix_pyrex.diff new file mode 100644 index 0000000..8e6843f --- /dev/null +++ b/source/lib-extra/librapi2/Fix_pyrex.diff @@ -0,0 +1,42 @@ +--- librapi2-0.13.orig/python/pyrapi2.pyx 2009-01-05 17:59:53.000000000 +0000 ++++ librapi2-0.13/python/pyrapi2.pyx 2009-01-12 08:18:46.000000000 +0000 +@@ -10,10 +10,10 @@ + void free(void *ptr) + + cdef extern from "synce.h": +- char *wstr_to_utf8(LPCWSTR unicode) +- LPWSTR wstr_from_utf8(char *utf8) +- void wstr_free_string(void *str) +- char* synce_strerror(DWORD error) ++ char *wstr_to_utf8(LPCWSTR unicode) nogil ++ LPWSTR wstr_from_utf8(char *utf8) nogil ++ void wstr_free_string(void *str) nogil ++ char* synce_strerror(DWORD error) nogil + + cdef extern from "synce_log.h": + void synce_log_set_level(int level) +@@ -22,7 +22,7 @@ + void *rapi_connection_from_name(char *device_name) + void rapi_connection_select(void *connection) + HRESULT CeRapiInit() +- HRESULT CeProcessConfig(LPCWSTR config, DWORD flags, LPWSTR* reply) ++ HRESULT CeProcessConfig(LPCWSTR config, DWORD flags, LPWSTR* reply) nogil + LONG CeRegCreateKeyEx(HKEY hKey, LPCWSTR lpszSubKey, DWORD Reserved, LPWSTR lpszClass, DWORD ulOptions, REGSAM samDesired, LPSECURITY_ATTRIBUTES lpSecurityAttributes, PHKEY phkResult, LPDWORD lpdwDisposition) + LONG CeRegOpenKeyEx(HKEY hKey, LPCWSTR lpszSubKey, DWORD ulOptions, REGSAM samDesired, PHKEY phkResult) + LONG CeRegCloseKey(HKEY hKey) +@@ -35,13 +35,13 @@ + HRESULT CeSyncResume() + HRESULT CeSyncPause() + HRESULT CeSyncTimeToPc() +- BOOL CeGetSystemPowerStatusEx(PSYSTEM_POWER_STATUS_EX pSystemPowerStatus, BOOL refresh) ++ BOOL CeGetSystemPowerStatusEx(PSYSTEM_POWER_STATUS_EX pSystemPowerStatus, BOOL refresh) nogil + DWORD CeGetDiskFreeSpaceEx( LPCTSTR _lpDirectoryName, PULARGE_INTEGER lpFreeBytesAvailable, PULARGE_INTEGER lpTotalNumberOfBytes, PULARGE_INTEGER lpTotalNumberOfFreeBytes) + BOOL CeFindAllFiles( LPCWSTR szPath, DWORD dwFlags, LPDWORD lpdwFoundCount, LPLPCE_FIND_DATA ppFindDataArray) + + BOOL CeCloseHandle(HANDLE hObject) + HANDLE CeCreateFile( LPCWSTR lpFileName, DWORD dwDesiredAccess, DWORD dwShareMode, LPSECURITY_ATTRIBUTES lpSecurityAttributes, DWORD dwCreationDisposition, DWORD dwFlagsAndAttributes, HANDLE hTemplateFile) +- BOOL CeWriteFile( HANDLE hFile, LPCVOID lpBuffer, DWORD nNumberOfBytesToWrite, LPDWORD lpNumberOfBytesWritten, LPOVERLAPPED lpOverlapped) ++ BOOL CeWriteFile( HANDLE hFile, LPCVOID lpBuffer, DWORD nNumberOfBytesToWrite, LPDWORD lpNumberOfBytesWritten, LPOVERLAPPED lpOverlapped) nogil + BOOL CeReadFile( HANDLE hFile, LPVOID lpBuffer, DWORD nNumberOfBytesToRead, LPDWORD lpNumberOfBytesRead, LPOVERLAPPED lpOverlapped) + + BOOL CeCreateProcess( LPCWSTR lpApplicationName, LPCWSTR lpCommandLine, void* lpProcessAttributes, void* lpThreadAttributes, BOOL bInheritHandles, DWORD dwCreationFlags, LPVOID lpEnvironment, LPWSTR lpCurrentDirectory, void* lpStartupInfo, LPPROCESS_INFORMATION lpProcessInformation) \ No newline at end of file diff --git a/source/lib-extra/librapi2/FrugalBuild b/source/lib-extra/librapi2/FrugalBuild index 6c2d25b..fe7d78f 100644 --- a/source/lib-extra/librapi2/FrugalBuild +++ b/source/lib-extra/librapi2/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: bouleetbil pkgname=librapi2 -pkgver=0.12 -pkgrel=2 +pkgver=0.13 +pkgrel=1 pkgdesc="SynCE - RAPI communication library" groups=('lib-extra') archs=('i686' 'x86_64') @@ -12,7 +12,9 @@ makedepends=('pyrex') _F_sourceforge_dirname="synce" _F_sourceforge_realname="SynCE" Finclude sourceforge python -sha1sums=('1cd7e7d54711f1c3ee9d581eb7b235adeb2fc11b') +source=($source Fix_pyrex.diff) +sha1sums=('244a814a907454e81889aebea64017012f16b480' \ + 'c3c72b8a548a7d8c7d53a8040705459a0f3c2a66') subpkgs=("librapi2-python") subdescs=('python bindings for librapi2') subdepends=("librapi2=$pkgver pyrex" ) From bouleetbil at frogdev.info Tue Jan 13 20:33:47 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue Jan 13 20:33:49 2009 Subject: [Frugalware-git] frugalware-current: odccm-0.13-1-i686 Message-ID: <20090113193347.DE71211B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f1a30b0bba5f098cd8441fd2e1ad80df26787aa6 commit f1a30b0bba5f098cd8441fd2e1ad80df26787aa6 Author: bouleetbil Date: Tue Jan 13 20:27:47 2009 +0100 odccm-0.13-1-i686 *version bump diff --git a/source/apps-extra/odccm/FrugalBuild b/source/apps-extra/odccm/FrugalBuild index 8eefa20..69852e6 100644 --- a/source/apps-extra/odccm/FrugalBuild +++ b/source/apps-extra/odccm/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: bouleetbil pkgname=odccm -pkgver=0.12 +pkgver=0.13 pkgrel=1 pkgdesc="SynCE - odccm connection manager" groups=('apps-extra') @@ -11,7 +11,7 @@ depends=('librapi2' 'gnet' 'libsynce') _F_sourceforge_dirname="synce" _F_sourceforge_realname="SynCE" Finclude sourceforge -sha1sums=('ba284a355e2b5a2552769c6d63ea2b8f729d1b26') +sha1sums=('75a8ab1791d0f85f9f84d834548f2eee058a0e4f') Fconfopts="${Fconfopts[@]} --enable-legacy-support" build() { From devil505linux at gmail.com Tue Jan 13 20:41:57 2009 From: devil505linux at gmail.com (Devil505) Date: Tue Jan 13 20:41:58 2009 Subject: [Frugalware-git] frugalware-current: vacuum-0.7-1-i686 Message-ID: <20090113194157.8219D11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ac671478ad7547c3f827260b719beb4a3decfdce commit ac671478ad7547c3f827260b719beb4a3decfdce Author: Devil505 Date: Tue Jan 13 20:41:36 2009 +0100 vacuum-0.7-1-i686 * new package diff --git a/source/games-extra/vacuum/FrugalBuild b/source/games-extra/vacuum/FrugalBuild new file mode 100644 index 0000000..c5d1369 --- /dev/null +++ b/source/games-extra/vacuum/FrugalBuild @@ -0,0 +1,21 @@ +# Compiling Time: 0.05 SBU +# Maintainer: Devil505 + +pkgname=vacuum +pkgver=0.7 +pkgrel=1 +pkgdesc="A fast-paced side-scrolling action game" +Finclude sourceforge +depends=('perl-sdl') +groups=('games-extra') +archs=('i686') +sha1sums=('d8ef2151fb82e305ff0f7692e9c0ebfde2ce4d9e') + +_F_desktop_name="Vacuum Magic" +_F_desktop_icon="/usr/share/vacuum/icon.png" +_F_desktop_categories="Game;ActionGame;" + +build() { + Fbuild + Fdesktop2 +} From devil505linux at gmail.com Tue Jan 13 20:44:08 2009 From: devil505linux at gmail.com (Devil505) Date: Tue Jan 13 20:44:10 2009 Subject: [Frugalware-git] frugalware-current: maxr-0.2.3-1-i686 Message-ID: <20090113194408.CBF8D11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0dba0b1227c9f6cc6abb073a150bf9f91bfb8e2c commit 0dba0b1227c9f6cc6abb073a150bf9f91bfb8e2c Author: Devil505 Date: Tue Jan 13 20:42:32 2009 +0100 maxr-0.2.3-1-i686 * new package / closed request FS#3530 diff --git a/source/games-extra/maxr/FrugalBuild b/source/games-extra/maxr/FrugalBuild new file mode 100644 index 0000000..76b5b73 --- /dev/null +++ b/source/games-extra/maxr/FrugalBuild @@ -0,0 +1,32 @@ +# Compiling Time: 0.10 SBU +# Maintainer: Devil505 + +pkgname=maxr +pkgver=0.2.3 +pkgrel=1 +pkgdesc="OpenSource reimplementation for M.A.X." +url="http://www.maxthegame.de/" +depends=('sdl_net' 'sdl_mixer' 'libstdc++') +groups=('games-extra') +archs=('i686') +up2date="lynx -dump http://www.maxthegame.de/bbs/docs.php?id=3 | grep tar.gz | Flasttar" +source=(http://www.maxthegame.de/downloads/$pkgname-$pkgver.tar.gz) +sha1sums=('783d5978c5cf32aa3629be8972116444564d23c2') + +_F_desktop_name="M.A.X. Reloaded" +_F_desktop_icon="/usr/share/maxr/maxr.png" +_F_desktop_categories="Game;" + +build() { + Fcd + ./bootstrap.sh || Fdie + Fconf + Fmake + make DATADIR=$Fdestdir/usr/share/$pkgname install || Fdie + Fwrapper "cd /usr/share/maxr/ && ./maxr" $pkgname + Fdesktop2 +} + + +# optimization OK + From bouleetbil at frogdev.info Tue Jan 13 20:46:03 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue Jan 13 20:46:04 2009 Subject: [Frugalware-git] frugalware-current: synce-hal-0.13-1-i686 Message-ID: <20090113194603.2651E11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=756723f83c0c7526606f78e8603181a094f9ca91 commit 756723f83c0c7526606f78e8603181a094f9ca91 Author: bouleetbil Date: Tue Jan 13 20:39:51 2009 +0100 synce-hal-0.13-1-i686 *version bump diff --git a/source/lib-extra/synce-hal/FrugalBuild b/source/lib-extra/synce-hal/FrugalBuild index a3a6645..a2c2123 100644 --- a/source/lib-extra/synce-hal/FrugalBuild +++ b/source/lib-extra/synce-hal/FrugalBuild @@ -2,15 +2,15 @@ # Maintainer: bouleetbil pkgname=synce-hal -pkgver=0.2 +pkgver=0.13 pkgrel=1 pkgdesc="SynCE - HAL support" groups=('lib-extra') archs=('i686' 'x86_64') depends=('libsynce' 'gnet' 'hal') +_F_sourceforge_realname="SynCE" _F_sourceforge_dirname="synce" -_F_sourceforge_broken_up2date="1" Finclude sourceforge -sha1sums=('92116494533016c5e6ae206b012aa0dd00b126cd') +sha1sums=('a9eba0574ff1248253b3eaad08b8d19af58f1042') # optimization OK From bouleetbil at frogdev.info Tue Jan 13 21:08:22 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue Jan 13 21:08:23 2009 Subject: [Frugalware-git] frugalware-current: synce-gvfs-0.13-1-i686 Message-ID: <20090113200822.67FF411B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1fbd48476946c4aab8ae1194193df431cc84e1fd commit 1fbd48476946c4aab8ae1194193df431cc84e1fd Author: bouleetbil Date: Tue Jan 13 21:02:28 2009 +0100 synce-gvfs-0.13-1-i686 *new package diff --git a/source/xlib-extra/synce-gvfs/FrugalBuild b/source/xlib-extra/synce-gvfs/FrugalBuild new file mode 100644 index 0000000..ef24ed9 --- /dev/null +++ b/source/xlib-extra/synce-gvfs/FrugalBuild @@ -0,0 +1,19 @@ +# Compiling Time: 0.09 SBU +# Maintainer: bouleetbil + +pkgname=synce-gvfs +pkgver=0.13 +pkgrel=1 +pkgdesc="SynCE - gvfs support" +groups=('xlib-extra') +archs=('i686') +depends=('libsynce' 'gvfs' 'librapi2') +makedepends=('intltool') +_F_sourceforge_realname="SynCE-GNOME" +_F_sourceforge_dirname="synce" +_F_sourceforge_pkgver=0.2.1 +Finclude sourceforge +sha1sums=('7761b49971e42d6baa6ac7d1acb5ad2e7f610284') +_F_cd_path=$pkgname-$_F_sourceforge_pkgver + +# optimization OK From bouleetbil at frogdev.info Tue Jan 13 21:14:05 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue Jan 13 21:14:06 2009 Subject: [Frugalware-git] frugalware-current: libevent-1.4.8-1-ppc Message-ID: <20090113201405.65BEF11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=45874f6aef7c1172f7f56110217ded3d4132025a commit 45874f6aef7c1172f7f56110217ded3d4132025a Author: bouleetbil Date: Tue Jan 13 21:13:00 2009 +0100 libevent-1.4.8-1-ppc *added ppc to archs() diff --git a/source/lib/libevent/FrugalBuild b/source/lib/libevent/FrugalBuild index b976842..9f497cd 100644 --- a/source/lib/libevent/FrugalBuild +++ b/source/lib/libevent/FrugalBuild @@ -9,7 +9,7 @@ pkgextraver=-stable pkgdesc="Provides a mechanism to execute a callback function when a specific event occurs on a file descriptor or after a timeout has been reached" url="http://www.monkey.org/~provos/libevent/" groups=('lib') -archs=('i686' 'x86_64') +archs=('i686' 'x86_64' 'ppc') depends=('glibc') up2date="lynx -dump http://www.monkey.org/~provos/libevent/ |grep libevent.*tar |sed -ne 's/.*t-\(.*\)-s.*/\1/;1p'" source=(http://www.monkey.org/~provos/$pkgname-$pkgver$pkgextraver.tar.gz) From bouleetbil at frogdev.info Tue Jan 13 21:15:25 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue Jan 13 21:15:25 2009 Subject: [Frugalware-git] frugalware-current: libnfsidmap-0.21-1-ppc Message-ID: <20090113201525.0C82411B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=519cf1a1010d6ef54509aab3b3f4593ae6991a2b commit 519cf1a1010d6ef54509aab3b3f4593ae6991a2b Author: bouleetbil Date: Tue Jan 13 21:14:47 2009 +0100 libnfsidmap-0.21-1-ppc *added ppc to archs() diff --git a/source/network/libnfsidmap/FrugalBuild b/source/network/libnfsidmap/FrugalBuild index e5522a8..7af116f 100644 --- a/source/network/libnfsidmap/FrugalBuild +++ b/source/network/libnfsidmap/FrugalBuild @@ -8,7 +8,7 @@ pkgrel=1 pkgdesc="Library to help mapping id's, mainly for NFSv4." url="http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/" groups=('network') -archs=('i686' 'x86_64') +archs=('i686' 'x86_64' 'ppc') makedepends=('openldap') depends=('libldap') up2date="lynx -dump http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/|grep tar.gz|sed -n 's/.*-\(.*\)\.t.*/\1/p'|sort -u -n -t . -k 2|tail -n 1" From bouleetbil at frogdev.info Tue Jan 13 21:17:09 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue Jan 13 21:17:10 2009 Subject: [Frugalware-git] frugalware-current: synce-gnomevfs-0.13-1-i686 Message-ID: <20090113201709.CD31411B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=caf2ffa7066589fb167fc9060cb4eabc91a56644 commit caf2ffa7066589fb167fc9060cb4eabc91a56644 Author: bouleetbil Date: Tue Jan 13 21:11:00 2009 +0100 synce-gnomevfs-0.13-1-i686 *version bump diff --git a/source/gnome-extra/synce-gnomevfs/FrugalBuild b/source/gnome-extra/synce-gnomevfs/FrugalBuild index a572b88..bf4182f 100644 --- a/source/gnome-extra/synce-gnomevfs/FrugalBuild +++ b/source/gnome-extra/synce-gnomevfs/FrugalBuild @@ -2,16 +2,16 @@ # Maintainer: bouleetbil pkgname=synce-gnomevfs -pkgver=0.1.1 -_F_sourceforge_pkgver=0.12 +pkgver=0.13 pkgrel=1 pkgdesc="SynCE - Gnome VFS extensions" groups=('gnome-extra') archs=('i686' 'x86_64') depends=('gnome-vfs' 'libsynce' 'librapi2' 'zlib' 'openssl' 'e2fsprogs') _F_sourceforge_dirname="synce" +_F_sourceforge_realname="SynCE-GNOME" Finclude sourceforge _F_cd_path=$pkgname-$_F_sourceforge_pkgver -sha1sums=('53308c266bd44ca27d12d703b436df9e8b47cdc9') +sha1sums=('07a5dca3bbc96a72c9f109dac201317367f9ca72') # optimization OK From bouleetbil at frogdev.info Tue Jan 13 21:24:04 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue Jan 13 21:24:06 2009 Subject: [Frugalware-git] frugalware-current: nfs-utils-1.1.4-1-ppc Message-ID: <20090113202404.C10A311B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=60842383efb75854a963796245da4b1977e54a55 commit 60842383efb75854a963796245da4b1977e54a55 Author: bouleetbil Date: Tue Jan 13 21:22:51 2009 +0100 nfs-utils-1.1.4-1-ppc *added ppc to archs() diff --git a/source/network/nfs-utils/FrugalBuild b/source/network/nfs-utils/FrugalBuild index 92a879a..11efbf2 100644 --- a/source/network/nfs-utils/FrugalBuild +++ b/source/network/nfs-utils/FrugalBuild @@ -6,7 +6,7 @@ pkgver=1.1.4 pkgrel=1 pkgdesc="Support programs for Network File Systems" groups=('network') -archs=('i686' 'x86_64') +archs=('i686' 'x86_64' 'ppc') backup=(etc/exports etc/conf.d/nfsd etc/sysconfig/nfs) _F_sourceforge_dirname="nfs" _F_sourceforge_ext=".tar.bz2" From bouleetbil at frogdev.info Tue Jan 13 21:29:09 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue Jan 13 21:29:10 2009 Subject: [Frugalware-git] frugalware-current: synce-trayicon-0.13-1-i686 Message-ID: <20090113202909.AB5B611B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8dbc5e524cf4e9377cc2b4bf81962195c5cfe2fb commit 8dbc5e524cf4e9377cc2b4bf81962195c5cfe2fb Author: bouleetbil Date: Tue Jan 13 21:22:36 2009 +0100 synce-trayicon-0.13-1-i686 *version bump *fixe up2date diff --git a/source/gnome-extra/synce-trayicon/FrugalBuild b/source/gnome-extra/synce-trayicon/FrugalBuild index cc218e0..5140dec 100644 --- a/source/gnome-extra/synce-trayicon/FrugalBuild +++ b/source/gnome-extra/synce-trayicon/FrugalBuild @@ -2,8 +2,7 @@ # Maintainer: bouleetbil pkgname=synce-trayicon -pkgver=0.1.1 -_F_sourceforge_pkgver=0.12 +pkgver=0.13 pkgrel=1 pkgdesc="SynCE - Gnome trayicon" groups=('gnome-extra') @@ -13,16 +12,16 @@ depends=('libgnomeui' 'libsm' 'gnome-vfs' 'esd' 'pango' \ 'librapi2' 'libnotify' 'atk' 'freetype2' 'libxdmcp' \ 'libjpeg' 'openssl' 'e2fsprogs' 'libxdamage' 'libxinerama' \ 'libxi' 'libxrandr' 'libxcursor' 'libsynce' 'liborange') -makedepends=('gnome-common' 'perl-xml-parser') +makedepends=('gnome-common' 'perl-xml-parser' 'intltool') options=('scriptlet') _F_sourceforge_dirname="synce" +_F_sourceforge_realname="SynCE-GNOME" _F_gnome_iconcache="y" _F_gnome_schemas=('/etc/gconf/schemas/synce-trayicon.schemas') Finclude sourceforge gnome-scriptlet _F_desktop_categories="Office;PDA;" _F_desktop_icon="/usr/share/icons/hicolor/22x22/apps/synce-color.png" -sha1sums=('201f4c0cea51d97df6e8ba4ac2d7f7ce0ebdb9cd') -_F_cd_path=$pkgname-$_F_sourceforge_pkgver +sha1sums=('cf3503b6fb64ac0c0646a06121544d7483056e44') build() { Fbuild From bouleetbil at frogdev.info Tue Jan 13 21:35:34 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue Jan 13 21:35:35 2009 Subject: [Frugalware-git] frugalware-current: sync-engine-0.13-1-i686 Message-ID: <20090113203534.049A111B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a226fafcde0f1980ec01e3b203b8b89321b37b75 commit a226fafcde0f1980ec01e3b203b8b89321b37b75 Author: bouleetbil Date: Tue Jan 13 21:29:16 2009 +0100 sync-engine-0.13-1-i686 *version bump diff --git a/source/apps-extra/sync-engine/FrugalBuild b/source/apps-extra/sync-engine/FrugalBuild index 664d4e0..c253f68 100644 --- a/source/apps-extra/sync-engine/FrugalBuild +++ b/source/apps-extra/sync-engine/FrugalBuild @@ -2,9 +2,8 @@ # Maintainer: bouleetbil pkgname=sync-engine -pkgver=0.1.1 -_F_sourceforge_pkgver=0.12 -pkgrel=2 +pkgver=0.13 +pkgrel=1 pkgdesc="SynCE - Synchronization engine" groups=('apps-extra') archs=('i686' 'x86_64') @@ -12,6 +11,6 @@ depends=('pygobject' 'dbus-python' 'librapi2-python' \ 'libxml2' 'libxslt' 'pyxml' 'odccm' 'librra' 'librtfcomp') makedepends=('setuptools') _F_sourceforge_dirname="synce" +_F_sourceforge_realname="SynCE" Finclude sourceforge -_F_cd_path=$pkgname-$_F_sourceforge_pkgver -sha1sums=('c6ddee57c9cf7ee2927662bee533ab0a75ba1464') +sha1sums=('36d45d7216b830033ced56db533f3c0e1f2e970d') From bouleetbil at frogdev.info Tue Jan 13 21:55:20 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue Jan 13 21:55:21 2009 Subject: [Frugalware-git] frugalware-current: asymptote-1.58-1-i686 Message-ID: <20090113205520.792F411B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ba6eecbff737b231967e661d28e728aae15d5542 commit ba6eecbff737b231967e661d28e728aae15d5542 Author: bouleetbil Date: Tue Jan 13 21:48:33 2009 +0100 asymptote-1.58-1-i686 *version bump diff --git a/source/xapps-extra/asymptote/FrugalBuild b/source/xapps-extra/asymptote/FrugalBuild index dd4f6bf..a8e87b0 100644 --- a/source/xapps-extra/asymptote/FrugalBuild +++ b/source/xapps-extra/asymptote/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: uzsolt pkgname=asymptote -pkgver=1.57 +pkgver=1.58 pkgrel=1 pkgdesc="Asymptote is a powerful descriptive vector graphics language." depends=('libgc' 'gsl' 'ncurses' 'readline' 'libstdc++' 'fftw' 'imaging' \ @@ -16,7 +16,7 @@ _F_sourceforge_ext=.src.tgz Finclude sourceforge url="http://asymptote.sourceforge.net/" license=('GPL2') -sha1sums=('af946f518444ea78e68cc6ed9f8800762fbdb9ca') +sha1sums=('66f691b129a2538de92cd43347bd9b09ab6a4378') _F_desktop_desc="A asymptote GUI" _F_desktop_exec="xasy" _F_desktop_categories="Graphics;VectorGraphics;" From bouleetbil at frogdev.info Tue Jan 13 22:08:05 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue Jan 13 22:08:06 2009 Subject: [Frugalware-git] frugalware-current: hamster-applet-2.24.3-1-i686 Message-ID: <20090113210805.D550A11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=727fc2d8d57b69f73f8205dd8e3d7540e85853d6 commit 727fc2d8d57b69f73f8205dd8e3d7540e85853d6 Author: bouleetbil Date: Tue Jan 13 22:01:32 2009 +0100 hamster-applet-2.24.3-1-i686 *version bump diff --git a/source/gnome-extra/hamster-applet/FrugalBuild b/source/gnome-extra/hamster-applet/FrugalBuild index 9a35146..92092a6 100644 --- a/source/gnome-extra/hamster-applet/FrugalBuild +++ b/source/gnome-extra/hamster-applet/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: bouleetbil pkgname=hamster-applet -pkgver=2.24.2 -pkgrel=2 +pkgver=2.24.3 +pkgrel=1 pkgdesc="Project Hamster is time tracking for masses. " depends=('gnome-applets' 'gnome-python-desktop-applet' 'pysqlite2' 'libxext' \ 'libxdmcp' 'libxau' 'gtk+2' 'freetype2' 'libffi' 'libxdamage' 'libxml2') @@ -14,8 +14,6 @@ options=('scriptlet') _F_gnome_iconcache="y" _F_gnome_schemas=('/etc/gconf/schemas/hamster-applet.schemas') Finclude gnome gnome-scriptlet -source=($source Fix_usepysqlite.diff) -sha1sums=('45d114b8311eca761c9faf668d1c6bf0e29d68fc' \ - '34ffc7d97c45823df073699512d00f7ce34e8780') +sha1sums=('6425b707c622d6f5c8f3caed4c7fc91d50aa2641') # optimization OK From bouleetbil at frogdev.info Tue Jan 13 22:10:49 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue Jan 13 22:10:51 2009 Subject: [Frugalware-git] frugalware-current: hamster-applet-2.24.3-1-i686 Message-ID: <20090113211049.D068B11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=93a052017f001207b94c2205072c2da0535535b0 commit 93a052017f001207b94c2205072c2da0535535b0 Author: bouleetbil Date: Tue Jan 13 22:04:20 2009 +0100 hamster-applet-2.24.3-1-i686 *forgot to delete useless patch diff --git a/source/gnome-extra/hamster-applet/Fix_usepysqlite.diff b/source/gnome-extra/hamster-applet/Fix_usepysqlite.diff deleted file mode 100644 index 4dc2853..0000000 --- a/source/gnome-extra/hamster-applet/Fix_usepysqlite.diff +++ /dev/null @@ -1,54 +0,0 @@ ---- hamster-applet-2.24.2old/configure 2008-11-24 19:55:16.000000000 +0100 -+++ hamster-applet-2.24.2/configure 2008-11-25 23:45:23.000000000 +0100 -@@ -14678,40 +14678,8 @@ - echo "${ECHO_T}$PYGTK_DEFSDIR" >&6; } - - --if test "x$PYTHON_VERSION" = "x2.5"; then -- { echo "$as_me:$LINENO: checking for python sqlite module" >&5 --echo $ECHO_N "checking for python sqlite module... $ECHO_C" >&6; } -- if { (echo "$as_me:$LINENO: DISPLAY= \$PYTHON -c ' --try: -- import sqlite3 --except ImportError, e: -- if str(e).find(\"sqlite3\") >= 0: -- raise --except: -- pass -- '") >&5 -- (DISPLAY= $PYTHON -c ' --try: -- import sqlite3 --except ImportError, e: -- if str(e).find("sqlite3") >= 0: -- raise --except: -- pass -- ') 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -- { echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6; } -- else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -- { { echo "$as_me:$LINENO: error: Python 2.5: inbuilt sqlite is required to build hamster" >&5 --echo "$as_me: error: Python 2.5: inbuilt sqlite is required to build hamster" >&2;} -- { (exit 1); exit 1; }; } -- fi --else -+ -+ - { echo "$as_me:$LINENO: checking for pysqlite2 module" >&5 - echo $ECHO_N "checking for pysqlite2 module... $ECHO_C" >&6; } - if { (echo "$as_me:$LINENO: DISPLAY= \$PYTHON -c ' -@@ -14744,7 +14712,7 @@ - echo "$as_me: error: Python 2.4: pysqlite2 module required to build hamster" >&2;} - { (exit 1); exit 1; }; } - fi --fi -+ - - - From bouleetbil at frogdev.info Tue Jan 13 22:21:00 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue Jan 13 22:21:02 2009 Subject: [Frugalware-git] frugalware-current: zapping-0.10cvs6-6-i686 Message-ID: <20090113212100.ED70611B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2a10ee2a06837942947f58c64653d4e116c28e38 commit 2a10ee2a06837942947f58c64653d4e116c28e38 Author: bouleetbil Date: Tue Jan 13 22:14:29 2009 +0100 zapping-0.10cvs6-6-i686 *rebuild with python>=2.6 diff --git a/source/gnome-extra/zapping/FrugalBuild b/source/gnome-extra/zapping/FrugalBuild index c5c2fc0..1b8d6ba 100644 --- a/source/gnome-extra/zapping/FrugalBuild +++ b/source/gnome-extra/zapping/FrugalBuild @@ -3,10 +3,10 @@ pkgname=zapping pkgver=0.10cvs6 -pkgrel=5 +pkgrel=6 pkgdesc="Zapping is a TV viewer" license="GPL" -depends=('libgnomeui' 'libxxf86vm' 'libxmu' 'rte' 'libxv' 'atk' 'freetype2' 'pango' 'zvbi' 'libxxf86dga' 'perl-xml-parser' 'dbus-glib>=0.71') +depends=('libgnomeui' 'libxxf86vm' 'libxmu' 'rte' 'libxv' 'atk' 'freetype2' 'pango' 'zvbi' 'libxxf86dga' 'perl-xml-parser' 'dbus-glib>=0.71' 'python>=2.6') makedepends=('rarian') archs=('i686' '!x86_64') groups=('gnome-extra') From bouleetbil at frogdev.info Tue Jan 13 22:32:09 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Tue Jan 13 22:32:10 2009 Subject: [Frugalware-git] frugalware-current: librra-0.13-1-i686 Message-ID: <20090113213209.0834011B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=807bf431ef717519064682100acc8d8244d71b3c commit 807bf431ef717519064682100acc8d8244d71b3c Author: bouleetbil Date: Tue Jan 13 22:25:46 2009 +0100 librra-0.13-1-i686 *version bump *fixe up2date diff --git a/source/lib-extra/librra/FrugalBuild b/source/lib-extra/librra/FrugalBuild index c1a1ed6..efc4a23 100644 --- a/source/lib-extra/librra/FrugalBuild +++ b/source/lib-extra/librra/FrugalBuild @@ -2,16 +2,15 @@ # Maintainer: bouleetbil pkgname=librra -pkgver=0.1.1 -_F_sourceforge_pkgver=0.12 -pkgrel=2 +pkgver=0.13 +pkgrel=1 pkgdesc="SynCE - RRA protocol library" groups=('lib-extra') archs=('i686' 'x86_64') depends=('pyrex' 'librapi2-python' 'libmimedir' 'hal' 'e2fsprogs' 'python') +_F_sourceforge_realname="SynCE" _F_sourceforge_dirname="synce" Finclude sourceforge -sha1sums=('dbc420e76387cf0b820564a2e59870b3f7c4a827') -_F_cd_path=$pkgname-$_F_sourceforge_pkgver +sha1sums=('f8338d2ec6831330e1ac1fef046b6727a91e6777') # optimization OK From vmiklos at frugalware.org Wed Jan 14 00:54:47 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Jan 14 00:54:48 2009 Subject: [Frugalware-git] frugalware-current: module-init-tools-3.5-2-i686 Message-ID: <20090113235447.3BA5F11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c4809a92563c44edc8fcacabc1593f2572598f5a commit c4809a92563c44edc8fcacabc1593f2572598f5a Author: Miklos Vajna Date: Wed Jan 14 00:54:15 2009 +0100 module-init-tools-3.5-2-i686 - add snd-seq-oss, snd-pcm-oss, snd-mixer-oss to the default modules file - closes #3568 diff --git a/source/base/module-init-tools/FrugalBuild b/source/base/module-init-tools/FrugalBuild index 49ccf90..647cf49 100644 --- a/source/base/module-init-tools/FrugalBuild +++ b/source/base/module-init-tools/FrugalBuild @@ -3,7 +3,7 @@ pkgname=module-init-tools pkgver=3.5 -pkgrel=1 +pkgrel=2 pkgdesc="Utilities for inserting and removing modules from the Linux kernel" url="http://kerneltools.org/KernelTools.org" depends=('glibc>=2.8-3') @@ -16,7 +16,7 @@ source=(http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/$pkgname- rc.modules modules binfmt_misc prefer-modprobe.d.patch) sha1sums=('86289ccafc47c0f1dde0955fda1922cdcc79ae9f' \ '2946433739d105c569a8f0b15bb41a7403a52b5c' \ - '49a6c7e2c3f212610718c1d891dc8bdf96081d5e' \ + '07c76e65af673c8aad478ad78ef2d750b8ea407e' \ '73cef31f3c1f924c3ef1cd112672ffda750266a5' \ '6338b55775a4479bddf56c11c990c0b73bb28d66') options=('scriptlet') diff --git a/source/base/module-init-tools/modules b/source/base/module-init-tools/modules index c74770b..2c06ac5 100644 --- a/source/base/module-init-tools/modules +++ b/source/base/module-init-tools/modules @@ -23,3 +23,8 @@ parport_pc lp loop rtc-cmos + +# oss compat modules +snd-seq-oss +snd-pcm-oss +snd-mixer-oss From crazy at frugalware.org Wed Jan 14 01:56:16 2009 From: crazy at frugalware.org (crazy) Date: Wed Jan 14 01:56:19 2009 Subject: [Frugalware-git] frugalware-current: xine-lib-1.1.16.1-1-x86_64 Message-ID: <20090114005616.7386911B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1151e207fef792fa0292e46de5724b8c9a9bd408 commit 1151e207fef792fa0292e46de5724b8c9a9bd408 Author: crazy Date: Wed Jan 14 01:53:18 2009 +0100 xine-lib-1.1.16.1-1-x86_64 * Version bump diff --git a/source/xlib/xine-lib/FrugalBuild b/source/xlib/xine-lib/FrugalBuild index 15b5fc7..321920b 100644 --- a/source/xlib/xine-lib/FrugalBuild +++ b/source/xlib/xine-lib/FrugalBuild @@ -3,8 +3,8 @@ # Contributor: VMiklos pkgname=xine-lib -pkgver=1.1.15 -pkgrel=3 +pkgver=1.1.16.1 +pkgrel=1 pkgdesc="Xine multimedia playback engine libraries" _F_sourceforge_dirname="xine" _F_sourceforge_ext=".tar.bz2" @@ -19,9 +19,7 @@ options=('scriptlet') makedepends=('arts' 'esd' 'sdl' 'jack') groups=('xlib') archs=('i686' 'x86_64' 'ppc') -source=($source xine-lib-1.1.15-buffer_h_ansi.patch) -sha1sums=('bcb567ea2a11c5f26b2384d5400b8466ea9048c6' \ - 'f96f76c22267d3a814caf6db080f81df5070bd5d') +sha1sums=('82709254a0603e3971058aacf8578926b75d4a20') build() { From boobaa at frugalware.org Wed Jan 14 07:16:08 2009 From: boobaa at frugalware.org (CSÉCSY László) Date: Wed Jan 14 07:16:10 2009 Subject: [Frugalware-git] frugalware-current: php-pecl-memcache-3.0.3-1-i686 Message-ID: <20090114061608.BED4311B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a561fa6afcc3cd8bf2ff8775843792e88fc8a748 commit a561fa6afcc3cd8bf2ff8775843792e88fc8a748 Author: CSÉCSY László Date: Wed Jan 14 07:15:53 2009 +0100 php-pecl-memcache-3.0.3-1-i686 version bump diff --git a/source/devel-extra/php-pecl-memcache/FrugalBuild b/source/devel-extra/php-pecl-memcache/FrugalBuild index 4ab6d22..78dd3aa 100644 --- a/source/devel-extra/php-pecl-memcache/FrugalBuild +++ b/source/devel-extra/php-pecl-memcache/FrugalBuild @@ -2,12 +2,12 @@ # Maintainer: CSÉCSY László _F_pecl_name="memcache" -pkgver=3.0.2 +pkgver=3.0.3 pkgdesc="allows you to work with memcached through handy OO and procedural interfaces" depends=('php>=5.2.6') Finclude pecl pkgrel=1 -sha1sums=('6815671a37da0413107b4a1f3e45acac8f49bc62') +sha1sums=('b9ad5d59f63b220d04d6a443db33242da917191a') up2date="lynx -dump http://pecl.php.net/package/$_F_pecl_name |grep -m1 '[0-9.]\{3,\}\.tgz$'|sed 's/.*-\(.*\)\.t.*/\1/'" build() { From boobaa at frugalware.org Wed Jan 14 07:18:12 2009 From: boobaa at frugalware.org (CSÉCSY László) Date: Wed Jan 14 07:18:13 2009 Subject: [Frugalware-git] frugalware-current: man-pages-3.16-1-i686 Message-ID: <20090114061812.7C1DB11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5efb3d2c33852b482fe4d9ff6874546c474778b6 commit 5efb3d2c33852b482fe4d9ff6874546c474778b6 Author: CSÉCSY László Date: Wed Jan 14 07:18:00 2009 +0100 man-pages-3.16-1-i686 version bump diff --git a/source/apps/man-pages/FrugalBuild b/source/apps/man-pages/FrugalBuild index b84bca0..0033347 100644 --- a/source/apps/man-pages/FrugalBuild +++ b/source/apps/man-pages/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: VMiklos pkgname=man-pages -pkgver=3.15 +pkgver=3.16 pkgrel=1 pkgdesc="Man pages are online documentation for Linux" url="http://www.win.tue.nl/~aeb/linux/man" @@ -41,4 +41,4 @@ build() Frm /usr/share/man/man4/mouse.4 } -sha1sums=('ca422fca75e63889c6b1ded9f420993916909ff8') +sha1sums=('5508600e4d8752ee19840aa7469c93775e6bce29') From boobaa at frugalware.org Wed Jan 14 13:54:56 2009 From: boobaa at frugalware.org (CSÉCSY László) Date: Wed Jan 14 13:54:58 2009 Subject: [Frugalware-git] frugalware-current: memcached-1.2.6-1-i686 Message-ID: <20090114125456.B046E11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=24ca4c6a8b1668b7acc6208a0cde0e66ab5fd542 commit 24ca4c6a8b1668b7acc6208a0cde0e66ab5fd542 Author: CSÉCSY László Date: Wed Jan 14 13:54:42 2009 +0100 memcached-1.2.6-1-i686 new package / initial import diff --git a/source/network-extra/memcached/FrugalBuild b/source/network-extra/memcached/FrugalBuild new file mode 100644 index 0000000..9888240 --- /dev/null +++ b/source/network-extra/memcached/FrugalBuild @@ -0,0 +1,24 @@ +# Compiling Time: 0.01 SBU +# Maintainer: CSÉCSY László + +pkgname=memcached +pkgver=1.2.6 +pkgrel=1 +pkgdesc="A high-performance, distributed memory object caching system." +url="http://www.danga.com/memcached/" +depends=('libevent') +groups=('network-extra') +archs=('i686') +up2date="lynx -dump ${url}download.bml | Flasttar" +source=(${url}dist/$pkgname-$pkgver.tar.gz memcached rc.memcached) +backup=(etc/sysconfig/memcached) +sha1sums=('675a2576efac3d1333181e33fdd43f45f1f5d3fa' \ + 'a870f1229b48f0de9ce73143d34d7be89f405a62' \ + '0210b69943c26df849f6dfda427ecd90750bf639') + +build() { + Fbuild + Ffile /etc/sysconfig/memcached +} + +# optimization OK diff --git a/source/network-extra/memcached/memcached b/source/network-extra/memcached/memcached new file mode 100644 index 0000000..c59f721 --- /dev/null +++ b/source/network-extra/memcached/memcached @@ -0,0 +1,6 @@ +# These are the upstream defaults (well, mostly). +PORT="11211" +USER="nobody" +MAXCONN="1024" +CACHESIZE="64" +OPTIONS="" diff --git a/source/network-extra/memcached/rc.memcached b/source/network-extra/memcached/rc.memcached new file mode 100644 index 0000000..b0935f7 --- /dev/null +++ b/source/network-extra/memcached/rc.memcached @@ -0,0 +1,48 @@ +#!/bin/bash + +# (c) 2009 CSÉCSY László +# (c) 2003, 2004, 2009 Vajna Miklos +# (c) 2005 Laszlo Dvornik +# (c) 2005 Marcus Habermehl +# rc.memcached for Frugalware +# distributed under GPL License + +# chkconfig: 2345 12 80 +# description: A high-performance, distributed memory object caching system. + +source /lib/initscripts/functions +TEXTDOMAIN=memcached +TEXTDOMAINDIR=/lib/initscripts/messages + +source /etc/sysconfig/memcached + +actions=(restart start status stop) +daemon=$"memcached" + +pidfile="/var/run/memcached.pid" + +rc_start() +{ + start_msg + if [[ ! -f $pidfile && -z $(pidof memcached 2> /dev/null) ]]; then + /usr/bin/memcached -d -p $PORT -u $USER -c $MAXCONN -m $CACHESIZE $OPTIONS + pidof memcached >$pidfile 2>/dev/null + ok $? + else + ok 999 + fi +} + +rc_stop() +{ + stop_msg + if [ -f $pidfile ]; then + kill "$(cat $pidfile)" + rm -f $pidfile + ok $? + else + ok 999 + fi +} + +rc_exec $1 From vmiklos at frugalware.org Wed Jan 14 15:57:49 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Jan 14 15:57:52 2009 Subject: [Frugalware-git] frugalware-current: tig-0.13-1-i686 Message-ID: <20090114145749.EB36811B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4fd99d3909af4488780ab7700ae526390c12f3f8 commit 4fd99d3909af4488780ab7700ae526390c12f3f8 Author: Miklos Vajna Date: Wed Jan 14 15:57:40 2009 +0100 tig-0.13-1-i686 - version bump diff --git a/source/devel-extra/tig/FrugalBuild b/source/devel-extra/tig/FrugalBuild index 1d80b7b..132db45 100644 --- a/source/devel-extra/tig/FrugalBuild +++ b/source/devel-extra/tig/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Miklos Vajna pkgname=tig -pkgver=0.12.1 +pkgver=0.13 pkgrel=1 pkgdesc="A text-mode interface for git." url="http://jonas.nitro.dk/tig/" @@ -13,7 +13,7 @@ backup=(etc/tigrc) archs=('i686' 'x86_64') up2date="lynx -dump http://jonas.nitro.dk/tig/releases/|Flasttar" source=(http://jonas.nitro.dk/tig/releases/tig-$pkgver.tar.gz) -sha1sums=('b867a22e248e3c014489ea7c33567e4ca885d88a') +sha1sums=('c322d9844782f510f40a8c6ec201b8fef38cc9f9') build() { From vmiklos at frugalware.org Wed Jan 14 16:52:26 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Jan 14 16:52:28 2009 Subject: [Frugalware-git] frugalware-current: gnutls-2.6.3-1-x86_64 Message-ID: <20090114155226.4C98111B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4831fc08acf4b135452b12fb66302cc10fcf3908 commit 4831fc08acf4b135452b12fb66302cc10fcf3908 Author: András VöröskÅ‘i Date: Sat Dec 20 14:55:35 2008 +0100 gnutls-2.6.3-1-x86_64 version bump diff --git a/source/lib/gnutls/FrugalBuild b/source/lib/gnutls/FrugalBuild index 6b0e1c6..8fa1e0f 100644 --- a/source/lib/gnutls/FrugalBuild +++ b/source/lib/gnutls/FrugalBuild @@ -3,13 +3,13 @@ # Contributor: VMiklos pkgname=gnutls -pkgver=2.4.2 +pkgver=2.6.3 pkgrel=1 pkgdesc="A library which provides a secure layer over a reliable transport layer" url="http://www.gnu.org/software/gnutls/" groups=('lib') archs=('i686' 'x86_64' 'ppc') -depends=('libtasn1' 'readline' 'libstdc++' 'opencdk>=0.6.0' 'lzo') +depends=('libtasn1>=1.7' 'readline' 'libstdc++' 'opencdk>=0.6.0' 'lzo') makedepends=('gtk-doc') options=('scriptlet') up2date="lynx -dump ftp://ftp.gnutls.org/pub/gnutls/|grep tar.bz2$ | grep -v rc | sed -n 's/.*-\(.*\)\.t.*/\1/;$ p'" From vmiklos at frugalware.org Wed Jan 14 17:11:42 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Jan 14 17:11:44 2009 Subject: [Frugalware-git] frugalware-current: fakeroot-1.12.1-1-i686 Message-ID: <20090114161142.972A111B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=80fc586e068c9115b33252b3ce23362e4d3bdb72 commit 80fc586e068c9115b33252b3ce23362e4d3bdb72 Author: Miklos Vajna Date: Wed Jan 14 17:08:30 2009 +0100 fakeroot-1.12.1-1-i686 - version bump diff --git a/source/devel/fakeroot/FrugalBuild b/source/devel/fakeroot/FrugalBuild index 111800e..43b2b53 100644 --- a/source/devel/fakeroot/FrugalBuild +++ b/source/devel/fakeroot/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: Miklos Vajna pkgname=fakeroot -pkgver=1.12 +pkgver=1.12.1 pkgrel=1 pkgdesc="Gives a fake root environment" url="http://packages.debian.org/unstable/utils/fakeroot" @@ -13,7 +13,7 @@ groups=('devel' 'devel-core') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump http://ftp.debian.org/debian/pool/main/f/fakeroot/?M=A|grep gz$|sed -n 's/.*_\(.*\)\.t.*/\1/;$ p'" source=(http://ftp.debian.org/debian/pool/main/f/fakeroot/${pkgname}_$pkgver.tar.gz) -sha1sums=('bdb6d5b4ea2916e0e56efc99542e56c3a659a16b') +sha1sums=('29d9056e5141b1dad87877fc58adcc3384ccf0f5') build() { From vmiklos at frugalware.org Wed Jan 14 17:12:21 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Jan 14 17:12:23 2009 Subject: [Frugalware-git] frugalware-current: libtasn1-1.7-1-x86_64 Message-ID: <20090114161221.DB4B911B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=777c32d51541d0425ed4adc914854ddaa6a84b49 commit 777c32d51541d0425ed4adc914854ddaa6a84b49 Author: András VöröskÅ‘i Date: Sat Dec 20 14:28:26 2008 +0100 libtasn1-1.7-1-x86_64 version bump new m8r diff --git a/source/lib/libtasn1/FrugalBuild b/source/lib/libtasn1/FrugalBuild index 31590c4..71589f7 100644 --- a/source/lib/libtasn1/FrugalBuild +++ b/source/lib/libtasn1/FrugalBuild @@ -1,8 +1,9 @@ # Compiling Time: 0.22 SBU -# Maintainer: Christian Hamar alias krix +# Contributorr: Christian Hamar alias krix +# Maintainer: voroskoi pkgname=libtasn1 -pkgver=1.5 +pkgver=1.7 pkgrel=1 pkgdesc="The ASN.1 library used in GNUTLS" url="http://josefsson.org/libtasn1/" From voroskoi at frugalware.org Wed Jan 14 17:37:16 2009 From: voroskoi at frugalware.org (András VöröskÅ‘i) Date: Wed Jan 14 17:37:24 2009 Subject: [Frugalware-git] frugalware-current: libtasn1-1.7-1-x86_64 Message-ID: <20090114163716.A8EFF11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6fea7bf6798d2a17798ab23b767cdb6504469be9 commit 6fea7bf6798d2a17798ab23b767cdb6504469be9 Author: András VöröskÅ‘i Date: Sat Dec 20 14:28:26 2008 +0100 libtasn1-1.7-1-x86_64 version bump new m8r diff --git a/source/lib/libtasn1/FrugalBuild b/source/lib/libtasn1/FrugalBuild index 31590c4..71589f7 100644 --- a/source/lib/libtasn1/FrugalBuild +++ b/source/lib/libtasn1/FrugalBuild @@ -1,8 +1,9 @@ # Compiling Time: 0.22 SBU -# Maintainer: Christian Hamar alias krix +# Contributorr: Christian Hamar alias krix +# Maintainer: voroskoi pkgname=libtasn1 -pkgver=1.5 +pkgver=1.7 pkgrel=1 pkgdesc="The ASN.1 library used in GNUTLS" url="http://josefsson.org/libtasn1/" From voroskoi at frugalware.org Wed Jan 14 17:37:16 2009 From: voroskoi at frugalware.org (András VöröskÅ‘i) Date: Wed Jan 14 17:37:25 2009 Subject: [Frugalware-git] frugalware-current: gnutls-2.6.3-1-x86_64 Message-ID: <20090114163716.C6F5211B8630@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9c6ab353508fc66d8cea7b7e5c37bd0a48164c0c commit 9c6ab353508fc66d8cea7b7e5c37bd0a48164c0c Author: András VöröskÅ‘i Date: Sat Dec 20 14:55:35 2008 +0100 gnutls-2.6.3-1-x86_64 version bump diff --git a/source/lib/gnutls/FrugalBuild b/source/lib/gnutls/FrugalBuild index 6b0e1c6..8fa1e0f 100644 --- a/source/lib/gnutls/FrugalBuild +++ b/source/lib/gnutls/FrugalBuild @@ -3,13 +3,13 @@ # Contributor: VMiklos pkgname=gnutls -pkgver=2.4.2 +pkgver=2.6.3 pkgrel=1 pkgdesc="A library which provides a secure layer over a reliable transport layer" url="http://www.gnu.org/software/gnutls/" groups=('lib') archs=('i686' 'x86_64' 'ppc') -depends=('libtasn1' 'readline' 'libstdc++' 'opencdk>=0.6.0' 'lzo') +depends=('libtasn1>=1.7' 'readline' 'libstdc++' 'opencdk>=0.6.0' 'lzo') makedepends=('gtk-doc') options=('scriptlet') up2date="lynx -dump ftp://ftp.gnutls.org/pub/gnutls/|grep tar.bz2$ | grep -v rc | sed -n 's/.*-\(.*\)\.t.*/\1/;$ p'" From voroskoi at frugalware.org Wed Jan 14 17:37:16 2009 From: voroskoi at frugalware.org (András VöröskÅ‘i) Date: Wed Jan 14 17:37:26 2009 Subject: [Frugalware-git] frugalware-current: libsoup-2.24.0.1-3-x86_64 Message-ID: <20090114163716.E1A8C11B8631@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2592259bf13658afbbe5530733bb95c636bf3c22 commit 2592259bf13658afbbe5530733bb95c636bf3c22 Author: András VöröskÅ‘i Date: Sun Jan 11 10:39:59 2009 +0100 libsoup-2.24.0.1-3-x86_64 rebuilt with gnutls-2.6 diff --git a/source/lib/libsoup/FrugalBuild b/source/lib/libsoup/FrugalBuild index 07b919d..0fa3544 100644 --- a/source/lib/libsoup/FrugalBuild +++ b/source/lib/libsoup/FrugalBuild @@ -3,10 +3,10 @@ pkgname=libsoup pkgver=2.24.0.1 -pkgrel=2 +pkgrel=3 pkgdesc="An HTTP library implementation in C" url="http://www.gnome.org/" -depends=('glib2>=2.18.1' 'gnutls>=2.4' 'libxml2' 'libgcrypt>=1.4') +depends=('glib2>=2.18.1' 'gnutls>=2.6' 'libxml2' 'libgcrypt>=1.4') groups=('lib') archs=('i686' 'x86_64' 'ppc') Finclude gnome From voroskoi at frugalware.org Wed Jan 14 17:37:17 2009 From: voroskoi at frugalware.org (András VöröskÅ‘i) Date: Wed Jan 14 17:37:26 2009 Subject: [Frugalware-git] frugalware-current: weechat-0.2.6-4-x86_64 Message-ID: <20090114163717.0C20F11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c5332d80f93284ce5c2f89574240ad3b426989f3 commit c5332d80f93284ce5c2f89574240ad3b426989f3 Author: András VöröskÅ‘i Date: Sun Jan 11 10:46:33 2009 +0100 weechat-0.2.6-4-x86_64 rebuilt with gnutls-2.6 diff --git a/source/network-extra/weechat/FrugalBuild b/source/network-extra/weechat/FrugalBuild index 872653c..ebe8f8b 100644 --- a/source/network-extra/weechat/FrugalBuild +++ b/source/network-extra/weechat/FrugalBuild @@ -4,10 +4,10 @@ pkgname=weechat pkgver=0.2.6 -pkgrel=3 +pkgrel=4 pkgdesc="Fast, light & extensible IRC client." url="http://weechat.flashtux.org/" -depends=('aspell' 'gnutls>=2.4' 'libgcrypt>=1.4') +depends=('aspell' 'gnutls>=2.6' 'libgcrypt>=1.4') makedepends=('ruby') groups=('network-extra') archs=('i686' 'x86_64') From voroskoi at frugalware.org Wed Jan 14 17:37:17 2009 From: voroskoi at frugalware.org (András VöröskÅ‘i) Date: Wed Jan 14 17:37:27 2009 Subject: [Frugalware-git] frugalware-current: lftp-3.7.7-1-x86_64 Message-ID: <20090114163717.1EFA311B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ccc7e3a178fa4c7a449fea52921af9332deb80ef commit ccc7e3a178fa4c7a449fea52921af9332deb80ef Author: András VöröskÅ‘i Date: Sun Jan 11 10:53:40 2009 +0100 lftp-3.7.7-1-x86_64 version bump compiled with gnutls-2.6 diff --git a/source/network-extra/lftp/FrugalBuild b/source/network-extra/lftp/FrugalBuild index 43ec281..2051ec7 100644 --- a/source/network-extra/lftp/FrugalBuild +++ b/source/network-extra/lftp/FrugalBuild @@ -3,16 +3,16 @@ # Maintainer: voroskoi pkgname=lftp -pkgver=3.7.3 -pkgrel=2 +pkgver=3.7.7 +pkgrel=1 pkgdesc="A sophisticated ftp/http client, file transfer program" url="http://lftp.yar.ru/" -depends=('expat' 'gnutls>=2.4' 'zlib' 'libgcrypt>=1.4') +depends=('expat' 'gnutls>=2.6' 'zlib' 'libgcrypt>=1.4') groups=('network-extra') archs=('i686' 'x86_64') backup=('etc/lftp.conf') up2date="lynx -dump $url |grep released|sed -ne 's/.*p-\(.*\) r.*/\1/' -e '1 p'" source=(http://ftp.yars.free.net/pub/source/$pkgname/$pkgname-$pkgver.tar.bz2) -sha1sums=('0f212eccd4deb71660bc44785e42a36c10edfd32') +sha1sums=('e6aee8516228d862f3dd906f77ebe43c68d189ce') # optimization OK From voroskoi at frugalware.org Wed Jan 14 17:37:17 2009 From: voroskoi at frugalware.org (András VöröskÅ‘i) Date: Wed Jan 14 17:37:28 2009 Subject: [Frugalware-git] frugalware-current: Merge branch 'master' of ../current Message-ID: <20090114163717.579F211B8630@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=64eaffc84d1ceacb81bf4b6f250ecb3b31f7938b commit 64eaffc84d1ceacb81bf4b6f250ecb3b31f7938b Merge: ccc7e3a... 74d7b6e... Author: András VöröskÅ‘i Date: Sun Jan 11 11:09:10 2009 +0100 Merge branch 'master' of ../current Conflicts: source/network-extra/weechat/FrugalBuild diff --cc source/network-extra/weechat/FrugalBuild index ebe8f8b,27e1029..3032acb --- a/source/network-extra/weechat/FrugalBuild +++ b/source/network-extra/weechat/FrugalBuild @@@ -7,7 -7,7 +7,7 @@@ pkgver=0.2. pkgrel=4 pkgdesc="Fast, light & extensible IRC client." url="http://weechat.flashtux.org/" - depends=('aspell' 'gnutls>=2.6' 'libgcrypt>=1.4') -depends=('aspell' 'gnutls>=2.4' 'libgcrypt>=1.4' 'python>=2.6') ++depends=('aspell' 'gnutls>=2.6' 'libgcrypt>=1.4' 'python>=2.6') makedepends=('ruby') groups=('network-extra') archs=('i686' 'x86_64') From voroskoi at frugalware.org Wed Jan 14 17:37:17 2009 From: voroskoi at frugalware.org (András VöröskÅ‘i) Date: Wed Jan 14 17:37:29 2009 Subject: [Frugalware-git] frugalware-current: pidgin-2.5.3-3-x86_64 Message-ID: <20090114163717.72EF111B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=78d0babe97e42acbf78a35f9dc885b3411a7e4bf commit 78d0babe97e42acbf78a35f9dc885b3411a7e4bf Author: András VöröskÅ‘i Date: Sun Jan 11 11:41:01 2009 +0100 pidgin-2.5.3-3-x86_64 rebuilt with gnutls-2.6 diff --git a/source/xapps/pidgin/FrugalBuild b/source/xapps/pidgin/FrugalBuild index cd5ded1..f943648 100644 --- a/source/xapps/pidgin/FrugalBuild +++ b/source/xapps/pidgin/FrugalBuild @@ -4,12 +4,12 @@ pkgname=pidgin pkgver=2.5.3 -pkgrel=2 +pkgrel=3 pkgdesc="A multi-protocol instant messaging (IM) client" depends=('gtk+2>=2.12.1' 'libao' 'audiofile' 'gtkspell' 'startup-notification>=0.9' \ 'libxscrnsaver' 'dbus-x11' 'gstreamer') makedepends=('evolution-data-server>=1.12.0' 'doxygen' 'tk' 'perl-xml-parser' 'intltool' 'sqlite3' \ - 'avahi-compat>=0.6.21' 'dbus-glib>=0.74' 'avahi-glib>=0.6.21' 'gnutls>=2.4' 'libxml2' 'libxslt' 'nss>=3.12') + 'avahi-compat>=0.6.21' 'dbus-glib>=0.74' 'avahi-glib>=0.6.21' 'gnutls>=2.6' 'libxml2' 'libxslt' 'nss>=3.12') rodepends=('libpurple') conflicts=('gaim') provides=('gaim') @@ -26,7 +26,7 @@ sha1sums=('bd3f6eca0a0c9b221be8a664e904450db8589314' \ subpkgs=("libpurple") subdescs=('Library intended to be used by programmers seeking to write an IM client that connects to many IM networks.') -subdepends=("avahi-compat>=0.6.21 dbus-glib>=0.74 avahi-glib>=0.6.21 gnutls>=2.4 libxml2 libxslt nss>=3.12") +subdepends=("avahi-compat>=0.6.21 dbus-glib>=0.74 avahi-glib>=0.6.21 gnutls>=2.6 libxml2 libxslt nss>=3.12") subgroups=('lib') subarchs=('i686 x86_64 ppc') From voroskoi at frugalware.org Wed Jan 14 17:37:17 2009 From: voroskoi at frugalware.org (András VöröskÅ‘i) Date: Wed Jan 14 17:37:30 2009 Subject: [Frugalware-git] frugalware-current: loudmouth-1.4.0-3-x86_64 Message-ID: <20090114163717.93B3011B8631@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=efad34b2810e725fa711c91beed6f683f3fc35c5 commit efad34b2810e725fa711c91beed6f683f3fc35c5 Author: András VöröskÅ‘i Date: Sun Jan 11 11:43:55 2009 +0100 loudmouth-1.4.0-3-x86_64 rebuilt with gnutls-2.6 diff --git a/source/apps-extra/loudmouth/FrugalBuild b/source/apps-extra/loudmouth/FrugalBuild index ada6975..c8d0758 100644 --- a/source/apps-extra/loudmouth/FrugalBuild +++ b/source/apps-extra/loudmouth/FrugalBuild @@ -3,10 +3,10 @@ pkgname=loudmouth pkgver=1.4.0 -pkgrel=2 +pkgrel=3 pkgdesc="A lightweight and easy-to-use C library for programming with the Jabber protocol." url="http://www.loudmouth-project.org/" -depends=('libgcrypt>=1.4' 'gnutls>=2.4' 'glib2' 'zlib' 'check') +depends=('libgcrypt>=1.4' 'gnutls>=2.6' 'glib2' 'zlib' 'check') options=('scriptlet') groups=('apps-extra') archs=('i686' 'x86_64' 'ppc') From voroskoi at frugalware.org Wed Jan 14 17:37:17 2009 From: voroskoi at frugalware.org (András VöröskÅ‘i) Date: Wed Jan 14 17:37:31 2009 Subject: [Frugalware-git] frugalware-current: wireshark-1.0.5-2-x86_64 Message-ID: <20090114163717.AEBB011B8630@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=57746104336014b23607a4a855cdd7ed871fd0d5 commit 57746104336014b23607a4a855cdd7ed871fd0d5 Author: András VöröskÅ‘i Date: Sun Jan 11 12:25:40 2009 +0100 wireshark-1.0.5-2-x86_64 rebuilt with gnutls-2.6 diff --git a/source/xapps-extra/wireshark/FrugalBuild b/source/xapps-extra/wireshark/FrugalBuild index 5982120..50d3136 100644 --- a/source/xapps-extra/wireshark/FrugalBuild +++ b/source/xapps-extra/wireshark/FrugalBuild @@ -3,10 +3,10 @@ pkgname=wireshark pkgver=1.0.5 -pkgrel=1 +pkgrel=2 pkgdesc="The world's most popular network protocol analyzer" url="http://www.wireshark.org/" -depends=('heimdal>=1.2.1' 'gtk+2>=2.10.2' 'pcre' 'libpcap' 'gnutls>=2.4') +depends=('heimdal>=1.2.1' 'gtk+2>=2.10.2' 'pcre' 'libpcap' 'gnutls>=2.6') replaces=('ethereal') groups=('xapps-extra') archs=('i686' 'x86_64') From voroskoi at frugalware.org Wed Jan 14 17:37:17 2009 From: voroskoi at frugalware.org (András VöröskÅ‘i) Date: Wed Jan 14 17:37:32 2009 Subject: [Frugalware-git] frugalware-current: net6-1.3.8-3-x86_64 Message-ID: <20090114163717.CC24411B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c2540c714e7e948b44fa9288387c11a6bf2fb79e commit c2540c714e7e948b44fa9288387c11a6bf2fb79e Author: András VöröskÅ‘i Date: Sun Jan 11 12:30:25 2009 +0100 net6-1.3.8-3-x86_64 rebuilt with gnutls-2.6 diff --git a/source/lib-extra/net6/FrugalBuild b/source/lib-extra/net6/FrugalBuild index a44156c..e36e95a 100644 --- a/source/lib-extra/net6/FrugalBuild +++ b/source/lib-extra/net6/FrugalBuild @@ -4,10 +4,10 @@ pkgname=net6 pkgver=1.3.8 -pkgrel=2 +pkgrel=3 pkgdesc="net6 is a library which eases the development of network-based applications" url="http://releases.0x539.de/net6/" -depends=('libsigc++2' 'gnutls>=2.4') +depends=('libsigc++2' 'gnutls>=2.6') groups=('lib-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url | sed '/latest/d' | sed '/stable/d' | Flasttar" From voroskoi at frugalware.org Wed Jan 14 17:37:17 2009 From: voroskoi at frugalware.org (András VöröskÅ‘i) Date: Wed Jan 14 17:37:32 2009 Subject: [Frugalware-git] frugalware-current: bitlbee-1.2.3-3-x86_64 Message-ID: <20090114163717.E2F6C11B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2379783c58a27c352e5e4e2430b6571fd6407ce4 commit 2379783c58a27c352e5e4e2430b6571fd6407ce4 Author: András VöröskÅ‘i Date: Sun Jan 11 12:37:01 2009 +0100 bitlbee-1.2.3-3-x86_64 rebuilt with gnutls-2.6 diff --git a/source/network-extra/bitlbee/FrugalBuild b/source/network-extra/bitlbee/FrugalBuild index a3c02a6..d6285e3 100644 --- a/source/network-extra/bitlbee/FrugalBuild +++ b/source/network-extra/bitlbee/FrugalBuild @@ -3,13 +3,13 @@ pkgname=bitlbee pkgver=1.2.3 -pkgrel=2 +pkgrel=3 pkgdesc="An IRC to other chat networks gateway." url="http://www.bitlbee.org/main.php/news.html" # inetd: othervise it can't serve on port 6667 # tcp_wrappers: it's also needed, i don't remember why :) rodepends=('inetd' 'tcp_wrappers') -depends=('glib2' 'gnutls>=2.4' 'libgcrypt>=1.4' 'zlib') +depends=('glib2' 'gnutls>=2.6' 'libgcrypt>=1.4' 'zlib') backup=(etc/biltbee/{bitlbee.conf,motd.txt}) groups=('network-extra') archs=('i686' 'x86_64') From voroskoi at frugalware.org Wed Jan 14 17:37:18 2009 From: voroskoi at frugalware.org (András VöröskÅ‘i) Date: Wed Jan 14 17:37:33 2009 Subject: [Frugalware-git] frugalware-current: msmtp-1.4.17-1-x86_64 Message-ID: <20090114163718.11A6611B8631@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e68c44b4ead2b8518882b246d208ccb28b04ec5f commit e68c44b4ead2b8518882b246d208ccb28b04ec5f Author: András VöröskÅ‘i Date: Sun Jan 11 12:43:26 2009 +0100 msmtp-1.4.17-1-x86_64 version bump compiled with gnutls-2.6 diff --git a/source/network-extra/msmtp/FrugalBuild b/source/network-extra/msmtp/FrugalBuild index 06743d6..9481779 100644 --- a/source/network-extra/msmtp/FrugalBuild +++ b/source/network-extra/msmtp/FrugalBuild @@ -2,15 +2,15 @@ # Maintainer: crazy pkgname=msmtp -pkgver=1.4.16 -pkgrel=2 +pkgver=1.4.17 +pkgrel=1 pkgdesc="msmtp is small light SMTP Client" license="GPL 2" groups=('network-extra') archs=('i686' 'x86_64') _F_sourceforge_ext=".tar.bz2" Finclude sourceforge -depends=('libgcrypt' 'gnutls>=2.4' 'zlib' 'libidn' 'gettext') -sha1sums=('784ee281cee05e4a312629efaa4ea892bb98a51f') +depends=('libgcrypt' 'gnutls>=2.6' 'zlib' 'libidn' 'gettext') +sha1sums=('6b7fa1d9c9eee249b571b3f7720ebd779f94f4de') # optimization OK From voroskoi at frugalware.org Wed Jan 14 17:37:18 2009 From: voroskoi at frugalware.org (András VöröskÅ‘i) Date: Wed Jan 14 17:37:34 2009 Subject: [Frugalware-git] frugalware-current: bug-buddy-2.24.2-2-x86_64 Message-ID: <20090114163718.8011211B887F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9f7c8fbe1771e6a5ed0cc609ba199e8f193aee56 commit 9f7c8fbe1771e6a5ed0cc609ba199e8f193aee56 Author: András VöröskÅ‘i Date: Sun Jan 11 12:59:58 2009 +0100 bug-buddy-2.24.2-2-x86_64 rebuilt with gnutls-2.6 diff --git a/source/gnome/bug-buddy/FrugalBuild b/source/gnome/bug-buddy/FrugalBuild index 318357b..0bff66c 100644 --- a/source/gnome/bug-buddy/FrugalBuild +++ b/source/gnome/bug-buddy/FrugalBuild @@ -3,11 +3,11 @@ pkgname=bug-buddy pkgver=2.24.2 -pkgrel=1 +pkgrel=2 pkgdesc="A bug reporting tool for GNOME" depends=('gnome-desktop>=2.24.2' 'gnome-menus>=2.24.2' 'rarian>=0.8.0' 'desktop-file-utils' \ 'libsoup>=2.24.0.1-2' 'libgtop>=2.24.0' 'evolution-data-server>=2.24.1' 'libelf' \ - 'heimdal>=1.2.1' 'db>=4.7.25') + 'heimdal>=1.2.1' 'db>=4.7.25' 'gnutls>=2.6') makedepends=('intltool' 'gnome-doc-utils>=0.12.2') groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64' 'ppc') From voroskoi at frugalware.org Wed Jan 14 17:37:18 2009 From: voroskoi at frugalware.org (András VöröskÅ‘i) Date: Wed Jan 14 17:37:35 2009 Subject: [Frugalware-git] frugalware-current: vino-2.24.1-2-x86_64 Message-ID: <20090114163718.487EC11B887E@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6d9d41fc1d5e65c7e9a7b4c29dc985e2c39e0cbb commit 6d9d41fc1d5e65c7e9a7b4c29dc985e2c39e0cbb Author: András VöröskÅ‘i Date: Sun Jan 11 12:49:09 2009 +0100 vino-2.24.1-2-x86_64 rebuilt with gnutls-2.6 diff --git a/source/gnome/vino/FrugalBuild b/source/gnome/vino/FrugalBuild index c091e94..779f8b7 100644 --- a/source/gnome/vino/FrugalBuild +++ b/source/gnome/vino/FrugalBuild @@ -3,9 +3,9 @@ pkgname=vino pkgver=2.24.1 -pkgrel=1 +pkgrel=2 pkgdesc="An integrated VNC server for GNOME" -depends=('libgnomeui>=2.24.0' 'gnutls>=2.4' 'avahi' 'libxtst' 'libxdamage' 'libnotify' 'gnome-keyring') +depends=('libgnomeui>=2.24.0' 'gnutls>=2.6' 'avahi' 'libxtst' 'libxdamage' 'libnotify' 'gnome-keyring') makedepends=('intltool' 'perl-xml-parser') groups=('gnome') archs=('i686' 'x86_64' 'ppc') From voroskoi at frugalware.org Wed Jan 14 17:37:18 2009 From: voroskoi at frugalware.org (András VöröskÅ‘i) Date: Wed Jan 14 17:37:35 2009 Subject: [Frugalware-git] frugalware-current: rhythmbox-0.11.5-6-x86_64 Message-ID: <20090114163718.D61B611B8630@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=aaf4066e031661fee055ca1411efa5797e9b10ed commit aaf4066e031661fee055ca1411efa5797e9b10ed Author: András VöröskÅ‘i Date: Sun Jan 11 18:52:52 2009 +0100 rhythmbox-0.11.5-6-x86_64 rebuilt with gnutls>=2.6 diff --git a/source/gnome/rhythmbox/FrugalBuild b/source/gnome/rhythmbox/FrugalBuild index 3160e96..efd517e 100644 --- a/source/gnome/rhythmbox/FrugalBuild +++ b/source/gnome/rhythmbox/FrugalBuild @@ -4,13 +4,13 @@ pkgname=rhythmbox pkgver=0.11.5 -pkgrel=5 +pkgrel=6 pkgdesc="A music management application for GNOME" url="http://www.rhythmbox.org/" depends=('libgnomeui>=2.24.0' 'nautilus-cd-burner>=2.24.0' 'rarian' 'desktop-file-utils' \ 'totem>=2.24.0' 'gst-plugins-base-oil' 'avahi-glib' 'libnotify' 'libsexy' 'libgpod>=0.6.0' \ 'libsoup>=2.24.0.1-2' 'gnome-media>=2.24.0' 'dbus-glib>=0.74' 'python>=2.6' \ - 'evolution-data-server>=2.24.1') + 'evolution-data-server>=2.24.1' 'gnutls>=2.6') makedepends=('intltool' 'gnome-doc-utils') rodepends=('notification-daemon') groups=('gnome') From voroskoi at frugalware.org Wed Jan 14 17:37:18 2009 From: voroskoi at frugalware.org (András VöröskÅ‘i) Date: Wed Jan 14 17:37:36 2009 Subject: [Frugalware-git] frugalware-current: evolution-data-server-2.24.1-2-x86_64 Message-ID: <20090114163718.A1B7011B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=80886007cd25589f6a34a963c8583e049b79167e commit 80886007cd25589f6a34a963c8583e049b79167e Author: András VöröskÅ‘i Date: Sun Jan 11 17:00:26 2009 +0100 evolution-data-server-2.24.1-2-x86_64 rebuilt with gnutls-2.6 diff --git a/source/gnome/evolution-data-server/FrugalBuild b/source/gnome/evolution-data-server/FrugalBuild index d1e01c6..6b52e20 100644 --- a/source/gnome/evolution-data-server/FrugalBuild +++ b/source/gnome/evolution-data-server/FrugalBuild @@ -3,10 +3,10 @@ pkgname=evolution-data-server pkgver=2.24.1 -pkgrel=1 +pkgrel=2 pkgdesc="Evolution Data Server provides a central location for addressbook and calendar in the GNOME Desktop" depends=('nss>=3.12' 'libsoup>=2.24.0.1-2' 'libgnomeui>=2.24.0' 'heimdal>=1.2.1' 'gnome-keyring>=2.24.1' \ - 'db>=4.7.25') + 'db>=4.7.25' 'gnutls>=2.6') makedepends=('intltool' 'gtk-doc>=1.9' 'openldap>=2.3.24') groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64' 'ppc') From voroskoi at frugalware.org Wed Jan 14 17:37:19 2009 From: voroskoi at frugalware.org (András VöröskÅ‘i) Date: Wed Jan 14 17:37:37 2009 Subject: [Frugalware-git] frugalware-current: liferea-1.4.20-1-x86_64 Message-ID: <20090114163719.1A25811B8631@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=cdd907b1116c0829925c1be04be82b1e2f9f9a59 commit cdd907b1116c0829925c1be04be82b1e2f9f9a59 Author: András VöröskÅ‘i Date: Sun Jan 11 19:30:29 2009 +0100 liferea-1.4.20-1-x86_64 version bump fixed up2date compiled with gnutls>=2.6 diff --git a/source/gnome-extra/liferea/FrugalBuild b/source/gnome-extra/liferea/FrugalBuild index ac07fba..edc7b47 100644 --- a/source/gnome-extra/liferea/FrugalBuild +++ b/source/gnome-extra/liferea/FrugalBuild @@ -2,22 +2,21 @@ # Maintainer: Christian Hamar alias krix pkgname=liferea -pkgver=1.4.15 -pkgrel=2 +pkgver=1.4.20 +pkgrel=1 pkgdesc="Liferea is a news aggregator for online news feeds." license="GPL2" groups=('gnome-extra') archs=('i686' 'x86_64') -depends=('dbus-glib>=0.71-2' 'gconf' 'xulrunner>=1.8.0.1' 'libxslt>=1.1.20' 'libnotify' 'gnutls>=2.4' \ +depends=('dbus-glib>=0.71-2' 'gconf' 'xulrunner>=1.8.0.1' 'libxslt>=1.1.20' 'libnotify' 'gnutls>=2.6' \ 'sqlite3' 'libglade') -makedepends=('perl-xml-parser') +makedepends=('perl-xml-parser' 'intltool') options=('scriptlet') _F_gnome_schemas=('/etc/gconf/schemas/liferea.schemas') _F_gnome_desktop="y" _F_gnome_iconcache="y" Finclude sourceforge gnome-scriptlet -up2date="lynx -dump http://liferea.sourceforge.net|grep -m1 'Stable'|sed 's/.*ea \(.*\) (.*/\1/'" -sha1sums=('8ff9ed78b03c89a8bc2ff4f8070e665a5cb496c5') +sha1sums=('794e52e692c135b52b28c6f2c6cc8bba2db4f078') build() { Fcd $pkgname-$pkgver From voroskoi at frugalware.org Wed Jan 14 17:37:19 2009 From: voroskoi at frugalware.org (András VöröskÅ‘i) Date: Wed Jan 14 17:37:38 2009 Subject: [Frugalware-git] frugalware-current: filezilla-3.1.6-2-x86_64 Message-ID: <20090114163719.3255B11B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3c7cf3b6080d757c44e21c77068bfa9e181daf04 commit 3c7cf3b6080d757c44e21c77068bfa9e181daf04 Author: András VöröskÅ‘i Date: Sun Jan 11 19:40:09 2009 +0100 filezilla-3.1.6-2-x86_64 rebuilt with gnutls>=2.6 diff --git a/source/xapps-extra/filezilla/FrugalBuild b/source/xapps-extra/filezilla/FrugalBuild index 00d8abc..2939dc4 100644 --- a/source/xapps-extra/filezilla/FrugalBuild +++ b/source/xapps-extra/filezilla/FrugalBuild @@ -3,9 +3,9 @@ pkgname=filezilla pkgver=3.1.6 -pkgrel=1 +pkgrel=2 pkgdesc="a fast and reliable cross-platform FTP, FTPS and SFTP client" -depends=('wxgtk>=2.8.6' 'libidn' 'gnutls>=2.4' 'libgcrypt' 'libgcc' 'libxau' 'libxdmcp' 'libxxf86vm' 'expat' 'libxdamage' 'libxml2' 'libice') +depends=('wxgtk>=2.8.6' 'libidn' 'gnutls>=2.6' 'libgcrypt' 'libgcc' 'libxau' 'libxdmcp' 'libxxf86vm' 'expat' 'libxdamage' 'libxml2' 'libice') makedepends=('gettext') _F_sourceforge_ext="_src.tar.bz2" _F_sourceforge_dirname="$pkgname" From voroskoi at frugalware.org Wed Jan 14 17:37:19 2009 From: voroskoi at frugalware.org (András VöröskÅ‘i) Date: Wed Jan 14 17:37:38 2009 Subject: [Frugalware-git] frugalware-current: swfdec-0.8.4-2-x86_64 Message-ID: <20090114163719.442B511B887D@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=09ee49b2898859859fb7013f1022e0a10623ac52 commit 09ee49b2898859859fb7013f1022e0a10623ac52 Author: András VöröskÅ‘i Date: Sun Jan 11 22:22:14 2009 +0100 swfdec-0.8.4-2-x86_64 rebuilt with gnutls>=2.6 diff --git a/source/xlib/swfdec/FrugalBuild b/source/xlib/swfdec/FrugalBuild index 518764e..a2d429e 100644 --- a/source/xlib/swfdec/FrugalBuild +++ b/source/xlib/swfdec/FrugalBuild @@ -3,12 +3,12 @@ pkgname=swfdec pkgver=0.8.4 -pkgrel=1 +pkgrel=2 pkgdesc="Swfdec is a decoder/renderer library for Macromedia Flash animations." url="http://swfdec.freedesktop.org/" license="LGPL" depends=('libmad' 'gtk+2>=2.12.9' 'liboil' 'ffmpeg>=20080427' 'alsa-lib' 'faad2' 'gstreamer' \ - 'gstreamer>=0.10.11' 'gst-plugins-good' 'libsoup>=2.4.1' 'gnutls>=2.4') + 'gstreamer>=0.10.11' 'gst-plugins-good' 'libsoup>=2.4.1' 'gnutls>=2.6') options=('scriptlet') groups=('xlib') archs=('i686' 'x86_64' 'ppc') From voroskoi at frugalware.org Wed Jan 14 17:37:19 2009 From: voroskoi at frugalware.org (András VöröskÅ‘i) Date: Wed Jan 14 17:37:39 2009 Subject: [Frugalware-git] frugalware-current: seahorse-2.24.0-2-x86_64 Message-ID: <20090114163719.6662211B8630@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=77290ba26bf5f808c916abbf8dc11b8d19a0dca6 commit 77290ba26bf5f808c916abbf8dc11b8d19a0dca6 Author: András VöröskÅ‘i Date: Sun Jan 11 22:39:39 2009 +0100 seahorse-2.24.0-2-x86_64 rebuilt with gnutls=2.6.3-1 diff --git a/source/gnome-extra/seahorse/FrugalBuild b/source/gnome-extra/seahorse/FrugalBuild index 2e33fc9..1ee8b00 100644 --- a/source/gnome-extra/seahorse/FrugalBuild +++ b/source/gnome-extra/seahorse/FrugalBuild @@ -3,10 +3,10 @@ pkgname=seahorse pkgver=2.24.0 -pkgrel=1 +pkgrel=2 pkgdesc="A GNOME application for managing PGP keys." url="http://www.seahorse.sourceforge.net/" -depends=('gnutls=2.4.2-1' 'gtksourceview' 'gnupg' 'gpgme' 'libsoup' 'dbus' \ +depends=('gnutls=2.6.3-1' 'gtksourceview' 'gnupg' 'gpgme' 'libsoup' 'dbus' \ 'dbus-glib' 'libsoup' 'libxml2' 'libnotify' 'libgnomeui>=2.24.0' \ 'openssh' 'gconf>=2.24.0' 'avahi') makedepends=('gettext' 'openldap' 'intltool' 'pkgconfig' 'gnome-doc-utils') From vmiklos at frugalware.org Wed Jan 14 17:37:19 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Jan 14 17:37:40 2009 Subject: [Frugalware-git] frugalware-current: Merge branch 'master' of git.frugalware.org:/pub/other/people/voroskoi/wipv Message-ID: <20090114163719.A1DD111B887F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e03d01d1eda2a4be245307d754ae772ab9d65bd0 commit e03d01d1eda2a4be245307d754ae772ab9d65bd0 Merge: 777c32d... 77290ba... Author: Miklos Vajna Date: Wed Jan 14 17:35:40 2009 +0100 Merge branch 'master' of git.frugalware.org:/pub/other/people/voroskoi/wipv From vmiklos at frugalware.org Wed Jan 14 18:02:49 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Jan 14 18:02:50 2009 Subject: [Frugalware-git] frugalware-0.9: proftpd-1.3.1-5solaria2-i686 Message-ID: <20090114170249.1A08811B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.9.git;a=commitdiff;h=bc311fbd9a43034d98784b072f1b00c7e4dc3133 commit bc311fbd9a43034d98784b072f1b00c7e4dc3133 Author: Miklos Vajna Date: Wed Jan 14 18:02:37 2009 +0100 proftpd-1.3.1-5solaria2-i686 - rebuild with openssl diff --git a/source/network/proftpd/FrugalBuild b/source/network/proftpd/FrugalBuild index ba5d135..fd482d2 100644 --- a/source/network/proftpd/FrugalBuild +++ b/source/network/proftpd/FrugalBuild @@ -5,12 +5,12 @@ pkgname=proftpd pkgver=1.3.1 pkgextraver= -pkgrel=5solaria1 +pkgrel=5solaria2 pkgdesc="Highly configurable GPL-licensed FTP server software" url="http://www.proftpd.org/" groups=('network') archs=('i686' 'x86_64') -depends=('ncurses' 'libmysqlclient' 'openssl=0.9.8-14') +depends=('ncurses' 'libmysqlclient' 'openssl=0.9.8-15solaria1') makedepends=('tcp_wrappers' 'mysql') backup=(etc/{proftpd.conf,ftpusers}) up2date="lynx -dump $url | Flasttar" From vmiklos at frugalware.org Wed Jan 14 18:14:37 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Jan 14 18:14:39 2009 Subject: [Frugalware-git] frugalware-current: firefox-webdeveloper-1.1.6-2-i686 Message-ID: <20090114171437.6B8EE11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=50cea7702dd6d36bfb4968d8d532900a61e3eaaa commit 50cea7702dd6d36bfb4968d8d532900a61e3eaaa Author: Miklos Vajna Date: Wed Jan 14 18:13:33 2009 +0100 firefox-webdeveloper-1.1.6-2-i686 - rebuild, new upstream release without pkgver++ diff --git a/source/xapps-extra/firefox-webdeveloper/FrugalBuild b/source/xapps-extra/firefox-webdeveloper/FrugalBuild index 4f5f450..d6532df 100644 --- a/source/xapps-extra/firefox-webdeveloper/FrugalBuild +++ b/source/xapps-extra/firefox-webdeveloper/FrugalBuild @@ -5,7 +5,7 @@ _F_firefox_ext=web-developer _F_firefox_id=c45c406e-ab73-11d8-be73-000a95be3b12 _F_firefox_name="${_F_firefox_ext}-localized.xpi" pkgver=1.1.6 -pkgrel=1 +pkgrel=2 pkgdesc="Adds a menu and a toolbar with various web developer tools." url="http://chrispederick.com/work/firefox/webdeveloper/" rodepends=('firefox>=1.5') @@ -14,7 +14,8 @@ archs=('i686' 'x86_64') up2date="lynx -dump $url/update_localized.rdf |grep :version|sed 's/.*\"\(.*\)\"/\1/'|Fsort|tail -n 1" source=(http://downloads.chrispederick.com/work/web-developer/web-developer-localized.xpi\ chrome.manifest) +options=('noversrc') Finclude firefox-extension pkgname=firefox-webdeveloper -sha1sums=('59f13b4fbe11bff98282172a228abb7a54216dc3' \ +sha1sums=('146b8f78e14309571b315b638fb14d9eb06fb6fe' \ 'd10fa22e4fddcea91a78c614347458b2d363e9d5') From vmiklos at frugalware.org Wed Jan 14 18:19:36 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Jan 14 18:19:38 2009 Subject: [Frugalware-git] frugalware-current: firefox-webdeveloper-1.1.6-2-ppc Message-ID: <20090114171936.5DC4411B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3fad5860cfcc3deb7e82d1744271033ec02efc8f commit 3fad5860cfcc3deb7e82d1744271033ec02efc8f Author: Miklos Vajna Date: Wed Jan 14 18:19:57 2009 +0100 firefox-webdeveloper-1.1.6-2-ppc added ppc to archs() diff --git a/source/xapps-extra/firefox-webdeveloper/FrugalBuild b/source/xapps-extra/firefox-webdeveloper/FrugalBuild index d6532df..0032f1e 100644 --- a/source/xapps-extra/firefox-webdeveloper/FrugalBuild +++ b/source/xapps-extra/firefox-webdeveloper/FrugalBuild @@ -10,7 +10,6 @@ pkgdesc="Adds a menu and a toolbar with various web developer tools." url="http://chrispederick.com/work/firefox/webdeveloper/" rodepends=('firefox>=1.5') groups=('xapps-extra' 'firefox-extensions') -archs=('i686' 'x86_64') up2date="lynx -dump $url/update_localized.rdf |grep :version|sed 's/.*\"\(.*\)\"/\1/'|Fsort|tail -n 1" source=(http://downloads.chrispederick.com/work/web-developer/web-developer-localized.xpi\ chrome.manifest) @@ -19,3 +18,4 @@ Finclude firefox-extension pkgname=firefox-webdeveloper sha1sums=('146b8f78e14309571b315b638fb14d9eb06fb6fe' \ 'd10fa22e4fddcea91a78c614347458b2d363e9d5') +archs=(${archs[@]} 'ppc') From vmiklos at frugalware.org Wed Jan 14 18:21:28 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Jan 14 18:21:29 2009 Subject: [Frugalware-git] pacman-tools: portpkg: cache sources from rsync mirror if possible Message-ID: <20090114172128.4DD6711B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=6ce0f31af7cd7ddec4b849c0f7d439d62b372eef commit 6ce0f31af7cd7ddec4b849c0f7d439d62b372eef Author: Miklos Vajna Date: Wed Jan 14 18:21:44 2009 +0100 portpkg: cache sources from rsync mirror if possible diff --git a/portpkg b/portpkg index a8a1402..07a56ad 100755 --- a/portpkg +++ b/portpkg @@ -25,6 +25,8 @@ if ! echo ${archs[@]} |grep -q `uname -m`; then fi if ! ls *fpm &>/dev/null; then + makepkg -dgu || die "failed to download sources" + rm -rf src || die "failed to remove duplicated sources" sudo makepkg -cuk || die "build failed" fi From devil505linux at gmail.com Wed Jan 14 18:21:59 2009 From: devil505linux at gmail.com (Devil505) Date: Wed Jan 14 18:22:01 2009 Subject: [Frugalware-git] frugalware-current: filezilla-3.2.0-1-i686 Message-ID: <20090114172159.F2B4D11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0ef1ffe818d102356e05a6ec2f01ebc98ca09966 commit 0ef1ffe818d102356e05a6ec2f01ebc98ca09966 Author: Devil505 Date: Wed Jan 14 18:20:49 2009 +0100 filezilla-3.2.0-1-i686 * version bump * added _F_gnome_iconcache="y" * added dbus in depends() diff --git a/source/xapps-extra/filezilla/FrugalBuild b/source/xapps-extra/filezilla/FrugalBuild index 2939dc4..b2a6fa6 100644 --- a/source/xapps-extra/filezilla/FrugalBuild +++ b/source/xapps-extra/filezilla/FrugalBuild @@ -2,19 +2,20 @@ # Maintainer: Devil505 pkgname=filezilla -pkgver=3.1.6 -pkgrel=2 +pkgver=3.2.0 +pkgrel=1 pkgdesc="a fast and reliable cross-platform FTP, FTPS and SFTP client" -depends=('wxgtk>=2.8.6' 'libidn' 'gnutls>=2.6' 'libgcrypt' 'libgcc' 'libxau' 'libxdmcp' 'libxxf86vm' 'expat' 'libxdamage' 'libxml2' 'libice') +depends=('wxgtk>=2.8.6' 'libidn' 'gnutls>=2.6' 'libgcrypt' 'libgcc' 'libxau' 'libxdmcp' 'libxxf86vm' 'expat' 'libxdamage' 'libxml2' 'libice' 'dbus') makedepends=('gettext') _F_sourceforge_ext="_src.tar.bz2" _F_sourceforge_dirname="$pkgname" _F_sourceforge_name="FileZilla" _F_sourceforge_sep="_" -Finclude sourceforge +_F_gnome_iconcache="y" +Finclude sourceforge gnome-scriptlet options=('scriptlet') groups=('xapps-extra') archs=('i686' 'x86_64') -sha1sums=('955f31e5e718956d32cb92fa6558e78e22ec17ce') +sha1sums=('ca8a358eb13c6b14fbff57fb87226e79131553aa') # optimization OK From vmiklos at frugalware.org Wed Jan 14 18:26:10 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Jan 14 18:26:12 2009 Subject: [Frugalware-git] frugalware-current: libbinio-1.4-1-ppc Message-ID: <20090114172610.A98DE11B8630@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bf2319e6ad689666e8f8ea5509372caa4dbc8e7a commit bf2319e6ad689666e8f8ea5509372caa4dbc8e7a Author: Miklos Vajna Date: Wed Jan 14 18:26:14 2009 +0100 libbinio-1.4-1-ppc added ppc to archs() diff --git a/source/lib-extra/libbinio/FrugalBuild b/source/lib-extra/libbinio/FrugalBuild index a6be4e2..39e6750 100644 --- a/source/lib-extra/libbinio/FrugalBuild +++ b/source/lib-extra/libbinio/FrugalBuild @@ -8,7 +8,7 @@ pkgdesc="Binary I/O stream class library." Finclude sourceforge depends=('libstdc++') groups=('lib-extra') -archs=('i686' 'x86_64') +archs=('i686' 'x86_64' 'ppc') sha1sums=('5b47d9ad9fd8663c34d49351e9cb7dd6389578d9') # optimization OK From devil505linux at gmail.com Wed Jan 14 18:30:21 2009 From: devil505linux at gmail.com (Devil505) Date: Wed Jan 14 18:30:23 2009 Subject: [Frugalware-git] frugalware-current: consonance-0.4.1-1-i686 Message-ID: <20090114173021.57FC911B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3de6a47da62e89e8a99dddaa23c593b2a7276415 commit 3de6a47da62e89e8a99dddaa23c593b2a7276415 Author: Devil505 Date: Wed Jan 14 18:29:53 2009 +0100 consonance-0.4.1-1-i686 * version bump diff --git a/source/xapps-extra/consonance/FrugalBuild b/source/xapps-extra/consonance/FrugalBuild index 3431159..0a71ed6 100644 --- a/source/xapps-extra/consonance/FrugalBuild +++ b/source/xapps-extra/consonance/FrugalBuild @@ -2,16 +2,16 @@ # Maintainer: Devil505 pkgname=consonance -pkgver=0.4 +pkgver=0.4.1 pkgrel=1 pkgdesc="A lightweight music manager" depends=('libmad' 'libao' 'libnotify' 'freetype2' 'libxau' 'libxdmcp' 'libsndfile' 'libvorbis' 'taglib' 'libxdamage' 'libxext') -_F_sourceforge_prefix="release v" +_F_sourceforge_prefix="$pkgname v" Finclude sourceforge options=('scriptlet') groups=('xapps-extra') archs=('i686' 'x86_64') -sha1sums=('e4189203090c4738a266bfad794e3eeb71d0b494') +sha1sums=('bb04185043677d024de11fcaa55bf00b295be0f0') build() { From vmiklos at frugalware.org Wed Jan 14 18:35:31 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Jan 14 18:35:32 2009 Subject: [Frugalware-git] frugalware-current: adplug-2.1-1-i686 Message-ID: <20090114173531.5FF9911B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=91a757177d4da47f81d616127f1a8bdd599a4244 commit 91a757177d4da47f81d616127f1a8bdd599a4244 Author: Miklos Vajna Date: Wed Jan 14 18:35:14 2009 +0100 adplug-2.1-1-i686 - remove obsolete _F_sourceforge_broken_up2date - add gcc43.patch diff --git a/source/multimedia-extra/adplug/FrugalBuild b/source/multimedia-extra/adplug/FrugalBuild index c4da3c2..322dade 100644 --- a/source/multimedia-extra/adplug/FrugalBuild +++ b/source/multimedia-extra/adplug/FrugalBuild @@ -5,11 +5,11 @@ pkgname=adplug pkgver=2.1 pkgrel=1 pkgdesc="AdPlug is a cross-platform OPL2 audio player library" -_F_sourceforge_broken_up2date=1 Finclude sourceforge depends=('libbinio' 'libstdc++') groups=('multimedia-extra') archs=('i686' 'x86_64') - -sha1sums=('5ca88f3d804e14bdb804a24f76345fa8afb9c072') +source=($source gcc43.patch) +sha1sums=('5ca88f3d804e14bdb804a24f76345fa8afb9c072' \ + '7743e83a779320785d7811c9d753ffdc15eefdfd') # optimization OK diff --git a/source/multimedia-extra/adplug/gcc43.patch b/source/multimedia-extra/adplug/gcc43.patch new file mode 100644 index 0000000..f9a83ae --- /dev/null +++ b/source/multimedia-extra/adplug/gcc43.patch @@ -0,0 +1,230 @@ +#!/bin/sh /usr/share/dpatch/dpatch-run +## 02-fix-ftbfs-with-gcc-4.3.dpatch by Cyril Brulebois +## +## DP: Fix missing includes, needed for gcc-4.3 transition. + +@DPATCH@ + +--- a/src/a2m.cpp ++++ b/src/a2m.cpp +@@ -33,6 +33,8 @@ + + #include "a2m.h" + ++#include ++ + const unsigned int Ca2mLoader::MAXFREQ = 2000, + Ca2mLoader::MINCOPY = ADPLUG_A2M_MINCOPY, + Ca2mLoader::MAXCOPY = ADPLUG_A2M_MAXCOPY, +--- a/src/bmf.cpp ++++ b/src/bmf.cpp +@@ -43,6 +43,8 @@ + #include "bmf.h" + #include "debug.h" + ++#include ++ + const unsigned char CxadbmfPlayer::bmf_adlib_registers[117] = + { + 0x20, 0x23, 0x40, 0x43, 0x60, 0x63, 0x80, 0x83, 0xA0, 0xB0, 0xC0, 0xE0, 0xE3, +--- a/src/cff.cpp ++++ b/src/cff.cpp +@@ -28,6 +28,8 @@ + + #include "cff.h" + ++#include ++ + /* -------- Public Methods -------------------------------- */ + + CPlayer *CcffLoader::factory(Copl *newopl) +--- a/src/dro.cpp ++++ b/src/dro.cpp +@@ -27,6 +27,8 @@ + + #include "dro.h" + ++#include ++ + /*** public methods *************************************/ + + CPlayer *CdroPlayer::factory(Copl *newopl) +--- a/src/dtm.cpp ++++ b/src/dtm.cpp +@@ -24,6 +24,8 @@ + + #include "dtm.h" + ++#include ++ + /* -------- Public Methods -------------------------------- */ + + CPlayer *CdtmLoader::factory(Copl *newopl) +--- a/src/fmc.cpp ++++ b/src/fmc.cpp +@@ -21,6 +21,8 @@ + + #include "fmc.h" + ++#include ++ + /* -------- Public Methods -------------------------------- */ + + CPlayer *CfmcLoader::factory(Copl *newopl) +--- a/src/mad.cpp ++++ b/src/mad.cpp +@@ -21,6 +21,8 @@ + + #include "mad.h" + ++#include ++ + /* -------- Public Methods -------------------------------- */ + + CPlayer *CmadLoader::factory(Copl *newopl) +--- a/src/mkj.cpp ++++ b/src/mkj.cpp +@@ -24,6 +24,8 @@ + #include "mkj.h" + #include "debug.h" + ++#include ++ + CPlayer *CmkjPlayer::factory(Copl *newopl) + { + return new CmkjPlayer(newopl); +--- a/src/msc.cpp ++++ b/src/msc.cpp +@@ -24,6 +24,8 @@ + #include "msc.h" + #include "debug.h" + ++#include ++ + const unsigned char CmscPlayer::msc_signature [MSC_SIGN_LEN] = { + 'C', 'e', 'r', 'e', 's', ' ', '\x13', ' ', + 'M', 'S', 'C', 'p', 'l', 'a', 'y', ' ' }; +--- a/src/mtk.cpp ++++ b/src/mtk.cpp +@@ -21,6 +21,8 @@ + + #include "mtk.h" + ++#include ++ + /*** public methods **************************************/ + + CPlayer *CmtkLoader::factory(Copl *newopl) +--- a/src/protrack.cpp ++++ b/src/protrack.cpp +@@ -28,6 +28,8 @@ + #include "protrack.h" + #include "debug.h" + ++#include ++ + #define SPECIALARPLEN 256 // Standard length of special arpeggio lists + #define JUMPMARKER 0x80 // Orderlist jump marker + +--- a/src/rad.cpp ++++ b/src/rad.cpp +@@ -24,6 +24,8 @@ + + #include "rad.h" + ++#include ++ + CPlayer *CradLoader::factory(Copl *newopl) + { + return new CradLoader(newopl); +--- a/src/rat.cpp ++++ b/src/rat.cpp +@@ -32,6 +32,8 @@ + #include "rat.h" + #include "debug.h" + ++#include ++ + const unsigned char CxadratPlayer::rat_adlib_bases[18] = + { + 0x00, 0x01, 0x02, 0x08, 0x09, 0x0A, 0x10, 0x11, 0x12, +--- a/src/raw.cpp ++++ b/src/raw.cpp +@@ -21,6 +21,8 @@ + + #include "raw.h" + ++#include ++ + /*** public methods *************************************/ + + CPlayer *CrawPlayer::factory(Copl *newopl) +--- a/src/rix.cpp ++++ b/src/rix.cpp +@@ -23,6 +23,9 @@ + #include "rix.h" + #include "debug.h" + ++#include ++#include ++ + const unsigned char CrixPlayer::adflag[] = {0,0,0,1,1,1,0,0,0,1,1,1,0,0,0,1,1,1}; + const unsigned char CrixPlayer::reg_data[] = {0,1,2,3,4,5,8,9,10,11,12,13,16,17,18,19,20,21}; + const unsigned char CrixPlayer::ad_C0_offs[] = {0,1,2,0,1,2,3,4,5,3,4,5,6,7,8,6,7,8}; +--- a/src/rol.h ++++ b/src/rol.h +@@ -25,6 +25,7 @@ + + #include + #include ++#include + + #include "player.h" + +--- a/src/s3m.cpp ++++ b/src/s3m.cpp +@@ -24,6 +24,8 @@ + + #include "s3m.h" + ++#include ++ + const char Cs3mPlayer::chnresolv[] = // S3M -> adlib channel conversion + {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,1,2,3,4,5,6,7,8,-1,-1,-1,-1,-1,-1,-1}; + +--- a/src/sa2.cpp ++++ b/src/sa2.cpp +@@ -25,6 +25,8 @@ + #include "sa2.h" + #include "debug.h" + ++#include ++ + CPlayer *Csa2Loader::factory(Copl *newopl) + { + return new Csa2Loader(newopl); +--- a/src/sng.cpp ++++ b/src/sng.cpp +@@ -21,6 +21,8 @@ + + #include "sng.h" + ++#include ++ + CPlayer *CsngPlayer::factory(Copl *newopl) + { + return new CsngPlayer(newopl); +--- a/src/adl.cpp.old 2008-04-16 18:09:57.000000000 +0200 ++++ b/src/adl.cpp 2008-04-16 18:10:21.000000000 +0200 +@@ -47,10 +47,11 @@ + * $Id: adl.cpp,v 1.9 2006/08/16 00:20:45 dynamite Exp $ + * + */ + + #include ++#include + #include + #include + + #include "adl.h" + #include "debug.h" From vmiklos at frugalware.org Wed Jan 14 18:44:04 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Jan 14 18:44:06 2009 Subject: [Frugalware-git] frugalware-current: adplug-2.1-1-ppc Message-ID: <20090114174404.1146D11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d50534990129ec6d7212eb140a4e9ac25c7491c2 commit d50534990129ec6d7212eb140a4e9ac25c7491c2 Author: Miklos Vajna Date: Wed Jan 14 18:44:15 2009 +0100 adplug-2.1-1-ppc added ppc to archs() diff --git a/source/multimedia-extra/adplug/FrugalBuild b/source/multimedia-extra/adplug/FrugalBuild index 322dade..ecfc769 100644 --- a/source/multimedia-extra/adplug/FrugalBuild +++ b/source/multimedia-extra/adplug/FrugalBuild @@ -8,7 +8,7 @@ pkgdesc="AdPlug is a cross-platform OPL2 audio player library" Finclude sourceforge depends=('libbinio' 'libstdc++') groups=('multimedia-extra') -archs=('i686' 'x86_64') +archs=('i686' 'x86_64' 'ppc') source=($source gcc43.patch) sha1sums=('5ca88f3d804e14bdb804a24f76345fa8afb9c072' \ '7743e83a779320785d7811c9d753ffdc15eefdfd') From bouleetbil at frogdev.info Wed Jan 14 18:50:23 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Wed Jan 14 18:50:25 2009 Subject: [Frugalware-git] frugalware-current: gtk2-sharp-2.12.7-2-i686 Message-ID: <20090114175023.289E311B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=fb0a20655c58584e61348b24df63a09f24ea3455 commit fb0a20655c58584e61348b24df63a09f24ea3455 Author: bouleetbil Date: Wed Jan 14 18:41:56 2009 +0100 gtk2-sharp-2.12.7-2-i686 *moved to xlib diff --git a/source/gnome/gtk2-sharp/FrugalBuild b/source/gnome/gtk2-sharp/FrugalBuild deleted file mode 100644 index 6ed9293..0000000 --- a/source/gnome/gtk2-sharp/FrugalBuild +++ /dev/null @@ -1,23 +0,0 @@ -# Compiling time: 0.73 SBU -# Maintainer: Christian Hamar alias krix - -pkgname=gtk2-sharp -_F_gnome_name=gtk-sharp -pkgver=2.12.7 -pkgrel=1 -pkgdesc="A C# language binding for the GTK+2 toolkit" -url="http://www.mono-project.com/GtkSharp" -depends=('mono>=2.0.1' 'gtk+2>=2.14.4' 'libglade' 'libxdamage') -provides=('gtk-sharp') -replaces=('gtk-sharp') -groups=('gnome') -archs=('i686' 'x86_64' 'ppc') -_F_cd_path="$_F_gnome_name-$pkgver" -_F_mono_aot=0 -Finclude gnome mono -sha1sums=('39f17934e9f51b79952d2f22548a68707bbda9e3') - -unset MAKEFLAGS - - -# optimization OK diff --git a/source/xlib/gtk2-sharp/FrugalBuild b/source/xlib/gtk2-sharp/FrugalBuild new file mode 100644 index 0000000..f88bf90 --- /dev/null +++ b/source/xlib/gtk2-sharp/FrugalBuild @@ -0,0 +1,23 @@ +# Compiling time: 0.73 SBU +# Maintainer: Christian Hamar alias krix + +pkgname=gtk2-sharp +_F_gnome_name=gtk-sharp +pkgver=2.12.7 +pkgrel=2 +pkgdesc="A C# language binding for the GTK+2 toolkit" +url="http://www.mono-project.com/GtkSharp" +depends=('mono>=2.0.1' 'gtk+2>=2.14.4' 'libglade' 'libxdamage') +provides=('gtk-sharp') +replaces=('gtk-sharp') +groups=('xlib') +archs=('i686' 'x86_64' 'ppc') +_F_cd_path="$_F_gnome_name-$pkgver" +_F_mono_aot=0 +Finclude gnome mono +sha1sums=('39f17934e9f51b79952d2f22548a68707bbda9e3') + +unset MAKEFLAGS + + +# optimization OK From devil505linux at gmail.com Wed Jan 14 18:51:26 2009 From: devil505linux at gmail.com (Devil505) Date: Wed Jan 14 18:51:27 2009 Subject: [Frugalware-git] frugalware-current: music-applet-2.5.1-1-i686 Message-ID: <20090114175126.9833211B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=25dba2e1a83e839286873e804384a51418f53d18 commit 25dba2e1a83e839286873e804384a51418f53d18 Author: Devil505 Date: Wed Jan 14 18:44:40 2009 +0100 music-applet-2.5.1-1-i686 * version bump diff --git a/source/gnome-extra/music-applet/FrugalBuild b/source/gnome-extra/music-applet/FrugalBuild index f3bcd18..4ab5795 100644 --- a/source/gnome-extra/music-applet/FrugalBuild +++ b/source/gnome-extra/music-applet/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: AlexExtreme pkgname=music-applet -pkgver=2.5.0 +pkgver=2.5.1 pkgrel=1 pkgdesc="Music Applet is a GNOME panel applet that lets you control different music players" url="http://www.kuliniewicz.org/music-applet/" @@ -17,6 +17,6 @@ groups=('gnome-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://www.kuliniewicz.org/music-applet/downloads/ | grep -m1 'Music Applet [0-9]\.[0-9]' | sed 's/.*Applet //' | sed 's/ -.*//'" source=(http://www.kuliniewicz.org/$pkgname/downloads/$pkgname-$pkgver.tar.gz) -sha1sums=('068181697fdf70cc73b019141812b47c5a409f95') +sha1sums=('0b0ba604418da8e49e781de20472e457f11c13ec') # optimization OK From vmiklos at frugalware.org Wed Jan 14 18:54:24 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Jan 14 18:54:25 2009 Subject: [Frugalware-git] frugalware-current: libnms-0.6.0-1-ppc Message-ID: <20090114175424.9663211B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b64b79316835826457d35e72731b93865960f4d6 commit b64b79316835826457d35e72731b93865960f4d6 Author: Miklos Vajna Date: Wed Jan 14 18:54:33 2009 +0100 libnms-0.6.0-1-ppc added ppc to archs() diff --git a/source/multimedia-extra/libnms/FrugalBuild b/source/multimedia-extra/libnms/FrugalBuild index 81584a2..3415f28 100644 --- a/source/multimedia-extra/libnms/FrugalBuild +++ b/source/multimedia-extra/libnms/FrugalBuild @@ -8,7 +8,7 @@ pkgdesc="Open Media Streaming Client Library." url="http://streaming.polito.it/client/library" depends=('glibc') groups=('multimedia-extra') -archs=('i686' 'x86_64') +archs=('i686' 'x86_64' 'ppc') up2date="$pkgver" #up2date="lynx -dump http://streaming.polito.it/downloads/libnms|grep -m1 '.tar.bz2'|sed 's/.*-\(.*\).t.*/\1/'" source=(http://streaming.polito.it/files/$pkgname-$pkgver.tar.bz2) From devil505linux at gmail.com Wed Jan 14 19:00:53 2009 From: devil505linux at gmail.com (Devil505) Date: Wed Jan 14 19:00:54 2009 Subject: [Frugalware-git] frugalware-current: filezilla-3.2.0-1-i686 Message-ID: <20090114180053.6BCE611B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d4389697fa3dffec0f83e270c12aad0555aa2c4d commit d4389697fa3dffec0f83e270c12aad0555aa2c4d Author: Devil505 Date: Wed Jan 14 18:52:26 2009 +0100 filezilla-3.2.0-1-i686 * fixing a mistake diff --git a/source/xapps-extra/filezilla/FrugalBuild b/source/xapps-extra/filezilla/FrugalBuild index b2a6fa6..3fee86c 100644 --- a/source/xapps-extra/filezilla/FrugalBuild +++ b/source/xapps-extra/filezilla/FrugalBuild @@ -7,13 +7,13 @@ pkgrel=1 pkgdesc="a fast and reliable cross-platform FTP, FTPS and SFTP client" depends=('wxgtk>=2.8.6' 'libidn' 'gnutls>=2.6' 'libgcrypt' 'libgcc' 'libxau' 'libxdmcp' 'libxxf86vm' 'expat' 'libxdamage' 'libxml2' 'libice' 'dbus') makedepends=('gettext') +options=('scriptlet') _F_sourceforge_ext="_src.tar.bz2" _F_sourceforge_dirname="$pkgname" _F_sourceforge_name="FileZilla" _F_sourceforge_sep="_" _F_gnome_iconcache="y" Finclude sourceforge gnome-scriptlet -options=('scriptlet') groups=('xapps-extra') archs=('i686' 'x86_64') sha1sums=('ca8a358eb13c6b14fbff57fb87226e79131553aa') From bouleetbil at frogdev.info Wed Jan 14 19:12:18 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Wed Jan 14 19:12:20 2009 Subject: [Frugalware-git] frugalware-current: gtk2-sharp-2.12.7-2-ppc Message-ID: <20090114181218.81D7411B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d02b8b46145b2c9ba2164f1f4552977d0c10abf8 commit d02b8b46145b2c9ba2164f1f4552977d0c10abf8 Author: bouleetbil Date: Wed Jan 14 19:11:17 2009 +0100 gtk2-sharp-2.12.7-2-ppc *delete some blank lines diff --git a/source/xlib/gtk2-sharp/FrugalBuild b/source/xlib/gtk2-sharp/FrugalBuild index f88bf90..8e0b54d 100644 --- a/source/xlib/gtk2-sharp/FrugalBuild +++ b/source/xlib/gtk2-sharp/FrugalBuild @@ -16,8 +16,6 @@ _F_cd_path="$_F_gnome_name-$pkgver" _F_mono_aot=0 Finclude gnome mono sha1sums=('39f17934e9f51b79952d2f22548a68707bbda9e3') - unset MAKEFLAGS - # optimization OK From devil505linux at gmail.com Wed Jan 14 19:15:56 2009 From: devil505linux at gmail.com (Devil505) Date: Wed Jan 14 19:15:58 2009 Subject: [Frugalware-git] frugalware-current: bouml-4.9.2-1-x86_64 Message-ID: <20090114181556.5179311B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e7cefaa2d611e565377d256d7d03ebaa30402a84 commit e7cefaa2d611e565377d256d7d03ebaa30402a84 Author: Devil505 Date: Wed Jan 14 19:15:09 2009 +0100 bouml-4.9.2-1-x86_64 * version bump diff --git a/source/xapps-extra/bouml/FrugalBuild b/source/xapps-extra/bouml/FrugalBuild index 6bd8ede..704e064 100644 --- a/source/xapps-extra/bouml/FrugalBuild +++ b/source/xapps-extra/bouml/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Devil505 pkgname=bouml -pkgver=4.9 +pkgver=4.9.2 pkgrel=1 pkgdesc="Free UML 2 tool box with C++, Java and Idl code generation" _F_sourceforge_sep="_" @@ -13,6 +13,6 @@ options=('scriptlet') groups=('xapps-extra') archs=('i686' 'x86_64') _F_cd_path="${pkgname}_${pkgver}" -sha1sums=('de2017806d5c042c1cdfaeffe873f4eaffe2c5f3') +sha1sums=('5e33dc403555b349601bbee21be24c608fb70dfe') # optimization OK From bouleetbil at frogdev.info Wed Jan 14 19:26:44 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Wed Jan 14 19:26:46 2009 Subject: [Frugalware-git] frugalware-current: telepathy-glib-0.7.22-1-i686 Message-ID: <20090114182644.5EE2411B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=94b6cb16900fe3a9c01757e2d699cda70d5c2010 commit 94b6cb16900fe3a9c01757e2d699cda70d5c2010 Author: bouleetbil Date: Wed Jan 14 19:20:26 2009 +0100 telepathy-glib-0.7.22-1-i686 *version bump diff --git a/source/lib-extra/telepathy-glib/FrugalBuild b/source/lib-extra/telepathy-glib/FrugalBuild index b3d45b2..d45d059 100644 --- a/source/lib-extra/telepathy-glib/FrugalBuild +++ b/source/lib-extra/telepathy-glib/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: AlexExtreme pkgname=telepathy-glib -pkgver=0.7.20 +pkgver=0.7.22 pkgrel=1 pkgdesc="A glib library to ease writing telepathy clients in glib." url="http://telepathy.freedesktop.org/wiki/" @@ -13,6 +13,6 @@ groups=('lib-extra') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump http://telepathy.freedesktop.org/releases/telepathy-glib/ | Flasttar" source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) -sha1sums=('b1de82a6bfdd3a698b609654f26d4ff078374992') +sha1sums=('3f5d757e7d034c305c858dbb0eb9c37daff41a9f') # optimization OK From devil505linux at gmail.com Wed Jan 14 19:37:08 2009 From: devil505linux at gmail.com (Devil505) Date: Wed Jan 14 19:37:10 2009 Subject: [Frugalware-git] frugalware-current: synce-gvfs-0.13-1-x86_64 Message-ID: <20090114183708.CC09111B8630@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=94b1b1a194c7589444c453fadf33fe38de4a77fd commit 94b1b1a194c7589444c453fadf33fe38de4a77fd Author: Devil505 Date: Wed Jan 14 19:36:13 2009 +0100 synce-gvfs-0.13-1-x86_64 * added x86_64 to archs diff --git a/source/xlib-extra/synce-gvfs/FrugalBuild b/source/xlib-extra/synce-gvfs/FrugalBuild index ef24ed9..7ddb5d3 100644 --- a/source/xlib-extra/synce-gvfs/FrugalBuild +++ b/source/xlib-extra/synce-gvfs/FrugalBuild @@ -6,7 +6,7 @@ pkgver=0.13 pkgrel=1 pkgdesc="SynCE - gvfs support" groups=('xlib-extra') -archs=('i686') +archs=('i686' 'x86_64') depends=('libsynce' 'gvfs' 'librapi2') makedepends=('intltool') _F_sourceforge_realname="SynCE-GNOME" From devil505linux at gmail.com Wed Jan 14 19:37:08 2009 From: devil505linux at gmail.com (Devil505) Date: Wed Jan 14 19:37:13 2009 Subject: [Frugalware-git] frugalware-current: vacuum-0.7-1-x86_64 Message-ID: <20090114183708.B093711B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c174a3dc256952fb343347814d3ad5a6d6126f6d commit c174a3dc256952fb343347814d3ad5a6d6126f6d Author: Devil505 Date: Wed Jan 14 19:31:07 2009 +0100 vacuum-0.7-1-x86_64 * added x86_64 to archs diff --git a/source/games-extra/vacuum/FrugalBuild b/source/games-extra/vacuum/FrugalBuild index c5d1369..aca9bd8 100644 --- a/source/games-extra/vacuum/FrugalBuild +++ b/source/games-extra/vacuum/FrugalBuild @@ -8,7 +8,7 @@ pkgdesc="A fast-paced side-scrolling action game" Finclude sourceforge depends=('perl-sdl') groups=('games-extra') -archs=('i686') +archs=('i686' 'x86_64') sha1sums=('d8ef2151fb82e305ff0f7692e9c0ebfde2ce4d9e') _F_desktop_name="Vacuum Magic" From devil505linux at gmail.com Wed Jan 14 19:51:48 2009 From: devil505linux at gmail.com (Devil505) Date: Wed Jan 14 19:51:50 2009 Subject: [Frugalware-git] frugalware-current: nautilus-sound-converter-1.0.0-1-x86_64 Message-ID: <20090114185148.EE54811B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e455730a88eeb7d34e114be0412deb14ee37c9c7 commit e455730a88eeb7d34e114be0412deb14ee37c9c7 Author: Devil505 Date: Wed Jan 14 19:44:26 2009 +0100 nautilus-sound-converter-1.0.0-1-x86_64 * added x86_64 to archs diff --git a/source/gnome-extra/nautilus-sound-converter/FrugalBuild b/source/gnome-extra/nautilus-sound-converter/FrugalBuild index 2c2a485..fba517d 100644 --- a/source/gnome-extra/nautilus-sound-converter/FrugalBuild +++ b/source/gnome-extra/nautilus-sound-converter/FrugalBuild @@ -10,7 +10,7 @@ depends=('nautilus' 'gnome-media' 'gst-plugins-base') makedepends=('intltool') Finclude googlecode groups=('gnome-extra') -archs=('i686' 'ppc') +archs=('i686' 'x86_64' 'ppc') sha1sums=('d0af32cb5ad6e8a192fef76677ad98ad1a94d03f') # optimization OK From vmiklos at frugalware.org Wed Jan 14 19:56:50 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Wed Jan 14 19:56:52 2009 Subject: [Frugalware-git] frugalware-current: texi2html-1.64-1-ppc Message-ID: <20090114185650.7842811B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c804bcf624a423ad3e1568ba70cc93652c8c5310 commit c804bcf624a423ad3e1568ba70cc93652c8c5310 Author: Miklos Vajna Date: Wed Jan 14 19:56:56 2009 +0100 texi2html-1.64-1-ppc added ppc to archs() diff --git a/source/apps-extra/texi2html/FrugalBuild b/source/apps-extra/texi2html/FrugalBuild index 78aebeb..bf811aa 100644 --- a/source/apps-extra/texi2html/FrugalBuild +++ b/source/apps-extra/texi2html/FrugalBuild @@ -8,7 +8,7 @@ pkgdesc="Texi2html is a Perl script that converts Texinfo to HTML." url="http://www.mathematik.uni-kl.de/~obachman/Texi2html/" depends=('perl') groups=('apps-extra') -archs=('i686' 'x86_64') +archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump $url | grep -m1 tar.gz | sed 's/.*l-\(.*\).ta.*/\1/'" source=($url/Distrib/$pkgname-$pkgver.tar.gz) sha1sums=('973b95dcc06fcdae4929a4a7a4ee7f51b568f84c') From devil505linux at gmail.com Wed Jan 14 19:59:30 2009 From: devil505linux at gmail.com (Devil505) Date: Wed Jan 14 19:59:31 2009 Subject: [Frugalware-git] frugalware-current: yabause-0.9.9-1-x86_64 Message-ID: <20090114185930.07CE011B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ca83aef4e7e8e63e96453721806f3748073fd45a commit ca83aef4e7e8e63e96453721806f3748073fd45a Author: Devil505 Date: Wed Jan 14 19:55:21 2009 +0100 yabause-0.9.9-1-x86_64 * added x86_64 to archs diff --git a/source/games-extra/yabause/FrugalBuild b/source/games-extra/yabause/FrugalBuild index 5604164..3c52e2c 100644 --- a/source/games-extra/yabause/FrugalBuild +++ b/source/games-extra/yabause/FrugalBuild @@ -8,7 +8,7 @@ pkgdesc='A Sega Saturn emulator.' depends=('gtkglext' 'libxmu' 'libice' 'libxau' 'libxdmcp' 'freetype2' 'sdl' 'libgcc' 'libxxf86vm' 'libxdamage' 'libdrm' 'libxml2') Finclude sourceforge groups=('games-extra') -archs=('i686') +archs=('i686' 'x86_64') sha1sums=('e1ed79a0fd2d59f8b86238623360749575761bd5') # optimization OK From devil505linux at gmail.com Wed Jan 14 20:00:55 2009 From: devil505linux at gmail.com (Devil505) Date: Wed Jan 14 20:00:56 2009 Subject: [Frugalware-git] frugalware-current: xdg-user-dirs-0.10-1-x86_64 Message-ID: <20090114190055.301CC11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4a38a37c63a8dafb5bc4398a029f0e8f1ee09275 commit 4a38a37c63a8dafb5bc4398a029f0e8f1ee09275 Author: Devil505 Date: Wed Jan 14 20:00:28 2009 +0100 xdg-user-dirs-0.10-1-x86_64 * added x86_64 to archs diff --git a/source/apps-extra/xdg-user-dirs/FrugalBuild b/source/apps-extra/xdg-user-dirs/FrugalBuild index 6d47ce8..e9cdef1 100644 --- a/source/apps-extra/xdg-user-dirs/FrugalBuild +++ b/source/apps-extra/xdg-user-dirs/FrugalBuild @@ -8,7 +8,7 @@ pkgdesc="xdg-user-dirs is a tool to help manage user directories like the deskto url="http://www.freedesktop.org/wiki/Software/xdg-user-dirs" depends=('glibc') groups=('apps-extra') -archs=('i686') +archs=('i686' 'x86_64') up2date="lynx -dump $url | Flasttar" source=(http://user-dirs.freedesktop.org/releases/$pkgname-$pkgver.tar.gz) sha1sums=('824ab2ccdbea30d4cdc29bbec3b80250297e363b') From devil505linux at gmail.com Wed Jan 14 20:10:42 2009 From: devil505linux at gmail.com (Devil505) Date: Wed Jan 14 20:10:43 2009 Subject: [Frugalware-git] frugalware-current: maxr-0.2.3-1-x86_64 Message-ID: <20090114191042.6B46011B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8a33d1ceae3f2497d10ca6545585e45f99a85b93 commit 8a33d1ceae3f2497d10ca6545585e45f99a85b93 Author: Devil505 Date: Wed Jan 14 20:10:21 2009 +0100 maxr-0.2.3-1-x86_64 * added x86_64 to archs diff --git a/source/games-extra/maxr/FrugalBuild b/source/games-extra/maxr/FrugalBuild index 76b5b73..802c902 100644 --- a/source/games-extra/maxr/FrugalBuild +++ b/source/games-extra/maxr/FrugalBuild @@ -8,7 +8,7 @@ pkgdesc="OpenSource reimplementation for M.A.X." url="http://www.maxthegame.de/" depends=('sdl_net' 'sdl_mixer' 'libstdc++') groups=('games-extra') -archs=('i686') +archs=('i686' 'x86_64') up2date="lynx -dump http://www.maxthegame.de/bbs/docs.php?id=3 | grep tar.gz | Flasttar" source=(http://www.maxthegame.de/downloads/$pkgname-$pkgver.tar.gz) sha1sums=('783d5978c5cf32aa3629be8972116444564d23c2') From ryuo at frugalware.org Wed Jan 14 20:30:47 2009 From: ryuo at frugalware.org (James Buren) Date: Wed Jan 14 20:30:48 2009 Subject: [Frugalware-git] frugalware-current: tintin-1.98.8-1-i686 Message-ID: <20090114193047.5FB2C11B8630@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3c99a278df2abb61bf74cae804766357e37b3c36 commit 3c99a278df2abb61bf74cae804766357e37b3c36 Author: James Buren Date: Wed Jan 14 13:33:21 2009 -0600 tintin-1.98.8-1-i686 * version bump diff --git a/source/games-extra/tintin/FrugalBuild b/source/games-extra/tintin/FrugalBuild index 94f7f9a..3651f0f 100644 --- a/source/games-extra/tintin/FrugalBuild +++ b/source/games-extra/tintin/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: James Buren pkgname=tintin -pkgver=1.98.7 +pkgver=1.98.8 pkgrel=1 pkgdesc="A console mud client from which other mud clients have been written." _F_sourceforge_realname="TinTin++ Source Code" @@ -10,7 +10,7 @@ Finclude sourceforge depends=('zlib') groups=('games-extra') archs=('i686' 'x86_64') -sha1sums=('08b13158cd1745a704ec8e301f1cf84845c59e52') +sha1sums=('d1c8998a8c42fbdcd97642a946aededb13f5c544') build() { From ryuo at frugalware.org Wed Jan 14 20:30:47 2009 From: ryuo at frugalware.org (James Buren) Date: Wed Jan 14 20:30:51 2009 Subject: [Frugalware-git] frugalware-current: awesome-2.3.5-1-i686 Message-ID: <20090114193047.46C4D11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=336f9a4386ea33ad92f761c813faa36249da02a9 commit 336f9a4386ea33ad92f761c813faa36249da02a9 Author: James Buren Date: Wed Jan 14 13:31:27 2009 -0600 awesome-2.3.5-1-i686 * version bump diff --git a/source/x11-extra/awesome/FrugalBuild b/source/x11-extra/awesome/FrugalBuild index 0602245..2fc67c0 100644 --- a/source/x11-extra/awesome/FrugalBuild +++ b/source/x11-extra/awesome/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: James Buren pkgname=awesome -pkgver=2.3.4 +pkgver=2.3.5 pkgrel=1 pkgdesc="awesome is a floating and tiling window manager initialy based on a dwm code rewriting." url="http://awesome.naquadah.org/" @@ -14,7 +14,7 @@ groups=('x11-extra') archs=('i686' 'x86_64') up2date="curl -s '$url/download/' | grep 'Latest stable' | sed 's|.*version \(.*\) (.*|\1|'" source=($url/download/$pkgname-$pkgver.tar.bz2) -sha1sums=('dbcb9d0dd712d4e73a27c7f57e3c94e26563c44f') +sha1sums=('7457aa4094d6dd06a10e35169459c679f858478f') build() { From ryuo at frugalware.org Wed Jan 14 20:30:47 2009 From: ryuo at frugalware.org (James Buren) Date: Wed Jan 14 20:30:52 2009 Subject: [Frugalware-git] frugalware-current: pycups-1.9.45-1-i686 Message-ID: <20090114193047.789F711B8631@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5fa39b60df5da74016c7d715aac97d4d0964316f commit 5fa39b60df5da74016c7d715aac97d4d0964316f Author: James Buren Date: Wed Jan 14 13:34:43 2009 -0600 pycups-1.9.45-1-i686 * version bump diff --git a/source/lib-extra/pycups/FrugalBuild b/source/lib-extra/pycups/FrugalBuild index 965ff5a..8d497a3 100644 --- a/source/lib-extra/pycups/FrugalBuild +++ b/source/lib-extra/pycups/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: James Buren pkgname=pycups -pkgver=1.9.44 -pkgrel=2 +pkgver=1.9.45 +pkgrel=1 pkgdesc="The python bindings for cups." url="http://cyberelk.net/tim/software/pycups/" depends=('python' 'cups') @@ -11,6 +11,6 @@ groups=('lib-extra') archs=('i686' 'x86_64') up2date="Flasttar `echo $url | sed 's|software|data|'`" source=(`echo $url | sed 's|software|data|'`/$pkgname-$pkgver.tar.bz2) -sha1sums=('e5920cba3d888c867c5324810fa2fe18f9deb414') +sha1sums=('976e84f1a32cbc0fc3fc5c3557fad334048e0573') # optimization OK From priyank at frugalware.org Wed Jan 14 20:40:27 2009 From: priyank at frugalware.org (Priyank) Date: Wed Jan 14 20:40:30 2009 Subject: [Frugalware-git] frugalware-current: seahorse-2.24.1-1-i686 Message-ID: <20090114194027.E9C4C11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6444dcb20c115e31f0f222fef9d835b925ee080c commit 6444dcb20c115e31f0f222fef9d835b925ee080c Author: Priyank Date: Thu Jan 15 01:07:51 2009 +0530 seahorse-2.24.1-1-i686 * Version bump diff --git a/source/gnome-extra/seahorse/FrugalBuild b/source/gnome-extra/seahorse/FrugalBuild index 1ee8b00..0c21e75 100644 --- a/source/gnome-extra/seahorse/FrugalBuild +++ b/source/gnome-extra/seahorse/FrugalBuild @@ -2,13 +2,13 @@ # Maintainer: Priyank Gosalia pkgname=seahorse -pkgver=2.24.0 -pkgrel=2 +pkgver=2.24.1 +pkgrel=1 pkgdesc="A GNOME application for managing PGP keys." url="http://www.seahorse.sourceforge.net/" -depends=('gnutls=2.6.3-1' 'gtksourceview' 'gnupg' 'gpgme' 'libsoup' 'dbus' \ - 'dbus-glib' 'libsoup' 'libxml2' 'libnotify' 'libgnomeui>=2.24.0' \ - 'openssh' 'gconf>=2.24.0' 'avahi') +depends=('gnutls=2.6.3-1' 'gtksourceview' 'gnupg>=1.4.9-2' \ + 'gpgme' 'libsoup>=2.24.0.1' 'dbus' 'dbus-glib' 'libxml2' \ + 'libnotify' 'libgnomeui>=2.24.0' 'openssh' 'gconf>=2.24.0' 'avahi') makedepends=('gettext' 'openldap' 'intltool' 'pkgconfig' 'gnome-doc-utils') groups=('gnome-extra') archs=('i686' 'x86_64') @@ -18,12 +18,11 @@ _F_gnome_desktop="y" _F_gnome_iconcache="y" _F_gnome_mime="y" Finclude gnome gnome-scriptlet -sha1sums=('e6113d22cf63121bf4a2505ad7a1b755c21a280c') +sha1sums=('66a993a5a24e2e2637db6964c39c0a6cc432e0ec') unset MAKEFLAGS -Fconfopts="${Fconfopts[@]} -enable-ldap --enable-hkp \ - --enable-agent --enable-libnotify --with-keyserver --enable-ssh \ - --enable-nautilus --enable-dbus --enable-avahi --enable-sharing \ - --enable-gnome-keyring --disable-epiphany \ - --disable-update-mime-database" +Fconfopts="${Fconfopts[@]} -enable-ldap --enable-hkp --enable-libnotify \ + --with-keyserver --enable-ssh --enable-dbus --enable-avahi \ + --enable-sharing --enable-gnome-keyring --disable-scrollkeeper \ + --disable-schemas-install" # optimization OK From priyank at frugalware.org Wed Jan 14 20:58:42 2009 From: priyank at frugalware.org (Priyank) Date: Wed Jan 14 20:58:43 2009 Subject: [Frugalware-git] frugalware-current: seahorse-applet-2.24.1-2-i686 Message-ID: <20090114195842.2323411B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=fae29fb2ed67436d1a364d70e2ae9620e0ddd6a7 commit fae29fb2ed67436d1a364d70e2ae9620e0ddd6a7 Author: Priyank Date: Thu Jan 15 01:24:24 2009 +0530 seahorse-applet-2.24.1-2-i686 * Rebuild with seahorse-2.24.1 * Changed maintainer to myself (ok with bouleetbil) diff --git a/source/gnome-extra/seahorse-applet/FrugalBuild b/source/gnome-extra/seahorse-applet/FrugalBuild index 3247ca6..383be0d 100644 --- a/source/gnome-extra/seahorse-applet/FrugalBuild +++ b/source/gnome-extra/seahorse-applet/FrugalBuild @@ -1,14 +1,15 @@ # Compiling Time: 0.36 SBU -# Maintainer: bouleetbil +# Maintainer: Priyank Gosalia +# Contributor: bouleetbil pkgname=seahorse-applet _F_gnome_name=seahorse-plugins pkgver=2.24.1 -pkgrel=1 +pkgrel=2 pkgdesc="seahorse panel applet for GNOME" url="http://www.seahorse.sourceforge.net/" -depends=('seahorse>=2.24.0' 'gnome-applets>=2.24.0') -makedepends=('gnome-doc-utils' 'nautilus>=2.24.1' 'gedit>=2.24.0' 'intltool') +depends=('seahorse>=2.24.1' 'gnome-applets>=2.24.0') +makedepends=('gnome-doc-utils' 'nautilus>=2.24.2' 'gedit>=2.24.3' 'intltool') groups=('gnome-extra') archs=('i686' 'x86_64') _F_gnome_iconcache="y" @@ -21,7 +22,7 @@ sha1sums=('88a144999f55e82d5fe8eee3c251371589e82ed9') subpkgs=("$pkgname-gedit" "$pkgname-nautilus") subdescs=('seahorse encryption plugin for gedit' \ 'seahorse encryption extension for nautilus') -subdepends=("$pkgname=$pkgver gedit>=2.24.0 gedit-python>=2.24.0" "$pkgname=$pkgver nautilus>=2.24.1") +subdepends=("$pkgname=$pkgver gedit>=2.24.3 gedit-python>=2.24.3" "$pkgname=$pkgver nautilus>=2.24.2") subgroups=('gnome-extra' 'gnome-extra') subarchs=('i686 x86_64' 'i686 x86_64') Fconfopts="${Fconfopts[@]} --disable-update-mime-database" From devil505linux at gmail.com Wed Jan 14 21:08:21 2009 From: devil505linux at gmail.com (Devil505) Date: Wed Jan 14 21:08:23 2009 Subject: [Frugalware-git] homepage-ng: * french translation of 1.0pre2 announcement Message-ID: <20090114200821.C33CC11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=8607fb8df83e40ff59ae8858fdbbc38a2cd637df commit 8607fb8df83e40ff59ae8858fdbbc38a2cd637df Author: Devil505 Date: Wed Jan 14 21:07:55 2009 +0100 * french translation of 1.0pre2 announcement diff --git a/frugalware/xml/news_fr.xml b/frugalware/xml/news_fr.xml index a4caca3..53bab31 100644 --- a/frugalware/xml/news_fr.xml +++ b/frugalware/xml/news_fr.xml @@ -22,6 +22,40 @@ Example: Mon, 07 Aug 2006 12:34:56 -0600 --> + 123 + Frugalware 1.0pre2 (Anacreon) est disponible + Tue, 13 Jan 2009 06:52:36 +0100 + Miklos Vajna + 0 + annoncer la sortie de Frugalware 1.0pre2, le second aperçu technique de notre prochaine version stable 1.0.
    + Voici une liste courte et incomplète depuis la version 1.0pre1:
    +
      +
    • Améliorations: +
        +
      • Installateur : ajout du support pour avoir /boot sur un périphérique RAID1, support amélioré pour détecter les noms de cartes réseau.
        • +
      • Les ports séries sont maintenant contrôlés par le groupe “dialout†(en lieu et place de “uucpâ€), suite à un accord avec les autres distributions.
        • +
      • Pour les utilisateurs de Virtualbox qui doivent télécharger le paquet entier (environ 10 Mo) encore et encore après chaque mise à jour du kernel et bien bonne nouvelle, le module kernel est maintenant dans un paquet séparé, ce qui évitera de gaspiller du temps.
        • +
      +
      • +
    • Mise à jour de paquets: +
        +
      • Mono 2.0.1
        • +
      • Python 2.6.1
        • +
      • GNOME 2.24.2
        • +
      • Plus de 800 paquets mis à jour
        • +
      • Plus de 100 nouveaux paquets
        • +
      +
      • +
    + Veuillez vous référer à la Frugalware Anacreon ChangeLog pour plus d'information.
    + Téléchargement pour i686, x86_64 et ppc: Regardez notre liste de mirrors. N'oubliez pas de vérifier l'integritée des images d'installation avant de les graver!
    + NOTE: Cliquez ici pour savoir quel média vous avez besoin pour l'installation.
    + IMPORTANT: Après avoir plublié les images d'installation, il fut reporté que le service 'syslog' ne démarre pas. La prochaine mise à jour avec 'pacman-g2 -Syu' corrigera cela, ou vous pouvez aussi manuellement éxécuterla commande ,,sed -i 's/"]/" ]/g' rc.syslog'' pour résoudre ce problème.
    + ]]> +     +     + 122 Lettre d'information Frugalware numéro 37 Sat, 10 Jan 2009 22:33:48 +1000 From devil505linux at gmail.com Wed Jan 14 21:10:55 2009 From: devil505linux at gmail.com (Devil505) Date: Wed Jan 14 21:10:56 2009 Subject: [Frugalware-git] homepage-ng: * oops, a space between two words was missing Message-ID: <20090114201055.139D211B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=d0c654d72c6250306b7152dad8aae3a4ffe83ba3 commit d0c654d72c6250306b7152dad8aae3a4ffe83ba3 Author: Devil505 Date: Wed Jan 14 21:10:19 2009 +0100 * oops, a space between two words was missing diff --git a/frugalware/xml/news_fr.xml b/frugalware/xml/news_fr.xml index 53bab31..a498690 100644 --- a/frugalware/xml/news_fr.xml +++ b/frugalware/xml/news_fr.xml @@ -51,7 +51,7 @@ Example: Mon, 07 Aug 2006 12:34:56 -0600 --> Veuillez vous référer à la Frugalware Anacreon ChangeLog pour plus d'information.
    Téléchargement pour i686, x86_64 et ppc: Regardez notre liste de mirrors. N'oubliez pas de vérifier l'integritée des images d'installation avant de les graver!
    NOTE: Cliquez ici pour savoir quel média vous avez besoin pour l'installation.
    - IMPORTANT: Après avoir plublié les images d'installation, il fut reporté que le service 'syslog' ne démarre pas. La prochaine mise à jour avec 'pacman-g2 -Syu' corrigera cela, ou vous pouvez aussi manuellement éxécuterla commande ,,sed -i 's/"]/" ]/g' rc.syslog'' pour résoudre ce problème.
    + IMPORTANT: Après avoir plublié les images d'installation, il fut reporté que le service 'syslog' ne démarre pas. La prochaine mise à jour avec 'pacman-g2 -Syu' corrigera cela, ou vous pouvez aussi manuellement éxécuter la commande ,,sed -i 's/"]/" ]/g' rc.syslog'' pour résoudre ce problème.
    ]]>     From devil505linux at gmail.com Wed Jan 14 21:14:03 2009 From: devil505linux at gmail.com (Devil505) Date: Wed Jan 14 21:14:05 2009 Subject: [Frugalware-git] frugalware-current: scourge-0.21.1-1-x86_64 Message-ID: <20090114201403.AB75411B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ce18f5d56fa19aac95a378cbf482898be8726ff5 commit ce18f5d56fa19aac95a378cbf482898be8726ff5 Author: Devil505 Date: Wed Jan 14 21:13:17 2009 +0100 scourge-0.21.1-1-x86_64 * added x86_64 to archs diff --git a/source/games-extra/scourge/FrugalBuild b/source/games-extra/scourge/FrugalBuild index 80be5e2..b7eba77 100644 --- a/source/games-extra/scourge/FrugalBuild +++ b/source/games-extra/scourge/FrugalBuild @@ -10,7 +10,7 @@ _F_sourceforge_ext=".src.tar.gz" Finclude sourceforge depends=('sdl_ttf' 'sdl_mixer' 'sdlimage' 'sdl_net' 'mesa') groups=(games-extra) -archs=('i686') +archs=('i686' 'x86_64') source=($source ${source/$pkgname-$pkgver.src.tar.gz/$pkgname-$pkgver.data.tar.gz}) sha1sums=('d5742d78e2efad7f9b63cfb958e950f9608d310c' \ 'c3eb246f3598f2282f71e47b9ea2031ff3eda75e') From ryuo at frugalware.org Wed Jan 14 21:47:02 2009 From: ryuo at frugalware.org (James Buren) Date: Wed Jan 14 21:47:05 2009 Subject: [Frugalware-git] frugalware-current: wavegain-1.2.8-1-i686 Message-ID: <20090114204702.7BB6511B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ed4b424434841b45bd4e7e07696ca749e997bbcd commit ed4b424434841b45bd4e7e07696ca749e997bbcd Author: James Buren Date: Wed Jan 14 14:50:39 2009 -0600 wavegain-1.2.8-1-i686 * version bump diff --git a/source/multimedia-extra/wavegain/FrugalBuild b/source/multimedia-extra/wavegain/FrugalBuild index 9dc08d0..f6842b1 100644 --- a/source/multimedia-extra/wavegain/FrugalBuild +++ b/source/multimedia-extra/wavegain/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: James Buren pkgname=wavegain -pkgver=1.2.6 -pkgrel=2 +pkgver=1.2.8 +pkgrel=1 pkgdesc="an audio file normalizer using ReplayGain algorithms" url="http://www.rarewares.org/others.php" depends=('libsndfile') @@ -11,7 +11,7 @@ groups=('multimedia-extra') archs=('i686' 'x86_64') up2date="Flastarchive $url srcs.zip" source=(http://www.rarewares.org/files/others/${pkgname}-${pkgver}srcs.zip) -sha1sums=('1427140c788b8a217275692f61c2bc42bd134f6c') +sha1sums=('540d028d0a3532d7c07e48a5d17af25a7268c0e6') build() { From boobaa at frugalware.org Wed Jan 14 22:32:16 2009 From: boobaa at frugalware.org (CSÉCSY László) Date: Wed Jan 14 22:32:18 2009 Subject: [Frugalware-git] frugalware-current: memcached-1.2.6-2-i686 Message-ID: <20090114213216.B307011B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b21ddbd8b2a079d956b232cbf45769a24a8178cb commit b21ddbd8b2a079d956b232cbf45769a24a8178cb Author: CSÉCSY László Date: Wed Jan 14 22:31:39 2009 +0100 memcached-1.2.6-2-i686 add support for service status diff --git a/source/network-extra/memcached/FrugalBuild b/source/network-extra/memcached/FrugalBuild index 9888240..85e85c1 100644 --- a/source/network-extra/memcached/FrugalBuild +++ b/source/network-extra/memcached/FrugalBuild @@ -3,7 +3,7 @@ pkgname=memcached pkgver=1.2.6 -pkgrel=1 +pkgrel=2 pkgdesc="A high-performance, distributed memory object caching system." url="http://www.danga.com/memcached/" depends=('libevent') @@ -14,7 +14,7 @@ source=(${url}dist/$pkgname-$pkgver.tar.gz memcached rc.memcached) backup=(etc/sysconfig/memcached) sha1sums=('675a2576efac3d1333181e33fdd43f45f1f5d3fa' \ 'a870f1229b48f0de9ce73143d34d7be89f405a62' \ - '0210b69943c26df849f6dfda427ecd90750bf639') + '38e9794f2f9addc5b25d118b1d370f663c4b9f95') build() { Fbuild diff --git a/source/network-extra/memcached/rc.memcached b/source/network-extra/memcached/rc.memcached index b0935f7..ea87143 100644 --- a/source/network-extra/memcached/rc.memcached +++ b/source/network-extra/memcached/rc.memcached @@ -20,11 +20,12 @@ actions=(restart start status stop) daemon=$"memcached" pidfile="/var/run/memcached.pid" +pid="cat $pidfile 2> /dev/null" rc_start() { start_msg - if [[ ! -f $pidfile && -z $(pidof memcached 2> /dev/null) ]]; then + if [ -z "$(eval $pid)" ]; then /usr/bin/memcached -d -p $PORT -u $USER -c $MAXCONN -m $CACHESIZE $OPTIONS pidof memcached >$pidfile 2>/dev/null ok $? @@ -36,7 +37,7 @@ rc_start() rc_stop() { stop_msg - if [ -f $pidfile ]; then + if [ -n "$(eval $pid)" ]; then kill "$(cat $pidfile)" rm -f $pidfile ok $? From ryuo at frugalware.org Wed Jan 14 22:43:12 2009 From: ryuo at frugalware.org (James Buren) Date: Wed Jan 14 22:43:15 2009 Subject: [Frugalware-git] frugalware-current: moc-2.4.4-1-i686 Message-ID: <20090114214312.98EAB11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2d0ce3079c7cb31d770bf3f48d97cca2def029d5 commit 2d0ce3079c7cb31d770bf3f48d97cca2def029d5 Author: James Buren Date: Wed Jan 14 15:46:34 2009 -0600 moc-2.4.4-1-i686 * version bump * update depends diff --git a/source/multimedia-extra/moc/FrugalBuild b/source/multimedia-extra/moc/FrugalBuild index 7b8d07a..ec95416 100644 --- a/source/multimedia-extra/moc/FrugalBuild +++ b/source/multimedia-extra/moc/FrugalBuild @@ -3,17 +3,17 @@ # Contributor: uzsolt pkgname=moc -pkgver=2.4.3 -pkgrel=4 +pkgver=2.4.4 +pkgrel=1 pkgdesc="MOC (music on console) is a console audio player for LINUX/UNIX designed to be powerful and easy to use." url="http://moc.daper.net/" -depends=('flac' 'libvorbis' 'libmpcdec' 'taglib' 'speex' 'libmad' 'libid3tag' 'alsa-lib' 'libsamplerate' 'curl>=7.19.0' 'ncurses') +depends=('alsa-lib' 'libsamplerate' 'curl' 'ncurses' 'libtool' 'libmpcdec' 'taglib' 'libgcc' 'flac' 'speex' 'libmad' 'libid3tag' 'ffmpeg' 'libraw1394' 'libx11') groups=('multimedia-extra') archs=('i686' 'x86_64') up2date="Flasttar ftp://ftp.daper.net/pub/soft/moc/stable" source=(ftp://ftp.daper.net/pub/soft/moc/stable/$pkgname-$pkgver.tar.bz2) license=('GPL2') -sha1sums=('d9b54636f51f5366e94b684ddff3e869b1c634ac') +sha1sums=('e56ee13aa17c177f0afc42efe3804ebbbf46d4db') build() { From vmiklos at frugalware.org Thu Jan 15 00:19:20 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Jan 15 00:19:22 2009 Subject: [Frugalware-git] pacman-g2: scripts/mirrors: fix for the case when a path of a mirror is empty Message-ID: <20090114231920.A8B9111B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=2520398b33be6032eec0ff16505079a236519df4 commit 2520398b33be6032eec0ff16505079a236519df4 Author: Miklos Vajna Date: Thu Jan 15 00:08:58 2009 +0100 scripts/mirrors: fix for the case when a path of a mirror is empty diff --git a/scripts/mirrors.py b/scripts/mirrors.py index 3d5de29..65c7e4b 100644 --- a/scripts/mirrors.py +++ b/scripts/mirrors.py @@ -32,8 +32,11 @@ for i in xmldoc.getElementsByTagName('mirror'): for j in i.getElementsByTagName('type'): m.types.append(j.firstChild.toxml()) for j in ['id', 'path', 'ftp_path', 'http_path', 'rsync_path', 'country', 'supplier', 'bandwidth']: - if i.getElementsByTagName(j) and i.getElementsByTagName(j)[0].firstChild: - m.__setattr__(j, i.getElementsByTagName(j)[0].firstChild.toxml()) + if i.getElementsByTagName(j): + if i.getElementsByTagName(j)[0].firstChild: + m.__setattr__(j, i.getElementsByTagName(j)[0].firstChild.toxml()) + else: + m.__setattr__(j, "") try: mirrors[m.country] except KeyError: @@ -63,6 +66,8 @@ for i in countries: path = j.http_path except AttributeError: path = j.path - sock.write("Server = %s://%s%s.frugalware.org/%s/%s/frugalware-@CARCH@\n" % + if len(path): + path = "/%s" % path + sock.write("Server = %s://%s%s.frugalware.org%s/%s/frugalware-@CARCH@\n" % (proto, domain, j.id, path, ver)) sock.close() From vmiklos at frugalware.org Thu Jan 15 00:19:20 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Jan 15 00:19:24 2009 Subject: [Frugalware-git] pacman-g2: re-generate mirrorlist Message-ID: <20090114231920.BBB0911B8630@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=4b2c5e4c586f9fbfd78fe12d39d6eb36f77a69cb commit 4b2c5e4c586f9fbfd78fe12d39d6eb36f77a69cb Author: Miklos Vajna Date: Thu Jan 15 00:19:01 2009 +0100 re-generate mirrorlist - mainly because the French mirror's url is changed diff --git a/etc/pacman-g2/repos/frugalware-current.in b/etc/pacman-g2/repos/frugalware-current.in index 660869f..99e4592 100644 --- a/etc/pacman-g2/repos/frugalware-current.in +++ b/etc/pacman-g2/repos/frugalware-current.in @@ -21,14 +21,14 @@ Server = ftp://ftp13.frugalware.org/pub/frugalware/frugalware-current/frugalware # Belgian National Research Network (1 GBit) Server = ftp://ftp5.frugalware.org/packages/frugalware/pub/frugalware/frugalware-current/frugalware-@CARCH@ # ---------- -# - FRENCH - +# - FRANCE - # ---------- -# botux.net (100 MBit) -Server = ftp://ftp7.frugalware.org/pub/frugalware/frugalware-current/frugalware-@CARCH@ +# frugalware-fr.org by botux.net (1 GBit) +Server = ftp://ftp7.frugalware.org/frugalware-current/frugalware-@CARCH@ # ----------- # - GERMANY - # ----------- -# Schlund + Partner AG (10 MBit) +# linux-de.org (100 MBit) Server = ftp://ftp8.frugalware.org/distro/frugalware/frugalware-current/frugalware-@CARCH@ # ----------- # - HUNGARY - diff --git a/etc/pacman-g2/repos/frugalware.in b/etc/pacman-g2/repos/frugalware.in index b08046f..c8013e1 100644 --- a/etc/pacman-g2/repos/frugalware.in +++ b/etc/pacman-g2/repos/frugalware.in @@ -21,14 +21,14 @@ Server = ftp://ftp13.frugalware.org/pub/frugalware/frugalware-stable/frugalware- # Belgian National Research Network (1 GBit) Server = ftp://ftp5.frugalware.org/packages/frugalware/pub/frugalware/frugalware-stable/frugalware-@CARCH@ # ---------- -# - FRENCH - +# - FRANCE - # ---------- -# botux.net (100 MBit) -Server = ftp://ftp7.frugalware.org/pub/frugalware/frugalware-stable/frugalware-@CARCH@ +# frugalware-fr.org by botux.net (1 GBit) +Server = ftp://ftp7.frugalware.org/frugalware-stable/frugalware-@CARCH@ # ----------- # - GERMANY - # ----------- -# Schlund + Partner AG (10 MBit) +# linux-de.org (100 MBit) Server = ftp://ftp8.frugalware.org/distro/frugalware/frugalware-stable/frugalware-@CARCH@ # ----------- # - HUNGARY - From vmiklos at frugalware.org Thu Jan 15 00:22:59 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Jan 15 00:23:00 2009 Subject: [Frugalware-git] frugalware-current: pacman-g2-3.7.2-3-i686 Message-ID: <20090114232259.A875311B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=db40dec419f25a5aaa317f5ebdead7d05dbf42b6 commit db40dec419f25a5aaa317f5ebdead7d05dbf42b6 Author: Miklos Vajna Date: Thu Jan 15 00:22:07 2009 +0100 pacman-g2-3.7.2-3-i686 - backport patch from git to update mirrorlist diff --git a/source/base/pacman-g2/FrugalBuild b/source/base/pacman-g2/FrugalBuild index f081fdf..e81b635 100644 --- a/source/base/pacman-g2/FrugalBuild +++ b/source/base/pacman-g2/FrugalBuild @@ -7,7 +7,7 @@ USE_MINIMAL=${USE_MINIMAL:-"n"} pkgname=pacman-g2 pkgver=3.7.2 Fuse $USE_DEVEL && pkgver=3.6.5.25.gf2bbdac -pkgrel=2 +pkgrel=3 pkgdesc="A .tar.bz2 based package manager library (libpacman) and client (pacman-g2) with dependency support." url="http://ftp.frugalware.org/pub/other/pacman-g2/" backup=(etc/{makepkg,pacman-g2}.conf etc/pacman-g2/repos/{frugalware,frugalware-current}) @@ -25,8 +25,9 @@ archs=('i686' 'x86_64' 'ppc') _F_archive_nosort=y up2date="lynx -dump $url/releases/ |Flasttar" if ! Fuse $USE_DEVEL; then - source=($url/releases/$pkgname-$pkgver.tar.gz) - signatures=("$source.asc") + source=($url/releases/$pkgname-$pkgver.tar.gz \ + http://git.frugalware.org/patches/pacman-g2/4b2c5e4c586f9fbfd78fe12d39d6eb36f77a69cb.patch) + signatures=("$source.asc" '') else _F_scm_type="git" _F_scm_url="git://git.frugalware.org/pub/other/pacman-g2/pacman-g2" From vmiklos at frugalware.org Thu Jan 15 00:28:12 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Jan 15 00:28:13 2009 Subject: [Frugalware-git] frugalware-current: openssh-5.1p1-3-i686 Message-ID: <20090114232812.0970911B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3da2eecad0b3f1b1932ee3a49dea98663d009246 commit 3da2eecad0b3f1b1932ee3a49dea98663d009246 Author: Miklos Vajna Date: Thu Jan 15 00:27:52 2009 +0100 openssh-5.1p1-3-i686 - add status subcommand to rc.sshd diff --git a/source/network/openssh/FrugalBuild b/source/network/openssh/FrugalBuild index 467be3b..dd685cd 100644 --- a/source/network/openssh/FrugalBuild +++ b/source/network/openssh/FrugalBuild @@ -4,7 +4,7 @@ pkgname=openssh pkgver=5.1p1 -pkgrel=2 +pkgrel=3 pkgdesc='Secure Shell daemon and clients' url="http://www.openssh.com/" backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/sysconfig/tunnel') diff --git a/source/network/openssh/rc.sshd b/source/network/openssh/rc.sshd index 1ea8015..1f75fa0 100644 --- a/source/network/openssh/rc.sshd +++ b/source/network/openssh/rc.sshd @@ -1,8 +1,8 @@ #!/bin/bash -# (c) 2003 Vajna Miklos +# (c) 2003, 2009 Vajna Miklos # (c) 2006 Andras Voroskoi -# rc.sshd for FrugalWare +# rc.sshd for Frugalware # distributed under GPL License # chkconfig: 2345 32 56 @@ -12,24 +12,23 @@ source /lib/initscripts/functions TEXTDOMAIN=sshd TEXTDOMAINDIR=/lib/initscripts/messages -actions=(restart start stop) +actions=(restart start stop status) daemon=$"SSH daemon" +pid="cat /var/run/sshd.pid 2>/dev/null" + rc_start() { start_msg - if [ ! -r /var/run/sshd.pid ]; then + if [ -z "$(eval $pid)" ]; then # creating host keys if [ ! -r /etc/ssh/ssh_host_key ]; then /usr/bin/ssh-keygen -t rsa1 -f /etc/ssh/ssh_host_key -N '' |logger - retval=$? fi if [ ! -f /etc/ssh/ssh_host_dsa_key ]; then /usr/bin/ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key -N '' |logger - retval=$? fi if [ ! -f /etc/ssh/ssh_host_rsa_key ]; then /usr/bin/ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -N '' |logger - retval=$? fi /usr/sbin/sshd ok $? @@ -40,8 +39,8 @@ rc_start() { rc_stop() { stop_msg - if [ -r /var/run/sshd.pid ]; then - kill `cat /var/run/sshd.pid` + if [ -n "$(eval $pid)" ]; then + kill "$(eval $pid)" ok $? else ok 999 From voroskoi at frugalware.org Thu Jan 15 05:50:29 2009 From: voroskoi at frugalware.org (András VöröskÅ‘i) Date: Thu Jan 15 05:50:31 2009 Subject: [Frugalware-git] frugalware-current: libksba-1.0.5-1-x86_64 Message-ID: <20090115045029.CC8EE11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6706471d3076c25b9365d70618ffe852cb352d96 commit 6706471d3076c25b9365d70618ffe852cb352d96 Author: András VöröskÅ‘i Date: Thu Jan 15 05:50:11 2009 +0100 libksba-1.0.5-1-x86_64 version bump diff --git a/source/lib/libksba/FrugalBuild b/source/lib/libksba/FrugalBuild index ba8e02d..b00fb2a 100644 --- a/source/lib/libksba/FrugalBuild +++ b/source/lib/libksba/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: voroskoi pkgname=libksba -pkgver=1.0.4 +pkgver=1.0.5 pkgrel=1 pkgdesc="Libksba is a CMS and X.509 access library." url="http://www.gnupg.org/related_software/libksba/" From voroskoi at frugalware.org Thu Jan 15 06:00:42 2009 From: voroskoi at frugalware.org (András VöröskÅ‘i) Date: Thu Jan 15 06:00:43 2009 Subject: [Frugalware-git] frugalware-current: sqlite3-3.6.9-1-x86_64 Message-ID: <20090115050042.56E4211B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=622b4461691c2c3f94e3601b5e2019b9f45b624b commit 622b4461691c2c3f94e3601b5e2019b9f45b624b Author: András VöröskÅ‘i Date: Thu Jan 15 06:00:29 2009 +0100 sqlite3-3.6.9-1-x86_64 version bump diff --git a/source/lib/sqlite3/FrugalBuild b/source/lib/sqlite3/FrugalBuild index 9c4e840..c260588 100644 --- a/source/lib/sqlite3/FrugalBuild +++ b/source/lib/sqlite3/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: voroskoi pkgname=sqlite3 -pkgver=3.6.7 +pkgver=3.6.9 pkgrel=1 pkgdesc="A C library that implements an SQL database engine" url="http://www.sqlite.org/" @@ -14,7 +14,7 @@ archs=('i686' 'x86_64' 'ppc') _F_cd_path="sqlite-$pkgver" up2date="lynx -dump http://www.sqlite.org/ |grep Version |sed 's/.*n \(.*\) of.*/\1/'" source=(http://www.sqlite.org/sqlite-$pkgver.tar.gz) -sha1sums=('e10153370f1de73337abb2eb17caac77a08ba8d6') +sha1sums=('4291e9858a13c8bc4c203439f6a27d45a84ef8fa') subpkgs=('lemon') subdescs=('The Lemon program is an LALR(1) parser generator.') From voroskoi at frugalware.org Thu Jan 15 06:09:44 2009 From: voroskoi at frugalware.org (András VöröskÅ‘i) Date: Thu Jan 15 06:09:46 2009 Subject: [Frugalware-git] frugalware-current: freetype2-2.3.8-1-x86_64 Message-ID: <20090115050944.8A8EA11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=713b42ea85e90a8ed3eff4b6f259a68256e2d1c3 commit 713b42ea85e90a8ed3eff4b6f259a68256e2d1c3 Author: András VöröskÅ‘i Date: Thu Jan 15 06:09:30 2009 +0100 freetype2-2.3.8-1-x86_64 version bump diff --git a/source/lib/freetype2/FrugalBuild b/source/lib/freetype2/FrugalBuild index b3c834e..76fabeb 100644 --- a/source/lib/freetype2/FrugalBuild +++ b/source/lib/freetype2/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: voroskoi pkgname=freetype2 -pkgver=2.3.7 +pkgver=2.3.8 pkgrel=1 pkgdesc="TrueType font rendering library - 2.0 series (with bytecode interpreter)" url="http://freetype.sourceforge.net" From voroskoi at frugalware.org Thu Jan 15 06:10:11 2009 From: voroskoi at frugalware.org (András VöröskÅ‘i) Date: Thu Jan 15 06:10:12 2009 Subject: [Frugalware-git] frugalware-current: smplayer-0.6.6-1-i686 Message-ID: <20090115051011.3FFEA11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=845e2af630668e4eff621c24ca361b1d1840300b commit 845e2af630668e4eff621c24ca361b1d1840300b Author: András VöröskÅ‘i Date: Thu Jan 15 06:09:02 2009 +0100 smplayer-0.6.6-1-i686 version bump updated patch diff --git a/source/kde-extra/smplayer/FrugalBuild b/source/kde-extra/smplayer/FrugalBuild index 9f2c21f..4af4bff 100644 --- a/source/kde-extra/smplayer/FrugalBuild +++ b/source/kde-extra/smplayer/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: voroskoi pkgname=smplayer -pkgver=0.6.4 +pkgver=0.6.6 pkgrel=1 pkgdesc="SMPlayer intends to be a complete front-end for MPlayer." makedepends=('qt4-linguist') @@ -13,11 +13,10 @@ groups=('kde-extra') _F_sourceforge_ext=.tar.bz2 Finclude kde sourceforge source=($source fix_it.patch) -sha1sums=('19dbd15de548538eadadc14e548507a7215ad0c4' \ - 'aab6f2d18a99f42b681491569efe5e506c70a20c') +sha1sums=('6b5299c84650a36ddb73951815e09c100f29e3e5' \ + 'a13c523780eb38f9d7ce835700399ea71b13967c') build() { - #_F_cd_path="${pkgname}-${pkgver}final" Fpatchall Fsed "DUMMY" "$pkgver" Makefile Fmake diff --git a/source/kde-extra/smplayer/fix_it.patch b/source/kde-extra/smplayer/fix_it.patch index 98bdf12..7eb3649 100644 --- a/source/kde-extra/smplayer/fix_it.patch +++ b/source/kde-extra/smplayer/fix_it.patch @@ -1,7 +1,7 @@ -diff -aur smplayer-0.6.4/Makefile fw_smplayer-0.6.4/Makefile ---- smplayer-0.6.4/Makefile 2008-10-13 23:16:45.000000000 +0200 -+++ fw_smplayer-0.6.4/Makefile 2008-10-26 20:50:01.000000000 +0100 -@@ -1,13 +1,13 @@ +diff -aur smplayer-0.6.6/Makefile fw_smplayer-0.6.6/Makefile +--- smplayer-0.6.6/Makefile 2008-11-02 00:32:22.000000000 +0100 ++++ fw_smplayer-0.6.6/Makefile 2009-01-15 05:47:36.000000000 +0100 +@@ -1,11 +1,11 @@ -PREFIX=/usr/local +PREFIX=/usr @@ -13,16 +13,13 @@ diff -aur smplayer-0.6.4/Makefile fw_smplayer-0.6.4/Makefile -DOC_PATH=$(PREFIX)/share/doc/packages/smplayer +DOC_PATH=$(PREFIX)/share/doc/smplayer-DUMMY TRANSLATION_PATH=$(PREFIX)/share/smplayer/translations --CONF_PATH=$(CONF_PREFIX)/etc/smplayer -+CONF_PATH=/etc/smplayer THEMES_PATH=$(PREFIX)/share/smplayer/themes SHORTCUTS_PATH=$(PREFIX)/share/smplayer/shortcuts - -diff -aur smplayer-0.6.4/src/smplayer.pro fw_smplayer-0.6.4/src/smplayer.pro ---- smplayer-0.6.4/src/smplayer.pro 2008-10-22 01:32:02.000000000 +0200 -+++ fw_smplayer-0.6.4/src/smplayer.pro 2008-10-26 20:48:41.000000000 +0100 -@@ -252,7 +252,7 @@ - DEFINES += CONF_PATH=$(CONF_PATH) +diff -aur smplayer-0.6.6/src/smplayer.pro fw_smplayer-0.6.6/src/smplayer.pro +--- smplayer-0.6.6/src/smplayer.pro 2008-12-21 00:22:20.000000000 +0100 ++++ fw_smplayer-0.6.6/src/smplayer.pro 2009-01-15 05:47:54.000000000 +0100 +@@ -274,7 +274,7 @@ + DEFINES += TRANSLATION_PATH=$(TRANSLATION_PATH) DEFINES += THEMES_PATH=$(THEMES_PATH) DEFINES += SHORTCUTS_PATH=$(SHORTCUTS_PATH) - #DEFINES += NO_DEBUG_ON_CONSOLE From voroskoi at frugalware.org Thu Jan 15 06:16:14 2009 From: voroskoi at frugalware.org (András VöröskÅ‘i) Date: Thu Jan 15 06:16:17 2009 Subject: [Frugalware-git] frugalware-current: libssh2-1.0-1-x86_64 Message-ID: <20090115051614.DC56311B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=95d38faceee2c22ec72249596bd37c8853e4eefd commit 95d38faceee2c22ec72249596bd37c8853e4eefd Author: András VöröskÅ‘i Date: Thu Jan 15 06:15:48 2009 +0100 libssh2-1.0-1-x86_64 version bump diff --git a/source/lib/libssh2/FrugalBuild b/source/lib/libssh2/FrugalBuild index 3cb9d4d..0b2b2f2 100644 --- a/source/lib/libssh2/FrugalBuild +++ b/source/lib/libssh2/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: voroskoi pkgname=libssh2 -pkgver=0.18 +pkgver=1.0 pkgrel=1 pkgdesc="libssh2 is a library implementing the SSH2 protocol as defined by Internet Drafts." groups=('lib') @@ -10,6 +10,6 @@ archs=('i686' 'x86_64' 'ppc') depends=('openssl' 'zlib') Finclude sourceforge url="http://www.libssh2.org/wiki/index.php/Main_Page" -sha1sums=('9bc6148869fca08350e27ea2c9fc44917ac027ff') +sha1sums=('630ad6509a25d1b585875637a459a95502ba0863') # optimization OK From voroskoi at frugalware.org Thu Jan 15 06:22:42 2009 From: voroskoi at frugalware.org (András VöröskÅ‘i) Date: Thu Jan 15 06:22:44 2009 Subject: [Frugalware-git] frugalware-current: libevent-1.4.9-1-i686 Message-ID: <20090115052242.E5BFB11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0ad5bc4310d3fd85ebf147ad0471f7923f5763a1 commit 0ad5bc4310d3fd85ebf147ad0471f7923f5763a1 Author: András VöröskÅ‘i Date: Thu Jan 15 06:19:20 2009 +0100 libevent-1.4.9-1-i686 version bump diff --git a/source/lib/libevent/FrugalBuild b/source/lib/libevent/FrugalBuild index 9f497cd..3a922fc 100644 --- a/source/lib/libevent/FrugalBuild +++ b/source/lib/libevent/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: voroskoi pkgname=libevent -pkgver=1.4.8 +pkgver=1.4.9 pkgrel=1 pkgextraver=-stable pkgdesc="Provides a mechanism to execute a callback function when a specific event occurs on a file descriptor or after a timeout has been reached" From voroskoi at frugalware.org Thu Jan 15 06:28:46 2009 From: voroskoi at frugalware.org (András VöröskÅ‘i) Date: Thu Jan 15 06:28:48 2009 Subject: [Frugalware-git] frugalware-current: c-ares-1.6.0-1-x86_64 Message-ID: <20090115052846.8BE4D11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e31387cc98e146fed865d0134c8b818dfdf17d3d commit e31387cc98e146fed865d0134c8b818dfdf17d3d Author: András VöröskÅ‘i Date: Thu Jan 15 06:28:21 2009 +0100 c-ares-1.6.0-1-x86_64 version bump fixed up2date diff --git a/source/lib/c-ares/FrugalBuild b/source/lib/c-ares/FrugalBuild index 4778be0..cb10daf 100644 --- a/source/lib/c-ares/FrugalBuild +++ b/source/lib/c-ares/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: voroskoi pkgname=c-ares -pkgver=1.5.3 +pkgver=1.6.0 pkgrel=1 pkgdesc="C library that performs DNS requests and name resolves asynchronously." url="http://daniel.haxx.se/projects/c-ares/" @@ -10,7 +10,7 @@ depends=() groups=('lib') archs=('i686' 'x86_64' 'ppc') Fconfopts="$Fconfopts --disable-debug --enable-shared --enable-libgcc --with-gnu-ld" -up2date="lynx -dump $url |grep tar |sed -ne 's/.*-\(.*\).t.*/\1/;1p'" +up2date="lynx -dump $url |Flasttar" source=($url/c-ares-$pkgver.tar.gz) signatures=($source.asc) From voroskoi at frugalware.org Thu Jan 15 06:38:12 2009 From: voroskoi at frugalware.org (András VöröskÅ‘i) Date: Thu Jan 15 06:38:14 2009 Subject: [Frugalware-git] frugalware-current: whois-4.7.30-1-i686 Message-ID: <20090115053812.9299211B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4473a07c96380caede414328730bc3298375b238 commit 4473a07c96380caede414328730bc3298375b238 Author: András VöröskÅ‘i Date: Thu Jan 15 06:37:52 2009 +0100 whois-4.7.30-1-i686 version bump diff --git a/source/network/whois/FrugalBuild b/source/network/whois/FrugalBuild index 094929d..881ad64 100644 --- a/source/network/whois/FrugalBuild +++ b/source/network/whois/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: voroskoi pkgname=whois -pkgver=4.7.26 +pkgver=4.7.30 pkgrel=1 pkgdesc="The GNU whois client" url="http://www.linux.it/~md/software/" @@ -18,14 +18,14 @@ source=(http://ftp.de.debian.org/debian/pool/main/w/whois/$pkgname\_$pkgver.tar. build() { Fpatchall - Fmkdir /usr/{bin,share/man/man1} - Fmake OPTS="$CFLAGS" HAVE_LIBIDN=1 + Fsed '-g -O2' "${CFLAGS}" Makefile + Fmake HAVE_LIBIDN=1 make prefix=/usr BASEDIR=$Fdestdir install || Fdie Ffile $pkgname-$pkgver/whois.conf /etc/whois.conf } -sha1sums=('477c5eec6eb1413624e7a609dbef79e0707720dd' \ +sha1sums=('049a8946a62d95d00ca1cafe928a064119237cb0' \ '07bc0caaa23521d35d75584fdb5f95f1befdba25' \ '50e73d59b53cadf80e3c5aa8c1c8eb6667fa80e6') From voroskoi at frugalware.org Thu Jan 15 06:39:02 2009 From: voroskoi at frugalware.org (András VöröskÅ‘i) Date: Thu Jan 15 06:39:04 2009 Subject: [Frugalware-git] frugalware-current: curl-7.19.2-1-x86_64 Message-ID: <20090115053902.9FDB711B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d3f2c20788a0b0322a14107ed6d695211cab24ae commit d3f2c20788a0b0322a14107ed6d695211cab24ae Author: András VöröskÅ‘i Date: Thu Jan 15 06:38:25 2009 +0100 curl-7.19.2-1-x86_64 version bump compiled with c-ares>=1.6 and libssh2>=1.0 diff --git a/source/network/curl/FrugalBuild b/source/network/curl/FrugalBuild index 739b8ed..b9215e1 100644 --- a/source/network/curl/FrugalBuild +++ b/source/network/curl/FrugalBuild @@ -3,12 +3,12 @@ # Maintainer: voroskoi pkgname=curl -pkgver=7.19.0 +pkgver=7.19.2 pkgrel=1 pkgdesc="A command line tool for transferring data specified with URL syntax." url="http://curl.haxx.se" makedepends=('groff') -depends=('openssl=0.9.8' 'c-ares>=1.5' 'libidn' 'libssh2') +depends=('openssl=0.9.8' 'c-ares>=1.6' 'libidn' 'libssh2>=1.0') groups=('network') archs=('i686' 'x86_64' 'ppc') Fconfopts="$Fconfopts --enable-ares" #ares necessary for rtorrent From voroskoi at frugalware.org Thu Jan 15 06:55:10 2009 From: voroskoi at frugalware.org (András VöröskÅ‘i) Date: Thu Jan 15 06:55:12 2009 Subject: [Frugalware-git] frugalware-current: rsync-3.0.5-1-i686 Message-ID: <20090115055510.06B2411B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4a8028fd4d62008c747f5827dd9a6b6a5cf7bf6b commit 4a8028fd4d62008c747f5827dd9a6b6a5cf7bf6b Author: András VöröskÅ‘i Date: Thu Jan 15 06:54:51 2009 +0100 rsync-3.0.5-1-i686 version bump diff --git a/source/network/rsync/FrugalBuild b/source/network/rsync/FrugalBuild index 3dd640a..4d68752 100644 --- a/source/network/rsync/FrugalBuild +++ b/source/network/rsync/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: voroskoi pkgname=rsync -pkgver=3.0.4 +pkgver=3.0.5 pkgrel=1 pkgdesc="An open source utility that provides fast incremental file transfer." url="http://samba.anu.edu.au/rsync/" From voroskoi at frugalware.org Thu Jan 15 06:57:13 2009 From: voroskoi at frugalware.org (András VöröskÅ‘i) Date: Thu Jan 15 06:57:14 2009 Subject: [Frugalware-git] frugalware-current: libtorrent-0.12.4-1-x86_64 Message-ID: <20090115055713.B0BEA11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=440475abb4c377ed0e4abe6c7551657d2a9c27af commit 440475abb4c377ed0e4abe6c7551657d2a9c27af Author: András VöröskÅ‘i Date: Thu Jan 15 06:56:38 2009 +0100 libtorrent-0.12.4-1-x86_64 version bump diff --git a/source/lib-extra/libtorrent/FrugalBuild b/source/lib-extra/libtorrent/FrugalBuild index 412bada..e4f8754 100644 --- a/source/lib-extra/libtorrent/FrugalBuild +++ b/source/lib-extra/libtorrent/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: voroskoi pkgname=libtorrent -pkgver=0.11.9 +pkgver=0.12.4 pkgrel=1 pkgdesc="LibTorrent is a BitTorrent library written in C++ for *nix, with a focus on high performance and good code." url="http://libtorrent.rakshasa.no/" @@ -12,6 +12,6 @@ archs=('i686' 'x86_64') up2date="lynx -dump $url |grep libtorrent.*.tar |sed -ne 's/.*t-\(.*\).t.*/\1/;1p'" source=(http://libtorrent.rakshasa.no/downloads/libtorrent-$pkgver.tar.gz) Fconfopts="$Fconfopts --enable-static" -sha1sums=('d88e754d1c2ff7f8c5fb7544331264bd505870b8') +sha1sums=('6deab3f6af5e9566c987131d586751c7dc3b5dbb') # optimization OK From voroskoi at frugalware.org Thu Jan 15 07:01:36 2009 From: voroskoi at frugalware.org (András VöröskÅ‘i) Date: Thu Jan 15 07:01:37 2009 Subject: [Frugalware-git] frugalware-current: e16-0.16.8.15-1-i686 Message-ID: <20090115060136.7FF5411B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=11a79c23faf9c58f715bd6c73fa3b1a987d47765 commit 11a79c23faf9c58f715bd6c73fa3b1a987d47765 Author: András VöröskÅ‘i Date: Thu Jan 15 07:01:07 2009 +0100 e16-0.16.8.15-1-i686 version bump diff --git a/source/x11-extra/e16/FrugalBuild b/source/x11-extra/e16/FrugalBuild index fbfdeab..f99f219 100644 --- a/source/x11-extra/e16/FrugalBuild +++ b/source/x11-extra/e16/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: voroskoi pkgname=e16 -pkgver=0.16.8.14 +pkgver=0.16.8.15 pkgrel=1 pkgdesc="A fast, flexible, and very extensible Window Manager" pkgdesc_localized=('hu_HU Egy gyors, rugalmas, könnyen kiterjeszthetõ ablakkezelõ.') @@ -24,7 +24,7 @@ build() { Fexe /etc/X11/xinit/xinitrc.$pkgname Frm /usr/etc } -sha1sums=('b8e04d8f14875773baa69a44d2d057cdb2e6971c' \ +sha1sums=('4bcd91edde5b9ab2486af0814de8d3592f669d70' \ '776d5b787b57a08d6ae41780532365c8e211645f' \ '1c1356fd99c4e29b85379ad52103f8b161378e65') From voroskoi at frugalware.org Thu Jan 15 07:07:37 2009 From: voroskoi at frugalware.org (András VöröskÅ‘i) Date: Thu Jan 15 07:07:38 2009 Subject: [Frugalware-git] frugalware-current: rtorrent-0.8.4-1-x86_64 Message-ID: <20090115060737.5ECA611B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e20d7f7aab1552deddfafa35dd06dba108f7132f commit e20d7f7aab1552deddfafa35dd06dba108f7132f Author: András VöröskÅ‘i Date: Thu Jan 15 07:07:09 2009 +0100 rtorrent-0.8.4-1-x86_64 version bump gcc-4.3.patch removed diff --git a/source/network-extra/rtorrent/FrugalBuild b/source/network-extra/rtorrent/FrugalBuild index 2608d76..8cdf40f 100644 --- a/source/network-extra/rtorrent/FrugalBuild +++ b/source/network-extra/rtorrent/FrugalBuild @@ -2,19 +2,17 @@ # Maintainer: voroskoi pkgname=rtorrent -pkgver=0.7.9 -pkgrel=2 +pkgver=0.8.4 +pkgrel=1 pkgdesc="The ncurses client for libtorrent." url="http://libtorrent.rakshasa.no/" -depends=('ncurses' 'libtorrent>=0.11.9' 'xmlrpc-c>=1.11.00' 'c-ares>=1.5') +depends=('ncurses' 'libtorrent>=0.12.4' 'xmlrpc-c>=1.11.00' 'c-ares>=1.6') groups=('network-extra') archs=('i686' 'x86_64') Fconfopts="$Fconfopts --with-xmlrpc-c" up2date="lynx -dump $url |grep rtorrent.*.tar |sed -ne 's/.*t-\(.*\).t.*/\1/;1p'" -source=(http://libtorrent.rakshasa.no/downloads/rtorrent-$pkgver.tar.gz curl_segfault_dirty_hack.diff \ - gcc-4.3.patch) -sha1sums=('0b53bd3b2c15f93352607ab3685916fe27033450' \ - '583dadf10d30956ec796ec9f3c2c4d5dfff64c79' \ - 'eeb8e7624a02b2fef2084ad64e668948428132ab') +source=(http://libtorrent.rakshasa.no/downloads/rtorrent-$pkgver.tar.gz curl_segfault_dirty_hack.diff) +sha1sums=('83a7c0dbeb46bb074ae075d9faf5d05f0df17571' \ + '583dadf10d30956ec796ec9f3c2c4d5dfff64c79') # optimization OK diff --git a/source/network-extra/rtorrent/gcc-4.3.patch b/source/network-extra/rtorrent/gcc-4.3.patch deleted file mode 100644 index dadf328..0000000 --- a/source/network-extra/rtorrent/gcc-4.3.patch +++ /dev/null @@ -1,83 +0,0 @@ -diff -Naur rtorrent-0.7.9.orig/rak/functional.h rtorrent-0.7.9/rak/functional.h ---- rtorrent-0.7.9.orig/rak/functional.h 2007-07-19 22:23:09.000000000 +0100 -+++ rtorrent-0.7.9/rak/functional.h 2008-04-11 20:32:13.000000000 +0100 -@@ -37,6 +37,8 @@ - #ifndef RAK_FUNCTIONAL_H - #define RAK_FUNCTIONAL_H - -+#include -+ - #include - - namespace rak { -diff -Naur rtorrent-0.7.9.orig/src/command_ui.cc rtorrent-0.7.9/src/command_ui.cc ---- rtorrent-0.7.9.orig/src/command_ui.cc 2007-10-19 18:20:56.000000000 +0100 -+++ rtorrent-0.7.9/src/command_ui.cc 2008-04-11 20:33:26.000000000 +0100 -@@ -36,6 +36,8 @@ - - #include "config.h" - -+#include -+ - #include - #include - #include -diff -Naur rtorrent-0.7.9.orig/src/display/text_element_value.cc rtorrent-0.7.9/src/display/text_element_value.cc ---- rtorrent-0.7.9.orig/src/display/text_element_value.cc 2007-08-28 14:09:34.000000000 +0100 -+++ rtorrent-0.7.9/src/display/text_element_value.cc 2008-04-11 20:25:53.000000000 +0100 -@@ -34,6 +34,8 @@ - // Skomakerveien 33 - // 3185 Skoppum, NORWAY - -+#include -+ - #include "config.h" - - #include "globals.h" -diff -Naur rtorrent-0.7.9.orig/src/display/window_file_list.cc rtorrent-0.7.9/src/display/window_file_list.cc ---- rtorrent-0.7.9.orig/src/display/window_file_list.cc 2007-07-19 22:23:11.000000000 +0100 -+++ rtorrent-0.7.9/src/display/window_file_list.cc 2008-04-11 20:28:45.000000000 +0100 -@@ -36,6 +36,8 @@ - - #include "config.h" - -+#include -+ - #include - #include - #include -diff -Naur rtorrent-0.7.9.orig/src/rpc/command_map.cc rtorrent-0.7.9/src/rpc/command_map.cc ---- rtorrent-0.7.9.orig/src/rpc/command_map.cc 2007-10-20 19:58:46.000000000 +0100 -+++ rtorrent-0.7.9/src/rpc/command_map.cc 2008-04-11 20:30:02.000000000 +0100 -@@ -36,6 +36,8 @@ - - #include "config.h" - -+#include -+ - #include - #include - #include -diff -Naur rtorrent-0.7.9.orig/src/rpc/exec_file.cc rtorrent-0.7.9/src/rpc/exec_file.cc ---- rtorrent-0.7.9.orig/src/rpc/exec_file.cc 2007-08-11 19:59:23.000000000 +0100 -+++ rtorrent-0.7.9/src/rpc/exec_file.cc 2008-04-11 20:30:26.000000000 +0100 -@@ -36,7 +36,7 @@ - - #include "config.h" - --#include -+#include - #include - #include - #include -diff -Naur rtorrent-0.7.9.orig/src/rpc/parse.cc rtorrent-0.7.9/src/rpc/parse.cc ---- rtorrent-0.7.9.orig/src/rpc/parse.cc 2007-08-20 02:21:03.000000000 +0100 -+++ rtorrent-0.7.9/src/rpc/parse.cc 2008-04-11 20:30:42.000000000 +0100 -@@ -37,6 +37,7 @@ - #include "config.h" - - #include -+#include - #include - #include - From voroskoi at frugalware.org Thu Jan 15 07:09:13 2009 From: voroskoi at frugalware.org (András VöröskÅ‘i) Date: Thu Jan 15 07:09:15 2009 Subject: [Frugalware-git] frugalware-current: r8169-6.009.00-1-i686 Message-ID: <20090115060913.6799411B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f496305d0cdb304314b93525efd293aaa682eefc commit f496305d0cdb304314b93525efd293aaa682eefc Author: András VöröskÅ‘i Date: Thu Jan 15 07:08:52 2009 +0100 r8169-6.009.00-1-i686 version bump diff --git a/source/network-extra/r8169/FrugalBuild b/source/network-extra/r8169/FrugalBuild index aa0cd64..16f80c2 100644 --- a/source/network-extra/r8169/FrugalBuild +++ b/source/network-extra/r8169/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: voroskoi pkgname=r8169 -pkgver=6.008.00 -pkgrel=4 +pkgver=6.009.00 +pkgrel=1 Finclude sourceforge kernel-module pkgdesc="Realtek driver for RTL8169/8110 cards." url="http://www.realtek.com.tw" @@ -12,7 +12,7 @@ archs=('i686' 'x86_64') up2date="Flasttar ftp://202.65.194.211/cn/nic/" source=(ftp://202.65.194.211/cn/nic/${pkgname}-${pkgver}.tar.bz2 README.Frugalware \ 0001-NET-Nuke-SET_MODULE_OWNER-macro.patch) -sha1sums=('ccccbdb08ae184f761e061abb9269a5e8ac4e84c' \ +sha1sums=('f963f742ac0dc4a3e6d461bc40b86dd83f09b280' \ '21b9e951b8470946d0af2ce1a0527c1d0153dc3f' \ 'f965b8f6c3169027cf342110c8744b2cb1aed673') From voroskoi at frugalware.org Thu Jan 15 07:12:59 2009 From: voroskoi at frugalware.org (András VöröskÅ‘i) Date: Thu Jan 15 07:13:01 2009 Subject: [Frugalware-git] frugalware-current: cups-1.3.9-1-x86_64 Message-ID: <20090115061259.7A47611B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=107760bd5de1b0c8ec78d4d7905f2183ed18fa43 commit 107760bd5de1b0c8ec78d4d7905f2183ed18fa43 Author: András VöröskÅ‘i Date: Thu Jan 15 07:12:45 2009 +0100 cups-1.3.9-1-x86_64 up2date fix diff --git a/source/apps/cups/FrugalBuild b/source/apps/cups/FrugalBuild index 949d1af..c66a7c1 100644 --- a/source/apps/cups/FrugalBuild +++ b/source/apps/cups/FrugalBuild @@ -12,7 +12,7 @@ rodepends=('libcups') groups=('apps') archs=('i686' 'x86_64' 'ppc') backup=(etc/cups/{printers.conf,classes.conf,client.conf,cupsd.conf,mime.types,mime.convs}) -up2date="lynx -dump $url |grep Stable |sed -e 's/.*v\(.*\)/\1/'" +up2date="lynx -dump http://www.cups.org/ |grep v[0-9] |sed -ne 's/.*v\(.*\) .*/\1/;1p'" source=(ftp://ftp.easysw.com/pub/cups/$pkgver/cups-$pkgver-source.tar.bz2 \ rc.cups rc.cups-{hu,de}.po) From voroskoi at frugalware.org Thu Jan 15 07:16:17 2009 From: voroskoi at frugalware.org (András VöröskÅ‘i) Date: Thu Jan 15 07:16:19 2009 Subject: [Frugalware-git] frugalware-current: ghostscript-8.63-1-x86_64 Message-ID: <20090115061617.83F3F11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=65bac2794cecf0fe4b3a912dc735fa74d3e940cb commit 65bac2794cecf0fe4b3a912dc735fa74d3e940cb Author: András VöröskÅ‘i Date: Thu Jan 15 07:16:07 2009 +0100 ghostscript-8.63-1-x86_64 up2date fix diff --git a/source/apps/ghostscript/FrugalBuild b/source/apps/ghostscript/FrugalBuild index e847d22..381b6d3 100644 --- a/source/apps/ghostscript/FrugalBuild +++ b/source/apps/ghostscript/FrugalBuild @@ -13,7 +13,7 @@ archs=('i686' 'x86_64' 'ppc') license="GPLv2" Finclude sourceforge url="http://www.ghostscript.com/awki" -up2date="lynx -dump http://www.ghostscript.com/awki/Releases |grep latest |sed -ne 's/.*pt \(.*\) (.*/\1/;1p'" +up2date="lynx -dump http://ghostscript.com/releases |Flasttar" sha1sums=('58b648e0383d6167e5ea93b2dde033eceb366491') subpkgs=('xghostscript') From bouleetbil at frogdev.info Thu Jan 15 07:20:26 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Thu Jan 15 07:20:28 2009 Subject: [Frugalware-git] frugalware-current: telepathy-farsight-0.0.4-1-i686 Message-ID: <20090115062026.7562911B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b95cfee6207c83894f408a6a5b7753f73b4fd82b commit b95cfee6207c83894f408a6a5b7753f73b4fd82b Author: bouleetbil Date: Thu Jan 15 07:14:16 2009 +0100 telepathy-farsight-0.0.4-1-i686 *version bump diff --git a/source/xlib-extra/telepathy-farsight/FrugalBuild b/source/xlib-extra/telepathy-farsight/FrugalBuild index 9249872..a50ffe7 100644 --- a/source/xlib-extra/telepathy-farsight/FrugalBuild +++ b/source/xlib-extra/telepathy-farsight/FrugalBuild @@ -2,15 +2,15 @@ # Maintainer: bouleetbil pkgname=telepathy-farsight -pkgver=0.0.3 +pkgver=0.0.4 pkgrel=1 pkgdesc="A farsight plugin for Telepathy" url="http://telepathy.freedesktop.org/wiki/" -depends=('libtelepathy>=0.3.3' 'farsight2>=0.0.4-1' 'telepathy-glib>=0.7.18-1') +depends=('libtelepathy>=0.3.3' 'farsight2>=0.0.4-1' 'telepathy-glib>=0.7.22-1') groups=('xlib-extra') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump http://telepathy.freedesktop.org/releases/$pkgname/ | Flasttar" source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) -sha1sums=('aeb178893d921a41d8b87ae6dd481af6afde3d9b') +sha1sums=('bdaa6834cc0e41d95b998a107e1215f5847bd149') # optimization OK From boobaa at frugalware.org Thu Jan 15 07:40:25 2009 From: boobaa at frugalware.org (CSÉCSY László) Date: Thu Jan 15 07:40:27 2009 Subject: [Frugalware-git] frugalware-current: drupal-5.15-1-i686 Message-ID: <20090115064025.A5BE111B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=90dfb4127451f0841d34a40e0acef82aa9a8a7ef commit 90dfb4127451f0841d34a40e0acef82aa9a8a7ef Author: CSÉCSY László Date: Thu Jan 15 07:40:01 2009 +0100 drupal-5.15-1-i686 version bump closes #3571 in -current diff --git a/source/network-extra/drupal/FrugalBuild b/source/network-extra/drupal/FrugalBuild index 848fada..45d726a 100644 --- a/source/network-extra/drupal/FrugalBuild +++ b/source/network-extra/drupal/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: AlexExtreme pkgname=drupal -pkgver=5.14 +pkgver=5.15 pkgrel=1 pkgdesc="An advanced content management system to manage your website" url="http://drupal.org" @@ -15,7 +15,7 @@ up2date="lynx -dump http://drupal.org/project/Drupal+project | grep -m1 'l-5[0-9 backup=(var/www/drupal/sites/default/settings.php) source=(http://drupal.org/files/projects/drupal-$pkgver.tar.gz \ drupalsetup README.Frugalware) -sha1sums=('bc1089626ac01165f2b3df0ac3cc521e740b328a' \ +sha1sums=('ecf67f38e85a6f01102f4dae18f1b2d221f1acba' \ 'c56deef0edee4cea4b9391d20358eb7e2faf0005' \ '64c0eadd7a2e00b11644458a4eeea8e3203fa739') options=('stick') From boobaa at frugalware.org Thu Jan 15 07:42:32 2009 From: boobaa at frugalware.org (CSÉCSY László) Date: Thu Jan 15 07:42:34 2009 Subject: [Frugalware-git] frugalware-current: drupal6-6.9-1-i686 Message-ID: <20090115064232.AE47511B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6d2eb63243f1bfaea46bc89663a675702269ee72 commit 6d2eb63243f1bfaea46bc89663a675702269ee72 Author: CSÉCSY László Date: Thu Jan 15 07:42:08 2009 +0100 drupal6-6.9-1-i686 version bump closes #3572 in -current diff --git a/source/network-extra/drupal6/FrugalBuild b/source/network-extra/drupal6/FrugalBuild index ab047af..b45dd5f 100644 --- a/source/network-extra/drupal6/FrugalBuild +++ b/source/network-extra/drupal6/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: CSÉCSY László pkgname=drupal6 -pkgver=6.8 +pkgver=6.9 pkgrel=1 pkgdesc="An open source content management platform" url="http://drupal.org" @@ -13,7 +13,7 @@ up2date="lynx -dump http://drupal.org/project/Drupal+project | grep -m1 'l-6[0-9 backup=(var/www/drupal6/sites/default/settings.php) source=(http://drupal.org/files/projects/drupal-$pkgver.tar.gz \ README.Frugalware) -sha1sums=('d736ef18f1c2fd06217e31f6af3ea3745299f7fd' \ +sha1sums=('d9eb531bcb2a4d500dc9e989b0afe702653d7e84' \ '3e301be2f8a247c86b5f32e68773c9618322e7d7') options=('stick') From boobaa at frugalware.org Thu Jan 15 07:45:13 2009 From: boobaa at frugalware.org (CSÉCSY László) Date: Thu Jan 15 07:45:14 2009 Subject: [Frugalware-git] frugalware-0.9: drupal-5.15-1solaria1-i686 Message-ID: <20090115064513.D893E11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.9.git;a=commitdiff;h=069838f22b3958afe74c43226e9a8af9981758ec commit 069838f22b3958afe74c43226e9a8af9981758ec Author: CSÉCSY László Date: Thu Jan 15 07:44:35 2009 +0100 drupal-5.15-1solaria1-i686 secfix verbump, closes #3571 in -stable backport of 90dfb41 diff --git a/source/network-extra/drupal/FrugalBuild b/source/network-extra/drupal/FrugalBuild index 7a441f1..8e48fa4 100644 --- a/source/network-extra/drupal/FrugalBuild +++ b/source/network-extra/drupal/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: AlexExtreme pkgname=drupal -pkgver=5.13 +pkgver=5.15 pkgrel=1solaria1 pkgdesc="An advanced content management system to manage your website" url="http://drupal.org" @@ -15,7 +15,7 @@ up2date="lynx -dump http://drupal.org/project/Drupal+project | grep -m1 'l-5[0-9 backup=(var/www/drupal/sites/default/settings.php) source=(http://drupal.org/files/projects/drupal-$pkgver.tar.gz \ drupalsetup README.Frugalware) -sha1sums=('06fc9907f15ef9eec933bdf7974ea52c71ddd982' \ +sha1sums=('ecf67f38e85a6f01102f4dae18f1b2d221f1acba' \ 'c56deef0edee4cea4b9391d20358eb7e2faf0005' \ '64c0eadd7a2e00b11644458a4eeea8e3203fa739') options=('stick') From boobaa at frugalware.org Thu Jan 15 07:47:18 2009 From: boobaa at frugalware.org (CSÉCSY László) Date: Thu Jan 15 07:47:19 2009 Subject: [Frugalware-git] frugalware-0.9: drupal6-6.9-1solaria1-i686 Message-ID: <20090115064718.7F2CA11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.9.git;a=commitdiff;h=684cdfc1f17cc1e8eb815403a3baba5d7aa5efaf commit 684cdfc1f17cc1e8eb815403a3baba5d7aa5efaf Author: CSÉCSY László Date: Thu Jan 15 07:46:42 2009 +0100 drupal6-6.9-1solaria1-i686 secfix verbump, closes #3572 in -stable backport of 6d2eb63 diff --git a/source/network-extra/drupal6/FrugalBuild b/source/network-extra/drupal6/FrugalBuild index 05d7bb7..3570cf7 100644 --- a/source/network-extra/drupal6/FrugalBuild +++ b/source/network-extra/drupal6/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: CSÉCSY László pkgname=drupal6 -pkgver=6.7 +pkgver=6.9 pkgrel=1solaria1 pkgdesc="An open source content management platform" url="http://drupal.org" @@ -13,7 +13,7 @@ up2date="lynx -dump http://drupal.org/project/Drupal+project | grep -m1 'l-6[0-9 backup=(var/www/drupal6/sites/default/settings.php) source=(http://drupal.org/files/projects/drupal-$pkgver.tar.gz \ README.Frugalware) -sha1sums=('1a1f9955878b794bbf201e2f8544f00c74121c3c' \ +sha1sums=('d9eb531bcb2a4d500dc9e989b0afe702653d7e84' \ '3e301be2f8a247c86b5f32e68773c9618322e7d7') options=('stick') From voroskoi at frugalware.org Thu Jan 15 07:48:41 2009 From: voroskoi at frugalware.org (András VöröskÅ‘i) Date: Thu Jan 15 07:48:43 2009 Subject: [Frugalware-git] frugalware-current: smb4k-0.9.9-1-i686 Message-ID: <20090115064841.C3A4211B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0777f40d154a28d7ceb6baf0d2869f3f00270dea commit 0777f40d154a28d7ceb6baf0d2869f3f00270dea Author: András VöröskÅ‘i Date: Thu Jan 15 07:43:30 2009 +0100 smb4k-0.9.9-1-i686 version bump diff --git a/source/kde-extra/smb4k/FrugalBuild b/source/kde-extra/smb4k/FrugalBuild index 1852677..f40f003 100644 --- a/source/kde-extra/smb4k/FrugalBuild +++ b/source/kde-extra/smb4k/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: voroskoi pkgname=smb4k -pkgver=0.9.8 +pkgver=0.9.9 pkgrel=1 pkgdesc="Smb4K is a SMB/CIFS share browser for KDE." _F_berlios_ext=".tar.bz2" @@ -13,6 +13,6 @@ depends=('kdebase') rodepends=('samba-client') groups=('kde-extra' 'kde-apps') archs=('i686' 'x86_64') -sha1sums=('96d571655f30945bebc26d6af2b264274b685c93') +sha1sums=('b13e72b6c8d01684bc842a08ae796343b795823f') # optimization OK From voroskoi at frugalware.org Thu Jan 15 08:00:42 2009 From: voroskoi at frugalware.org (András VöröskÅ‘i) Date: Thu Jan 15 08:00:43 2009 Subject: [Frugalware-git] frugalware-current: gutenprint-5.2.3-1-i686 Message-ID: <20090115070042.91F9A11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=106588a21123398b662f1fd118dd3099c9adbd6e commit 106588a21123398b662f1fd118dd3099c9adbd6e Author: András VöröskÅ‘i Date: Thu Jan 15 07:56:26 2009 +0100 gutenprint-5.2.3-1-i686 version bump diff --git a/source/apps-extra/gutenprint/FrugalBuild b/source/apps-extra/gutenprint/FrugalBuild index 4d94713..08a8f4b 100644 --- a/source/apps-extra/gutenprint/FrugalBuild +++ b/source/apps-extra/gutenprint/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: voroskoi pkgname=gutenprint -pkgver=5.2.2 +pkgver=5.2.3 pkgrel=1 pkgdesc="IJS printer driver for Ghostscript and CUPS" depends=('cups>=1.1.15' 'readline') @@ -19,7 +19,7 @@ _F_sourceforge_dirname="gimp-print" _F_sourceforge_ext=".tar.bz2" options=('scriptlet') Finclude sourceforge -sha1sums=('0efaadf2db4c67ecb66e79f5405315975dd1d11b') +sha1sums=('e4ddb21665578835d58267d59b57d8d970c3ee86') Fconfopts="$Fconfopts --enable-debug \ --enable-escputil \ --with-foomatic3 \ From priyank at frugalware.org Thu Jan 15 08:00:57 2009 From: priyank at frugalware.org (Priyank) Date: Thu Jan 15 08:00:58 2009 Subject: [Frugalware-git] xfce46: xfce4.sh: changed version to 4.5.93 Message-ID: <20090115070057.7D58511B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfce46.git;a=commitdiff;h=50d26985f8057c8552cef500b48519ac04d19e2d commit 50d26985f8057c8552cef500b48519ac04d19e2d Author: Priyank Date: Thu Jan 15 12:30:49 2009 +0530 xfce4.sh: changed version to 4.5.93 diff --git a/source/include/xfce4.sh b/source/include/xfce4.sh index f9ebbbb..91876d0 100644 --- a/source/include/xfce4.sh +++ b/source/include/xfce4.sh @@ -63,7 +63,7 @@ if echo ${groups[*]} | grep -q goodies ; then else url="http://www.xfce.org/" preup2date="lynx -dump http://www.xfce.org/archive/ | grep xfce- | tail -n1 | sed 's/.*-\(.*\)\/.*/\1/'" - dlurl="$url/archive/xfce-4.5.92/src" + dlurl="$url/archive/xfce-4.5.93/src" up2date="lynx -dump $url/archive/xfce-\$($preup2date)/src/ | Flasttar" source=($dlurl/$_F_xfce_name-$pkgver.tar.bz2) fi From priyank at frugalware.org Thu Jan 15 08:02:11 2009 From: priyank at frugalware.org (Priyank) Date: Thu Jan 15 08:02:13 2009 Subject: [Frugalware-git] xfce46: xfce4-dev-tools-4.5.93-1-i686 Message-ID: <20090115070211.C211811B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfce46.git;a=commitdiff;h=ca664f8428ab651676ff7847e6534bc4f60ba6b6 commit ca664f8428ab651676ff7847e6534bc4f60ba6b6 Author: Priyank Date: Thu Jan 15 12:31:08 2009 +0530 xfce4-dev-tools-4.5.93-1-i686 * Version bump diff --git a/source/xfce4/xfce4-dev-tools/FrugalBuild b/source/xfce4/xfce4-dev-tools/FrugalBuild index 61fe024..deda6bb 100644 --- a/source/xfce4/xfce4-dev-tools/FrugalBuild +++ b/source/xfce4/xfce4-dev-tools/FrugalBuild @@ -2,13 +2,13 @@ # Maintainer: Priyank Gosalia pkgname=xfce4-dev-tools -pkgver=4.5.92 +pkgver=4.5.93 pkgrel=1 pkgdesc="Xfce4 developer tools." depends=('intltool') groups=('xfce4' 'xfce4-core') archs=('i686' 'x86_64') Finclude xfce4 -sha1sums=('c37bc3090a7d8e6a0c1809b8658870931557135b') +sha1sums=('25ff523fe849778ca98296ac825c109dfdfa1de2') # optimization OK From priyank at frugalware.org Thu Jan 15 08:06:11 2009 From: priyank at frugalware.org (Priyank) Date: Thu Jan 15 08:06:12 2009 Subject: [Frugalware-git] xfce46: libxfce4util-4.5.93-1-i686 Message-ID: <20090115070611.DD49A11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfce46.git;a=commitdiff;h=295ce497d0e81b3087e7b2ae4996f50b8a058d92 commit 295ce497d0e81b3087e7b2ae4996f50b8a058d92 Author: Priyank Date: Thu Jan 15 12:35:22 2009 +0530 libxfce4util-4.5.93-1-i686 * Version bump diff --git a/source/xfce4/libxfce4util/FrugalBuild b/source/xfce4/libxfce4util/FrugalBuild index 8cf476c..b18f443 100644 --- a/source/xfce4/libxfce4util/FrugalBuild +++ b/source/xfce4/libxfce4util/FrugalBuild @@ -1,14 +1,14 @@ -# Compiling Time: 0.11 SBU +# Compiling Time: 0.06 SBU # Maintainer: Priyank Gosalia pkgname=libxfce4util -pkgver=4.5.92 +pkgver=4.5.93 pkgrel=1 pkgdesc="Basic utility non-GUI functions for Xfce4." -depends=('glib2>=2.18.1') +depends=('glib2>=2.18.4') groups=('xfce4' 'xfce4-core') archs=('i686' 'x86_64') Finclude xfce4 -sha1sums=('333865f93cdadc2523edd53879277e74ab3337f1') +sha1sums=('3aecb1b829905e9c15c688c7b9b76d80e2146b06') # optimization OK From priyank at frugalware.org Thu Jan 15 08:10:19 2009 From: priyank at frugalware.org (Priyank) Date: Thu Jan 15 08:10:22 2009 Subject: [Frugalware-git] xfce46: xfconf-4.5.93-1-i686 Message-ID: <20090115071019.90E8311B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfce46.git;a=commitdiff;h=a1541a38b30ce2ea1e941cb95bbb8a66007e63ce commit a1541a38b30ce2ea1e941cb95bbb8a66007e63ce Author: Priyank Date: Thu Jan 15 12:39:03 2009 +0530 xfconf-4.5.93-1-i686 * Version bump diff --git a/source/xfce4/xfconf/FrugalBuild b/source/xfce4/xfconf/FrugalBuild index f88b7d4..866ea4b 100644 --- a/source/xfce4/xfconf/FrugalBuild +++ b/source/xfce4/xfconf/FrugalBuild @@ -2,16 +2,15 @@ # Maintainer: Priyank Gosalia pkgname=xfconf -pkgver=4.5.92 +pkgver=4.5.93 pkgrel=1 pkgdesc="Xfce4 Configuration library and tools" -depends=('libxfce4util>=4.5.92' 'dbus' 'dbus-glib>=0.76' 'gtk+2>=2.14.4') +depends=('libxfce4util>=4.5.93' 'dbus' 'dbus-glib>=0.76' 'gtk+2>=2.14.7') groups=('xfce4' 'xfce4-core') conflicts=('libxfce4mcs') replaces=('libxfce4mcs') archs=('i686' 'x86_64') Finclude xfce4 -sha1sums=('7ecd517526c9b7d1c5c92f1d471eef4d1f35929b') - +sha1sums=('cf9fecc313294575223eb4a80a77a278642234f0') # optimization OK From priyank at frugalware.org Thu Jan 15 08:24:34 2009 From: priyank at frugalware.org (Priyank) Date: Thu Jan 15 08:24:35 2009 Subject: [Frugalware-git] xfce46: libxfcegui4-4.5.93-1-i686 Message-ID: <20090115072434.82E8E11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfce46.git;a=commitdiff;h=ba7e29a05e94aeddd8426af885c7b752fbbb5464 commit ba7e29a05e94aeddd8426af885c7b752fbbb5464 Author: Priyank Date: Thu Jan 15 12:45:02 2009 +0530 libxfcegui4-4.5.93-1-i686 * Version bump diff --git a/source/xfce4/libxfcegui4/FrugalBuild b/source/xfce4/libxfcegui4/FrugalBuild index 1d8c22c..c86f650 100644 --- a/source/xfce4/libxfcegui4/FrugalBuild +++ b/source/xfce4/libxfcegui4/FrugalBuild @@ -2,18 +2,18 @@ # Maintainer: Priyank Gosalia pkgname=libxfcegui4 -pkgver=4.5.92 +pkgver=4.5.93 pkgrel=1 pkgdesc="Various GTK+ widgets for Xfce4." -depends=('gtk+2>=2.14.4' 'libxfce4util>=4.5.92' 'hicolor-icon-theme' \ - 'libglade' 'startup-notification' 'librsvg' 'xfconf>=4.5.92') -makedepends=('gtk-doc') +depends=('gtk+2>=2.14.7' 'libxfce4util>=4.5.93' 'hicolor-icon-theme' \ + 'libglade' 'startup-notification' 'librsvg' 'xfconf>=4.5.93') +makedepends=('gtk-doc' 'intltool') groups=('xfce4' 'xfce4-core') archs=('i686' 'x86_64') _F_gnome_iconcache=y Finclude xfce4 gnome-scriptlet options=('scriptlet' 'genscriptlet') Fconfopts="$Fconfopts --enable-xinerama --enable-gtk-doc" -sha1sums=('c423f2c8fe09595926b5b4e24feed635a89e2433') +sha1sums=('1dc67a0c865c673d26054d3c9bfd5844c7331ee8') # optimization OK From priyank at frugalware.org Thu Jan 15 08:29:56 2009 From: priyank at frugalware.org (Priyank) Date: Thu Jan 15 08:29:57 2009 Subject: [Frugalware-git] xfce46: libxfce4menu-4.5.93-1-i686 Message-ID: <20090115072956.08DFF11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfce46.git;a=commitdiff;h=ac883b93a85c3397226661d834a9bb6279e380e1 commit ac883b93a85c3397226661d834a9bb6279e380e1 Author: Priyank Date: Thu Jan 15 12:58:32 2009 +0530 libxfce4menu-4.5.93-1-i686 * Version bump diff --git a/source/xfce4/libxfce4menu/FrugalBuild b/source/xfce4/libxfce4menu/FrugalBuild index dfaeb56..5bae37e 100644 --- a/source/xfce4/libxfce4menu/FrugalBuild +++ b/source/xfce4/libxfce4menu/FrugalBuild @@ -2,13 +2,14 @@ # Maintainer: Priyank Gosalia pkgname=libxfce4menu -pkgver=4.5.92 +pkgver=4.5.93 pkgrel=1 pkgdesc="Xfce4 menu library" -depends=('glib2>=2.18.1' 'gtk+2>=2.14.4' 'libxfce4util>=4.5.92') +makedepends=('intltool') +depends=('glib2>=2.18.1' 'gtk+2>=2.14.7' 'libxfce4util>=4.5.93') groups=('xfce4' 'xfce4-core') archs=('i686' 'x86_64') Finclude xfce4 -sha1sums=('df810e883842d73f833afe13d8f2a5b7967ae17d') +sha1sums=('86b546b1ce619fff6bb3ba7c1716f4128a6cc175') # optimization OK From boobaa at frugalware.org Thu Jan 15 08:34:35 2009 From: boobaa at frugalware.org (CSÉCSY László) Date: Thu Jan 15 08:34:37 2009 Subject: [Frugalware-git] frugalware-current: drupal-i18n-5.x_2.5-1-i686 Message-ID: <20090115073435.6040311B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e8914ed9c90d7fd8856862da7d9b7eb1db9e4fcb commit e8914ed9c90d7fd8856862da7d9b7eb1db9e4fcb Author: CSÉCSY László Date: Thu Jan 15 08:34:18 2009 +0100 drupal-i18n-5.x_2.5-1-i686 version bump closes #3573 in -current diff --git a/source/network-extra/drupal-i18n/FrugalBuild b/source/network-extra/drupal-i18n/FrugalBuild index a140fc2..e667a72 100644 --- a/source/network-extra/drupal-i18n/FrugalBuild +++ b/source/network-extra/drupal-i18n/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: CSÉCSY László _F_drupal_module=i18n -pkgver=5.x_2.4 +pkgver=5.x_2.5 pkgrel=1 pkgdesc="A collection of modules to add multi-lingual capabilities to Drupal" Finclude drupal -sha1sums=('45ed4f59754ba2455f3d718bf2bb90accbc569c5') +sha1sums=('741e4c73e6c290ca245041a2033f443ccd99650b') From priyank at frugalware.org Thu Jan 15 08:36:44 2009 From: priyank at frugalware.org (Priyank) Date: Thu Jan 15 08:36:46 2009 Subject: [Frugalware-git] xfce46: libexo-0.3.93-1-i686 Message-ID: <20090115073644.AD22611B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfce46.git;a=commitdiff;h=ba3dbccd2ee5f3401497d67e80849acf3a496e3b commit ba3dbccd2ee5f3401497d67e80849acf3a496e3b Author: Priyank Date: Thu Jan 15 13:04:40 2009 +0530 libexo-0.3.93-1-i686 * Version bump diff --git a/source/xfce4/libexo/FrugalBuild b/source/xfce4/libexo/FrugalBuild index e58b0e0..70fb36e 100644 --- a/source/xfce4/libexo/FrugalBuild +++ b/source/xfce4/libexo/FrugalBuild @@ -4,10 +4,10 @@ pkgname=libexo _F_xfce_name=exo _F_archive_name=exo -pkgver=0.3.92 +pkgver=0.3.93 pkgrel=1 pkgdesc="Extension library to Xfce4." -depends=('libxfce4util>=4.5.92' 'perl-uri' 'libnotify' 'hal>=0.5.11') +depends=('libxfce4util>=4.5.93' 'perl-uri' 'libnotify' 'hal>=0.5.11') makedepends=('intltool') groups=('xfce4' 'xfce4-core') archs=('i686' 'x86_64') @@ -16,6 +16,6 @@ Finclude xfce4 gnome-scriptlet options=('genscriptlet') _F_cd_path="$_F_xfce_name-$pkgver" Fconfopts="${Fconfopts[@]} --enable-hal --enable-notifications" -sha1sums=('61a7090f175157bbc4817903c7cae52a20ec3a70') +sha1sums=('85395be64d267d48b39496c48ff651a65a365efc') # optimization OK From boobaa at frugalware.org Thu Jan 15 08:36:51 2009 From: boobaa at frugalware.org (CSÉCSY László) Date: Thu Jan 15 08:36:52 2009 Subject: [Frugalware-git] frugalware-0.9: drupal-i18n-5.x_2.5-1solaria1-i686 Message-ID: <20090115073651.2B22D11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-0.9.git;a=commitdiff;h=d980bd597460e609e3691f1af864616b5d0c9399 commit d980bd597460e609e3691f1af864616b5d0c9399 Author: CSÉCSY László Date: Thu Jan 15 08:36:14 2009 +0100 drupal-i18n-5.x_2.5-1solaria1-i686 secfix verbump, closes #3573 in -stable backport of e8914ed diff --git a/source/network-extra/drupal-i18n/FrugalBuild b/source/network-extra/drupal-i18n/FrugalBuild index a140fc2..2e563fc 100644 --- a/source/network-extra/drupal-i18n/FrugalBuild +++ b/source/network-extra/drupal-i18n/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: CSÉCSY László _F_drupal_module=i18n -pkgver=5.x_2.4 -pkgrel=1 +pkgver=5.x_2.5 +pkgrel=1solaria1 pkgdesc="A collection of modules to add multi-lingual capabilities to Drupal" Finclude drupal -sha1sums=('45ed4f59754ba2455f3d718bf2bb90accbc569c5') +sha1sums=('741e4c73e6c290ca245041a2033f443ccd99650b') From priyank at frugalware.org Thu Jan 15 08:43:23 2009 From: priyank at frugalware.org (Priyank) Date: Thu Jan 15 08:43:25 2009 Subject: [Frugalware-git] xfce46: xfce4-panel-4.5.93-1-i686 Message-ID: <20090115074323.A345211B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfce46.git;a=commitdiff;h=cae23b2c7bad4c2587443d36211955a05be90923 commit cae23b2c7bad4c2587443d36211955a05be90923 Author: Priyank Date: Thu Jan 15 13:11:47 2009 +0530 xfce4-panel-4.5.93-1-i686 * Version bump diff --git a/source/xfce4/xfce4-panel/FrugalBuild b/source/xfce4/xfce4-panel/FrugalBuild index 1bbd562..d9d6125 100644 --- a/source/xfce4/xfce4-panel/FrugalBuild +++ b/source/xfce4/xfce4-panel/FrugalBuild @@ -2,18 +2,18 @@ # Maintainer: Priyank Gosalia pkgname=xfce4-panel -pkgver=4.5.92 +pkgver=4.5.93 pkgrel=1 pkgdesc="Panel for the Xfce4 desktop environment." -makedepends=('perl-xml-parser') -depends=('pango' 'atk' 'libxml2' 'libxfcegui4>=4.5.92' 'libxfce4util>=4.5.92' \ - 'startup-notification' 'libwnck' 'libexo>=0.3.92') +makedepends=('perl-xml-parser' 'intltool') +depends=('pango' 'atk' 'libxml2' 'libxfcegui4>=4.5.93' 'libxfce4util>=4.5.93' \ + 'startup-notification' 'libwnck' 'libexo>=0.3.93') groups=('xfce4' 'xfce4-core') conflicts=('xfce4-showdesktop-plugin' 'xfce4-taskbar-plugin' 'xfce4-windowlist-plugin' 'xfce4-iconbox' 'xfce4-systray') replaces=('xfce4-showdesktop-plugin' 'xfce4-taskbar-plugin' 'xfce4-windowlist-plugin' 'xfce4-iconbox' 'xfce4-systray') archs=('i686' 'x86_64') _F_gnome_iconcache=y Finclude xfce4 gnome-scriptlet -sha1sums=('dcc2aa83bb832ee1091152aae245672393ac4be6') +sha1sums=('eca59c281cb7cebd307ea4f77c705ff2085b80d3') # optimization OK From boobaa at frugalware.org Thu Jan 15 10:28:23 2009 From: boobaa at frugalware.org (CSÉCSY László) Date: Thu Jan 15 10:28:24 2009 Subject: [Frugalware-git] frugalware-current: drupal6-image-6.x_1.0_alpha4-1-i686 Message-ID: <20090115092823.24D6B11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c9ac73cbc52deb042824417254d4acbcc08c7e39 commit c9ac73cbc52deb042824417254d4acbcc08c7e39 Author: CSÉCSY László Date: Thu Jan 15 10:27:55 2009 +0100 drupal6-image-6.x_1.0_alpha4-1-i686 version bump diff --git a/source/network-extra/drupal6-image/FrugalBuild b/source/network-extra/drupal6-image/FrugalBuild index b7d527c..ab9dab9 100644 --- a/source/network-extra/drupal6-image/FrugalBuild +++ b/source/network-extra/drupal6-image/FrugalBuild @@ -3,8 +3,8 @@ _F_drupal_module=image _F_drupal_ver=6.x -pkgver=6.x_1.0_alpha2 +pkgver=6.x_1.0_alpha4 pkgrel=1 pkgdesc="Allows users with proper permissions to upload images into Drupal" Finclude drupal -sha1sums=('91d92f90c4f293ba3bf654d79e8e09ceb911ab32') +sha1sums=('31e45bd2f8ad0056253a31eb23828686b725ca0b') From devil505linux at gmail.com Thu Jan 15 18:36:09 2009 From: devil505linux at gmail.com (Devil505) Date: Thu Jan 15 18:36:11 2009 Subject: [Frugalware-git] frugalware-current: clutter-0.8.6-1-i686 Message-ID: <20090115173609.8E1C611B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1d217bb01489ec39fa08a7294cbf4704209662c8 commit 1d217bb01489ec39fa08a7294cbf4704209662c8 Author: Devil505 Date: Thu Jan 15 18:35:52 2009 +0100 clutter-0.8.6-1-i686 * version bump diff --git a/source/xlib-extra/clutter/FrugalBuild b/source/xlib-extra/clutter/FrugalBuild index e619fc5..578b31f 100644 --- a/source/xlib-extra/clutter/FrugalBuild +++ b/source/xlib-extra/clutter/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Devil505 pkgname=clutter -pkgver=0.8.4 +pkgver=0.8.6 pkgrel=1 pkgdesc="A GObject based library for creating fast, visually rich graphical user interfaces." url="http://www.clutter-project.org" @@ -12,6 +12,6 @@ groups=('xlib-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url/sources/LATEST | Flasttar" source=($url/sources/$pkgname/0.8/$pkgname-$pkgver.tar.bz2) -sha1sums=('5b9a347766b39b52564c5ad034bb51c5ab348dfe') +sha1sums=('7af885dc7fea7fb7c2083ac27827a5d9d56dd7e3') # optimization OK From devil505linux at gmail.com Thu Jan 15 18:41:28 2009 From: devil505linux at gmail.com (Devil505) Date: Thu Jan 15 18:41:30 2009 Subject: [Frugalware-git] frugalware-current: xmltv-0.5.54-1-i686 Message-ID: <20090115174128.848CE11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=80dc33d01229c83f68f37b4af6b9e73ac62dacec commit 80dc33d01229c83f68f37b4af6b9e73ac62dacec Author: Devil505 Date: Thu Jan 15 18:39:29 2009 +0100 xmltv-0.5.54-1-i686 * version bump diff --git a/source/apps-extra/xmltv/FrugalBuild b/source/apps-extra/xmltv/FrugalBuild index 1a5162b..9512563 100644 --- a/source/apps-extra/xmltv/FrugalBuild +++ b/source/apps-extra/xmltv/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: AlexExtreme pkgname=xmltv -pkgver=0.5.53 +pkgver=0.5.54 pkgrel=1 pkgdesc="XMLTV is a set of programs to process TV (tvguide) listings and manage your TV viewing" _F_sourceforge_ext=".tar.bz2" @@ -14,7 +14,7 @@ depends=('perl-xml-parser' 'perl-xml-twig' 'perl-libwww' 'perl-archive-zip' \ 'perl-xml-writer' 'perl-unicode-string') groups=('apps-extra') archs=('i686' 'x86_64') -sha1sums=('873bf8bd067f61c02417ae31c60842314521246e') +sha1sums=('68e3f0cf7e283543da15d5fe386bdb9f1446711e') build() { Fcd From vmiklos at frugalware.org Thu Jan 15 18:57:22 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Jan 15 18:57:23 2009 Subject: [Frugalware-git] frugalware-current: encfs-1.4.2-2-i686 Message-ID: <20090115175722.2CB1D11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=51bda89f1099e2d79d6bc26bb77beff38e92f746 commit 51bda89f1099e2d79d6bc26bb77beff38e92f746 Author: Miklos Vajna Date: Thu Jan 15 18:57:00 2009 +0100 encfs-1.4.2-2-i686 - rebuild with boost>=1.37.0 - closes #3575 diff --git a/source/apps-extra/encfs/FrugalBuild b/source/apps-extra/encfs/FrugalBuild index a9a9224..ce1f507 100644 --- a/source/apps-extra/encfs/FrugalBuild +++ b/source/apps-extra/encfs/FrugalBuild @@ -3,11 +3,11 @@ pkgname=encfs pkgver=1.4.2 -pkgrel=1 +pkgrel=2 pkgdesc="EncFS provides an encrypted filesystem in user-space." url="http://arg0.net/encfs" -depends=('fuse' 'openssl' 'rlog' 'libboost-mt') -makedepends=('boost') +depends=('fuse' 'openssl' 'rlog' 'libboost-mt>=1.37.0') +makedepends=('boost>=1.37.0') groups=('apps-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://arg0.net/encfs#download|grep -m1 '.tgz'|sed 's/.*fs-\(.*\).t.*/\1/;s/-/_/'" From priyank at frugalware.org Thu Jan 15 20:18:50 2009 From: priyank at frugalware.org (Priyank) Date: Thu Jan 15 20:18:51 2009 Subject: [Frugalware-git] xfce46: thunar-0.9.93-1-i686 Message-ID: <20090115191850.93CE911B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfce46.git;a=commitdiff;h=74e2dd6b41e34bec53ea516e4799f546f65f542d commit 74e2dd6b41e34bec53ea516e4799f546f65f542d Author: Priyank Date: Fri Jan 16 00:42:55 2009 +0530 thunar-0.9.93-1-i686 * Version bump diff --git a/source/xfce4/thunar/FrugalBuild b/source/xfce4/thunar/FrugalBuild index 30969a6..01115fd 100644 --- a/source/xfce4/thunar/FrugalBuild +++ b/source/xfce4/thunar/FrugalBuild @@ -4,13 +4,13 @@ pkgname=thunar _F_xfce_name=Thunar _F_archive_name=Thunar -pkgver=0.9.92 +pkgver=0.9.93 pkgrel=1 pkgdesc="Thunar is a modern file manager for Xfce4." -makedepends=('xfce4-dev-tools>=4.5.91' 'intltool') -depends=('libexo>=0.3.92' 'gtk+2>=2.14.4' 'gamin' 'libxfce4util>=4.5.92' \ +makedepends=('xfce4-dev-tools>=4.5.93' 'intltool') +depends=('libexo>=0.3.93' 'gtk+2>=2.14.7' 'gamin' 'libxfce4util>=4.5.93' \ 'hicolor-icon-theme' 'hal>=0.5.11' 'dbus-glib>=0.76' \ - 'libexif' 'xfce4-panel>=4.5.92' 'glib2>=2.18.1') + 'libexif' 'xfce4-panel>=4.5.93' 'glib2>=2.18.1') groups=('xfce4' 'xfce4-core') conflicts=('xffm') replaces=('xffm') @@ -19,6 +19,6 @@ _F_gnome_iconcache=y Finclude xfce4 gnome-scriptlet _F_cd_path="$_F_xfce_name-$pkgver" Fconfopts="$Fconfopts --enable-cairo --disable-debug --disable-gnome-thumbnailers" -sha1sums=('593abe4d4425fbc8faa6c7257f6f893d7ad92c77') +sha1sums=('b136e5371dcec7616c5a270cf822d526d5fd77f1') # optimization OK From priyank at frugalware.org Thu Jan 15 20:31:22 2009 From: priyank at frugalware.org (Priyank) Date: Thu Jan 15 20:31:24 2009 Subject: [Frugalware-git] gservice: gray-out inactive services to distinguish them from active ones Message-ID: <20090115193122.F351E11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gservice.git;a=commitdiff;h=c41d2030e29f7d434efdac400a08660db3cee22f commit c41d2030e29f7d434efdac400a08660db3cee22f Author: Priyank Date: Fri Jan 16 01:01:13 2009 +0530 gray-out inactive services to distinguish them from active ones diff --git a/src/gservice-backend.c b/src/gservice-backend.c index 3b0a0f7..fbe0fa8 100644 --- a/src/gservice-backend.c +++ b/src/gservice-backend.c @@ -250,14 +250,6 @@ gsvc_service_get_list (void) entry->description = gsvc_get_service_description (entry->name); gsvc_service_get_runlevel_info (entry); entry->enabled = FALSE; - /* - if (strcmp(entry->name,"single")) - { - if (gsvc_get_service_status (entry->name) == GSVC_ON) - entry->running = TRUE; - else - entry->running = FALSE; - }*/ /* search this service in the list of active services */ /* if found, set it's enabled bit */ tlist = alist; diff --git a/src/gservice-interface.c b/src/gservice-interface.c index 01eacdb..2d0fea3 100644 --- a/src/gservice-interface.c +++ b/src/gservice-interface.c @@ -67,6 +67,30 @@ gservice_get_icon (const char *icon, int size) return ret; } +/* This function renders the cells representing inactive services in grey */ +/* while the active ones are rendered in usual colors */ +void +gservice_cell_data_func (GtkTreeViewColumn *col, GtkCellRenderer *cell, + GtkTreeModel *model, GtkTreeIter *iter, + gpointer data) +{ + gboolean val = FALSE; + GdkColor color; + + gtk_tree_model_get (model, iter, 11, &val, -1); + if (!val) + { + gdk_color_parse ("gray", &color); + g_object_set (G_OBJECT(cell), "foreground-gdk", &color, NULL); + } + else + { + g_object_set (G_OBJECT(cell), "foreground-gdk", NULL, NULL); + } + + return; +} + static void gservice_setup_treeview (void) { @@ -75,7 +99,7 @@ gservice_setup_treeview (void) GtkTreeSelection *selection = NULL; GtkTreeViewColumn *column = NULL; - store = gtk_list_store_new (11, + store = gtk_list_store_new (12, GDK_TYPE_PIXBUF, /* status icon */ G_TYPE_STRING, /* service name & description */ G_TYPE_INT, /* runlevel 0 */ @@ -86,7 +110,8 @@ gservice_setup_treeview (void) G_TYPE_INT, /* runlevel 5 */ G_TYPE_INT, /* runlevel 6 */ G_TYPE_BOOLEAN, /* status */ - G_TYPE_STRING); /* service name for internal use */ + G_TYPE_STRING, /* service name for internal use */ + G_TYPE_BOOLEAN); /* activation status for internal use */ renderer = gtk_cell_renderer_pixbuf_new (); column = gtk_tree_view_column_new_with_attributes (_("Status"), @@ -109,6 +134,9 @@ gservice_setup_treeview (void) gtk_tree_view_column_set_expand (column, FALSE); gtk_tree_view_column_set_min_width (column, 30); gtk_tree_view_column_set_expand (column, TRUE); + gtk_tree_view_column_set_cell_data_func (column, renderer, + (GtkTreeCellDataFunc)gservice_cell_data_func, + NULL, NULL); gtk_tree_view_append_column (GTK_TREE_VIEW(gsvc_treeview_services), column); renderer = gtk_cell_renderer_toggle_new (); @@ -241,7 +269,7 @@ gservice_populate_services (void) char *desc = NULL; char *namedesc = NULL; desc = gsvc_glist_to_string (e->description); - namedesc = g_markup_printf_escaped ("%s\n%s", e->name, desc); + namedesc = g_markup_printf_escaped ("%s\n%s", e->name, desc); gtk_list_store_append (GTK_LIST_STORE(store), &iter); gtk_list_store_set (store, &iter, 1, (char*)namedesc, @@ -253,6 +281,7 @@ gservice_populate_services (void) 7, e->runlevel[5], 8, e->runlevel[6], 10, (char*)e->name, + 11, (e->enabled)?TRUE:FALSE, -1); //gtk_list_store_append (store, &iter); if (e->enabled) @@ -309,7 +338,7 @@ gservice_adjust_service_buttons_from_status (int status) break; } } - + return; } From priyank at frugalware.org Thu Jan 15 20:41:58 2009 From: priyank at frugalware.org (Priyank) Date: Thu Jan 15 20:41:59 2009 Subject: [Frugalware-git] xfce46: xfdesktop-4.5.93-1-i686 Message-ID: <20090115194158.5E82211B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfce46.git;a=commitdiff;h=4882d674a5e80c5e8b481cc8127d12f33de309d6 commit 4882d674a5e80c5e8b481cc8127d12f33de309d6 Author: Priyank Date: Fri Jan 16 01:09:06 2009 +0530 xfdesktop-4.5.93-1-i686 * Version bump diff --git a/source/xfce4/xfdesktop/FrugalBuild b/source/xfce4/xfdesktop/FrugalBuild index 577103e..af9d6a4 100644 --- a/source/xfce4/xfdesktop/FrugalBuild +++ b/source/xfce4/xfdesktop/FrugalBuild @@ -2,19 +2,19 @@ # Maintainer: Priyank Gosalia pkgname=xfdesktop -pkgver=4.5.92 +pkgver=4.5.93 pkgrel=1 pkgdesc="A desktop manager for Xfce4." -depends=('libxml2' 'libxfcegui4>=4.5.92' 'xfconf>=4.5.92' \ - 'dbus' 'thunar>=0.9.92' 'libexo>=0.3.92' 'libglade' \ - 'libxfce4menu>=4.5.92' 'libwnck') -makedepends=('xfce4-panel>=4.5.92') +depends=('libxml2' 'libxfcegui4>=4.5.93' 'xfconf>=4.5.93' \ + 'dbus' 'thunar>=0.9.93' 'libexo>=0.3.93' 'libglade' \ + 'libxfce4menu>=4.5.93' 'libwnck') +makedepends=('xfce4-panel>=4.5.93' 'intltool') groups=('xfce4' 'xfce4-core') archs=('i686' 'x86_64') _F_gnome_iconcache=y Finclude xfce4 gnome-scriptlet source=(${source[@]} xfce4-fw.png) -sha1sums=('733617ac126669526cc7c89534203d34c17ee745' \ +sha1sums=('dd29a87e2a6877b24180328fb004cbfebf95495f' \ '5cc04b415cf32353333106fb200244765f86b844') build() From priyank at frugalware.org Thu Jan 15 20:47:02 2009 From: priyank at frugalware.org (Priyank) Date: Thu Jan 15 20:47:03 2009 Subject: [Frugalware-git] xfce46: xfce4-settings-4.5.93-1-i686 Message-ID: <20090115194702.35BB711B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfce46.git;a=commitdiff;h=395f997346181dea6d8f44acdb46093b3f13ae60 commit 395f997346181dea6d8f44acdb46093b3f13ae60 Author: Priyank Date: Fri Jan 16 01:16:05 2009 +0530 xfce4-settings-4.5.93-1-i686 * Version bump diff --git a/source/xfce4/xfce4-settings/FrugalBuild b/source/xfce4/xfce4-settings/FrugalBuild index 1f30188..9219c28 100644 --- a/source/xfce4/xfce4-settings/FrugalBuild +++ b/source/xfce4/xfce4-settings/FrugalBuild @@ -2,12 +2,12 @@ # Maintainer: Priyank Gosalia pkgname=xfce4-settings -pkgver=4.5.92 -pkgrel=3 +pkgver=4.5.93 +pkgrel=1 pkgdesc="Xfce4 Settings Frontend" makedepends=('intltool') -depends=('libxfcegui4>=4.5.92' 'libxfce4util>=4.5.92' 'libexo>=0.3.92' \ - 'libglade' 'xfconf>=4.5.92' 'dbus-glib>=0.76' 'libxi' 'libxrandr' \ +depends=('libxfcegui4>=4.5.93' 'libxfce4util>=4.5.93' 'libexo>=0.3.93' \ + 'libglade' 'xfconf>=4.5.93' 'dbus-glib>=0.76' 'libxi' 'libxrandr' \ 'libxcursor' 'libnotify>=0.4.4' 'libwnck' 'libxklavier>=3.6') groups=('xfce4' 'xfce4-core') conflicts=('xfce-mcs-manager' 'xfce-mcs-plugins') @@ -15,7 +15,7 @@ replaces=('xfce-mcs-manager' 'xfce-mcs-plugins') archs=('i686' 'x86_64') Finclude xfce4 source=(${source[@]} ${pkgname}_frugalware.patch) -sha1sums=('3197160edb6c390e11dae0a1cebd1207e6ff6a74' \ +sha1sums=('5dba062675d89de24de5daf77f51c4bb1e19ec34' \ 'ca270db0583778d8a1f74ecec83fc3fbc46f7988') # optimization OK From priyank at frugalware.org Thu Jan 15 20:51:39 2009 From: priyank at frugalware.org (Priyank) Date: Thu Jan 15 20:51:40 2009 Subject: [Frugalware-git] gservice: gservice_service_get_status(): return GSVC_OFF for service "mount" Message-ID: <20090115195139.938FD11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gservice.git;a=commitdiff;h=f83292fdc287aa653fe3c70b426bb718ef6796ac commit f83292fdc287aa653fe3c70b426bb718ef6796ac Author: Priyank Date: Fri Jan 16 01:21:12 2009 +0530 gservice_service_get_status(): return GSVC_OFF for service "mount" * minor code cleanup * made gservice_cell_data_func() static diff --git a/src/gservice-backend.c b/src/gservice-backend.c index fbe0fa8..539fa4b 100644 --- a/src/gservice-backend.c +++ b/src/gservice-backend.c @@ -393,6 +393,11 @@ gsvc_service_get_status (const char *name) { return GSVC_OFF; } + else + if (!strcmp(name,"mount")) + { + return GSVC_OFF; + } cmd = g_strdup_printf ("service %s status", name); g_print ("%s\n", cmd); status = system (cmd); diff --git a/src/gservice-interface.c b/src/gservice-interface.c index 2d0fea3..40083ac 100644 --- a/src/gservice-interface.c +++ b/src/gservice-interface.c @@ -69,7 +69,7 @@ gservice_get_icon (const char *icon, int size) /* This function renders the cells representing inactive services in grey */ /* while the active ones are rendered in usual colors */ -void +static void gservice_cell_data_func (GtkTreeViewColumn *col, GtkCellRenderer *cell, GtkTreeModel *model, GtkTreeIter *iter, gpointer data) @@ -122,7 +122,6 @@ gservice_setup_treeview (void) gtk_tree_view_append_column (GTK_TREE_VIEW(gsvc_treeview_services), column); renderer = gtk_cell_renderer_text_new (); - //g_object_set (G_OBJECT(renderer), "size", 12000, "weight", PANGO_WEIGHT_BOLD, NULL); g_object_set (G_OBJECT(renderer), "wrap-mode", PANGO_WRAP_CHAR, NULL); g_object_set (G_OBJECT(renderer), "wrap-width", 300, NULL); gtk_cell_renderer_text_set_fixed_height_from_font (renderer, 5); @@ -213,18 +212,7 @@ gservice_setup_treeview (void) gtk_tree_view_set_model (GTK_TREE_VIEW(gsvc_treeview_services), GTK_TREE_MODEL(store)); selection = gtk_tree_view_get_selection (GTK_TREE_VIEW(gsvc_treeview_services)); g_signal_connect (selection, "changed", G_CALLBACK(cb_gsvc_service_selected), NULL); - /* - renderer = gtk_cell_renderer_text_new (); - g_object_set (G_OBJECT(renderer), "wrap-mode", PANGO_WRAP_WORD, "wrap-width", 250, NULL); - column = gtk_tree_view_column_new_with_attributes (_("Description"), - renderer, - "text", 9, - NULL); - gtk_tree_view_column_set_resizable (column, FALSE); - gtk_tree_view_column_set_expand (column, TRUE); - - gtk_tree_view_append_column (GTK_TREE_VIEW(gsvc_treeview_services), column); - */ + return; } From priyank at frugalware.org Thu Jan 15 20:55:39 2009 From: priyank at frugalware.org (Priyank) Date: Thu Jan 15 20:55:41 2009 Subject: [Frugalware-git] xfce46: xfwm4-4.5.93-1-i686 Message-ID: <20090115195539.AC9BE11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfce46.git;a=commitdiff;h=5f70207aa4901e8aa34a28a1171159010c47823b commit 5f70207aa4901e8aa34a28a1171159010c47823b Author: Priyank Date: Fri Jan 16 01:24:06 2009 +0530 xfwm4-4.5.93-1-i686 * Version bump diff --git a/source/xfce4/xfwm4/FrugalBuild b/source/xfce4/xfwm4/FrugalBuild index a0a4704..254c230 100644 --- a/source/xfce4/xfwm4/FrugalBuild +++ b/source/xfce4/xfwm4/FrugalBuild @@ -2,10 +2,11 @@ # Maintainer: Priyank Gosalia pkgname=xfwm4 -pkgver=4.5.92 +pkgver=4.5.93 pkgrel=1 pkgdesc="A window manager for Xfce4." -depends=('libxfcegui4>=4.5.92' 'libxfce4util>=4.5.92' 'xfconf>=4.5.92' \ +makedepends=('intltool') +depends=('libxfcegui4>=4.5.93' 'libxfce4util>=4.5.93' 'xfconf>=4.5.93' \ 'libxpm' 'libxext' 'libxfixes' 'libxdamage' 'libxcomposite' 'libpng' \ 'dbus-glib>=0.76' 'libwnck') groups=('xfce4' 'xfce4-core') @@ -13,6 +14,6 @@ archs=('i686' 'x86_64') _F_gnome_iconcache="y" Finclude xfce4 gnome-scriptlet Fconfopts="$Fconfopts --enable-compositor" -sha1sums=('cd9e03dc1ea43a4b585c4906c94a1f66f0338a14') +sha1sums=('21a63a20fd08de5afb962b483ecd41471c390bca') # optimization OK From priyank at frugalware.org Thu Jan 15 20:57:27 2009 From: priyank at frugalware.org (Priyank) Date: Thu Jan 15 20:57:28 2009 Subject: [Frugalware-git] xfce46: xfce-utils-4.5.93-1-i686 Message-ID: <20090115195727.147AB11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfce46.git;a=commitdiff;h=ced02bc851320f8abc733a105d532f5fc4e087e5 commit ced02bc851320f8abc733a105d532f5fc4e087e5 Author: Priyank Date: Fri Jan 16 01:26:33 2009 +0530 xfce-utils-4.5.93-1-i686 * Version bump diff --git a/source/xfce4/xfce-utils/FrugalBuild b/source/xfce4/xfce-utils/FrugalBuild index d93e19d..257e766 100644 --- a/source/xfce4/xfce-utils/FrugalBuild +++ b/source/xfce4/xfce-utils/FrugalBuild @@ -2,11 +2,11 @@ # Maintainer: Priyank Gosalia pkgname=xfce-utils -pkgver=4.5.92 +pkgver=4.5.93 pkgrel=1 pkgdesc="Utilities for Xfce4." -depends=('libxfcegui4>=4.5.92' 'libxfce4util>=4.5.92' 'dbus') -makedepends=('perl-xml') +depends=('libxfcegui4>=4.5.93' 'libxfce4util>=4.5.93' 'dbus') +makedepends=('perl-xml-parser' 'intltool') groups=('xfce4' 'xfce4-core') archs=('i686' 'x86_64') _F_gnome_desktop=y @@ -14,7 +14,7 @@ _F_gnome_iconcache=y Finclude xfce4 gnome-scriptlet options=('genscriptlet') Fconfopts="$Fconfopts --enable-dbus" -sha1sums=('44521a81d662458e6aaaabea2d7abb52d9f06613') +sha1sums=('0fca77266c9ea3bee0fef6b19cef82ed6aa63c17') build() { From priyank at frugalware.org Thu Jan 15 21:00:00 2009 From: priyank at frugalware.org (Priyank) Date: Thu Jan 15 21:00:02 2009 Subject: [Frugalware-git] xfce46: xfce4-mixer-4.5.93-1-i686 Message-ID: <20090115200000.4731911B8630@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfce46.git;a=commitdiff;h=4d40d10280cff743259c0125d2a935bc923ba05d commit 4d40d10280cff743259c0125d2a935bc923ba05d Author: Priyank Date: Fri Jan 16 01:29:11 2009 +0530 xfce4-mixer-4.5.93-1-i686 * Version bump diff --git a/source/xfce4/xfce4-mixer/FrugalBuild b/source/xfce4/xfce4-mixer/FrugalBuild index f6c8342..a2d1efe 100644 --- a/source/xfce4/xfce4-mixer/FrugalBuild +++ b/source/xfce4/xfce4-mixer/FrugalBuild @@ -2,17 +2,17 @@ # Maintainer: Priyank Gosalia pkgname=xfce4-mixer -pkgver=4.5.92 +pkgver=4.5.93 pkgrel=1 pkgdesc="The volume control plugin for the Xfce4 panel." -depends=('libxfcegui4>=4.5.92' 'libxfce4util>=4.5.92' 'xfce4-panel>=4.5.92' \ - 'xfconf>=4.5.92' 'gst-plugins-base>=0.10') -makedepends=('perl-xml-parser') +depends=('libxfcegui4>=4.5.93' 'libxfce4util>=4.5.93' 'xfce4-panel>=4.5.93' \ + 'xfconf>=4.5.93' 'gst-plugins-base>=0.10') +makedepends=('perl-xml-parser' 'intltool') groups=('xfce4' 'xfce4-core') archs=('i686' 'x86_64') _F_gnome_iconcache=y Finclude xfce4 gnome-scriptlet -sha1sums=('e87d8f43e641930faba3804504f8f50964721d6f') +sha1sums=('b0a6dbaf836ab94dc3f770013ff2bdd9d4916e73') unset MAKEFLAGS # optimization OK From priyank at frugalware.org Thu Jan 15 21:02:34 2009 From: priyank at frugalware.org (Priyank) Date: Thu Jan 15 21:02:36 2009 Subject: [Frugalware-git] xfce46: xfprint-4.5.93-1-i686 Message-ID: <20090115200234.EAFAD11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfce46.git;a=commitdiff;h=966b28ef7eb117121b2774a4dae375aef9d62e8e commit 966b28ef7eb117121b2774a4dae375aef9d62e8e Author: Priyank Date: Fri Jan 16 01:31:22 2009 +0530 xfprint-4.5.93-1-i686 * Version bump diff --git a/source/xfce4/xfprint/FrugalBuild b/source/xfce4/xfprint/FrugalBuild index dcd1a09..66137dd 100644 --- a/source/xfce4/xfprint/FrugalBuild +++ b/source/xfce4/xfprint/FrugalBuild @@ -2,16 +2,17 @@ # Maintainer: Priyank Gosalia pkgname=xfprint -pkgver=4.5.91 +pkgver=4.5.93 pkgrel=1 pkgdesc="A printer manager for Xfce4." url="http://www.xfce.org/" groups=('xfce4' 'xfce4-core') archs=('i686' 'x86_64') -depends=('libxfce4util>=4.5.91' 'libxfcegui4>=4.5.91' 'cups' 'xfconf>=4.5.91') +makedepends=('intltool') +depends=('libxfce4util>=4.5.93' 'libxfcegui4>=4.5.93' 'cups' 'xfconf>=4.5.93') _F_gnome_iconcache="y" Finclude xfce4 gnome-scriptlet Fconfopts="$Fconfopts --enable-cups" -sha1sums=('e7697540cda789ae20ca001e7683589c7ea8945f') +sha1sums=('ce8c05fd4e363ebf888478fa4b703c72534b091d') # optimization OK From priyank at frugalware.org Thu Jan 15 21:04:44 2009 From: priyank at frugalware.org (Priyank) Date: Thu Jan 15 21:04:45 2009 Subject: [Frugalware-git] xfce46: xfce4-appfinder-4.5.93-1-i686 Message-ID: <20090115200444.4357E11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfce46.git;a=commitdiff;h=a1ce6d3b245e8d22ef3c200bdeeb7c9b0be25bb8 commit a1ce6d3b245e8d22ef3c200bdeeb7c9b0be25bb8 Author: Priyank Date: Fri Jan 16 01:33:58 2009 +0530 xfce4-appfinder-4.5.93-1-i686 * Version bump diff --git a/source/xfce4/xfce4-appfinder/FrugalBuild b/source/xfce4/xfce4-appfinder/FrugalBuild index 430f49d..cc1f1cc 100644 --- a/source/xfce4/xfce4-appfinder/FrugalBuild +++ b/source/xfce4/xfce4-appfinder/FrugalBuild @@ -2,17 +2,17 @@ # Maintainer: Priyank Gosalia pkgname=xfce4-appfinder -pkgver=4.5.92 +pkgver=4.5.93 pkgrel=1 pkgdesc="Application finder for Xfce4" makedepends=('intltool') -depends=('libxfcegui4>=4.5.92' 'libxfce4menu>=4.5.92' 'xfconf>=4.5.92' \ - 'thunar>=0.9.92' 'gtk+2>=2.14.4') +depends=('libxfcegui4>=4.5.93' 'libxfce4menu>=4.5.93' 'xfconf>=4.5.93' \ + 'thunar>=0.9.93' 'gtk+2>=2.14.4') groups=('xfce4' 'xfce4-core') archs=('i686' 'x86_64') _F_gnome_iconcache=y Finclude xfce4 gnome-scriptlet -sha1sums=('92d6e635916fc4e44af45764eb1a507cad22aca7') +sha1sums=('2eb21fe75486552318741dd1d9e1df939e468f65') # optimization OK From priyank at frugalware.org Thu Jan 15 21:08:04 2009 From: priyank at frugalware.org (Priyank) Date: Thu Jan 15 21:08:05 2009 Subject: [Frugalware-git] xfce46: xfwm4-themes-4.5.93-1-i686 Message-ID: <20090115200804.2209D11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfce46.git;a=commitdiff;h=fc8a7bbacb9e1aea69613c6098049765ad4cd074 commit fc8a7bbacb9e1aea69613c6098049765ad4cd074 Author: Priyank Date: Fri Jan 16 01:37:01 2009 +0530 xfwm4-themes-4.5.93-1-i686 * Version bump diff --git a/source/xfce4/xfwm4-themes/FrugalBuild b/source/xfce4/xfwm4-themes/FrugalBuild index 7d50fdb..b3e0768 100644 --- a/source/xfce4/xfwm4-themes/FrugalBuild +++ b/source/xfce4/xfwm4-themes/FrugalBuild @@ -2,11 +2,11 @@ # Maintainer: Priyank Gosalia pkgname=xfwm4-themes -pkgver=4.5.91 +pkgver=4.5.93 pkgrel=1 pkgdesc="A set of additional themes for the Xfce4 window manager." -depends=('xfwm4>=4.5.91') +depends=('xfwm4>=4.5.93') groups=('xfce4' 'xfce4-core') archs=('i686' 'x86_64') Finclude xfce4 -sha1sums=('4b503e631e825a2ae1b2f7d3d4a67a51bc9ff18a') +sha1sums=('b880bb00b9165893aeba6897e81848418ab6501b') From priyank at frugalware.org Thu Jan 15 21:09:50 2009 From: priyank at frugalware.org (Priyank) Date: Thu Jan 15 21:09:51 2009 Subject: [Frugalware-git] xfce46: thunar-volman-0.3.80-3-i686 Message-ID: <20090115200950.2543111B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfce46.git;a=commitdiff;h=bf0cea47a217de08a5d3f52f38d5acc27c0cae6a commit bf0cea47a217de08a5d3f52f38d5acc27c0cae6a Author: Priyank Date: Fri Jan 16 01:39:01 2009 +0530 thunar-volman-0.3.80-3-i686 * Rebuild with thunar-0.9.93 diff --git a/source/xfce4/thunar-volman/FrugalBuild b/source/xfce4/thunar-volman/FrugalBuild index e978478..f08e988 100644 --- a/source/xfce4/thunar-volman/FrugalBuild +++ b/source/xfce4/thunar-volman/FrugalBuild @@ -3,14 +3,14 @@ pkgname=thunar-volman pkgver=0.3.80 -pkgrel=2 +pkgrel=3 pkgdesc="Automatic volume management of removable drives and media for Thunar." #_F_berlios_dirname="xfce-goodies" #_F_berlios_ext=".tar.bz2" _F_gnome_iconcache="y" #Finclude berlios url="http://foo-projects.org/~benny/projects/thunar-volman/index.html" -depends=('thunar>=0.9.92' 'hal>=0.5.11' 'libexo>=0.3.92' 'libnotify' 'dbus') +depends=('thunar>=0.9.93' 'hal>=0.5.11' 'libexo>=0.3.93' 'libnotify' 'dbus') makedepends=('pkgconfig' 'perl-xml-parser') groups=('xfce4' 'xfce4-core') archs=('i686' 'x86_64') From priyank at frugalware.org Thu Jan 15 21:12:14 2009 From: priyank at frugalware.org (Priyank) Date: Thu Jan 15 21:12:15 2009 Subject: [Frugalware-git] xfce46: gtk-xfce-engine-2.5.93-1-i686 Message-ID: <20090115201214.0E87511B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfce46.git;a=commitdiff;h=e20e3355c9a833aea0349cc206d7ad1c997ceb28 commit e20e3355c9a833aea0349cc206d7ad1c997ceb28 Author: Priyank Date: Fri Jan 16 01:41:22 2009 +0530 gtk-xfce-engine-2.5.93-1-i686 * Version bump diff --git a/source/xfce4/gtk-xfce-engine/FrugalBuild b/source/xfce4/gtk-xfce-engine/FrugalBuild index 2b1c71d..7ade0b5 100644 --- a/source/xfce4/gtk-xfce-engine/FrugalBuild +++ b/source/xfce4/gtk-xfce-engine/FrugalBuild @@ -2,13 +2,13 @@ # Maintainer: Priyank Gosalia pkgname=gtk-xfce-engine -pkgver=2.5.92 +pkgver=2.5.93 pkgrel=1 pkgdesc="A port of Xfce4 engine to GTK+2.0." -depends=('gtk+2>=2.14.4') +depends=('gtk+2>=2.14.7') groups=('xfce4' 'xfce4-core') archs=('i686' 'x86_64') Finclude xfce4 -sha1sums=('f403c3b0817ba46a953cf4aa725d1dea52e9b216') +sha1sums=('18b24613b8b8b84a3dbe938a4c66ce65a3925bcb') # optimization OK From priyank at frugalware.org Thu Jan 15 21:16:06 2009 From: priyank at frugalware.org (Priyank) Date: Thu Jan 15 21:16:08 2009 Subject: [Frugalware-git] xfce46: orage-4.5.93-1-i686 Message-ID: <20090115201606.2CEB211B8630@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfce46.git;a=commitdiff;h=f9375aaaa2c75ae35390228824f39ec3045204c0 commit f9375aaaa2c75ae35390228824f39ec3045204c0 Author: Priyank Date: Fri Jan 16 01:44:21 2009 +0530 orage-4.5.93-1-i686 * Version bump diff --git a/source/xfce4/orage/FrugalBuild b/source/xfce4/orage/FrugalBuild index 37f60c6..fa802c1 100644 --- a/source/xfce4/orage/FrugalBuild +++ b/source/xfce4/orage/FrugalBuild @@ -2,17 +2,18 @@ # Maintainer: Priyank Gosalia pkgname=orage -pkgver=4.5.91 +pkgver=4.5.93 pkgrel=1 pkgdesc="A Time-managing application for the Xfce Desktop Environment." -depends=('libxfcegui4>=4.5.91' 'xfce4-panel>=4.5.91') +makedepends=('intltool') +depends=('libxfcegui4>=4.5.93' 'xfce4-panel>=4.5.93') groups=('xfce4' 'xfce4-core') conflicts=('xfcalendar') replaces=('xfcalendar') archs=('i686' 'x86_64') _F_gnome_iconcache=y Finclude xfce4 gnome-scriptlet -sha1sums=('d04f0bafb35091697685076aab4dcbeb6b6f0288') +sha1sums=('8737766955bde0253954513658974bc38b4b706d') build() { From vmiklos at frugalware.org Thu Jan 15 21:16:43 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Jan 15 21:16:44 2009 Subject: [Frugalware-git] frugalware-current: clisp-2.47-1-i686 Message-ID: <20090115201643.BA31811B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4eacc6f4a83f52a9856be7d1d7ca3654ecdff9d7 commit 4eacc6f4a83f52a9856be7d1d7ca3654ecdff9d7 Author: Elentir Date: Wed Jan 14 22:25:32 2009 +0100 clisp-2.47-1-i686 * new package diff --git a/source/devel-extra/clisp/FrugalBuild b/source/devel-extra/clisp/FrugalBuild new file mode 100644 index 0000000..ef21cf9 --- /dev/null +++ b/source/devel-extra/clisp/FrugalBuild @@ -0,0 +1,27 @@ +# Compiling Time: 0.90 SBU +# Maintainer: Miklos Vajna +# Contributor: Elentir + +pkgname=clisp +pkgver=2.47 +pkgrel=1 +pkgdesc="GNU CLisp is an ANSI Common Lisp Implementation" +url="http://clisp.cons.org/" +source=("http://ftp.gnu.org/pub/gnu/clisp/latest/$pkgname-$pkgver.tar.bz2") +depends=('glibc' 'readline' 'gettext' 'libsigsegv' 'ffcall') +groups=('devel-extra') +archs=('i686') +up2date="Flasttar http://ftp.gnu.org/pub/gnu/clisp/latest/" +Fconfopts="--prefix=/usr --docdir=/usr/share/doc/$pkgname-$pkgver" +sha1sums=('63749bf07409cee134c195547e6d911554b619d6') + +build() { + Fcd + ./configure $Fconfopts || Fdie + cd src || Fdie + ./makemake --with-dynamic-ffi ${Fconfopts} > Makefile || Fdie + make || Fdie + Fmakeinstall +} + +# optimization OK From priyank at frugalware.org Thu Jan 15 21:17:21 2009 From: priyank at frugalware.org (Priyank) Date: Thu Jan 15 21:17:22 2009 Subject: [Frugalware-git] xfce46: ristretto-0.0.21-1-i686 Message-ID: <20090115201721.3C5D711B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfce46.git;a=commitdiff;h=e112d85994405c52a65af800707d87de06ecfbea commit e112d85994405c52a65af800707d87de06ecfbea Author: Priyank Date: Fri Jan 16 01:46:39 2009 +0530 ristretto-0.0.21-1-i686 * Version bump diff --git a/source/xfce4/ristretto/FrugalBuild b/source/xfce4/ristretto/FrugalBuild index d315d1b..4da8025 100644 --- a/source/xfce4/ristretto/FrugalBuild +++ b/source/xfce4/ristretto/FrugalBuild @@ -2,17 +2,17 @@ # Maintainer: Priyank Gosalia pkgname=ristretto -pkgver=0.0.20 +pkgver=0.0.21 pkgrel=1 pkgdesc="A fast and lightweight picture viewer for Xfce." makedepends=('intltool') -depends=('libxfce4util>=4.4.2' 'thunar') +depends=('libxfce4util>=4.5.93' 'thunar>=0.9.93') groups=('xfce4' 'xfce4-goodies') archs=('i686' 'x86_64') _F_gnome_iconcache="y" _F_xfce_goodies_ext=".tar.gz" Finclude xfce4 gnome-scriptlet url="http://goodies.xfce.org/projects/applications/ristretto" -sha1sums=('c8070c52641fa0a369f1b4221247154901583938') +sha1sums=('48ca0a262f1f962200e24a667434b36c0e015e92') # optimization OK From priyank at frugalware.org Thu Jan 15 21:25:02 2009 From: priyank at frugalware.org (Priyank) Date: Thu Jan 15 21:25:02 2009 Subject: [Frugalware-git] xfce46: xfce4-session-4.5.93-1-i686 Message-ID: <20090115202502.2435611B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfce46.git;a=commitdiff;h=d0471bc11610c6b4c851e05d5aaab111448050b7 commit d0471bc11610c6b4c851e05d5aaab111448050b7 Author: Priyank Date: Fri Jan 16 01:53:27 2009 +0530 xfce4-session-4.5.93-1-i686 * Version bump * Removed xfce4-session_hibernate_fix.diff (now in upstream) diff --git a/source/xfce4/xfce4-session/FrugalBuild b/source/xfce4/xfce4-session/FrugalBuild index deab258..0c08083 100644 --- a/source/xfce4/xfce4-session/FrugalBuild +++ b/source/xfce4/xfce4-session/FrugalBuild @@ -2,13 +2,13 @@ # Maintainer: Priyank Gosalia pkgname=xfce4-session -pkgver=4.5.92 -pkgrel=2 +pkgver=4.5.93 +pkgrel=1 pkgdesc="A session manager for Xfce4." url="http://www.xfce.org/" -depends=('libsm' 'libxfcegui4>=4.5.92' 'libxfce4util>=4.5.92' \ +depends=('libsm' 'libxfcegui4>=4.5.93' 'libxfce4util>=4.5.93' \ 'libwnck' 'xorg-server' 'libwnck' 'dbus' 'dbus-glib>=0.76' - 'xfconf>=4.5.92') + 'xfconf>=4.5.93') rodepends=('xsm' 'sessreg' 'xmessage' 'fortune-mod') makedepends=('perl-xml-parser' 'intltool') conflicts=('xfce4-toys') @@ -18,10 +18,9 @@ archs=('i686' 'x86_64') _F_gnome_iconcache="y" Finclude gnome-scriptlet Finclude xfce4 -source=(${source[@]} $pkgname-hibernate_fix.diff xfce4-session xfce4.desktop) +source=(${source[@]} xfce4-session xfce4.desktop) Fconfopts="$Fconfopts --with-shutdown-style=hal --with-x" -sha1sums=('e86b2affe1b2b88bb18c6dfeb0d410e85420789d' \ - '33d732f1ea075a067c168ad7b2718407f598eaa9' \ +sha1sums=('922ac2b38b593b20a6b4315e05aae92fc5f4c790' \ 'd99d32e3dfb82ace51fd0ca6699b57078ad350fd' \ 'b0ed29953027f8b61e63da0104099d0f1a81b04e') diff --git a/source/xfce4/xfce4-session/xfce4-session-hibernate_fix.diff b/source/xfce4/xfce4-session/xfce4-session-hibernate_fix.diff deleted file mode 100644 index a6d6269..0000000 --- a/source/xfce4/xfce4-session/xfce4-session-hibernate_fix.diff +++ /dev/null @@ -1,38 +0,0 @@ ---- xfce4-session-4.5.92/xfce4-session/xfsm-manager.c 2008-11-14 15:11:08.000000000 +0530 -+++ xfce4-session.new/xfce4-session/xfsm-manager.c 2008-11-30 23:53:37.000000000 +0530 -@@ -1,4 +1,4 @@ --/* $Id: xfsm-manager.c 28625 2008-11-06 09:40:43Z kelnos $ */ -+/* $Id: xfsm-manager.c 28938 2008-11-28 06:14:37Z kelnos $ */ - /*- - * Copyright (c) 2003-2006 Benedikt Meurer - * Copyright (c) 2008 Brian Tarricone -@@ -910,14 +910,13 @@ - xfsm_manager_start_client_save_timeout (manager, client); - } - -- if ((manager->failsafe_mode || previous_id != NULL) -- && manager->state == XFSM_MANAGER_STARTUP) -+ if (previous_id != NULL && manager->state == XFSM_MANAGER_STARTUP) - { -- /* Only continue the startup if we are either in Failsafe mode (which -- * means that we don't have any previous_id at all) or the previous_id -- * matched one of the starting_properties. If there was no match -- * above, previous_id will be NULL here. -- * See http://bugs.xfce.org/view_bug_page.php?f_id=212 for details. -+ /* Only continue the startup if the previous_id matched one of -+ * the starting_properties. If there was no match above, -+ * previous_id will be NULL here. We don't need to continue when -+ * in failsafe mode because in that case the failsafe session is -+ * started all at once. - */ - if (g_queue_peek_head (manager->starting_properties) == NULL) - xfsm_startup_session_continue (manager); -@@ -1105,7 +1104,7 @@ - manager->shutdown_type, - &error) - && (error->domain != DBUS_GERROR -- || error->code != DBUS_GERROR_TIMED_OUT))) -+ || error->code != DBUS_GERROR_NO_REPLY))) - { - xfce_message_dialog (NULL, _("Shutdown Failed"), - GTK_STOCK_DIALOG_ERROR, From vmiklos at frugalware.org Thu Jan 15 21:26:11 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Jan 15 21:26:13 2009 Subject: [Frugalware-git] setup: handle utf8 po files as input Message-ID: <20090115202611.ABB8511B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=setup.git;a=commitdiff;h=09b459f5604e5366c05bd39aa88f58f0ca015ec5 commit 09b459f5604e5366c05bd39aa88f58f0ca015ec5 Author: Miklos Vajna Date: Thu Jan 15 21:26:10 2009 +0100 handle utf8 po files as input diff --git a/Makefile b/Makefile index 89ef4e4..bcb0a13 100644 --- a/Makefile +++ b/Makefile @@ -61,7 +61,7 @@ export CCACHE_DIR=/var/cache/ccache/setup export CCACHE_NOLINK=1 export CCACHE_UMASK=002 DIALOG_LANGS = `find po -name *.po |sed 's/.*\/\(.*\).po/\1/' |tr '\n' ' '` -GLIBC_LANGS = en_US,ISO-8859-1 da_DK,ISO-8859-1 de_DE,ISO-8859-1 fr_FR,ISO-8859-1 hu_HU,ISO-8859-2 id_ID,ISO-8859-1 it_IT,ISO-8859-1 nl_NL,ISO-8859-1 pt_BR,ISO-8859-1 ro_RO,ISO-8859-2 sk_SK,ISO-8859-2 sv_SE,ISO-8859-1 cs_CZ,ISO-8859-2 +GLIBC_LANGS = en_US,ISO-8859-1 da_DK,ISO-8859-1 de_DE,ISO-8859-1 fr_FR,ISO-8859-1 hu_HU,ISO-8859-2 id_ID,ISO-8859-1 it_IT,ISO-8859-1 nl_NL,ISO-8859-1 pt_BR,ISO-8859-1 ro_RO,ISO-8859-2 sk_SK,ISO-8859-2 sv_SE,ISO-8859-1 cs_CZ,ISO-8859-2 es_ES,ISO-8859-1 ru_RU,ISO-8859-5 tr_TR,ISO-8859-9 ifeq ($(CARCH),x86_64) QEMU ?= qemu-system-x86_64 endif @@ -94,7 +94,7 @@ compile: check ccache $(packages) misc prepare: rm -rf config.mak - make -C po pos + make -C po pos GLIBC_LANGS="$(GLIBC_LANGS)" check_root: @if [ "`id -u`" != 0 ]; then \ diff --git a/po/Makefile b/po/Makefile index e466689..1e65d5b 100644 --- a/po/Makefile +++ b/po/Makefile @@ -7,15 +7,24 @@ pos: for i in $(LANGS); \ do \ cp $(PO_DIR)/setup/$$i/setup.po $$i.po; \ - if ! msgfmt -c --statistics -o $$i.gmo $$i.po; then \ - echo "WARNING: $$i.po will break your build!"; \ + charset=$$(echo $(GLIBC_LANGS)|sed 's/ /\n/g'|grep ^$$i|sed 's/.*,//'); \ + if [ -z "$$charset" ]; then \ + echo '$$charset empty for '$$i'!'; \ + exit 1; \ + fi; \ + iconv -f UTF-8 -t $$charset < $$i.po > $$i.new.po; \ + sed "s/UTF-8/$$charset/" $$i.new.po > $$i.po; \ + rm $$i.new.po; \ + if ! msgfmt -c --statistics -o /dev/null $$i.po; then \ + echo "$$i.po would break your build!"; \ + exit 1; \ fi; \ done mos: for i in $(wildcard *.po); do \ echo -n "$$i: "; \ - msgfmt -c --statistics -o ../merge/usr/share/locale/`basename $$i .po`/LC_MESSAGES/setup.mo $$i; \ + msgfmt -o ../merge/usr/share/locale/`basename $$i .po`/LC_MESSAGES/setup.mo $$i; \ done pot: intltool-extract From vmiklos at frugalware.org Thu Jan 15 22:33:39 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Jan 15 22:33:40 2009 Subject: [Frugalware-git] frugalware-current: python-gnutls-1.1.8-1-i686 Message-ID: <20090115213339.15C4C11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3f9b599f26d502e3db7ffcaf89fc1a2b2705f7f1 commit 3f9b599f26d502e3db7ffcaf89fc1a2b2705f7f1 Author: Miklos Vajna Date: Thu Jan 15 22:15:08 2009 +0100 python-gnutls-1.1.8-1-i686 - version bump - drop python26.patch, it's now in upstream diff --git a/source/devel-extra/python-gnutls/FrugalBuild b/source/devel-extra/python-gnutls/FrugalBuild index 76d879f..7b9fdf9 100644 --- a/source/devel-extra/python-gnutls/FrugalBuild +++ b/source/devel-extra/python-gnutls/FrugalBuild @@ -2,18 +2,16 @@ # Maintainer: Miklos Vajna pkgname=python-gnutls -pkgver=1.1.6 -pkgrel=3 +pkgver=1.1.8 +pkgrel=1 pkgdesc="Python wrapper for the GNUTLS library" url="http://pypi.python.org/pypi/$pkgname" -depends=('gnutls>=2.4.1' 'python-ctypes') +depends=('gnutls>=2.6.3' 'python-ctypes') groups=('devel-extra') archs=('i686' 'x86_64') up2date="Flasttar $url" -source=(http://pypi.python.org/packages/source/${pkgname:0:1}/$pkgname/$pkgname-$pkgver.tar.gz \ - python26.patch) -sha1sums=('37085e458f35129da999a0f5562167ce8bc2fc6a' \ - 'b5a3a4b3ee5c756abd0d4acbe38006961d20c6d8') +source=(http://pypi.python.org/packages/source/${pkgname:0:1}/$pkgname/$pkgname-$pkgver.tar.gz) +sha1sums=('599bba969380fadc719fb49a94e5efd95084637d') build() { diff --git a/source/devel-extra/python-gnutls/python26.patch b/source/devel-extra/python-gnutls/python26.patch deleted file mode 100644 index da991e7..0000000 --- a/source/devel-extra/python-gnutls/python26.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/gnutls/crypto.py b/gnutls/crypto.py -index 452c5f2..d330144 100644 ---- a/gnutls/crypto.py -+++ b/gnutls/crypto.py -@@ -42,7 +42,7 @@ class X509Name(str): - __metaclass__ = X509NameMeta - - def __init__(self, dname): -- str.__init__(self, dname) -+ str.__init__(self) - pairs = [x.replace('\,', ',') for x in re.split(r'(? Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5d123f0cfbfdd1913ced5b73af98a94a3618a839 commit 5d123f0cfbfdd1913ced5b73af98a94a3618a839 Author: Miklos Vajna Date: Thu Jan 15 22:16:54 2009 +0100 apcupsd-3.14.5-1-i686 - version bump diff --git a/source/apps-extra/apcupsd/FrugalBuild b/source/apps-extra/apcupsd/FrugalBuild index ab01950..7f8b4c5 100644 --- a/source/apps-extra/apcupsd/FrugalBuild +++ b/source/apps-extra/apcupsd/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Miklos Vajna pkgname=apcupsd -pkgver=3.14.4 +pkgver=3.14.5 pkgrel=1 pkgdesc="A daemon for controlling APC UPSes." Finclude sourceforge @@ -14,7 +14,7 @@ archs=('i686' 'x86_64') up2date="lynx -dump $url |grep Stable|sed 's/.*: \([0-9\.]*\) (.*/\1/;q'" source=($source rc.apcupsd rc.apcupsd-hu.po \ apcupsd.conf.off) -sha1sums=('2c0a57c9b8dbe58178c12e0a7bc974bdf928b29a' \ +sha1sums=('c28685a2ccd0565b4c5d9e972773b18a915562a9' \ '00bf37801558c4219499d48747b657bf60f38f73' \ 'cb0e3f02874078a7fbd38429f3f59a45b057b163' \ 'd561f5535022e22a6a22514b13a95cdcec61e881') From vmiklos at frugalware.org Thu Jan 15 22:33:39 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Jan 15 22:33:43 2009 Subject: [Frugalware-git] frugalware-current: btg-0.9.9-1-i686 Message-ID: <20090115213339.50EC711B8631@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a1e40263d6f507f767f88612f3311eba1473cda1 commit a1e40263d6f507f767f88612f3311eba1473cda1 Author: Miklos Vajna Date: Thu Jan 15 22:24:17 2009 +0100 btg-0.9.9-1-i686 - version bump - drop all patches, they are in upstream diff --git a/source/network-extra/btg/FrugalBuild b/source/network-extra/btg/FrugalBuild index 027b9b0..19b4634 100644 --- a/source/network-extra/btg/FrugalBuild +++ b/source/network-extra/btg/FrugalBuild @@ -2,21 +2,16 @@ # Maintainer: Miklos Vajna pkgname=btg -pkgver=0.9.8 +pkgver=0.9.9 pkgextraver= -pkgrel=3 +pkgrel=1 pkgdesc="Bittorrent client implemented in C++ and using the Rasterbar Libtorrent library." Finclude berlios depends=('libboost-mt>=1.37.0' 'libtorrent-rasterbar>=0.14.1' 'gnutls' 'dialog') makedepends=('boost>=1.37.0' 'asio') groups=('network-extra') archs=('i686' 'x86_64') -source=($source datetime.patch svn456.patch svn470.patch svn477.patch) -sha1sums=('07af091edf11a2fdaf95ef6f4242342ee7ca5468' \ - '282765938ac7db61098a9bc3eb4516e7f5f2dc66' \ - '97fa0273b35532aebf818b4d6b58e852139d6fb8' \ - '0f233fde35ca25ce6c3b31bad662bb5bb891b24f' \ - '58fbf06f512d2dc928d2fd581ab7cb49dc61d73a') +sha1sums=('5fab5e136abc597be78568bf3b25ce76a997a4e0') build() { diff --git a/source/network-extra/btg/datetime.patch b/source/network-extra/btg/datetime.patch deleted file mode 100644 index 87e1401..0000000 --- a/source/network-extra/btg/datetime.patch +++ /dev/null @@ -1,28 +0,0 @@ -libtool: link: g++ -march=i686 -mtune=generic -O2 -pipe -fno-strict-aliasing -DNDEBUG -I/usr/include -I/usr/include -DBTG_DEBUG=0 -DBTG_OPTION_SAVESESSIONS=1 -DBTG_OPTION_EVENTCALLBACK=1 -DBTG_OPTION_UPNP=1 -DBTG_OPTION_USECYBERLINK=0 -DBTG_REV=TRUNK -DBTG_INTERNAL_XMLRPC=1 -march=i686 -mtune=generic -O2 -pipe -fno-strict-aliasing -Wl,--hash-style=both -o .libs/btgpasswd btgpasswd-arg.o btgpasswd-btgpasswd.o btgpasswd-dconfig.o -L/usr/lib ../../bcore/.libs/libbtgcore.so /usr/lib/libtorrent-rasterbar.so -lssl -lcrypto -lboost_iostreams-mt /usr/lib/libgnutls.so -lz /usr/lib/libtasn1.so /usr/lib/libgcrypt.so /usr/lib/libgpg-error.so -lboost_program_options-mt -lboost_thread-mt -lboost_filesystem-mt -lboost_system-mt ./.libs/libauth.a ../../external/ini/.libs/libini.a /usr/lib/libstdc++.so -lm -pthread -Wl,-rpath -Wl,/usr/lib/btg -btgpasswd-btgpasswd.o: In function `std::basic_string, std::allocator > boost::posix_time::to_simple_string_type(boost::posix_time::ptime)': -btgpasswd.cpp:(.text._ZN5boost10posix_time21to_simple_string_typeIcEESbIT_St11char_traitsIS2_ESaIS2_EENS0_5ptimeE[std::basic_string, std::allocator > boost::posix_time::to_simple_string_type(boost::posix_time::ptime)]+0x39c): undefined reference to `boost::gregorian::greg_month::as_short_string() const' -collect2: ld returned 1 exit status -make[3]: *** [btgpasswd] Error 1 -make[3]: Leaving directory `/var/tmp/fst/src/btg-0.9.8/daemon/auth' -make[2]: *** [all-recursive] Error 1 -make[2]: Leaving directory `/var/tmp/fst/src/btg-0.9.8/daemon' -make[1]: *** [all-recursive] Error 1 -make[1]: Leaving directory `/var/tmp/fst/src/btg-0.9.8' -make: *** [all] Error 2 - -This should fix the above error. - -diff --git a/bcore/Makefile.am b/bcore/Makefile.am -index 17afeee..a3c6717 100644 ---- a/bcore/Makefile.am -+++ b/bcore/Makefile.am -@@ -131,7 +131,8 @@ urlstatus.cpp - - libbtgcore_la_LIBADD = @XMLRPC_LDFLAGS@ @LIBTORRENT_LIBS@ @BOOST_IOSTREAMS_LIB@ \ - @LIBGNUTLS_LIBS@ @BOOST_PROGRAM_OPTIONS_LIB@ \ --@BOOST_THREAD_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_SYSTEM_LIB@ -+@BOOST_THREAD_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_SYSTEM_LIB@ \ -+@BOOST_DATE_TIME_LIB@ - - if BUILDINTERNALXMLRPC - libbtgcore_la_LIBADD += $(top_builddir)/external/xmlrpc-epi/src/libxmlrpc.la diff --git a/source/network-extra/btg/svn456.patch b/source/network-extra/btg/svn456.patch deleted file mode 100644 index 0c56ecf..0000000 --- a/source/network-extra/btg/svn456.patch +++ /dev/null @@ -1,408 +0,0 @@ -Index: configure.in -=================================================================== ---- configure.in (revision 455) -+++ configure.in (revision 456) -@@ -7,7 +7,7 @@ - AC_INIT(bcore/project.h) - AC_CANONICAL_SYSTEM - --AM_INIT_AUTOMAKE(btg, 0.9.8) -+AM_INIT_AUTOMAKE(btg, 0.9.9) - - BTG_BUILD="$VER_CURRENT.$VER_REVISION" - AC_SUBST(BTG_BUILD) -Index: daemon/context.cpp -=================================================================== ---- daemon/context.cpp (revision 455) -+++ daemon/context.cpp (revision 456) -@@ -474,7 +474,7 @@ - // tempDir_ + projectDefaults::sPATH_SEPARATOR() + - std::string fileTrackFilename = _torrent_filename; - -- // Add torrent name to filetracker -+ // Add torrent name to filetracker. - if (!filetrack_->add(tempDir_, fileTrackFilename)) - { - status = Context::ERR_EXISTS; -@@ -488,8 +488,11 @@ - libtorrent::entry torrent_entry; - - // Prepend tempDir_ to filename. -- std::string targetPath = tempDir_ + projectDefaults::sPATH_SEPARATOR() + _torrent_filename; -+ std::string targetPath = tempDir_ + -+ projectDefaults::sPATH_SEPARATOR() + -+ _torrent_filename; - -+#if BTG_LT_0_12 || BTG_LT_0_13 - // Read the file: - try - { -@@ -503,10 +506,9 @@ - } - catch (std::exception& e) - { -- BTG_MNOTICE(logWrapper(), "libtorrent exception: " << e.what()); -+ - status = Context::ERR_LIBTORRENT; - } -- - if (status != Context::ERR_OK) - { - // remove it from filetrack -@@ -514,6 +516,10 @@ - BTG_MEXIT(logWrapper(), "add", status); - return status; - } -+#elif BTG_LT_0_14 -+ status = Context::ERR_OK; -+#endif -+ - #if BTG_LT_0_12 - libtorrent::torrent_info tinfo; - if (!entryToInfo(torrent_entry, tinfo)) -@@ -525,15 +531,17 @@ - bool gotInfo = true; - try - { -- tinfo.reset(new libtorrent::torrent_info(torrent_entry)); -+ boost::filesystem::path targetFilename(targetPath); -+ BTG_MNOTICE(logWrapper(), "Attempt to get info from '" << targetPath << "'"); -+ tinfo.reset(new libtorrent::torrent_info(targetFilename)); - } - catch (std::exception& e) - { -+ BTG_MNOTICE(logWrapper(), "libtorrent exception (torrent_info constructor): " << e.what()); - gotInfo = false; - } - - if (!gotInfo) -- // if (!entryToInfo(torrent_entry, tinfo)) - #endif - { - // Unable to convert the entry to a torrent info. -@@ -546,6 +554,7 @@ - } - - std::vector contained_files; -+#if BTG_LT_0_12 || BTG_LT_0_13 - if (!entryToFiles(torrent_entry, contained_files)) - { - filetrack_->remove(tempDir_, fileTrackFilename); -@@ -553,7 +562,15 @@ - BTG_MEXIT(logWrapper(), "add", status); - return status; - } -- -+#elif BTG_LT_0_14 -+ if (!torrentInfoToFiles(*tinfo, contained_files)) -+ { -+ filetrack_->remove(tempDir_, fileTrackFilename); -+ status = Context::ERR_LIBTORRENT; -+ BTG_MEXIT(logWrapper(), "add", status); -+ return status; -+ } -+#endif - btg_assert(contained_files.size() >= 1, - logWrapper(), - "entryToFiles must return at least one file"); -@@ -600,28 +617,45 @@ - std::string fastResumeFileName = tempDir_ + projectDefaults::sPATH_SEPARATOR() + _torrent_filename + fastResumeFileNameEnd; - std::ifstream in(fastResumeFileName.c_str(), std::ios_base::binary); - in.unsetf(std::ios_base::skipws); -- -+#if (BTG_LT_0_12 || BTG_LT_0_13) - libtorrent::entry fastResumeEntry; -- -+#elif BTG_LT_0_14 -+ std::vector* resumeData = new std::vector; -+#endif - try - { -+#if (BTG_LT_0_12 || BTG_LT_0_13) - fastResumeEntry = libtorrent::bdecode( - std::istream_iterator(in), - std::istream_iterator() - ); -+#elif BTG_LT_0_14 -+ std::copy(std::istream_iterator(in), -+ std::istream_iterator(), -+ std::back_inserter(*resumeData)); -+#endif - } - catch (std::exception& e) - { - BTG_MNOTICE(logWrapper(), "libtorrent exception: " << e.what()); - status = Context::ERR_LIBTORRENT; - } -+ - if (status == Context::ERR_OK) - { - BTG_MNOTICE(logWrapper(), "using fast resume for '" << _torrent_filename << "'"); - #if BTG_LT_0_12 - handle = torrent_session->add_torrent(torrent_entry, dataPath, fastResumeEntry); --#elif (BTG_LT_0_13 || BTG_LT_0_14) -+#elif BTG_LT_0_13 - handle = torrent_session->add_torrent(tinfo, dataPath, fastResumeEntry); -+#elif BTG_LT_0_14 -+ libtorrent::add_torrent_params atp; -+ atp.name = 0; // "default name"; -+ atp.ti.swap(tinfo); -+ atp.save_path = dataPath; -+ atp.resume_data = resumeData; -+ -+ handle = torrent_session->add_torrent(atp); - #endif - - } -@@ -630,8 +664,15 @@ - { - #if BTG_LT_0_12 - handle = torrent_session->add_torrent(torrent_entry, dataPath); --#elif (BTG_LT_0_13 || BTG_LT_0_14) -+#elif BTG_LT_0_13 - handle = torrent_session->add_torrent(tinfo, dataPath); -+#elif BTG_LT_0_14 -+ libtorrent::add_torrent_params atp; -+ atp.name = 0; // "default name"; -+ atp.ti.swap(tinfo); -+ atp.save_path = dataPath; -+ -+ handle = torrent_session->add_torrent(atp); - #endif - } - } -@@ -2065,7 +2106,7 @@ - { - torrentInfo* ti = tii->second; - libtorrent::torrent_status status = ti->handle.status(); -- -+ - if (status.state == libtorrent::torrent_status::downloading) - { - ti->download_counter++; -Index: daemon/context_alert.cpp -=================================================================== ---- daemon/context_alert.cpp (revision 455) -+++ daemon/context_alert.cpp (revision 456) -@@ -142,7 +142,13 @@ - verboseFlag_, "Tracker alert: filename '" << - filename << "', status = " << - _alert->status_code << ", message '" << -- _alert->msg() << "'"); -+#if BTG_LT_0_14 -+ _alert->message() -+#else -+ _alert->msg() -+#endif -+ << "'"); -+ - ti->trackerStatus.invalidate(); - // Handle alerts which have some undefined status code. - if (_alert->status_code != trackerStatus::undefined) -@@ -154,7 +160,14 @@ - ti->trackerStatus.setStatus(trackerStatus::warning); - } - ti->trackerStatus.setSerial(ti->serial); -- ti->trackerStatus.setMessage(_alert->msg()); -+ ti->trackerStatus.setMessage( -+#if BTG_LT_0_14 -+ _alert->message() -+#else -+ _alert->msg() -+#endif -+ ); -+ - ti->serial++; - - if (ti->serial > trackerStatus::MAX_SERIAL) -@@ -200,13 +213,26 @@ - if (getIdFromHandle(_alert->handle, torrent_id, ti)) - { - getFilename(torrent_id, filename); -+ VERBOSE_LOG(logWrapper(), verboseFlag_, "Tracker warning alert: filename '" << -+ filename << "', message '" << -+#if BTG_LT_0_14 -+ _alert->message() -+#else -+ _alert->msg() -+#endif -+ << "'"); - -- VERBOSE_LOG(logWrapper(), verboseFlag_, "Tracker warning alert: filename '" << -- filename << "', message '" << _alert->msg() << "'"); - ti->trackerStatus.invalidate(); - ti->trackerStatus.setStatus(trackerStatus::warning); - ti->trackerStatus.setSerial(ti->serial); -- ti->trackerStatus.setMessage(_alert->msg()); -+ ti->trackerStatus.setMessage( -+#if BTG_LT_0_14 -+ _alert->message() -+#else -+ _alert->msg() -+#endif -+ ); -+ - ti->serial++; - - if (ti->serial > trackerStatus::MAX_SERIAL) -@@ -270,7 +296,13 @@ - else - { - // Log other alerts. -- BTG_NOTICE(logWrapper(), "Alert: " << alert->msg() << " (" << typeid(*alert).name() << ")"); -+ BTG_NOTICE(logWrapper(), "Alert: " << -+#if BTG_LT_0_14 -+ alert->message() -+#else -+ alert->msg() -+#endif -+ << " (" << typeid(*alert).name() << ")"); - } - } - } -Index: daemon/context_file.cpp -=================================================================== ---- daemon/context_file.cpp (revision 455) -+++ daemon/context_file.cpp (revision 456) -@@ -292,13 +292,13 @@ - iter++) - { - libtorrent::file_entry const& fe = *iter; -- -+ - // The full path. - boost::filesystem::path file_path = fe.path; -- -+ - // Only the file name. - std::string filename = file_path.leaf(); -- -+ - // Get the first directory name, if it exists. - if (!file_path.branch_path().empty()) - { -@@ -334,7 +334,7 @@ - - BTG_MNOTICE(logWrapper(), "Using directory '" << file_path.string() << "'"); - BTG_MNOTICE(logWrapper(), "Checking file '" << filename << "'"); -- -+ - try - { - if (find_file(boost::filesystem::path(file_path), filename)) -@@ -591,7 +591,46 @@ - - return status; - } -+#if BTG_LT_0_14 -+ bool Context::torrentInfoToFiles(libtorrent::torrent_info const& _tinfo, -+ std::vector & _output) const -+ { -+ BTG_MENTER(logWrapper(), "torrentInfoToFiles", ""); - -+ bool status = true; -+ try -+ { -+ libtorrent::torrent_info::file_iterator iter; -+ -+ for (iter = _tinfo.begin_files(); -+ iter != _tinfo.end_files(); -+ iter++) -+ { -+ libtorrent::file_entry const& fe = *iter; -+ BTG_MNOTICE(logWrapper(), fe.path.string()); -+ -+ _output.push_back(fe.path.string()); -+ } -+ } -+ catch (std::exception& e) -+ { -+ BTG_ERROR_LOG(logWrapper(), "libtorrent exception (torrentInfoToFiles): " << e.what() ); -+ status = false; -+ } -+ -+ if (_output.size() == 0) -+ { -+ // Torrents with no files are not ok. -+ BTG_ERROR_LOG(logWrapper(), "torrentInfoToFiles, attempt to load torrent with no files in it."); -+ status = false; -+ } -+ -+ BTG_MEXIT(logWrapper(), "torrentInfoToFiles", status); -+ return status; -+ } -+#endif -+ -+#if BTG_LT_0_12 || BTG_LT_0_13 - bool Context::entryToFiles(libtorrent::entry const& _input, - std::vector & _output) const - { -@@ -615,13 +654,14 @@ - } - catch (std::exception& e) - { -- BTG_ERROR_LOG(logWrapper(), "libtorrent exception: " << e.what() ); -+ BTG_ERROR_LOG(logWrapper(), "libtorrent exception (entryToFiles): " << e.what() ); - status = false; - } - - BTG_MEXIT(logWrapper(), "entryToFiles", status); - return status; - } -+#endif - - #if (BTG_LT_0_14) - void Context::bitfieldToVector(libtorrent::bitfield const& _input, -Index: daemon/context.h -=================================================================== ---- daemon/context.h (revision 455) -+++ daemon/context.h (revision 456) -@@ -660,12 +660,17 @@ - #if (BTG_LT_0_12 || BTG_LT_0_13) - bool entryToInfo(libtorrent::entry const& _input, - libtorrent::torrent_info & _output) const; --#endif -+ - /// Convert an entry to a list of contained files. - /// @return True - converted. False - conversion failed. - bool entryToFiles(libtorrent::entry const& _input, - std::vector & _output) const; -+#endif - -+#if BTG_LT_0_14 -+ bool torrentInfoToFiles(libtorrent::torrent_info const& _tinfo, -+ std::vector & _output) const; -+#endif - /// Find out if data of a torrent is present in the seed dir. - /// @param [in] _torrent_info Torrent info. - /// @return True - data is present, false otherwise. -Index: setup.sh -=================================================================== ---- setup.sh (revision 455) -+++ setup.sh (revision 456) -@@ -128,14 +128,19 @@ - svn) - # Libtorrent from SVN uses boost 1.3.5, where asio is included. - CXXFLAGS_pkgconfig=`export PKG_CONFIG_PATH=/$ROOT/$1/lib/pkgconfig; pkg-config --cflags libtorrent` -- export CXXFLAGS="$CXXFLAGS -I/pack/boost-1.35.0/include $CXXFLAGS_pkgconfig" -- export LDFLAGS="$LDFLAGS -L/pack/boost-1.35.0/lib" -- export LD_LIBRARY_PATH=/pack/boost-1.35.0/lib -- export LIBTORRENT_CFLAGS="-I$ROOT/svn/include -I$ROOT/svn/include/libtorrent" && \ -- export LIBTORRENT_LIBS="-L$ROOT/svn/lib -ltorrent" && \ -+ export LIBTORRENT_CFLAGS="-I$ROOT/$1/include -I$ROOT/$1/include/libtorrent" && \ -+ export LIBTORRENT_LIBS="-L$ROOT/$1/lib -ltorrent-rasterbar" && \ - echo "Using $CONFIGURE"; -- $CONFIGURE --with-rblibtorrent=$ROOT/svn -+ $CONFIGURE --with-rblibtorrent=$ROOT/$1 - ;; -+ svn-debug) -+ # Libtorrent from SVN uses boost 1.3.5, where asio is included. -+ CXXFLAGS_pkgconfig=`export PKG_CONFIG_PATH=/$ROOT/$1/lib/pkgconfig; pkg-config --cflags libtorrent` -+ export LIBTORRENT_CFLAGS="-I$ROOT/$1/include -I$ROOT/$1/include/libtorrent" && \ -+ export LIBTORRENT_LIBS="-L$ROOT/$1/lib -ltorrent-rasterbar" && \ -+ echo "Using $CONFIGURE"; -+ $CONFIGURE --with-rblibtorrent=$ROOT/$1 -+ ;; - system) - # Use libtorrent installed system wide. - $CONFIGURE diff --git a/source/network-extra/btg/svn470.patch b/source/network-extra/btg/svn470.patch deleted file mode 100644 index 0773f2d..0000000 --- a/source/network-extra/btg/svn470.patch +++ /dev/null @@ -1,139 +0,0 @@ -Index: bcore/externalization/xmlrpc.cpp -=================================================================== ---- bcore/externalization/xmlrpc.cpp (revision 469) -+++ bcore/externalization/xmlrpc.cpp (revision 470) -@@ -222,8 +222,8 @@ - - void XMLRPC::getBuffer(dBuffer & _buffer) - { -- char* buff; -- int buffsize; -+ char* buff = 0; -+ int buffsize = 0; - - XMLRPC_REQUEST_OUTPUT_OPTIONS opt = XMLRPC_RequestGetOutputOptions(xmlrpc_request); - -Index: bcore/transport/tcpipbase.cpp -=================================================================== ---- bcore/transport/tcpipbase.cpp (revision 469) -+++ bcore/transport/tcpipbase.cpp (revision 470) -@@ -142,6 +142,7 @@ - } - - t_byteP message = new t_byte[message_size]; -+ memset(message, 0, message_size); - - if (message == 0) - { -Index: daemon/daemonhandler.cpp -=================================================================== ---- daemon/daemonhandler.cpp (revision 469) -+++ daemon/daemonhandler.cpp (revision 470) -@@ -1281,6 +1281,7 @@ - } - - delete _command; -+ _command = 0; - - BTG_MNOTICE(logWrapper(), "data (out): " << sendBuffer_.size() << " bytes"); - -Index: daemon/context.cpp -=================================================================== ---- daemon/context.cpp (revision 469) -+++ daemon/context.cpp (revision 470) -@@ -62,6 +62,10 @@ - #include - #endif - -+#if BTG_LT_0_14 -+#include -+#endif -+ - namespace btg - { - namespace daemon -@@ -220,11 +224,20 @@ - - this->setNormalHttpSettings(); - -- // From the libtorrent manual. -- // Events that can be considered normal, but still deserves -- // an event. This could be a piece hash that fails. -+#if (BTG_LT_0_12 || BTG_LT_0_13) - torrent_session->set_severity_level(libtorrent::alert::info); -+#elif BTG_LT_0_14 -+ { -+ int amask = -+ libtorrent::alert::error_notification | -+ libtorrent::alert::port_mapping_notification | -+ libtorrent::alert::tracker_notification | -+ libtorrent::alert::status_notification | -+ libtorrent::alert::progress_notification; - -+ torrent_session->set_alert_mask(amask); -+ } -+#endif - setPeerIdFromConfig(); - } - } -@@ -1186,7 +1199,11 @@ - case libtorrent::torrent_status::checking_files: - ts = Status::ts_checking; - break; -+#if (BTG_LT_0_12) || (BTG_LT_0_13) - case libtorrent::torrent_status::connecting_to_tracker: -+#elif BTG_LT_0_14 -+ case libtorrent::torrent_status::downloading_metadata: -+#endif - ts = Status::ts_connecting; - break; - case libtorrent::torrent_status::downloading: -@@ -1815,7 +1832,11 @@ - { - case libtorrent::torrent_status::queued_for_checking: - case libtorrent::torrent_status::checking_files: -+#if (BTG_LT_0_12) || (BTG_LT_0_13) - case libtorrent::torrent_status::connecting_to_tracker: -+#elif BTG_LT_0_14 -+ case libtorrent::torrent_status::downloading_metadata: -+#endif - case libtorrent::torrent_status::downloading: - if (!moveToWorkingDir(_torrent_id)) - { -@@ -1965,8 +1986,11 @@ - - // Get the status from libtorrent: - libtorrent::torrent_status status = ti->handle.status(); -- -+#if (BTG_LT_0_12) || (BTG_LT_0_13) - if ((status.state == libtorrent::torrent_status::connecting_to_tracker) -+#elif BTG_LT_0_14 -+ if ((status.state == libtorrent::torrent_status::downloading_metadata) -+#endif - || - (status.state == libtorrent::torrent_status::downloading) - || -Index: daemon/context_file.cpp -=================================================================== ---- daemon/context_file.cpp (revision 469) -+++ daemon/context_file.cpp (revision 470) -@@ -521,6 +521,7 @@ - { - torrentInfo *ti = tii->second; - -+#if (BTG_LT_0_12 || BTG_LT_0_13) - // Get the fast resume data. - libtorrent::entry torrent_entry = ti->handle.write_resume_data(); - -@@ -559,6 +560,11 @@ - - BTG_MNOTICE(logWrapper(), "wrote fast resume data for '" << filename << "'"); - out.close(); -+#elif BTG_LT_0_14 -+ // The actual writting is done using a callback. -+ // TODO: implement this! -+ ti->handle.save_resume_data(); -+#endif - } - - op_status = true; diff --git a/source/network-extra/btg/svn477.patch b/source/network-extra/btg/svn477.patch deleted file mode 100644 index 63f7f42..0000000 --- a/source/network-extra/btg/svn477.patch +++ /dev/null @@ -1,114 +0,0 @@ -Index: daemon/context.cpp -=================================================================== ---- daemon/context.cpp (revision 476) -+++ daemon/context.cpp (revision 477) -@@ -546,7 +546,19 @@ - { - boost::filesystem::path targetFilename(targetPath); - BTG_MNOTICE(logWrapper(), "Attempt to get info from '" << targetPath << "'"); -- tinfo.reset(new libtorrent::torrent_info(targetFilename)); -+ -+ std::vector contents; -+ if (libtorrent::load_file(targetFilename, contents) == 0) -+ { -+ BTG_MNOTICE(logWrapper(), "Loaded " << targetFilename << " into buffer, size " << contents.size() << " bytes."); -+ } -+ else -+ { -+ BTG_MNOTICE(logWrapper(), "Failed to load " << targetFilename << " into buffer."); -+ gotInfo = false; -+ } -+ -+ tinfo.reset(new libtorrent::torrent_info(&contents[0], contents.size())); - } - catch (std::exception& e) - { -@@ -742,7 +754,7 @@ - filetrack_->remove(tempDir_, fileTrackFilename); - } - -- BTG_MEXIT(logWrapper(), "add", ""); -+ BTG_MEXIT(logWrapper(), "add", toString(status)); - return status; - } - -@@ -774,7 +786,7 @@ - BTG_ERROR_LOG(logWrapper(), "Attempt to write '" << targetPath << "' failed"); - } - -- BTG_MEXIT(logWrapper(), "add", status); -+ BTG_MEXIT(logWrapper(), "add", toString(status)); - return status; - } - -@@ -2553,6 +2565,27 @@ - - filter_->set(*torrent_session); - } -+ -+ std::string Context::toString(addResult const _addresult) const -+ { -+ std::string s; -+ switch(_addresult) -+ { -+ case ERR_UNDEFINED: -+ s = "ERR_UNDEFINED"; -+ break; -+ case ERR_OK: -+ s = "ERR_OK"; -+ break; -+ case ERR_EXISTS: -+ s = "ERR_EXISTS"; -+ break; -+ case ERR_LIBTORRENT: -+ s = "ERR_LIBTORRENT"; -+ break; -+ } -+ return s; -+ } - - Context::~Context() - { -Index: daemon/context_file.cpp -=================================================================== ---- daemon/context_file.cpp (revision 476) -+++ daemon/context_file.cpp (revision 477) -@@ -30,6 +30,8 @@ - #include - #include - -+#include -+ - namespace btg - { - namespace daemon -@@ -264,7 +266,14 @@ - return true; - } - } -- else if (itr->leaf() == file_name) // see below -+ -+#if BOOST_VERSION > 103500 -+ // 1.36.x and so on. -+ else if (itr->filename() == file_name) // see below -+#else -+ // Below 1.35.x. -+ else if (itr->path() == file_name) // see below -+#endif - { - BTG_MEXIT(logWrapper(), "find_file", true); - return true; -Index: daemon/context.h -=================================================================== ---- daemon/context.h (revision 476) -+++ daemon/context.h (revision 477) -@@ -707,6 +707,9 @@ - /// Set peer ID (read from configuration, converting it - /// to a format used by libtorrent). - void setPeerIdFromConfig(); -+ -+ std::string toString(addResult const _addresult) const; -+ - #if (BTG_LT_0_14) - /// Convert a libtorrent bitfield into a vector of bits. - /// From vmiklos at frugalware.org Thu Jan 15 22:33:39 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Jan 15 22:33:44 2009 Subject: [Frugalware-git] frugalware-current: webalizer-2.21_02-1-i686 Message-ID: <20090115213339.6C98A11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9e0cbbcd35c9ee70294dff5aee9f562e8d474c07 commit 9e0cbbcd35c9ee70294dff5aee9f562e8d474c07 Author: Miklos Vajna Date: Thu Jan 15 22:25:47 2009 +0100 webalizer-2.21_02-1-i686 - version bump diff --git a/source/network-extra/webalizer/FrugalBuild b/source/network-extra/webalizer/FrugalBuild index a557773..b5c6937 100644 --- a/source/network-extra/webalizer/FrugalBuild +++ b/source/network-extra/webalizer/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Miklos Vajna pkgname=webalizer -pkgver=2.20_03 +pkgver=2.21_02 pkgrel=1 pkgdesc="The Webalizer is a fast, free web server log file analysis program." url="http://www.mrunix.net/webalizer/" @@ -11,7 +11,7 @@ groups=('network-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://www.mrunix.net/webalizer/download.html|grep Stable|sed 's/.*: \(.*\)/\1/;s/-/_/'" source=(ftp://ftp.mrunix.net/pub/webalizer/$pkgname-${pkgver/_/-}-src.tgz) -sha1sums=('9c6298a97441d3066838ce8929031608279d4929') +sha1sums=('3f30373b8359dfac3b027e4f87099dec456af832') build() { From vmiklos at frugalware.org Thu Jan 15 22:33:39 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Jan 15 22:33:45 2009 Subject: [Frugalware-git] frugalware-current: hdparm-9.8-1-i686 Message-ID: <20090115213339.7CD1611B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0d46048702aa83b6930e65c49511c66a602cb8b1 commit 0d46048702aa83b6930e65c49511c66a602cb8b1 Author: Miklos Vajna Date: Thu Jan 15 22:27:34 2009 +0100 hdparm-9.8-1-i686 - version bump diff --git a/source/apps/hdparm/FrugalBuild b/source/apps/hdparm/FrugalBuild index fb0dc57..c3aebd4 100644 --- a/source/apps/hdparm/FrugalBuild +++ b/source/apps/hdparm/FrugalBuild @@ -2,12 +2,12 @@ # Maintainer: Miklos Vajna pkgname=hdparm -pkgver=9.6 +pkgver=9.8 pkgrel=1 pkgdesc="Read/set hard drive parameters" depends=('glibc') groups=('apps') archs=('i686' 'x86_64' 'ppc') Finclude sourceforge -sha1sums=('6c95b15518392db838c041cf1b45f03db0162920') +sha1sums=('752903d270b4f1eb67e1cae97b52579300e1a646') # optimization OK From vmiklos at frugalware.org Thu Jan 15 23:14:06 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Thu Jan 15 23:14:08 2009 Subject: [Frugalware-git] frugalware-current: lingot-0.7.6-1-i686 Message-ID: <20090115221406.B971011B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d05c58d9bb661636e3afca06107eec434d7889cc commit d05c58d9bb661636e3afca06107eec434d7889cc Author: Miklos Vajna Date: Thu Jan 15 23:13:43 2009 +0100 lingot-0.7.6-1-i686 - new package diff --git a/source/xapps-extra/lingot/FrugalBuild b/source/xapps-extra/lingot/FrugalBuild new file mode 100644 index 0000000..e866f39 --- /dev/null +++ b/source/xapps-extra/lingot/FrugalBuild @@ -0,0 +1,17 @@ +# Compiling Time: 0.08 SBU +# Maintainer: Miklos Vajna + +pkgname=lingot +pkgver=0.7.6 +pkgrel=1 +pkgdesc="LINGOT Is Not a Guitar-Only Tuner" +url="http://www.nongnu.org/lingot/" +depends=('gtk+2') +makedepends=('intltool') +groups=('xapps-extra') +archs=('i686') +up2date="Flasttar http://download.savannah.gnu.org/releases/lingot/" +source=(http://download.savannah.gnu.org/releases/lingot/lingot-$pkgver.tar.gz) +sha1sums=('7e0eb3d28f59c3ef9fcdaf47503747ce5029732d') + +# optimization OK From vmiklos at frugalware.org Fri Jan 16 01:30:08 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Jan 16 01:30:10 2009 Subject: [Frugalware-git] pacman-g2: makepkg: allow providing the package's key or keyring in pkgname.key Message-ID: <20090116003008.A492E11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=6fef9c540cd8a5ed932dfa69ed90120d19fc6a79 commit 6fef9c540cd8a5ed932dfa69ed90120d19fc6a79 Author: Miklos Vajna Date: Fri Jan 16 01:28:25 2009 +0100 makepkg: allow providing the package's key or keyring in pkgname.key See http://article.gmane.org/gmane.linux.frugalware.devel/5185. diff --git a/doc/FrugalBuild.txt b/doc/FrugalBuild.txt index 27b3424..f381dc7 100644 --- a/doc/FrugalBuild.txt +++ b/doc/FrugalBuild.txt @@ -237,9 +237,13 @@ sha1sums (array):: sha1sums in the FrugalBuild, run `makepkg -G`. signatures (array):: - If this field is present, it should contain an array of gpg signatures required - to validate the source files. Where there is no signature available just leave - it empty, like: + If this field is present, it should contain an array of gpg signatures + required to validate the source files. It is recommended (but not + required) that you also add the key or keyring of upstream to a file + named $pkgname.key to make off-line build possible. If there is no such + file, and the key is available on a public keyserver, it will be + retrieved automatically. Otherwise the build will be aborted. Where + there is no signature available just leave it empty, like: ---- signatures=(${source[0]}.asc '') diff --git a/scripts/makepkg b/scripts/makepkg index 30e48fc..aa65989 100755 --- a/scripts/makepkg +++ b/scripts/makepkg @@ -1390,6 +1390,10 @@ if [ "$GENSHA1" = "0" ]; then gpg --list-keys $ECHO "keyserver-options auto-key-retrieve" >>~/.gnupg/gpg.conf fi + if [ -e $startdir/$pkgname.key ]; then + msg "Importing $pkgname.key" + gpg --import $startdir/$pkgname.key + fi msg "Validating source files with gpg" errors=0 idx=0 From vmiklos at frugalware.org Fri Jan 16 01:40:51 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Jan 16 01:40:52 2009 Subject: [Frugalware-git] pacman-g2: updates for 3.7.3 Message-ID: <20090116004051.2BCB411B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=b708fd8d94a3801ed1563ca0bb32ab5eee9627d7 commit b708fd8d94a3801ed1563ca0bb32ab5eee9627d7 Author: Miklos Vajna Date: Fri Jan 16 01:40:47 2009 +0100 updates for 3.7.3 diff --git a/NEWS b/NEWS index b2369ac..6763543 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,12 @@ VERSION DESCRIPTION ----------------------------------------------------------------------------- +3.7.3 - pacman-g2: fixed a bug in -Si / -Qi output when + localized pkgdescs were present + - bindings: added a new cast function + - pacman-g2 -Sy now updates the database incrementall + (like rsync would), idea by Csaba Henk + - makepkg now supports verifying signatures when a + keyserver is not available 3.7.2 - support for bigendian machines - fix build when asciidoc is available but po4a is not - removed x86-specific hardwired -mtune=generic from diff --git a/configure.ac b/configure.ac index b69ec7d..e660329 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ ENV_CFLAGS=$CFLAGS AC_PREREQ(2.59) dnl Update it right before the release since $pkgver_foo are all _post_ release snapshots -AC_INIT([pacman-g2 package manager], 3.7.2, [frugalware-devel@frugalware.org], pacman-g2) +AC_INIT([pacman-g2 package manager], 3.7.3, [frugalware-devel@frugalware.org], pacman-g2) AC_LANG(C) AM_CONFIG_HEADER(config.h) AC_CANONICAL_SYSTEM @@ -22,7 +22,7 @@ dnl Define here the libpacman version number PM_MAJOR_VERSION=0 PM_MINOR_VERSION=3 PM_MICRO_VERSION=7 -PM_MICRO_VERSION_SUFFIX=.2 +PM_MICRO_VERSION_SUFFIX=.3 PM_VERSION=$PM_MAJOR_VERSION.$PM_MINOR_VERSION.$PM_MICRO_VERSION$PM_MICRO_VERSION_SUFFIX dnl Needed for libtool to create proper shared lib version PM_VERSION_INFO=`expr $PM_MAJOR_VERSION + $PM_MINOR_VERSION`:$PM_MICRO_VERSION:$PM_MINOR_VERSION From vmiklos at frugalware.org Fri Jan 16 02:16:48 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Jan 16 02:16:49 2009 Subject: [Frugalware-git] frugalware-current: pacman-g2-3.7.3-1-i686 Message-ID: <20090116011648.7E62E11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ad1459c377d400a790f793444d6fe40054ec3539 commit ad1459c377d400a790f793444d6fe40054ec3539 Author: Miklos Vajna Date: Fri Jan 16 02:16:36 2009 +0100 pacman-g2-3.7.3-1-i686 - version bump diff --git a/source/base/pacman-g2/FrugalBuild b/source/base/pacman-g2/FrugalBuild index e81b635..5642022 100644 --- a/source/base/pacman-g2/FrugalBuild +++ b/source/base/pacman-g2/FrugalBuild @@ -5,9 +5,9 @@ USE_DEVEL=${USE_DEVEL:-"n"} USE_MINIMAL=${USE_MINIMAL:-"n"} pkgname=pacman-g2 -pkgver=3.7.2 -Fuse $USE_DEVEL && pkgver=3.6.5.25.gf2bbdac -pkgrel=3 +pkgver=3.7.3 +Fuse $USE_DEVEL && pkgver=3.7.2.19.gb708fd8 +pkgrel=1 pkgdesc="A .tar.bz2 based package manager library (libpacman) and client (pacman-g2) with dependency support." url="http://ftp.frugalware.org/pub/other/pacman-g2/" backup=(etc/{makepkg,pacman-g2}.conf etc/pacman-g2/repos/{frugalware,frugalware-current}) @@ -25,9 +25,8 @@ archs=('i686' 'x86_64' 'ppc') _F_archive_nosort=y up2date="lynx -dump $url/releases/ |Flasttar" if ! Fuse $USE_DEVEL; then - source=($url/releases/$pkgname-$pkgver.tar.gz \ - http://git.frugalware.org/patches/pacman-g2/4b2c5e4c586f9fbfd78fe12d39d6eb36f77a69cb.patch) - signatures=("$source.asc" '') + source=($url/releases/$pkgname-$pkgver.tar.gz) + signatures=("$source.asc") else _F_scm_type="git" _F_scm_url="git://git.frugalware.org/pub/other/pacman-g2/pacman-g2" From vmiklos at frugalware.org Fri Jan 16 02:17:43 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Jan 16 02:17:43 2009 Subject: [Frugalware-git] pacman-g2: makepkg: update copyright Message-ID: <20090116011743.2731F11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=094f1bcd4f06767667924b52eb184c169d4108d8 commit 094f1bcd4f06767667924b52eb184c169d4108d8 Author: Miklos Vajna Date: Fri Jan 16 02:17:39 2009 +0100 makepkg: update copyright diff --git a/scripts/makepkg b/scripts/makepkg index aa65989..bd36f68 100755 --- a/scripts/makepkg +++ b/scripts/makepkg @@ -7,7 +7,7 @@ # Copyright (c) 2005 by Christian Hamar # Copyright (c) 2006 by Alex Smith # Copyright (c) 2006 by Andras Voroskoi -# Copyright (c) 2005, 2006, 2007, 2008 by Miklos Vajna +# Copyright (c) 2005, 2006, 2007, 2008, 2009 by Miklos Vajna # # 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 From vmiklos at frugalware.org Fri Jan 16 02:32:56 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Jan 16 02:33:00 2009 Subject: [Frugalware-git] frugalware-current: lingot-0.7.6-1-i686 Message-ID: <20090116013256.9795911B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7536db7708cc8c77bc9eb6a83c52cc255c1d4fee commit 7536db7708cc8c77bc9eb6a83c52cc255c1d4fee Author: Miklos Vajna Date: Fri Jan 16 02:32:20 2009 +0100 lingot-0.7.6-1-i686 - add lingot.key diff --git a/source/xapps-extra/lingot/FrugalBuild b/source/xapps-extra/lingot/FrugalBuild index e866f39..43b4cfa 100644 --- a/source/xapps-extra/lingot/FrugalBuild +++ b/source/xapps-extra/lingot/FrugalBuild @@ -12,6 +12,6 @@ groups=('xapps-extra') archs=('i686') up2date="Flasttar http://download.savannah.gnu.org/releases/lingot/" source=(http://download.savannah.gnu.org/releases/lingot/lingot-$pkgver.tar.gz) -sha1sums=('7e0eb3d28f59c3ef9fcdaf47503747ce5029732d') +signatures=($source.sig) # optimization OK diff --git a/source/xapps-extra/lingot/lingot.key b/source/xapps-extra/lingot/lingot.key new file mode 100644 index 0000000..c23274b Binary files /dev/null and b/source/xapps-extra/lingot/lingot.key differ From priyank at frugalware.org Fri Jan 16 10:28:37 2009 From: priyank at frugalware.org (Priyank) Date: Fri Jan 16 10:28:40 2009 Subject: [Frugalware-git] frugalware-current: celestia-1.5.1-1-i686 Message-ID: <20090116092837.B130D11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4647c67fc81fc271506867fcd3da9a0cc4407221 commit 4647c67fc81fc271506867fcd3da9a0cc4407221 Author: Priyank Date: Fri Jan 16 14:57:06 2009 +0530 celestia-1.5.1-1-i686 * New package / Initial import diff --git a/source/gnome-extra/celestia/FrugalBuild b/source/gnome-extra/celestia/FrugalBuild new file mode 100644 index 0000000..7393803 --- /dev/null +++ b/source/gnome-extra/celestia/FrugalBuild @@ -0,0 +1,24 @@ +# Compiling Time: 0.22 SBU +# Maintainer: Priyank Gosalia + +pkgname=celestia +pkgver=1.5.1 +pkgrel=1 +pkgdesc="A real-time space simulation that lets you experience our universe in 3D" +_F_sourceforge_name="Celestia-linux" +Finclude sourceforge +url="http://celestia.org" +depends=('gtk+2>=2.14.7' 'gtkglext' 'libgnome>=2.24.1' 'libtheora' \ + 'libgnomeui>=2.24.0' 'gconf>=2.24.0' 'libpng' 'libjpeg') +groups=('gnome-extra') +archs=('i686') +_F_gnome_schemas=('/etc/gconf/schemas/celestia.schemas') +Finclude gnome-scriptlet +source=(${source/Celestia-linux/celestia} $pkgname-$pkgver-gcc43.patch \ + $pkgname-$pkgver-gnome-desktop.patch) +Fconfopts="${Fconfopts[@]} --with-gnome --enable-threading" +sha1sums=('2d6a117daf6a400ab4c47a5a51c13f2ab601e6db' \ + '3cdb190517273cc0321ed78061c6707a42db443a' \ + '797ab4e29a6cd22f8c000874a454b6528149b860') + +# optimization OK diff --git a/source/gnome-extra/celestia/celestia-1.5.1-gcc43.patch b/source/gnome-extra/celestia/celestia-1.5.1-gcc43.patch new file mode 100644 index 0000000..4849f37 --- /dev/null +++ b/source/gnome-extra/celestia/celestia-1.5.1-gcc43.patch @@ -0,0 +1,1195 @@ +diff -Naur celestia-1.5.1/src/buildstardb.cpp celestia-1.5.1.new/src/buildstardb.cpp +--- celestia-1.5.1/src/buildstardb.cpp 2008-04-23 17:17:20.000000000 -0400 ++++ celestia-1.5.1.new/src/buildstardb.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -17,6 +17,7 @@ + #include + #include + #include "celengine/stardb.h" ++#include + + using namespace std; + +diff -Naur celestia-1.5.1/src/celengine/asterism.cpp celestia-1.5.1.new/src/celengine/asterism.cpp +--- celestia-1.5.1/src/celengine/asterism.cpp 2008-04-23 17:17:16.000000000 -0400 ++++ celestia-1.5.1.new/src/celengine/asterism.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -8,6 +8,7 @@ + // of the License, or (at your option) any later version. + + #include ++#include + + #ifndef _WIN32 + #ifndef TARGET_OS_MAC +diff -Naur celestia-1.5.1/src/celengine/astro.cpp celestia-1.5.1.new/src/celengine/astro.cpp +--- celestia-1.5.1/src/celengine/astro.cpp 2008-04-23 17:17:16.000000000 -0400 ++++ celestia-1.5.1.new/src/celengine/astro.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -10,12 +10,14 @@ + #include + #include + #include ++#include + #include + #include + #include + #include "celestia.h" + #include "astro.h" + #include ++#include + + #ifndef TARGET_OS_MAC + #ifdef __GNUC__ +diff -Naur celestia-1.5.1/src/celengine/body.cpp celestia-1.5.1.new/src/celengine/body.cpp +--- celestia-1.5.1/src/celengine/body.cpp 2008-04-23 17:17:16.000000000 -0400 ++++ celestia-1.5.1.new/src/celengine/body.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -14,6 +14,7 @@ + #include + #include + #include ++#include + #include "mesh.h" + #include "meshmanager.h" + #include "body.h" +diff -Naur celestia-1.5.1/src/celengine/cmdparser.cpp celestia-1.5.1.new/src/celengine/cmdparser.cpp +--- celestia-1.5.1/src/celengine/cmdparser.cpp 2008-04-23 17:17:16.000000000 -0400 ++++ celestia-1.5.1.new/src/celengine/cmdparser.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -30,6 +30,7 @@ + #include "astro.h" + #include "cmdparser.h" + #include "glcontext.h" ++#include + + using namespace std; + +diff -Naur celestia-1.5.1/src/celengine/console.cpp celestia-1.5.1.new/src/celengine/console.cpp +--- celestia-1.5.1/src/celengine/console.cpp 2008-04-23 17:17:16.000000000 -0400 ++++ celestia-1.5.1.new/src/celengine/console.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -10,6 +10,7 @@ + #include + #include + #include ++#include + #include "celutil/utf8.h" + #include "gl.h" + #include "vecgl.h" +diff -Naur celestia-1.5.1/src/celengine/dds.cpp celestia-1.5.1.new/src/celengine/dds.cpp +--- celestia-1.5.1/src/celengine/dds.cpp 2008-04-23 17:17:16.000000000 -0400 ++++ celestia-1.5.1.new/src/celengine/dds.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -15,6 +15,7 @@ + #include + #include + #include ++#include + + using namespace std; + +diff -Naur celestia-1.5.1/src/celengine/dsodb.cpp celestia-1.5.1.new/src/celengine/dsodb.cpp +--- celestia-1.5.1/src/celengine/dsodb.cpp 2008-04-23 17:17:16.000000000 -0400 ++++ celestia-1.5.1.new/src/celengine/dsodb.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -32,6 +32,7 @@ + #include + #include + #include ++#include + + using namespace std; + +diff -Naur celestia-1.5.1/src/celengine/fragmentprog.cpp celestia-1.5.1.new/src/celengine/fragmentprog.cpp +--- celestia-1.5.1/src/celengine/fragmentprog.cpp 2008-04-23 17:17:16.000000000 -0400 ++++ celestia-1.5.1.new/src/celengine/fragmentprog.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -13,6 +13,7 @@ + #include "gl.h" + #include "glext.h" + #include "fragmentprog.h" ++#include + + using namespace std; + +diff -Naur celestia-1.5.1/src/celengine/galaxy.cpp celestia-1.5.1.new/src/celengine/galaxy.cpp +--- celestia-1.5.1/src/celengine/galaxy.cpp 2008-04-23 17:17:16.000000000 -0400 ++++ celestia-1.5.1.new/src/celengine/galaxy.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -23,6 +23,8 @@ + #include "vecgl.h" + #include "render.h" + #include "texture.h" ++#include ++#include + + using namespace std; + +diff -Naur celestia-1.5.1/src/celengine/glcontext.cpp celestia-1.5.1.new/src/celengine/glcontext.cpp +--- celestia-1.5.1/src/celengine/glcontext.cpp 2008-04-23 17:17:16.000000000 -0400 ++++ celestia-1.5.1.new/src/celengine/glcontext.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -12,6 +12,7 @@ + #include "gl.h" + #include "glext.h" + #include "glcontext.h" ++#include + + using namespace std; + +diff -Naur celestia-1.5.1/src/celengine/glext.cpp celestia-1.5.1.new/src/celengine/glext.cpp +--- celestia-1.5.1/src/celengine/glext.cpp 2008-04-23 17:17:16.000000000 -0400 ++++ celestia-1.5.1.new/src/celengine/glext.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -19,6 +19,7 @@ + #endif /* ! _WIN32 */ + + #include "glext.h" ++#include + + // ARB_texture_compression + glx::PFNGLCOMPRESSEDTEXIMAGE3DARBPROC glx::glCompressedTexImage3DARB; +diff -Naur celestia-1.5.1/src/celengine/image.cpp celestia-1.5.1.new/src/celengine/image.cpp +--- celestia-1.5.1/src/celengine/image.cpp 2008-04-23 17:17:16.000000000 -0400 ++++ celestia-1.5.1.new/src/celengine/image.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -66,6 +66,7 @@ + #include + #include + #include ++#include + + using namespace std; + +diff -Naur celestia-1.5.1/src/celengine/location.cpp celestia-1.5.1.new/src/celengine/location.cpp +--- celestia-1.5.1/src/celengine/location.cpp 2008-04-23 17:17:16.000000000 -0400 ++++ celestia-1.5.1.new/src/celengine/location.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -11,6 +11,7 @@ + #include + #include + #include ++#include + + using namespace std; + +diff -Naur celestia-1.5.1/src/celengine/lodspheremesh.cpp celestia-1.5.1.new/src/celengine/lodspheremesh.cpp +--- celestia-1.5.1/src/celengine/lodspheremesh.cpp 2008-04-23 17:17:16.000000000 -0400 ++++ celestia-1.5.1.new/src/celengine/lodspheremesh.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -17,6 +17,7 @@ + #include "glext.h" + #include "vecgl.h" + #include "lodspheremesh.h" ++#include + + using namespace std; + +diff -Naur celestia-1.5.1/src/celengine/marker.cpp celestia-1.5.1.new/src/celengine/marker.cpp +--- celestia-1.5.1/src/celengine/marker.cpp 2008-04-23 17:17:16.000000000 -0400 ++++ celestia-1.5.1.new/src/celengine/marker.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -9,6 +9,7 @@ + + #include "marker.h" + #include "gl.h" ++#include + + + using namespace std; +diff -Naur celestia-1.5.1/src/celengine/mesh.cpp celestia-1.5.1.new/src/celengine/mesh.cpp +--- celestia-1.5.1/src/celengine/mesh.cpp 2008-04-23 17:17:16.000000000 -0400 ++++ celestia-1.5.1.new/src/celengine/mesh.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -14,6 +14,7 @@ + #include + #include + #include ++#include + + using namespace std; + +diff -Naur celestia-1.5.1/src/celengine/meshmanager.cpp celestia-1.5.1.new/src/celengine/meshmanager.cpp +--- celestia-1.5.1/src/celengine/meshmanager.cpp 2008-04-23 17:17:16.000000000 -0400 ++++ celestia-1.5.1.new/src/celengine/meshmanager.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -26,6 +26,7 @@ + #include "spheremesh.h" + #include "texmanager.h" + #include "meshmanager.h" ++#include + + using namespace std; + +diff -Naur celestia-1.5.1/src/celengine/modelfile.cpp celestia-1.5.1.new/src/celengine/modelfile.cpp +--- celestia-1.5.1/src/celengine/modelfile.cpp 2008-04-23 17:17:16.000000000 -0400 ++++ celestia-1.5.1.new/src/celengine/modelfile.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -15,6 +15,8 @@ + #include + #include + #include ++#include ++#include + + using namespace std; + +diff -Naur celestia-1.5.1/src/celengine/nebula.cpp celestia-1.5.1.new/src/celengine/nebula.cpp +--- celestia-1.5.1/src/celengine/nebula.cpp 2008-04-23 17:17:16.000000000 -0400 ++++ celestia-1.5.1.new/src/celengine/nebula.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -21,6 +21,7 @@ + #include "glext.h" + #include "vecgl.h" + #include "render.h" ++#include + + using namespace std; + +diff -Naur celestia-1.5.1/src/celengine/opencluster.cpp celestia-1.5.1.new/src/celengine/opencluster.cpp +--- celestia-1.5.1/src/celengine/opencluster.cpp 2008-04-23 17:17:16.000000000 -0400 ++++ celestia-1.5.1.new/src/celengine/opencluster.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -19,6 +19,7 @@ + #include "gl.h" + #include "vecgl.h" + #include "render.h" ++#include + + using namespace std; + +diff -Naur celestia-1.5.1/src/celengine/overlay.cpp celestia-1.5.1.new/src/celengine/overlay.cpp +--- celestia-1.5.1/src/celengine/overlay.cpp 2008-04-23 17:17:16.000000000 -0400 ++++ celestia-1.5.1.new/src/celengine/overlay.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -9,6 +9,7 @@ + + #include + #include ++#include + #include + #include "gl.h" + #include "vecgl.h" +diff -Naur celestia-1.5.1/src/celengine/parseobject.cpp celestia-1.5.1.new/src/celengine/parseobject.cpp +--- celestia-1.5.1/src/celengine/parseobject.cpp 2008-04-23 17:17:16.000000000 -0400 ++++ celestia-1.5.1.new/src/celengine/parseobject.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -21,6 +21,7 @@ + #include "trajmanager.h" + #include "rotationmanager.h" + #include "universe.h" ++#include + + using namespace std; + +diff -Naur celestia-1.5.1/src/celengine/render.cpp celestia-1.5.1.new/src/celengine/render.cpp +--- celestia-1.5.1/src/celengine/render.cpp 2008-04-23 17:17:16.000000000 -0400 ++++ celestia-1.5.1.new/src/celengine/render.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -11,6 +11,7 @@ + #include + #include + #include ++#include + + #ifndef _WIN32 + #ifndef TARGET_OS_MAC +diff -Naur celestia-1.5.1/src/celengine/rotationmanager.cpp celestia-1.5.1.new/src/celengine/rotationmanager.cpp +--- celestia-1.5.1/src/celengine/rotationmanager.cpp 2008-04-23 17:17:16.000000000 -0400 ++++ celestia-1.5.1.new/src/celengine/rotationmanager.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -14,6 +14,7 @@ + #include + #include "samporient.h" + #include "rotationmanager.h" ++#include + + using namespace std; + +diff -Naur celestia-1.5.1/src/celengine/selection.cpp celestia-1.5.1.new/src/celengine/selection.cpp +--- celestia-1.5.1/src/celengine/selection.cpp 2008-04-23 17:17:16.000000000 -0400 ++++ celestia-1.5.1.new/src/celengine/selection.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -8,6 +8,7 @@ + // of the License, or (at your option) any later version. + + #include ++#include + #include "astro.h" + #include "selection.h" + +diff -Naur celestia-1.5.1/src/celengine/shadermanager.cpp celestia-1.5.1.new/src/celengine/shadermanager.cpp +--- celestia-1.5.1/src/celengine/shadermanager.cpp 2008-04-23 17:17:16.000000000 -0400 ++++ celestia-1.5.1.new/src/celengine/shadermanager.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -15,6 +15,7 @@ + #include + #include + #include ++#include + + using namespace std; + +diff -Naur celestia-1.5.1/src/celengine/simulation.cpp celestia-1.5.1.new/src/celengine/simulation.cpp +--- celestia-1.5.1/src/celengine/simulation.cpp 2008-04-23 17:17:16.000000000 -0400 ++++ celestia-1.5.1.new/src/celengine/simulation.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -11,6 +11,7 @@ + // of the License, or (at your option) any later version. + + #include ++#include + #include "simulation.h" + + using namespace std; +diff -Naur celestia-1.5.1/src/celengine/solarsys.cpp celestia-1.5.1.new/src/celengine/solarsys.cpp +--- celestia-1.5.1/src/celengine/solarsys.cpp 2008-04-23 17:17:16.000000000 -0400 ++++ celestia-1.5.1.new/src/celengine/solarsys.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -30,6 +30,7 @@ + #include "universe.h" + #include "multitexture.h" + #include "parseobject.h" ++#include + + using namespace std; + +diff -Naur celestia-1.5.1/src/celengine/solarsysxml.cpp celestia-1.5.1.new/src/celengine/solarsysxml.cpp +--- celestia-1.5.1/src/celengine/solarsysxml.cpp 2008-04-23 17:17:16.000000000 -0400 ++++ celestia-1.5.1.new/src/celengine/solarsysxml.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -8,6 +8,8 @@ + // of the License, or (at your option) any later version. + + #include ++#include ++#include + + #include + #include +@@ -20,6 +22,7 @@ + #include "texmanager.h" + #include "meshmanager.h" + #include "solarsysxml.h" ++#include + + using namespace std; + +diff -Naur celestia-1.5.1/src/celengine/spiceinterface.cpp celestia-1.5.1.new/src/celengine/spiceinterface.cpp +--- celestia-1.5.1/src/celengine/spiceinterface.cpp 2008-04-23 17:17:16.000000000 -0400 ++++ celestia-1.5.1.new/src/celengine/spiceinterface.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -11,6 +11,7 @@ + + #include "SpiceUsr.h" + #include "spiceinterface.h" ++#include + + + bool +diff -Naur celestia-1.5.1/src/celengine/spiceorbit.cpp celestia-1.5.1.new/src/celengine/spiceorbit.cpp +--- celestia-1.5.1/src/celengine/spiceorbit.cpp 2008-04-23 17:17:16.000000000 -0400 ++++ celestia-1.5.1.new/src/celengine/spiceorbit.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -14,6 +14,7 @@ + #include "SpiceUsr.h" + #include "astro.h" + #include "spiceorbit.h" ++#include + + using namespace std; + +diff -Naur celestia-1.5.1/src/celengine/stardb.cpp celestia-1.5.1.new/src/celengine/stardb.cpp +--- celestia-1.5.1/src/celengine/stardb.cpp 2008-04-23 17:17:16.000000000 -0400 ++++ celestia-1.5.1.new/src/celengine/stardb.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -10,6 +10,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -24,6 +25,7 @@ + #include "multitexture.h" + #include "meshmanager.h" + #include ++#include + + using namespace std; + +diff -Naur celestia-1.5.1/src/celengine/texmanager.cpp celestia-1.5.1.new/src/celengine/texmanager.cpp +--- celestia-1.5.1/src/celengine/texmanager.cpp 2008-04-23 17:17:16.000000000 -0400 ++++ celestia-1.5.1.new/src/celengine/texmanager.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -13,6 +13,7 @@ + #include + #include "multitexture.h" + #include "texmanager.h" ++#include + + using namespace std; + +diff -Naur celestia-1.5.1/src/celengine/texture.cpp celestia-1.5.1.new/src/celengine/texture.cpp +--- celestia-1.5.1/src/celengine/texture.cpp 2008-04-23 17:17:16.000000000 -0400 ++++ celestia-1.5.1.new/src/celengine/texture.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + + #ifndef _WIN32 + #ifndef TARGET_OS_MAC +diff -Naur celestia-1.5.1/src/celengine/tokenizer.cpp celestia-1.5.1.new/src/celengine/tokenizer.cpp +--- celestia-1.5.1/src/celengine/tokenizer.cpp 2008-04-23 17:17:16.000000000 -0400 ++++ celestia-1.5.1.new/src/celengine/tokenizer.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -12,6 +12,7 @@ + #include + #include + #include "tokenizer.h" ++#include + + + static bool issep(char c) +diff -Naur celestia-1.5.1/src/celengine/trajmanager.cpp celestia-1.5.1.new/src/celengine/trajmanager.cpp +--- celestia-1.5.1/src/celengine/trajmanager.cpp 2008-04-23 17:17:16.000000000 -0400 ++++ celestia-1.5.1.new/src/celengine/trajmanager.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -15,6 +15,7 @@ + #include + #include "samporbit.h" + #include "trajmanager.h" ++#include + + using namespace std; + +diff -Naur celestia-1.5.1/src/celengine/universe.cpp celestia-1.5.1.new/src/celengine/universe.cpp +--- celestia-1.5.1/src/celengine/universe.cpp 2008-04-23 17:17:16.000000000 -0400 ++++ celestia-1.5.1.new/src/celengine/universe.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -13,6 +13,7 @@ + #include + #include + #include ++#include + #include "astro.h" + #include "3dsmesh.h" + #include "meshmanager.h" +diff -Naur celestia-1.5.1/src/celengine/vertexprog.cpp celestia-1.5.1.new/src/celengine/vertexprog.cpp +--- celestia-1.5.1/src/celengine/vertexprog.cpp 2008-04-23 17:17:16.000000000 -0400 ++++ celestia-1.5.1.new/src/celengine/vertexprog.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -14,6 +14,7 @@ + #include "gl.h" + #include "glext.h" + #include "vertexprog.h" ++#include + + using namespace std; + +diff -Naur celestia-1.5.1/src/celengine/virtualtex.cpp celestia-1.5.1.new/src/celengine/virtualtex.cpp +--- celestia-1.5.1/src/celengine/virtualtex.cpp 2008-04-23 17:17:16.000000000 -0400 ++++ celestia-1.5.1.new/src/celengine/virtualtex.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -19,6 +19,7 @@ + #include "virtualtex.h" + #include "gl.h" + #include "parser.h" ++#include + + using namespace std; + +diff -Naur celestia-1.5.1/src/celestia/celestiacore.cpp celestia-1.5.1.new/src/celestia/celestiacore.cpp +--- celestia-1.5.1/src/celestia/celestiacore.cpp 2008-04-23 17:17:06.000000000 -0400 ++++ celestia-1.5.1.new/src/celestia/celestiacore.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -43,6 +43,7 @@ + #include + #include + #include "url.h" ++#include + + #ifdef CELX + #include +diff -Naur celestia-1.5.1/src/celestia/celx.cpp celestia-1.5.1.new/src/celestia/celx.cpp +--- celestia-1.5.1/src/celestia/celx.cpp 2008-04-23 17:17:06.000000000 -0400 ++++ celestia-1.5.1.new/src/celestia/celx.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -11,7 +11,9 @@ + + #include + #include ++#include + #include ++#include + #include + #include + #include +diff -Naur celestia-1.5.1/src/celestia/configfile.cpp celestia-1.5.1.new/src/celestia/configfile.cpp +--- celestia-1.5.1/src/celestia/configfile.cpp 2008-04-23 17:17:06.000000000 -0400 ++++ celestia-1.5.1.new/src/celestia/configfile.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -16,6 +16,7 @@ + #include + #include + #include "configfile.h" ++#include + + using namespace std; + +diff -Naur celestia-1.5.1/src/celestia/destination.cpp celestia-1.5.1.new/src/celestia/destination.cpp +--- celestia-1.5.1/src/celestia/destination.cpp 2008-04-23 17:17:06.000000000 -0400 ++++ celestia-1.5.1.new/src/celestia/destination.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -14,6 +14,7 @@ + #include + #include + #include "destination.h" ++#include + + using namespace std; + +diff -Naur celestia-1.5.1/src/celestia/eclipsefinder.cpp celestia-1.5.1.new/src/celestia/eclipsefinder.cpp +--- celestia-1.5.1/src/celestia/eclipsefinder.cpp 2008-04-23 17:17:06.000000000 -0400 ++++ celestia-1.5.1.new/src/celestia/eclipsefinder.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -15,6 +15,7 @@ + #include + #include + #include ++#include + #include "eclipsefinder.h" + #include "celmath/mathlib.h" + #include "celmath/ray.h" +diff -Naur celestia-1.5.1/src/celestia/glutmain.cpp celestia-1.5.1.new/src/celestia/glutmain.cpp +--- celestia-1.5.1/src/celestia/glutmain.cpp 2008-04-23 17:17:06.000000000 -0400 ++++ celestia-1.5.1.new/src/celestia/glutmain.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -15,6 +15,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff -Naur celestia-1.5.1/src/celestia/gtk/actions.cpp celestia-1.5.1.new/src/celestia/gtk/actions.cpp +--- celestia-1.5.1/src/celestia/gtk/actions.cpp 2008-04-23 17:16:49.000000000 -0400 ++++ celestia-1.5.1.new/src/celestia/gtk/actions.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -15,6 +15,7 @@ + #endif /* HAVE_CONFIG_H */ + + #include ++#include + #include + #include + +diff -Naur celestia-1.5.1/src/celestia/gtk/common.cpp celestia-1.5.1.new/src/celestia/gtk/common.cpp +--- celestia-1.5.1/src/celestia/gtk/common.cpp 2008-04-23 17:16:49.000000000 -0400 ++++ celestia-1.5.1.new/src/celestia/gtk/common.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -20,6 +20,7 @@ + #include + + #include "common.h" ++#include + + + /* Returns the offset of the timezone at date */ +diff -Naur celestia-1.5.1/src/celestia/gtk/dialog-eclipse.cpp celestia-1.5.1.new/src/celestia/gtk/dialog-eclipse.cpp +--- celestia-1.5.1/src/celestia/gtk/dialog-eclipse.cpp 2008-04-23 17:16:49.000000000 -0400 ++++ celestia-1.5.1.new/src/celestia/gtk/dialog-eclipse.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -18,6 +18,7 @@ + + #include "dialog-eclipse.h" + #include "common.h" ++#include + + + /* Definitions: Callbacks */ +diff -Naur celestia-1.5.1/src/celestia/gtk/dialog-goto.cpp celestia-1.5.1.new/src/celestia/gtk/dialog-goto.cpp +--- celestia-1.5.1/src/celestia/gtk/dialog-goto.cpp 2008-04-23 17:16:49.000000000 -0400 ++++ celestia-1.5.1.new/src/celestia/gtk/dialog-goto.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -18,6 +18,7 @@ + + #include "dialog-goto.h" + #include "common.h" ++#include + + + /* Declarations: Callbacks */ +diff -Naur celestia-1.5.1/src/celestia/gtk/dialog-options.cpp celestia-1.5.1.new/src/celestia/gtk/dialog-options.cpp +--- celestia-1.5.1/src/celestia/gtk/dialog-options.cpp 2008-04-23 17:16:49.000000000 -0400 ++++ celestia-1.5.1.new/src/celestia/gtk/dialog-options.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -17,6 +17,7 @@ + #include "dialog-options.h" + #include "common.h" + #include "ui.h" ++#include + + + /* Definitions: Callbacks */ +diff -Naur celestia-1.5.1/src/celestia/gtk/dialog-solar.cpp celestia-1.5.1.new/src/celestia/gtk/dialog-solar.cpp +--- celestia-1.5.1/src/celestia/gtk/dialog-solar.cpp 2008-04-23 17:16:49.000000000 -0400 ++++ celestia-1.5.1.new/src/celestia/gtk/dialog-solar.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -22,6 +22,7 @@ + #include "dialog-solar.h" + #include "actions.h" + #include "common.h" ++#include + + + /* Declarations: Callbacks */ +diff -Naur celestia-1.5.1/src/celestia/gtk/dialog-star.cpp celestia-1.5.1.new/src/celestia/gtk/dialog-star.cpp +--- celestia-1.5.1/src/celestia/gtk/dialog-star.cpp 2008-04-23 17:16:49.000000000 -0400 ++++ celestia-1.5.1.new/src/celestia/gtk/dialog-star.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -25,6 +25,7 @@ + #include "dialog-star.h" + #include "actions.h" + #include "common.h" ++#include + + + /* Declarations: Callbacks */ +diff -Naur celestia-1.5.1/src/celestia/gtk/dialog-time.cpp celestia-1.5.1.new/src/celestia/gtk/dialog-time.cpp +--- celestia-1.5.1/src/celestia/gtk/dialog-time.cpp 2008-04-23 17:16:49.000000000 -0400 ++++ celestia-1.5.1.new/src/celestia/gtk/dialog-time.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -18,6 +18,7 @@ + + #include "dialog-time.h" + #include "common.h" ++#include + + + /* Declarations: Callbacks */ +diff -Naur celestia-1.5.1/src/celestia/gtk/dialog-tour.cpp celestia-1.5.1.new/src/celestia/gtk/dialog-tour.cpp +--- celestia-1.5.1/src/celestia/gtk/dialog-tour.cpp 2008-04-23 17:16:49.000000000 -0400 ++++ celestia-1.5.1.new/src/celestia/gtk/dialog-tour.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -18,6 +18,7 @@ + + #include "dialog-tour.h" + #include "common.h" ++#include + + + /* Declarations: Callbacks */ +diff -Naur celestia-1.5.1/src/celestia/gtk/main.cpp celestia-1.5.1.new/src/celestia/gtk/main.cpp +--- celestia-1.5.1/src/celestia/gtk/main.cpp 2008-04-23 17:16:49.000000000 -0400 ++++ celestia-1.5.1.new/src/celestia/gtk/main.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -19,6 +19,7 @@ + #include + #include + #include ++#include + #include + + #ifdef WIN32 +diff -Naur celestia-1.5.1/src/celestia/gtk/menu-context.cpp celestia-1.5.1.new/src/celestia/gtk/menu-context.cpp +--- celestia-1.5.1/src/celestia/gtk/menu-context.cpp 2008-04-23 17:16:49.000000000 -0400 ++++ celestia-1.5.1.new/src/celestia/gtk/menu-context.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -20,6 +20,7 @@ + #include "menu-context.h" + #include "actions.h" + #include "common.h" ++#include + + + /* Definitions: Callbacks */ +diff -Naur celestia-1.5.1/src/celestia/gtk/settings-file.cpp celestia-1.5.1.new/src/celestia/gtk/settings-file.cpp +--- celestia-1.5.1/src/celestia/gtk/settings-file.cpp 2008-04-23 17:16:49.000000000 -0400 ++++ celestia-1.5.1.new/src/celestia/gtk/settings-file.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -11,6 +11,7 @@ + */ + + #include ++#include + + #include + #include +diff -Naur celestia-1.5.1/src/celestia/gtk/settings-gconf.cpp celestia-1.5.1.new/src/celestia/gtk/settings-gconf.cpp +--- celestia-1.5.1/src/celestia/gtk/settings-gconf.cpp 2008-04-23 17:16:49.000000000 -0400 ++++ celestia-1.5.1.new/src/celestia/gtk/settings-gconf.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -12,6 +12,7 @@ + + #include + #include ++#include + + #include + #include +diff -Naur celestia-1.5.1/src/celestia/gtk/splash.cpp celestia-1.5.1.new/src/celestia/gtk/splash.cpp +--- celestia-1.5.1/src/celestia/gtk/splash.cpp 2008-04-23 17:16:49.000000000 -0400 ++++ celestia-1.5.1.new/src/celestia/gtk/splash.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -22,6 +22,7 @@ + + #include "splash.h" + #include "common.h" ++#include + + + /* Declarations */ +diff -Naur celestia-1.5.1/src/celestia/kde/celestialbrowser.cpp celestia-1.5.1.new/src/celestia/kde/celestialbrowser.cpp +--- celestia-1.5.1/src/celestia/kde/celestialbrowser.cpp 2008-04-23 17:17:05.000000000 -0400 ++++ celestia-1.5.1.new/src/celestia/kde/celestialbrowser.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -16,6 +16,7 @@ + #include "cellistviewitem.h" + #include "selectionpopup.h" + #include "celutil/utf8.h" ++#include + + /* + * Constructs a CelestialBrowser which is a child of 'parent', with the +diff -Naur celestia-1.5.1/src/celestia/kde/celsplashscreen.cpp celestia-1.5.1.new/src/celestia/kde/celsplashscreen.cpp +--- celestia-1.5.1/src/celestia/kde/celsplashscreen.cpp 2008-04-23 17:17:05.000000000 -0400 ++++ celestia-1.5.1.new/src/celestia/kde/celsplashscreen.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -22,6 +22,7 @@ + #include + #include + #include ++#include + + CelSplashScreen::CelSplashScreen(const QString& filename, QWidget* _parent): + QWidget(0, 0, WStyle_Customize | WX11BypassWM), +diff -Naur celestia-1.5.1/src/celestia/kde/eclipsefinderdlg.cpp celestia-1.5.1.new/src/celestia/kde/eclipsefinderdlg.cpp +--- celestia-1.5.1/src/celestia/kde/eclipsefinderdlg.cpp 2008-04-23 17:17:05.000000000 -0400 ++++ celestia-1.5.1.new/src/celestia/kde/eclipsefinderdlg.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -11,6 +11,7 @@ + #include "celestiacore.h" + #include "celengine/astro.h" + #include "eclipsefinder.h" ++#include + + /* + * Constructs a EclipseFinder which is a child of 'parent', with the +diff -Naur celestia-1.5.1/src/celestia/kde/kcelbookmarkmanager.cpp celestia-1.5.1.new/src/celestia/kde/kcelbookmarkmanager.cpp +--- celestia-1.5.1/src/celestia/kde/kcelbookmarkmanager.cpp 2008-04-23 17:17:05.000000000 -0400 ++++ celestia-1.5.1.new/src/celestia/kde/kcelbookmarkmanager.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -19,6 +19,7 @@ + #include + #include + #include "kcelbookmarkmanager.h" ++#include + + KBookmarkManager* KCelBookmarkManager::self() { + if ( !s_bookmarkManager ) +diff -Naur celestia-1.5.1/src/celestia/kde/kcelbookmarkmenu.cpp celestia-1.5.1.new/src/celestia/kde/kcelbookmarkmenu.cpp +--- celestia-1.5.1/src/celestia/kde/kcelbookmarkmenu.cpp 2008-04-23 17:17:05.000000000 -0400 ++++ celestia-1.5.1.new/src/celestia/kde/kcelbookmarkmenu.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -45,6 +45,7 @@ + #include + #include + #include ++#include + + template class QPtrList; + +diff -Naur celestia-1.5.1/src/celestia/kde/kdeapp.cpp celestia-1.5.1.new/src/celestia/kde/kdeapp.cpp +--- celestia-1.5.1/src/celestia/kde/kdeapp.cpp 2008-04-23 17:17:05.000000000 -0400 ++++ celestia-1.5.1.new/src/celestia/kde/kdeapp.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -87,6 +87,7 @@ + #endif + + #include "celengine/glext.h" ++#include + + #define MENUMAXSIZE 100 + +diff -Naur celestia-1.5.1/src/celestia/kde/kdeglwidget.cpp celestia-1.5.1.new/src/celestia/kde/kdeglwidget.cpp +--- celestia-1.5.1/src/celestia/kde/kdeglwidget.cpp 2008-04-23 17:17:05.000000000 -0400 ++++ celestia-1.5.1.new/src/celestia/kde/kdeglwidget.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -48,6 +48,7 @@ + + #include + #include ++#include + + KdeGlWidget::KdeGlWidget( QWidget* parent, const char* name, CelestiaCore* core) + : QGLWidget( parent, name ) +diff -Naur celestia-1.5.1/src/celestia/kde/kdemain.cpp celestia-1.5.1.new/src/celestia/kde/kdemain.cpp +--- celestia-1.5.1/src/celestia/kde/kdemain.cpp 2008-04-23 17:17:05.000000000 -0400 ++++ celestia-1.5.1.new/src/celestia/kde/kdemain.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -20,6 +20,7 @@ + #include + + #include "kdeuniquecelestia.h" ++#include + + static const char *description = + I18N_NOOP("Celestia"); +diff -Naur celestia-1.5.1/src/celestia/kde/kdepreferencesdialog.cpp celestia-1.5.1.new/src/celestia/kde/kdepreferencesdialog.cpp +--- celestia-1.5.1/src/celestia/kde/kdepreferencesdialog.cpp 2008-04-23 17:17:05.000000000 -0400 ++++ celestia-1.5.1.new/src/celestia/kde/kdepreferencesdialog.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -40,6 +40,7 @@ + #include "celengine/render.h" + #include "celengine/glcontext.h" + #include "celengine/astro.h" ++#include + + static uint32 FilterOtherLocations = ~(Location::City | + Location::Observatory | +diff -Naur celestia-1.5.1/src/celestia/kde/kdeuniquecelestia.cpp celestia-1.5.1.new/src/celestia/kde/kdeuniquecelestia.cpp +--- celestia-1.5.1/src/celestia/kde/kdeuniquecelestia.cpp 2008-04-23 17:17:05.000000000 -0400 ++++ celestia-1.5.1.new/src/celestia/kde/kdeuniquecelestia.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + + KdeUniqueCelestia::KdeUniqueCelestia() { + +diff -Naur celestia-1.5.1/src/celestia/kde/selectionpopup.cpp celestia-1.5.1.new/src/celestia/kde/selectionpopup.cpp +--- celestia-1.5.1/src/celestia/kde/selectionpopup.cpp 2008-04-23 17:17:05.000000000 -0400 ++++ celestia-1.5.1.new/src/celestia/kde/selectionpopup.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -29,6 +29,7 @@ + #include + + #include "celutil/utf8.h" ++#include + + SelectionPopup::SelectionPopup(QWidget* parent, CelestiaCore* _appCore, Selection _sel): + KPopupMenu(parent), +diff -Naur celestia-1.5.1/src/celestia/kde/videocapturedlg.cpp celestia-1.5.1.new/src/celestia/kde/videocapturedlg.cpp +--- celestia-1.5.1/src/celestia/kde/videocapturedlg.cpp 2008-04-23 17:17:05.000000000 -0400 ++++ celestia-1.5.1.new/src/celestia/kde/videocapturedlg.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -36,6 +36,7 @@ + #include + #include + #include "kdeapp.h" ++#include + + VideoCaptureDlg::VideoCaptureDlg(QWidget* p, const QString &dir): + accepted(false) +diff -Naur celestia-1.5.1/src/celestia/oggtheoracapture.cpp celestia-1.5.1.new/src/celestia/oggtheoracapture.cpp +--- celestia-1.5.1/src/celestia/oggtheoracapture.cpp 2008-04-23 17:17:06.000000000 -0400 ++++ celestia-1.5.1.new/src/celestia/oggtheoracapture.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -62,15 +62,18 @@ + #include + #include + #include ++#include + #include + #include + #include "../celengine/gl.h" + #include ++#include + #include "theora/theora.h" + + using namespace std; + + #include "oggtheoracapture.h" ++#include + + // {"video-rate-target",required_argument,NULL,'V'}, + // {"video-quality",required_argument,NULL,'v'}, +diff -Naur celestia-1.5.1/src/celestia/scriptmenu.cpp celestia-1.5.1.new/src/celestia/scriptmenu.cpp +--- celestia-1.5.1/src/celestia/scriptmenu.cpp 2008-04-23 17:17:06.000000000 -0400 ++++ celestia-1.5.1.new/src/celestia/scriptmenu.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -13,6 +13,7 @@ + #include "celutil/directory.h" + #include "celutil/filetype.h" + #include ++#include + + using namespace std; + +diff -Naur celestia-1.5.1/src/celestia/url.cpp celestia-1.5.1.new/src/celestia/url.cpp +--- celestia-1.5.1/src/celestia/url.cpp 2008-04-23 17:17:06.000000000 -0400 ++++ celestia-1.5.1.new/src/celestia/url.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -16,10 +16,12 @@ + ***************************************************************************/ + + #include ++#include + #include + #include "celestiacore.h" + #include "celengine/astro.h" + #include "url.h" ++#include + + static const unsigned int CurrentCelestiaURLVersion = 2; + +diff -Naur celestia-1.5.1/src/celestia/wglext.cpp celestia-1.5.1.new/src/celestia/wglext.cpp +--- celestia-1.5.1/src/celestia/wglext.cpp 2008-04-23 17:17:06.000000000 -0400 ++++ celestia-1.5.1.new/src/celestia/wglext.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -14,7 +14,10 @@ + #include "wglext.h" + #include + #include ++#include ++#include + #include ++#include + + using namespace std; + +diff -Naur celestia-1.5.1/src/celestia/winbookmarks.cpp celestia-1.5.1.new/src/celestia/winbookmarks.cpp +--- celestia-1.5.1/src/celestia/winbookmarks.cpp 2008-04-23 17:17:06.000000000 -0400 ++++ celestia-1.5.1.new/src/celestia/winbookmarks.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -13,6 +13,7 @@ + #include "res/resource.h" + #include + #include ++#include + + using namespace std; + +diff -Naur celestia-1.5.1/src/celestia/windatepicker.cpp celestia-1.5.1.new/src/celestia/windatepicker.cpp +--- celestia-1.5.1/src/celestia/windatepicker.cpp 2008-04-23 17:17:06.000000000 -0400 ++++ celestia-1.5.1.new/src/celestia/windatepicker.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -11,10 +11,12 @@ + + #include + #include ++#include + #include "celutil/basictypes.h" + #include "celengine/astro.h" + #include "celutil/util.h" + #include "celutil/winutil.h" ++#include + + + // DatePicker is a Win32 control for setting the date. It replaces the +diff -Naur celestia-1.5.1/src/celestia/wineclipses.cpp celestia-1.5.1.new/src/celestia/wineclipses.cpp +--- celestia-1.5.1/src/celestia/wineclipses.cpp 2008-04-23 17:17:06.000000000 -0400 ++++ celestia-1.5.1.new/src/celestia/wineclipses.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -10,6 +10,7 @@ + + #include + #include ++#include + #include + #include + #include +@@ -23,6 +24,7 @@ + #include "celmath/distance.h" + #include "celutil/util.h" + #include "celutil/winutil.h" ++#include + + using namespace std; + +diff -Naur celestia-1.5.1/src/celestia/winhyperlinks.cpp celestia-1.5.1.new/src/celestia/winhyperlinks.cpp +--- celestia-1.5.1/src/celestia/winhyperlinks.cpp 2008-04-23 17:17:06.000000000 -0400 ++++ celestia-1.5.1.new/src/celestia/winhyperlinks.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -9,6 +9,7 @@ + // as published by the Free Software Foundation; either version 2 + // of the License, or (at your option) any later version. + ++#include + #include "winhyperlinks.h" + #include "res/resource.h" + +diff -Naur celestia-1.5.1/src/celestia/winmain.cpp celestia-1.5.1.new/src/celestia/winmain.cpp +--- celestia-1.5.1/src/celestia/winmain.cpp 2008-04-23 17:17:06.000000000 -0400 ++++ celestia-1.5.1.new/src/celestia/winmain.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + + #include + #include +@@ -59,6 +60,7 @@ + #include "wglext.h" + + #include ++#include + + using namespace std; + +diff -Naur celestia-1.5.1/src/celestia/winsplash.cpp celestia-1.5.1.new/src/celestia/winsplash.cpp +--- celestia-1.5.1/src/celestia/winsplash.cpp 2008-04-23 17:17:06.000000000 -0400 ++++ celestia-1.5.1.new/src/celestia/winsplash.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -16,6 +16,7 @@ + #include "res/resource.h" + #include "celutil/util.h" + #include ++#include + #include + + using namespace std; +diff -Naur celestia-1.5.1/src/celestia/winstarbrowser.cpp celestia-1.5.1.new/src/celestia/winstarbrowser.cpp +--- celestia-1.5.1/src/celestia/winstarbrowser.cpp 2008-04-23 17:17:06.000000000 -0400 ++++ celestia-1.5.1.new/src/celestia/winstarbrowser.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -15,10 +15,12 @@ + #include + #include + #include ++#include + #include "winstarbrowser.h" + #include "celutil/winutil.h" + + #include "res/resource.h" ++#include + + extern void SetMouseCursor(LPCTSTR lpCursor); + +diff -Naur celestia-1.5.1/src/celestia/wintime.cpp celestia-1.5.1.new/src/celestia/wintime.cpp +--- celestia-1.5.1/src/celestia/wintime.cpp 2008-04-23 17:17:06.000000000 -0400 ++++ celestia-1.5.1.new/src/celestia/wintime.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -18,6 +18,7 @@ + #include + #include "celutil/util.h" + #include "celutil/winutil.h" ++#include + + + +diff -Naur celestia-1.5.1/src/celmath/quaternion.h celestia-1.5.1.new/src/celmath/quaternion.h +--- celestia-1.5.1/src/celmath/quaternion.h 2008-04-23 17:17:20.000000000 -0400 ++++ celestia-1.5.1.new/src/celmath/quaternion.h 2008-06-24 09:09:16.000000000 -0400 +@@ -16,7 +16,6 @@ + #include + #include + +- + template class Quaternion + { + public: +diff -Naur celestia-1.5.1/src/celutil/bigfix.cpp celestia-1.5.1.new/src/celutil/bigfix.cpp +--- celestia-1.5.1/src/celutil/bigfix.cpp 2008-04-23 17:17:19.000000000 -0400 ++++ celestia-1.5.1.new/src/celutil/bigfix.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -10,6 +10,7 @@ + #include + #include + #include "bigfix.h" ++#include + + + /*** Constructors ***/ +diff -Naur celestia-1.5.1/src/celutil/color.cpp celestia-1.5.1.new/src/celutil/color.cpp +--- celestia-1.5.1/src/celutil/color.cpp 2008-04-23 17:17:19.000000000 -0400 ++++ celestia-1.5.1.new/src/celutil/color.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -9,6 +9,7 @@ + + #include + #include ++#include + #include + #include "color.h" + +diff -Naur celestia-1.5.1/src/celutil/directory.cpp celestia-1.5.1.new/src/celutil/directory.cpp +--- celestia-1.5.1/src/celutil/directory.cpp 2008-04-23 17:17:19.000000000 -0400 ++++ celestia-1.5.1.new/src/celutil/directory.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -9,6 +9,7 @@ + + #include + #include "directory.h" ++#include + + using namespace std; + +diff -Naur celestia-1.5.1/src/celutil/filetype.cpp celestia-1.5.1.new/src/celutil/filetype.cpp +--- celestia-1.5.1/src/celutil/filetype.cpp 2008-04-23 17:17:19.000000000 -0400 ++++ celestia-1.5.1.new/src/celutil/filetype.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -11,6 +11,7 @@ + #include + #include "util.h" + #include "filetype.h" ++#include + + using namespace std; + +diff -Naur celestia-1.5.1/src/celutil/formatnum.cpp celestia-1.5.1.new/src/celutil/formatnum.cpp +--- celestia-1.5.1/src/celutil/formatnum.cpp 2008-04-23 17:17:19.000000000 -0400 ++++ celestia-1.5.1.new/src/celutil/formatnum.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -10,6 +10,8 @@ + #include + #include + #include ++#include ++#include + #include "formatnum.h" + + // HACK: MS Visual C++ has _snprintf declared in stdio.h but not snprintf +diff -Naur celestia-1.5.1/src/celutil/utf8.cpp celestia-1.5.1.new/src/celutil/utf8.cpp +--- celestia-1.5.1/src/celutil/utf8.cpp 2008-04-23 17:17:19.000000000 -0400 ++++ celestia-1.5.1.new/src/celutil/utf8.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -9,7 +9,9 @@ + + #include "utf8.h" + #include ++#include + #include "util.h" ++#include + + unsigned int WGL4_Normalization_00[256] = { + 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, +diff -Naur celestia-1.5.1/src/celutil/util.cpp celestia-1.5.1.new/src/celutil/util.cpp +--- celestia-1.5.1/src/celutil/util.cpp 2008-04-23 17:17:19.000000000 -0400 ++++ celestia-1.5.1.new/src/celutil/util.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -12,6 +12,7 @@ + #include "util.h" + #include + #include ++#include + + using namespace std; + +diff -Naur celestia-1.5.1/src/celutil/util.h celestia-1.5.1.new/src/celutil/util.h +--- celestia-1.5.1/src/celutil/util.h 2008-04-23 17:17:19.000000000 -0400 ++++ celestia-1.5.1.new/src/celutil/util.h 2008-06-24 09:09:16.000000000 -0400 +@@ -22,11 +22,11 @@ + switch(0){case 0: case pred:;} + + #ifndef min +-#define min(a, b) ((a) < (b) ? (a) : (b)) ++template bool min(T1 a, T2 b){ return a<(T1)b; } + #endif + + #ifndef max +-#define max(a, b) ((a) < (b) ? (b) : (a)) ++template bool max(T1 a, T2 b){ return a<(T1)b; } + #endif + + #ifdef _WIN32 +diff -Naur celestia-1.5.1/src/celutil/windirectory.cpp celestia-1.5.1.new/src/celutil/windirectory.cpp +--- celestia-1.5.1/src/celutil/windirectory.cpp 2008-04-23 17:17:19.000000000 -0400 ++++ celestia-1.5.1.new/src/celutil/windirectory.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -10,6 +10,7 @@ + #include + #include + #include "directory.h" ++#include + + using namespace std; + +diff -Naur celestia-1.5.1/src/packdb.cpp celestia-1.5.1.new/src/packdb.cpp +--- celestia-1.5.1/src/packdb.cpp 2008-04-23 17:17:20.000000000 -0400 ++++ celestia-1.5.1.new/src/packdb.cpp 2008-06-24 09:10:57.000000000 -0400 +@@ -10,6 +10,7 @@ + #include + #include + #include ++#include + + #define SPECTRAL_O 0 + #define SPECTRAL_B 1 +diff -Naur celestia-1.5.1/src/tools/atmosphere/scattersim.cpp celestia-1.5.1.new/src/tools/atmosphere/scattersim.cpp +--- celestia-1.5.1/src/tools/atmosphere/scattersim.cpp 2008-04-23 17:17:18.000000000 -0400 ++++ celestia-1.5.1.new/src/tools/atmosphere/scattersim.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -11,7 +11,9 @@ + #include + #include + #include ++#include + #include ++#include + #include + #include + #include +diff -Naur celestia-1.5.1/src/tools/buildstardb.cpp celestia-1.5.1.new/src/tools/buildstardb.cpp +--- celestia-1.5.1/src/tools/buildstardb.cpp 2008-04-23 17:17:18.000000000 -0400 ++++ celestia-1.5.1.new/src/tools/buildstardb.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -16,6 +16,7 @@ + #include + #include + #include "stardb.h" ++#include + + using namespace std; + +diff -Naur celestia-1.5.1/src/tools/cmod/cmodfix.cpp celestia-1.5.1.new/src/tools/cmod/cmodfix.cpp +--- celestia-1.5.1/src/tools/cmod/cmodfix.cpp 2008-04-23 17:17:17.000000000 -0400 ++++ celestia-1.5.1.new/src/tools/cmod/cmodfix.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -18,6 +18,7 @@ + #include + #include + #include ++#include + #include + #include + #ifdef TRISTRIP +diff -Naur celestia-1.5.1/src/tools/cmod/xtocmod.cpp celestia-1.5.1.new/src/tools/cmod/xtocmod.cpp +--- celestia-1.5.1/src/tools/cmod/xtocmod.cpp 2008-04-23 17:17:17.000000000 -0400 ++++ celestia-1.5.1.new/src/tools/cmod/xtocmod.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -3,6 +3,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff -Naur celestia-1.5.1/src/tools/stardb/makestardb.cpp celestia-1.5.1.new/src/tools/stardb/makestardb.cpp +--- celestia-1.5.1/src/tools/stardb/makestardb.cpp 2008-04-23 17:17:17.000000000 -0400 ++++ celestia-1.5.1.new/src/tools/stardb/makestardb.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -14,6 +14,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff -Naur celestia-1.5.1/src/tools/stardb/startextdump.cpp celestia-1.5.1.new/src/tools/stardb/startextdump.cpp +--- celestia-1.5.1/src/tools/stardb/startextdump.cpp 2008-04-23 17:17:17.000000000 -0400 ++++ celestia-1.5.1.new/src/tools/stardb/startextdump.cpp 2008-06-24 09:09:16.000000000 -0400 +@@ -13,6 +13,7 @@ + #include + #include + #include ++#include + #include + #include + #include diff --git a/source/gnome-extra/celestia/celestia-1.5.1-gnome-desktop.patch b/source/gnome-extra/celestia/celestia-1.5.1-gnome-desktop.patch new file mode 100644 index 0000000..87cfbc9 --- /dev/null +++ b/source/gnome-extra/celestia/celestia-1.5.1-gnome-desktop.patch @@ -0,0 +1,18 @@ +--- src/celestia/gtk/data/celestia.desktop~ 2007-08-25 17:45:09.000000000 +0200 ++++ src/celestia/gtk/data/celestia.desktop 2007-08-25 17:45:09.000000000 +0200 +@@ -1,12 +1,11 @@ + [Desktop Entry] + Encoding=UTF-8 +-Version=1.4.0 + Type=Application + Exec=celestia + Icon=celestia +-X-GNOME-DocPath= + Terminal=false + Name=Celestia +-Comment=Space Simulator ++Comment=Space 3D Simulator ++Comment[es]=Simulador 3D del Espacio + StartupNotify=true +-Categories=Astronomy;Science;Application; ++Categories=Education;Science;Astronomy; From vmiklos at frugalware.org Fri Jan 16 14:50:56 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Jan 16 14:50:58 2009 Subject: [Frugalware-git] frugalware-current: mpd-0.14-4-i686 Message-ID: <20090116135056.CBD3311B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=021452a2da9d4f21a38245177f75f4e92fc6449b commit 021452a2da9d4f21a38245177f75f4e92fc6449b Author: Miklos Vajna Date: Fri Jan 16 14:50:33 2009 +0100 mpd-0.14-4-i686 - add curl support - requested by olegfink on irc diff --git a/source/multimedia/mpd/FrugalBuild b/source/multimedia/mpd/FrugalBuild index e5a0a6b..505a262 100644 --- a/source/multimedia/mpd/FrugalBuild +++ b/source/multimedia/mpd/FrugalBuild @@ -3,14 +3,14 @@ pkgname=mpd pkgver=0.14 -pkgrel=3 +pkgrel=4 pkgdesc="the Music Player Daemon" _F_sourceforge_dirname="musicpd" _F_sourceforge_ext=".tar.bz2" Finclude sourceforge url="http://musicpd.org" depends=('libmikmod>=3.1.7' 'flac>=1.1.3' 'libao' 'audiofile>=0.1.7' 'libvorbis' \ - 'faad2' 'libid3tag' 'libmad' 'libshout' 'libmpcdec') + 'faad2' 'libid3tag' 'libmad' 'libshout' 'libmpcdec' 'curl') backup=('etc/mpd.conf') groups=('multimedia') archs=('i686' 'x86_64') From vmiklos at frugalware.org Fri Jan 16 15:12:40 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Jan 16 15:12:42 2009 Subject: [Frugalware-git] frugalware-current: ufraw-0.15-1-i686 Message-ID: <20090116141240.5AA0E11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b8b8ec215f5b4fd298e23bb69d44d79d924e4e65 commit b8b8ec215f5b4fd298e23bb69d44d79d924e4e65 Author: Cedynamix Date: Fri Jan 16 12:04:56 2009 +0100 ufraw-0.15-1-i686 * new package diff --git a/source/xapps-extra/ufraw/FrugalBuild b/source/xapps-extra/ufraw/FrugalBuild new file mode 100644 index 0000000..3bc13ab --- /dev/null +++ b/source/xapps-extra/ufraw/FrugalBuild @@ -0,0 +1,31 @@ +# Compiling Time: 0.11 SBU +# Maintainer: Miklos Vajna +# Contributor: Cedynamix + +pkgname=ufraw +pkgver=0.15 +pkgrel=1 +pkgdesc="The Unidentified Flying Raw (UFRaw) is a utility to read and manipulate raw images from digital cameras." +_F_sourceforge_prefix="$pkgname-" +Finclude sourceforge +depends=('lcms' 'bzip2' 'libstdc++' 'gtk+2' 'libxau' 'libxdmcp' 'freetype2' 'libxext' 'libxdamage' 'libxml2' \ + 'gtkimageview' 'cfitsio' 'exiv2') +makedepends=('gimp' 'cinepaint') +groups=('xapps-extra') +archs=('i686') +sha1sums=('e8c7fa95bfb84e18ee538495861e52516ca8b3b8') + +subpkgs=("$pkgname-gimp" "$pkgname-cinepaint") +subdescs=('gimp importer for raw camera images' 'cinepaint importer for raw camera images') +subdepends=("gimp ufraw" "cinepaint ufraw") +subgroups=('xlib-extra' 'xlib-extra') +subarchs=('i686' 'i686') + +build() { + Fbuild + Fsplit $pkgname-gimp /usr/lib/gimp + Fsplit $pkgname-cinepaint /usr/lib/cinepaint +} + +# optimization OK + From vmiklos at frugalware.org Fri Jan 16 15:26:48 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Jan 16 15:26:49 2009 Subject: [Frugalware-git] frugalware-current: darcs-2.2.0-1-i686 Message-ID: <20090116142648.29EDA11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=24c01ff99167c7a7c655c00b255d0ea7019bdbb8 commit 24c01ff99167c7a7c655c00b255d0ea7019bdbb8 Author: Miklos Vajna Date: Fri Jan 16 15:26:31 2009 +0100 darcs-2.2.0-1-i686 - version bump diff --git a/source/devel-extra/darcs/FrugalBuild b/source/devel-extra/darcs/FrugalBuild index 736c9af..fc725ed 100644 --- a/source/devel-extra/darcs/FrugalBuild +++ b/source/devel-extra/darcs/FrugalBuild @@ -2,18 +2,18 @@ # Maintainer: Miklos Vajna pkgname=darcs -pkgver=2.1.2 +pkgver=2.2.0 pkgrel=1 pkgdesc="David's Advanced Revision Control System" url="http://darcs.net" depends=('gmp' 'curl>=7.19.0' 'readline') groups=('devel-extra') archs=('i686' 'x86_64') -makedepends=('ghc>=6.6.1-2' 'latex2html' 'git') +makedepends=('ghc' 'latex2html') up2date="lynx -dump $url|grep Stable|sed 's/.*(\(.*\)).*/\1/'" source=(http://darcs.net/$pkgname-$pkgver.tar.gz \ README.Frugalware) -sha1sums=('57e604cc5bdf921f86bf48adeb4e9dfdaefb2c62' \ +sha1sums=('a932ee14efc57490a4304958ab391ad7c86030f0' \ '6f6443a7530355f0f5cc0524f87a7ca46c6992ca') options=('scriptlet') @@ -24,8 +24,7 @@ build() export CFLAGS="-O2 -pipe" fi export CFLAGS="${CFLAGS/-mtune=generic}" - Fconf --enable-git --with-git-core=/usr/lib \ - --with-git-includes=-I/usr/include/git + Fconf make all || Fdie Fmakeinstall Fmv /usr/share/doc/$pkgname /usr/share/doc/$pkgname-$pkgver From vmiklos at frugalware.org Fri Jan 16 15:35:01 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Jan 16 15:35:04 2009 Subject: [Frugalware-git] frugalware-current: kshutdown-1.0.4-1-i686 Message-ID: <20090116143501.E364B11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7a1b2b15eb3a05fcfb479079cafafc5ba7a297d0 commit 7a1b2b15eb3a05fcfb479079cafafc5ba7a297d0 Author: Miklos Vajna Date: Fri Jan 16 15:34:53 2009 +0100 kshutdown-1.0.4-1-i686 - version bump diff --git a/source/kde-extra/kshutdown/FrugalBuild b/source/kde-extra/kshutdown/FrugalBuild index 45709a1..cab3137 100644 --- a/source/kde-extra/kshutdown/FrugalBuild +++ b/source/kde-extra/kshutdown/FrugalBuild @@ -2,17 +2,16 @@ # Maintainer: Miklos Vajna pkgname=kshutdown -pkgver=1.0.3 +pkgver=1.0.4 pkgrel=1 pkgdesc="KShutDown is an advanced shut down utility for KDE." depends=('kdelibs') groups=('kde-extra') archs=('i686' 'x86_64') -_F_sourceforge_broken_up2date=1 _F_sourceforge_ext=".tar.bz2" _F_kde_defaults=0 Finclude sourceforge kde # 2.0 is for kde4 -up2date="$up2date|sed 's/2.0/1.0.3/'" -sha1sums=('a961aa648537422bb7314570e56f06c3c820461f') +up2date="$up2date|sed 's/2.0/1.0.4/'" +sha1sums=('5a6b1f28d8c835bbed14938b69d0b2e7b41309b7') # optimization OK From ryuo at frugalware.org Fri Jan 16 15:40:57 2009 From: ryuo at frugalware.org (James Buren) Date: Fri Jan 16 15:40:59 2009 Subject: [Frugalware-git] frugalware-current: firefox-adblock_plus-1.0.1-1-i686 Message-ID: <20090116144057.A577011B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6d50fd942233966bc67609326414e0ead5a2b035 commit 6d50fd942233966bc67609326414e0ead5a2b035 Author: James Buren Date: Fri Jan 16 08:44:36 2009 -0600 firefox-adblock_plus-1.0.1-1-i686 * version bump diff --git a/source/xapps-extra/firefox-adblock_plus/FrugalBuild b/source/xapps-extra/firefox-adblock_plus/FrugalBuild index 391d105..4fa9cd0 100644 --- a/source/xapps-extra/firefox-adblock_plus/FrugalBuild +++ b/source/xapps-extra/firefox-adblock_plus/FrugalBuild @@ -1,7 +1,7 @@ # Compiling Time: 0.01 SBU # Maintainer: James Buren -pkgver=1.0 +pkgver=1.0.1 pkgrel=1 _F_firefox_ext="adblock_plus" _F_firefox_name="$_F_firefox_ext-$pkgver-fx+sm+tb.xpi" @@ -10,7 +10,7 @@ pkgdesc="Firefox extension designed to make ads a thing of the past." url="https://addons.mozilla.org/en-US/firefox/addon/1865" up2date="elinks -dump '$url' | grep -o '$_F_firefox_ext-\(.*\)-fx+sm+tb.xpi' | sed 's|$_F_firefox_ext-\(.*\)-fx+sm+tb.xpi|\1|'" Finclude firefox-extension -source=(https://addons.mozilla.org/en-US/firefox/downloads/file/42123/$_F_firefox_name) +source=(https://addons.mozilla.org/en-US/firefox/downloads/file/44688/$_F_firefox_name) replaces=('firefox-adblock') -sha1sums=('f8807fafae9aa668d943f9a05997e5db72b974a0') +sha1sums=('cdb837247f6da122a26c8bdad43690583e2bb17c') archs=(${archs[@]} 'ppc') From ryuo at frugalware.org Fri Jan 16 15:43:09 2009 From: ryuo at frugalware.org (James Buren) Date: Fri Jan 16 15:43:11 2009 Subject: [Frugalware-git] frugalware-current: seamonkey-adblock_plus-1.0.1-1-i686 Message-ID: <20090116144309.54FB811B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c70aa6e4987d750ca5e1fe88a26b465cc8ba7d3a commit c70aa6e4987d750ca5e1fe88a26b465cc8ba7d3a Author: James Buren Date: Fri Jan 16 08:47:14 2009 -0600 seamonkey-adblock_plus-1.0.1-1-i686 * version bump diff --git a/source/xapps-extra/seamonkey-adblock_plus/FrugalBuild b/source/xapps-extra/seamonkey-adblock_plus/FrugalBuild index ab4a7c4..fcb2201 100644 --- a/source/xapps-extra/seamonkey-adblock_plus/FrugalBuild +++ b/source/xapps-extra/seamonkey-adblock_plus/FrugalBuild @@ -3,10 +3,10 @@ _F_seamonkey_name="adblock_plus" _F_seamonkey_ext="-fx+sm+tb.xpi" -pkgver=1.0 +pkgver=1.0.1 pkgrel=1 pkgdesc="Adblock plus makes ads a thing of the past. (seamonkey version)" url="https://addons.mozilla.org/en-US/seamonkey/addon/1865" -source=(https://addons.mozilla.org/en-US/seamonkey/downloads/file/42123/${_F_seamonkey_name}-${pkgver}${_F_seamonkey_ext}) -sha1sums=('f8807fafae9aa668d943f9a05997e5db72b974a0') +source=(https://addons.mozilla.org/en-US/seamonkey/downloads/file/44688/${_F_seamonkey_name}-${pkgver}${_F_seamonkey_ext}) +sha1sums=('cdb837247f6da122a26c8bdad43690583e2bb17c') Finclude seamonkey-addon From vmiklos at frugalware.org Fri Jan 16 17:52:02 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Jan 16 17:52:03 2009 Subject: [Frugalware-git] frugalware-current: unrar-3.8.5-1-ppc Message-ID: <20090116165202.2292911B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c558ab03d86d58757475285ec817fc2403b27185 commit c558ab03d86d58757475285ec817fc2403b27185 Author: Miklos Vajna Date: Fri Jan 16 17:50:46 2009 +0100 unrar-3.8.5-1-ppc added ppc to archs() diff --git a/source/apps-extra/unrar/FrugalBuild b/source/apps-extra/unrar/FrugalBuild index 1d10e89..6d0dbab 100644 --- a/source/apps-extra/unrar/FrugalBuild +++ b/source/apps-extra/unrar/FrugalBuild @@ -9,7 +9,7 @@ pkgdesc="Uncompress rar files" url="http://www.rarlab.com/" depends=('libstdc++') groups=('apps-extra') -archs=('i686' 'x86_64') +archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump $url/rar_add.htm |grep unrarsrc |sed 's/.*c-\(.*\).t.*/\1/'" source=(http://www.rarlab.com/rar/unrarsrc-$pkgver.tar.gz) sha1sums=('911d3ef2c279d9522afa22b452176dd86883a751') From vmiklos at frugalware.org Fri Jan 16 17:52:29 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Fri Jan 16 17:52:30 2009 Subject: [Frugalware-git] frugalware-current: clisp-2.47-1-i686 Message-ID: <20090116165229.88B7311B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=de6ae6993af56d31132d3a6d497cef054f7551d9 commit de6ae6993af56d31132d3a6d497cef054f7551d9 Author: Miklos Vajna Date: Fri Jan 16 17:52:18 2009 +0100 clisp-2.47-1-i686 - fix up smp build diff --git a/source/devel-extra/clisp/FrugalBuild b/source/devel-extra/clisp/FrugalBuild index ef21cf9..ead5203 100644 --- a/source/devel-extra/clisp/FrugalBuild +++ b/source/devel-extra/clisp/FrugalBuild @@ -20,6 +20,7 @@ build() { ./configure $Fconfopts || Fdie cd src || Fdie ./makemake --with-dynamic-ffi ${Fconfopts} > Makefile || Fdie + unset MAKEFLAGS make || Fdie Fmakeinstall } From priyank at frugalware.org Fri Jan 16 19:45:23 2009 From: priyank at frugalware.org (Priyank) Date: Fri Jan 16 19:45:25 2009 Subject: [Frugalware-git] frugalware-current: libgeda-1.4.2-1-i686 Message-ID: <20090116184523.927DC11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2a1e5a5539d7d3aab2567a0b7287e7a641a3243c commit 2a1e5a5539d7d3aab2567a0b7287e7a641a3243c Author: Priyank Date: Sat Jan 17 00:14:15 2009 +0530 libgeda-1.4.2-1-i686 * Version bump diff --git a/source/xlib-extra/libgeda/FrugalBuild b/source/xlib-extra/libgeda/FrugalBuild index ed2abb0..9d27553 100644 --- a/source/xlib-extra/libgeda/FrugalBuild +++ b/source/xlib-extra/libgeda/FrugalBuild @@ -2,19 +2,19 @@ # Maintainer: Priyank Gosalia pkgname=libgeda -pkgver=1.4.1 +pkgver=1.4.2 pkgrel=1 pkgdesc="libgeda library provides functions needed for the gEDA core suite." url="http://www.geda.seul.org/" depends=('gtk+' 'gtk+2' 'guile' 'gd' 'libstroke' 'shared-mime-info') -makedepends=('perl-xml-parser') +makedepends=('perl-xml-parser' 'intltool') groups=('xlib-extra' 'geda-suite') archs=('i686' 'x86_64') _F_gnome_iconcache=y Finclude gnome-scriptlet up2date="lynx -dump $url/sources.html | grep $pkgname | grep -m1 tar.gz | Flasttar" source=(http://www.geda.seul.org/release/v1.4/$pkgver/$pkgname-$pkgver.tar.gz) -sha1sums=('7feeabdae4aabae43a3f2a00d14bdc9a9cc826bf') +sha1sums=('7d79771f7ee010ec0bae33aac71fca6c8590adb4') build() { From priyank at frugalware.org Fri Jan 16 19:57:17 2009 From: priyank at frugalware.org (Priyank) Date: Fri Jan 16 19:57:19 2009 Subject: [Frugalware-git] frugalware-current: cegui-0.6.2-1-i686 Message-ID: <20090116185717.F2E9E11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=937383bb66dfa0e9d1a956aad98d9e08519c6412 commit 937383bb66dfa0e9d1a956aad98d9e08519c6412 Author: Priyank Date: Sat Jan 17 00:24:37 2009 +0530 cegui-0.6.2-1-i686 * Version bump diff --git a/source/xlib-extra/cegui/FrugalBuild b/source/xlib-extra/cegui/FrugalBuild index aa6c50b..457cbad 100644 --- a/source/xlib-extra/cegui/FrugalBuild +++ b/source/xlib-extra/cegui/FrugalBuild @@ -1,8 +1,8 @@ -# Compiling Time: 1.22 SBU +# Compiling Time: 1.47 SBU # Maintainer: Priyank Gosalia pkgname=cegui -pkgver=0.6.1 +pkgver=0.6.2 pkgrel=1 pkgdesc="Crazy Eddie's GUI System is a free library providing windowing and widgets for graphics APIs/engines" depends=('freetype2' 'pcre' 'xerces-c>=2.8.0' 'libgcc' 'freeglut' 'libgl' 'libsm' 'libxext' 'libxdamage' 'expat' 'libxml2' 'silly') @@ -15,6 +15,6 @@ url="http://www.cegui.org.uk/" source=(${source/$pkgname-/CEGUI-} compile-fix-for-xerces-c-2.8.0.patch) _F_cd_path="CEGUI-`echo $pkgver | sed 's/b//'`" Fconfopts="${Fconfopts} --without-devil --with-default-image-codec=SILLYImageCodec" -sha1sums=('f774f4ea34cb5b748fa72c010465f06035f0d46c' \ +sha1sums=('3b096bfffef23b9e83a400be7f4dbcb2482432ff' \ '817dee3f9b83588cad27da5ae86ec323ab21b1ee') # optimization OK From priyank at frugalware.org Fri Jan 16 20:04:53 2009 From: priyank at frugalware.org (Priyank) Date: Fri Jan 16 20:04:54 2009 Subject: [Frugalware-git] frugalware-current: uptimed-0.3.16-1-i686 Message-ID: <20090116190453.056EB11B8630@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8152d494166a606bafd982e8aa8ad43719adacde commit 8152d494166a606bafd982e8aa8ad43719adacde Author: Priyank Date: Sat Jan 17 00:34:06 2009 +0530 uptimed-0.3.16-1-i686 * Version bump diff --git a/source/apps-extra/uptimed/FrugalBuild b/source/apps-extra/uptimed/FrugalBuild index 2052d87..bb58e8e 100644 --- a/source/apps-extra/uptimed/FrugalBuild +++ b/source/apps-extra/uptimed/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: theD3viL pkgname=uptimed -pkgver=0.3.13 +pkgver=0.3.16 pkgrel=1 pkgdesc="A deamon which logs your uptime and uprecords." url="http://podgorny.cz/uptimed" @@ -14,7 +14,7 @@ install="uptimed.install" up2date="Flasttar $url/releases" source=(http://podgorny.cz/uptimed/releases/$pkgname-$pkgver.tar.bz2 \ rc.uptimed) -sha1sums=('fcb5173cf34b75c2272c981dc5850dc328fe1161' \ +sha1sums=('1579ae801277597b18a814d0dcf5613a1eb9ecfd' \ '679143e3177b8fd45e097f6eaab25ac3ad080b7d') build() From priyank at frugalware.org Fri Jan 16 20:28:47 2009 From: priyank at frugalware.org (Priyank) Date: Fri Jan 16 20:28:49 2009 Subject: [Frugalware-git] frugalware-current: phex-3.4.0.110-1-i686 Message-ID: <20090116192847.EA98811B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=aaf6bb746365c7256d25f87853dcc7bbb3f716ae commit aaf6bb746365c7256d25f87853dcc7bbb3f716ae Author: Priyank Date: Sat Jan 17 00:52:24 2009 +0530 phex-3.4.0.110-1-i686 * Version bump * Fix up2date diff --git a/source/xapps-extra/phex/FrugalBuild b/source/xapps-extra/phex/FrugalBuild index 468b2f3..fb23e9b 100644 --- a/source/xapps-extra/phex/FrugalBuild +++ b/source/xapps-extra/phex/FrugalBuild @@ -2,21 +2,23 @@ # Maintainer: Priyank Gosalia pkgname=phex -pkgver=3.2.4.105 +pkgver=3.4.0.110 pkgrel=1 pkgdesc="Phex is a p2p filesharing program running on gnutella network." license="GPL" _F_sourceforge_prefix="Phex " _F_sourceforge_ext=".zip" Finclude sourceforge +url="http://www.phex.org/mambo/" rodepends=('j2re') groups=('xapps-extra') archs=('i686' 'x86_64') +up2date="lynx -dump 'http://sourceforge.net/project/showfiles.php?group_id=27021&package_id=18754' | grep -m5 zip | tail -n1 | sed 's/.*x_\(.*\).z.*/\1/'" source=(${source/$pkgname-/${pkgname}_} phex.png) _F_desktop_name="Phex filesharing client" _F_desktop_categories="Network;" _F_desktop_icon="phex.png" -sha1sums=('bff7a30b6856799314344a15dff2d75b384bcca3' \ +sha1sums=('6b6c0a758872f3e1d64694e23fb5d140f33b661b' \ 'c57651f5ebf9be53638f7bb76a5bccb24dcd8b09') build() From priyank at frugalware.org Sat Jan 17 07:19:32 2009 From: priyank at frugalware.org (Priyank) Date: Sat Jan 17 07:19:36 2009 Subject: [Frugalware-git] gservice: Services are now displayed in alphabetically sorted order Message-ID: <20090117061932.C6CD811B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gservice.git;a=commitdiff;h=aef808bc829b228655d4849fe3394f3c225c3964 commit aef808bc829b228655d4849fe3394f3c225c3964 Author: Priyank Date: Sat Jan 17 11:48:29 2009 +0530 Services are now displayed in alphabetically sorted order diff --git a/src/gservice-backend.c b/src/gservice-backend.c index 539fa4b..cbc9add 100644 --- a/src/gservice-backend.c +++ b/src/gservice-backend.c @@ -208,6 +208,41 @@ gsvc_get_active_service_list (void) return ret; } +static int +gsvc_list_sort_func (gconstpointer *a, gconstpointer *b) +{ + gservice_entry_t *asvc = (gservice_entry_t*)a; + gservice_entry_t *bsvc = (gservice_entry_t*)b; + char aschar; + char bschar; + + if (!asvc) + { + return -1; + } + if (!bsvc) + { + return 1; + } + aschar = asvc->name[0]; + bschar = bsvc->name[0]; + if (aschar > bschar) + { + return 1; + } + else + if (aschar < bschar) + { + return -1; + } + else + { + return 0; + } + + return 0; +} + GList * gsvc_service_get_list (void) { @@ -269,6 +304,8 @@ gsvc_service_get_list (void) } } + /* sort the list */ + ret = g_list_sort (ret, (GCompareFunc)gsvc_list_sort_func); cleanup: /* free temporary data */ g_list_free (alist); From priyank at frugalware.org Sat Jan 17 07:19:32 2009 From: priyank at frugalware.org (Priyank) Date: Sat Jan 17 07:19:37 2009 Subject: [Frugalware-git] gservice: gservice-interface: hide run-level info in main window Message-ID: <20090117061932.DEDE011B8630@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gservice.git;a=commitdiff;h=6bb1adbc1bceb5f4096522aeadc3a332874f01ef commit 6bb1adbc1bceb5f4096522aeadc3a332874f01ef Author: Priyank Date: Sat Jan 17 11:48:56 2009 +0530 gservice-interface: hide run-level info in main window diff --git a/src/gservice-interface.c b/src/gservice-interface.c index 40083ac..6780e3a 100644 --- a/src/gservice-interface.c +++ b/src/gservice-interface.c @@ -77,7 +77,7 @@ gservice_cell_data_func (GtkTreeViewColumn *col, GtkCellRenderer *cell, gboolean val = FALSE; GdkColor color; - gtk_tree_model_get (model, iter, 11, &val, -1); + gtk_tree_model_get (model, iter, 4, &val, -1); if (!val) { gdk_color_parse ("gray", &color); @@ -99,16 +99,17 @@ gservice_setup_treeview (void) GtkTreeSelection *selection = NULL; GtkTreeViewColumn *column = NULL; - store = gtk_list_store_new (12, + store = gtk_list_store_new (5, GDK_TYPE_PIXBUF, /* status icon */ G_TYPE_STRING, /* service name & description */ - G_TYPE_INT, /* runlevel 0 */ - G_TYPE_INT, /* runlevel 1 */ - G_TYPE_INT, /* runlevel 2 */ - G_TYPE_INT, /* runlevel 3 */ - G_TYPE_INT, /* runlevel 4 */ - G_TYPE_INT, /* runlevel 5 */ - G_TYPE_INT, /* runlevel 6 */ + // G_TYPE_INT, /* runlevel 0 */ + // G_TYPE_INT, /* runlevel 1 */ + // G_TYPE_INT, /* runlevel 2 */ + // G_TYPE_INT, /* runlevel 3 */ + // G_TYPE_INT, /* runlevel 4 */ + // G_TYPE_INT, /* runlevel 5 */ + // G_TYPE_INT, /* runlevel 6 */ + // G_TYPE_BOOLEAN, /* status */ G_TYPE_STRING, /* service name for internal use */ G_TYPE_BOOLEAN); /* activation status for internal use */ @@ -123,7 +124,7 @@ gservice_setup_treeview (void) renderer = gtk_cell_renderer_text_new (); g_object_set (G_OBJECT(renderer), "wrap-mode", PANGO_WRAP_CHAR, NULL); - g_object_set (G_OBJECT(renderer), "wrap-width", 300, NULL); + g_object_set (G_OBJECT(renderer), "wrap-width", 400, NULL); gtk_cell_renderer_text_set_fixed_height_from_font (renderer, 5); column = gtk_tree_view_column_new_with_attributes (_("Service"), renderer, @@ -138,6 +139,7 @@ gservice_setup_treeview (void) NULL, NULL); gtk_tree_view_append_column (GTK_TREE_VIEW(gsvc_treeview_services), column); + /* renderer = gtk_cell_renderer_toggle_new (); g_object_set (G_OBJECT(renderer), "activatable", TRUE, NULL); g_signal_connect (renderer, "toggled", G_CALLBACK(cb_gsvc_r0_toggled), store); @@ -208,6 +210,7 @@ gservice_setup_treeview (void) gtk_tree_view_column_set_resizable (column, FALSE); gtk_tree_view_column_set_expand (column, FALSE); gtk_tree_view_append_column (GTK_TREE_VIEW(gsvc_treeview_services), column); + */ gtk_tree_view_set_model (GTK_TREE_VIEW(gsvc_treeview_services), GTK_TREE_MODEL(store)); selection = gtk_tree_view_get_selection (GTK_TREE_VIEW(gsvc_treeview_services)); @@ -261,15 +264,15 @@ gservice_populate_services (void) gtk_list_store_append (GTK_LIST_STORE(store), &iter); gtk_list_store_set (store, &iter, 1, (char*)namedesc, - 2, e->runlevel[0], + /*2, e->runlevel[0], 3, e->runlevel[1], 4, e->runlevel[2], 5, e->runlevel[3], 6, e->runlevel[4], 7, e->runlevel[5], - 8, e->runlevel[6], - 10, (char*)e->name, - 11, (e->enabled)?TRUE:FALSE, + 8, e->runlevel[6],*/ + 3, (char*)e->name, + 4, (e->enabled)?TRUE:FALSE, -1); //gtk_list_store_append (store, &iter); if (e->enabled) @@ -390,7 +393,7 @@ cb_gsvc_button_start_clicked (GtkButton *button, gpointer data) char *service = NULL; char *status = NULL; int retval = 0; - gtk_tree_model_get (model, &iter, 10, &service, -1); + gtk_tree_model_get (model, &iter, 3, &service, -1); if (service) { g_print ("STARTING: %s\n", service); @@ -419,7 +422,7 @@ cb_gsvc_button_stop_clicked (GtkButton *button, gpointer data) char *service = NULL; char *status = NULL; int retval = 0; - gtk_tree_model_get (model, &iter, 10, &service, -1); + gtk_tree_model_get (model, &iter, 3, &service, -1); if (service) { g_print ("STOPPING: %s\n", service); @@ -486,7 +489,7 @@ cb_gsvc_service_selected (GtkTreeSelection *selection, gpointer data) if (gtk_tree_selection_get_selected(selection, &model, &iter)) { GList *list = gsvc_service_list; - gtk_tree_model_get (model, &iter, 10, &service, -1); + gtk_tree_model_get (model, &iter, 3, &service, -1); g_print ("selected service: %s\n", service); while (list != NULL) { From priyank at frugalware.org Sat Jan 17 08:35:43 2009 From: priyank at frugalware.org (Priyank) Date: Sat Jan 17 08:35:45 2009 Subject: [Frugalware-git] gservice: Added a splash screen Message-ID: <20090117073543.B62B211B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gservice.git;a=commitdiff;h=a05bf2406e135f4fa5fd9ebe8b73a61bb401c65d commit a05bf2406e135f4fa5fd9ebe8b73a61bb401c65d Author: Priyank Date: Sat Jan 17 13:05:27 2009 +0530 Added a splash screen diff --git a/data/Makefile.am b/data/Makefile.am index 1d81691..6ffe40c 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,7 +1,7 @@ SUBDIRS = icons gladedir = $(datadir)/gservice -glade_DATA = gservice.glade +glade_DATA = gservice.glade gservice-splash.png EXTRA_DIST = $(glade_DATA) diff --git a/data/gservice-splash.png b/data/gservice-splash.png new file mode 100644 index 0000000..9ba619d Binary files /dev/null and b/data/gservice-splash.png differ diff --git a/data/gservice.glade b/data/gservice.glade index e5040ac..9eae825 100644 --- a/data/gservice.glade +++ b/data/gservice.glade @@ -1,6 +1,6 @@ - + 650 @@ -440,4 +440,17 @@ + + gService + False + True + GTK_WIN_POS_CENTER_ALWAYS + GDK_WINDOW_TYPE_HINT_SPLASHSCREEN + + + True + gservice-splash.png + + + diff --git a/src/gservice-interface.c b/src/gservice-interface.c index 6780e3a..47d8578 100644 --- a/src/gservice-interface.c +++ b/src/gservice-interface.c @@ -23,6 +23,7 @@ #include "gservice-about.h" GtkWidget *gsvc_main_window = NULL; +static GtkWidget *gsvc_splash_screen = NULL; static GtkWidget *gsvc_button_start = NULL; static GtkWidget *gsvc_button_stop = NULL; static GtkWidget *gsvc_button_restart = NULL; @@ -289,6 +290,7 @@ gservice_populate_services (void) g_free (desc); g_free (namedesc); temp = g_list_next (temp); + while (gtk_events_pending()) gtk_main_iteration (); } gtk_tree_view_set_model (GTK_TREE_VIEW(gsvc_treeview_services), GTK_TREE_MODEL(store)); //g_object_unref (pixbuf_on); @@ -344,6 +346,7 @@ void gservice_interface_init (void) { gsvc_main_window = gservice_get_widget ("gsvc_main_window"); + gsvc_splash_screen = gservice_get_widget ("gsvc_splash_screen"); gsvc_treeview_services = gservice_get_widget ("gsvc_treeview_services"); gsvc_textview_status = gservice_get_widget ("gsvc_textview_status"); gsvc_button_start = gservice_get_widget ("gsvc_button_start"); @@ -353,6 +356,9 @@ gservice_interface_init (void) gsvc_button_deactivate = gservice_get_widget ("gsvc_button_deactivate"); gsvc_button_edit = gservice_get_widget ("gsvc_button_edit"); gsvc_button_quit = gservice_get_widget ("gsvc_button_quit"); + gtk_widget_show (gsvc_splash_screen); + while (gtk_events_pending()) gtk_main_iteration (); + sleep (2); gservice_setup_treeview (); gservice_populate_services (); @@ -371,8 +377,10 @@ gservice_interface_init (void) NULL); /* alrite, lets display the main window */ + while (gtk_events_pending()) gtk_main_iteration (); + gtk_widget_hide (gsvc_splash_screen); gtk_widget_show (gsvc_main_window); - + return; } From priyank at frugalware.org Sat Jan 17 09:19:50 2009 From: priyank at frugalware.org (Priyank) Date: Sat Jan 17 09:19:52 2009 Subject: [Frugalware-git] frugalware-current: incollector-1.2-1-i686 Message-ID: <20090117081950.5062E11B8630@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4e62c2dee36538afe3fadadfd4edaf9cb6331005 commit 4e62c2dee36538afe3fadadfd4edaf9cb6331005 Author: Priyank Date: Sat Jan 17 13:39:48 2009 +0530 incollector-1.2-1-i686 * Version bump diff --git a/source/gnome-extra/incollector/FrugalBuild b/source/gnome-extra/incollector/FrugalBuild index c7cc6dd..3b19f5e 100644 --- a/source/gnome-extra/incollector/FrugalBuild +++ b/source/gnome-extra/incollector/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Priyank Gosalia pkgname=incollector -pkgver=0.6.1 -pkgrel=2 +pkgver=1.2 +pkgrel=1 pkgdesc="Incollector is an application to collect various kinds of information." url="http://incollector.devnull.pl" depends=('mono>=2.0.1' 'gtk2-sharp') @@ -12,7 +12,7 @@ archs=('i686' 'x86_64') Finclude mono up2date="lynx -dump $url/downloads.php | grep -m1 tar.gz | Flasttar" source=($url/download/sources/$pkgname-$pkgver.tar.gz) -sha1sums=('c5103056d01c00ced5f70b8dc41652adbe7f2dfc') +sha1sums=('970d335474760e5bc24decc43630b458e146bb83') build() { From priyank at frugalware.org Sat Jan 17 09:19:50 2009 From: priyank at frugalware.org (Priyank) Date: Sat Jan 17 09:19:54 2009 Subject: [Frugalware-git] frugalware-current: geda-core-1.4.2-1-i686 Message-ID: <20090117081950.3B20911B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=92d49125fe37fa25c061e058023ff3503b92662c commit 92d49125fe37fa25c061e058023ff3503b92662c Author: Priyank Date: Sat Jan 17 13:37:41 2009 +0530 geda-core-1.4.2-1-i686 * Version bump diff --git a/source/xapps-extra/geda-core/FrugalBuild b/source/xapps-extra/geda-core/FrugalBuild index d85b493..d3ab322 100644 --- a/source/xapps-extra/geda-core/FrugalBuild +++ b/source/xapps-extra/geda-core/FrugalBuild @@ -3,7 +3,7 @@ pkgname=geda-core _F_archive_name=geda-utils # Reference archive for package version -pkgver=1.4.0 +pkgver=1.4.2 pkgrel=1 pkgdesc="Core components for gEDA - A complete electronic design and automation suite." url="http://geda.seul.org/" @@ -30,14 +30,14 @@ Fconfopts="${Fconfopts[@]} --disable-dependency-tracking \ _F_gnome_desktop="y" _F_gnome_iconcache="y" Finclude gnome-scriptlet -sha1sums=('96c9de3bebd26b76d0559b4ee848be2105035d5e' \ - '494e4d9f323a935f6a858138101b5bed6788ce2f' \ - '0bdc4e350019f2193eda6f065277008538f06747' \ - '28af761573b682f93dff5936cc6d01458080239e' \ - 'a4bb4ee080b5eb822dac42f6f983be6ec8e669c7' \ - '725311fe02f6736f83f426c070e9fc40e42a231d' \ - 'd8b77a3f39fa324637314b62bdd56a7b2742f1a2' \ - '73895b572cbaf10eda563b8e8474dae9e833211f') +sha1sums=('b92473dfba4ea2449d26fe41001f1bd6b58ece6b' \ + 'e55f82290ebcfca7a7442a85b0ba0422f0c4423f' \ + 'd0f53301669bbf2f4a07a321bbbdc0b8b8651a53' \ + '69bd3d56d47195abc286c98675a9a4f0532f09aa' \ + '3827d35c8c6d17848cb8e47bae53e39970dde0b8' \ + '10965ca7fbd07e7721c258acc788f0ac5cdc14d3' \ + '9c38b275236548ebd24d46b0d13b306ff91ecf77' \ + 'e418478e874f3faa8d764d07b898723c17a4a596') build() { From boobaa at frugalware.org Sat Jan 17 09:39:00 2009 From: boobaa at frugalware.org (CSÉCSY László) Date: Sat Jan 17 09:39:01 2009 Subject: [Frugalware-git] frugalware-current: drupal-fckeditor-5.x_2.2_rc6-1-i686 Message-ID: <20090117083900.281A511B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=fd6cc27c3ac99acd7b702cdc88b71663c223acb5 commit fd6cc27c3ac99acd7b702cdc88b71663c223acb5 Author: CSÉCSY László Date: Sat Jan 17 09:38:30 2009 +0100 drupal-fckeditor-5.x_2.2_rc6-1-i686 version bump diff --git a/source/network-extra/drupal-fckeditor/FrugalBuild b/source/network-extra/drupal-fckeditor/FrugalBuild index d6eff07..d74e389 100644 --- a/source/network-extra/drupal-fckeditor/FrugalBuild +++ b/source/network-extra/drupal-fckeditor/FrugalBuild @@ -2,12 +2,12 @@ # Maintainer: CSÉCSY László _F_drupal_module=fckeditor -pkgver=5.x_2.1 +pkgver=5.x_2.2_rc6 pkgrel=1 pkgdesc="This module allows Drupal to replace textarea fields with the FCKeditor" Finclude sourceforge drupal source=(${source[@]} http://$_F_sourceforge_mirror.dl.sourceforge.net/sourceforge/fckeditor/FCKeditor_2.6.tar.gz) -sha1sums=('6abb600d3bb1fbfc93472c639c5f7daa9917d42f' \ +sha1sums=('49dfa97fff272fb8a8942f7daaffccb01207f5d9' \ '4c2799e1127d89dee6a410c9b4b701772c95c2d0') build() From boobaa at frugalware.org Sat Jan 17 09:40:43 2009 From: boobaa at frugalware.org (CSÉCSY László) Date: Sat Jan 17 09:40:45 2009 Subject: [Frugalware-git] frugalware-current: drupal-panels-5.x_2.0_rc1a-1-i686 Message-ID: <20090117084043.DC07E11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2b8e9d355b521dbd53fb87bf88573e2e1025fcaa commit 2b8e9d355b521dbd53fb87bf88573e2e1025fcaa Author: CSÉCSY László Date: Sat Jan 17 09:40:01 2009 +0100 drupal-panels-5.x_2.0_rc1a-1-i686 version bump diff --git a/source/network-extra/drupal-panels/FrugalBuild b/source/network-extra/drupal-panels/FrugalBuild index 6776c97..a7940f8 100644 --- a/source/network-extra/drupal-panels/FrugalBuild +++ b/source/network-extra/drupal-panels/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: CSÉCSY László _F_drupal_module=panels -pkgver=5.x_1.2 +pkgver=5.x_2.0_rc1a pkgrel=1 pkgdesc="This Drupal module allows you to create pages that are divided into areas of the page" Finclude drupal -sha1sums=('8d87d962c6b1b4aa6aed039d8bc53244a8e4c95b') +sha1sums=('dc862db64a5aabb0ee93e22c1f8d7bb134ebac43') From boobaa at frugalware.org Sat Jan 17 09:41:50 2009 From: boobaa at frugalware.org (CSÉCSY László) Date: Sat Jan 17 09:41:51 2009 Subject: [Frugalware-git] frugalware-current: drupal6-i18n-6.x_1.0_beta6-1-i686 Message-ID: <20090117084150.6281111B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=dce45f6b83364277b118f33568e6d4e9bf55e540 commit dce45f6b83364277b118f33568e6d4e9bf55e540 Author: CSÉCSY László Date: Sat Jan 17 09:41:40 2009 +0100 drupal6-i18n-6.x_1.0_beta6-1-i686 version bump diff --git a/source/network-extra/drupal6-i18n/FrugalBuild b/source/network-extra/drupal6-i18n/FrugalBuild index 08ae1e7..0b4d4f1 100644 --- a/source/network-extra/drupal6-i18n/FrugalBuild +++ b/source/network-extra/drupal6-i18n/FrugalBuild @@ -3,8 +3,8 @@ _F_drupal_module=i18n _F_drupal_ver=6.x -pkgver=6.x_1.0_beta4 +pkgver=6.x_1.0_beta6 pkgrel=1 pkgdesc="Enables multilingual content in Drupal" Finclude drupal -sha1sums=('b7d3d9190c532088392233c63190e20b4a674ba1') +sha1sums=('d95035e08baf8bbac0638cad0edfef9f14f8f900') From boobaa at frugalware.org Sat Jan 17 09:46:28 2009 From: boobaa at frugalware.org (CSÉCSY László) Date: Sat Jan 17 09:46:30 2009 Subject: [Frugalware-git] frugalware-current: drupal-fckeditor-5.x_2.2_rc6-2-i686 Message-ID: <20090117084628.2FA1011B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=77cb70abf9f4483e635562fd7a1b38a5ec2f4b93 commit 77cb70abf9f4483e635562fd7a1b38a5ec2f4b93 Author: CSÉCSY László Date: Sat Jan 17 09:46:07 2009 +0100 drupal-fckeditor-5.x_2.2_rc6-2-i686 doh, forgot to update fckeditor version diff --git a/source/network-extra/drupal-fckeditor/FrugalBuild b/source/network-extra/drupal-fckeditor/FrugalBuild index d74e389..dd4080e 100644 --- a/source/network-extra/drupal-fckeditor/FrugalBuild +++ b/source/network-extra/drupal-fckeditor/FrugalBuild @@ -3,12 +3,12 @@ _F_drupal_module=fckeditor pkgver=5.x_2.2_rc6 -pkgrel=1 +pkgrel=2 pkgdesc="This module allows Drupal to replace textarea fields with the FCKeditor" Finclude sourceforge drupal -source=(${source[@]} http://$_F_sourceforge_mirror.dl.sourceforge.net/sourceforge/fckeditor/FCKeditor_2.6.tar.gz) +source=(${source[@]} http://$_F_sourceforge_mirror.dl.sourceforge.net/sourceforge/fckeditor/FCKeditor_2.6.3.tar.gz) sha1sums=('49dfa97fff272fb8a8942f7daaffccb01207f5d9' \ - '4c2799e1127d89dee6a410c9b4b701772c95c2d0') + '49ea2d7c5881f8d9eb56173de895ef2155eafc4c') build() { From boobaa at frugalware.org Sat Jan 17 09:49:06 2009 From: boobaa at frugalware.org (CSÉCSY László) Date: Sat Jan 17 09:49:06 2009 Subject: [Frugalware-git] frugalware-current: drupal6-fckeditor-6.x_1.3_rc6-1-i686 Message-ID: <20090117084906.02B1911B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e7510c7a3ea3e0ba6cf92401f3830cf66bf5b134 commit e7510c7a3ea3e0ba6cf92401f3830cf66bf5b134 Author: CSÉCSY László Date: Sat Jan 17 09:48:38 2009 +0100 drupal6-fckeditor-6.x_1.3_rc6-1-i686 version bump diff --git a/source/network-extra/drupal6-fckeditor/FrugalBuild b/source/network-extra/drupal6-fckeditor/FrugalBuild index 19d37d4..654635b 100644 --- a/source/network-extra/drupal6-fckeditor/FrugalBuild +++ b/source/network-extra/drupal6-fckeditor/FrugalBuild @@ -3,13 +3,13 @@ _F_drupal_module=fckeditor _F_drupal_ver=6.x -pkgver=6.x_1.2_1 +pkgver=6.x_1.3_rc6 pkgrel=1 pkgdesc="This module allows Drupal to replace textarea fields with the FCKeditor" Finclude sourceforge drupal -source=(${source[@]} http://$_F_sourceforge_mirror.dl.sourceforge.net/sourceforge/fckeditor/FCKeditor_2.6.1.tar.gz) -sha1sums=('9eaa96de53db7b1f10577b10a1ebbcb17e94ed14' \ - '1e88ef60467b04a719dbf1388c1ff15356592a0f') +source=(${source[@]} http://$_F_sourceforge_mirror.dl.sourceforge.net/sourceforge/fckeditor/FCKeditor_2.6.3.tar.gz) +sha1sums=('c84ee26706b4eefb9a94abc7f75e0ef6b30e6a93' \ + '49ea2d7c5881f8d9eb56173de895ef2155eafc4c') build() { From priyank at frugalware.org Sat Jan 17 10:14:01 2009 From: priyank at frugalware.org (Priyank) Date: Sat Jan 17 10:14:03 2009 Subject: [Frugalware-git] frugalware-current: goocanvas-0.13-1-i686 Message-ID: <20090117091401.5E01511B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6a19f988f3f11d61b43d626a5a54e552340a4df1 commit 6a19f988f3f11d61b43d626a5a54e552340a4df1 Author: Priyank Date: Sat Jan 17 14:42:36 2009 +0530 goocanvas-0.13-1-i686 * Version bump diff --git a/source/gnome-extra/goocanvas/FrugalBuild b/source/gnome-extra/goocanvas/FrugalBuild index 03790e9..9537581 100644 --- a/source/gnome-extra/goocanvas/FrugalBuild +++ b/source/gnome-extra/goocanvas/FrugalBuild @@ -1,9 +1,9 @@ -# Compiling Time: 0.29 SBU +# Compiling Time: 0.27 SBU # Maintainer: Priyank Gosalia # Contributor: AlexExtreme pkgname=goocanvas -pkgver=0.12 +pkgver=0.13 pkgrel=1 pkgdesc="GooCanvas is a cairo-based canvas widget for GTK+." depends=('cairo>=1.6.4' 'gtk+2>=2.12.9') @@ -12,6 +12,6 @@ groups=('gnome-extra') archs=('i686' 'x86_64') _F_gnome_devel=y Finclude gnome -sha1sums=('bdd6f682543c3b5b722342a69c17541fa184f8ad') +sha1sums=('22595925b30b2572d541275abb6ea29f041a014a') # optimization OK From devil505linux at gmail.com Sat Jan 17 10:34:02 2009 From: devil505linux at gmail.com (Devil505) Date: Sat Jan 17 10:34:03 2009 Subject: [Frugalware-git] frugalware-current: rednotebook-0.4.1-1-i686 Message-ID: <20090117093402.20FC911B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0d6a0a2df1bc43a7692b58ef313932a35349f713 commit 0d6a0a2df1bc43a7692b58ef313932a35349f713 Author: Devil505 Date: Sat Jan 17 10:30:31 2009 +0100 rednotebook-0.4.1-1-i686 * version bump diff --git a/source/xapps-extra/rednotebook/FrugalBuild b/source/xapps-extra/rednotebook/FrugalBuild index 3df80fb..6b4ba30 100644 --- a/source/xapps-extra/rednotebook/FrugalBuild +++ b/source/xapps-extra/rednotebook/FrugalBuild @@ -2,11 +2,11 @@ # Maintainer: Devil505 pkgname=rednotebook -pkgver=0.4.0 -pkgrel=2 +pkgver=0.4.1 +pkgrel=1 pkgdesc="RedNotebook is a desktop diary that makes it very easy for you to keep track of the stuff you do and the thoughts you have." depends=('wxpython' 'pyyaml') Finclude sourceforge groups=('xapps-extra') archs=('i686' 'x86_64') -sha1sums=('47e7aa66ad03132509205ba2b8e6940d166fdbbd') +sha1sums=('48359515fa309cb53dbfc153ae9001d6aaeeebc2') From priyank at frugalware.org Sat Jan 17 10:34:52 2009 From: priyank at frugalware.org (Priyank) Date: Sat Jan 17 10:34:53 2009 Subject: [Frugalware-git] frugalware-current: goocanvasmm-0.13.0-1-i686 Message-ID: <20090117093452.6046411B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3341a59e1e061421738444718447a5deeaf74a7d commit 3341a59e1e061421738444718447a5deeaf74a7d Author: Priyank Date: Sat Jan 17 15:03:42 2009 +0530 goocanvasmm-0.13.0-1-i686 * Version bump diff --git a/source/gnome-extra/goocanvasmm/FrugalBuild b/source/gnome-extra/goocanvasmm/FrugalBuild index 9610c2d..94508f1 100644 --- a/source/gnome-extra/goocanvasmm/FrugalBuild +++ b/source/gnome-extra/goocanvasmm/FrugalBuild @@ -2,15 +2,15 @@ # Maintainer: Priyank Gosalia pkgname=goocanvasmm -pkgver=0.12.0 +pkgver=0.13.0 pkgrel=1 pkgdesc="C++ bindings for GooCanvas" -depends=('goocanvas>=0.12' 'gtkmm') +depends=('goocanvas>=0.13' 'gtkmm') options=('scriptlet') groups=('gnome-extra') archs=('i686' 'x86_64') _F_gnome_devel=y Finclude gnome -sha1sums=('5c2b68273b2b3704c4025ce26025f2d9313d65bb') +sha1sums=('57ce6faa941dbcc739505a791e67913a0a50e4dd') # optimization OK From priyank at frugalware.org Sat Jan 17 11:30:44 2009 From: priyank at frugalware.org (Priyank) Date: Sat Jan 17 11:30:46 2009 Subject: [Frugalware-git] frugalware-current: glom-1.8.5-1-i686 Message-ID: <20090117103044.3164F11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bc5e4291947bb822b6fb192237eefbc6d20a1cfe commit bc5e4291947bb822b6fb192237eefbc6d20a1cfe Author: Priyank Date: Sat Jan 17 16:00:13 2009 +0530 glom-1.8.5-1-i686 * Version bump diff --git a/source/gnome-extra/glom/FrugalBuild b/source/gnome-extra/glom/FrugalBuild index 0af97e9..1077daa 100644 --- a/source/gnome-extra/glom/FrugalBuild +++ b/source/gnome-extra/glom/FrugalBuild @@ -2,10 +2,9 @@ # Maintainer: Priyank Gosalia pkgname=glom -pkgver=1.8.1 -pkgrel=2 +pkgver=1.8.5 +pkgrel=1 pkgdesc="A database design tool for GNOME" -_F_gnome_devel="y" _F_gnome_iconcache="y" _F_gnome_mime="y" Finclude gnome gnome-scriptlet @@ -14,12 +13,12 @@ makedepends=('intltool' 'gnome-doc-utils') depends=('gtk+2>=2.14.4' 'gtkmm' 'libglademm>=2.6.6' 'gconfmm>=2.24.0' \ 'gnome-vfsmm>=2.24.0' 'libgdamm>=3.0.0' 'bakery>=2.6.0' \ 'gnome-python-extras>=2.19.1' 'libgtksourceviewmm>=1.9.5' \ - 'iso-codes' 'libavahi-ui>=0.6.22' 'goocanvasmm>=0.12.0' \ + 'iso-codes' 'libavahi-ui>=0.6.22' 'goocanvasmm>=0.13.0' \ 'libepc>=0.3.7' 'postgresql>=8.2.11') groups=('gnome-extra') archs=('i686' 'x86_64') Fconfopts="${Fconfopts[@]} --with-postgres-utils=/usr/bin" -sha1sums=('c8cfd7c7368e79a8dcb7a71e9f935d3811b31024') +sha1sums=('e800eb3b8a62a64e432c47f0133bf834aa5cbcb2') build() { From devil505linux at gmail.com Sat Jan 17 15:46:58 2009 From: devil505linux at gmail.com (Devil505) Date: Sat Jan 17 15:47:01 2009 Subject: [Frugalware-git] frugalware-current: ufraw-0.15-1-x86_64 Message-ID: <20090117144658.DE22F11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=49f3e6df5064985735a14dc910558747acd0f050 commit 49f3e6df5064985735a14dc910558747acd0f050 Author: Devil505 Date: Sat Jan 17 15:42:32 2009 +0100 ufraw-0.15-1-x86_64 * added x86_64 to archs and subarchs diff --git a/source/xapps-extra/ufraw/FrugalBuild b/source/xapps-extra/ufraw/FrugalBuild index 3bc13ab..f936170 100644 --- a/source/xapps-extra/ufraw/FrugalBuild +++ b/source/xapps-extra/ufraw/FrugalBuild @@ -12,14 +12,14 @@ depends=('lcms' 'bzip2' 'libstdc++' 'gtk+2' 'libxau' 'libxdmcp' 'freetype2' 'lib 'gtkimageview' 'cfitsio' 'exiv2') makedepends=('gimp' 'cinepaint') groups=('xapps-extra') -archs=('i686') +archs=('i686' 'x86_64') sha1sums=('e8c7fa95bfb84e18ee538495861e52516ca8b3b8') subpkgs=("$pkgname-gimp" "$pkgname-cinepaint") subdescs=('gimp importer for raw camera images' 'cinepaint importer for raw camera images') subdepends=("gimp ufraw" "cinepaint ufraw") subgroups=('xlib-extra' 'xlib-extra') -subarchs=('i686' 'i686') +subarchs=('i686 x86_64' 'i686 x86_64') build() { Fbuild From priyank at frugalware.org Sat Jan 17 15:49:04 2009 From: priyank at frugalware.org (Priyank) Date: Sat Jan 17 15:49:05 2009 Subject: [Frugalware-git] gservice: Toggle status icons depending on service status when user starts/stops a service Message-ID: <20090117144904.5828A11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gservice.git;a=commitdiff;h=55e28fe80de169c985eddd7b7db3cc896e0b67be commit 55e28fe80de169c985eddd7b7db3cc896e0b67be Author: Priyank Date: Sat Jan 17 20:18:23 2009 +0530 Toggle status icons depending on service status when user starts/stops a service * Also fixed a few leaks diff --git a/src/gservice-backend.c b/src/gservice-backend.c index cbc9add..97f62a9 100644 --- a/src/gservice-backend.c +++ b/src/gservice-backend.c @@ -298,6 +298,7 @@ gsvc_service_get_list (void) } tlist = g_list_next (tlist); } + entry->status = gsvc_service_get_status (entry->name); ret = g_list_append (ret, entry); } g_free (temp); @@ -474,6 +475,7 @@ gsvc_service_start (const char *service, int *retval) } if (retval) { + g_print ("RETVAL SETTING\n"); *retval = gsvc_service_get_status (service); } ret = g_strdup (string->str); diff --git a/src/gservice-backend.h b/src/gservice-backend.h index 9bd5762..5bba6a9 100644 --- a/src/gservice-backend.h +++ b/src/gservice-backend.h @@ -14,7 +14,7 @@ typedef struct _gservice_entry_t GList* description; gboolean runlevel[7]; gboolean enabled; - gboolean running; + gint status; } gservice_entry_t; /* returns a list of services */ diff --git a/src/gservice-interface.c b/src/gservice-interface.c index 47d8578..aeaf04e 100644 --- a/src/gservice-interface.c +++ b/src/gservice-interface.c @@ -275,17 +275,19 @@ gservice_populate_services (void) 3, (char*)e->name, 4, (e->enabled)?TRUE:FALSE, -1); - //gtk_list_store_append (store, &iter); - if (e->enabled) - { - //if (e->running) - gtk_list_store_set (store, &iter, 0, pixbuf_on); - //else - // gtk_list_store_set (store, &iter, 0, pixbuf_off); - } - else + switch (e->status) { + case GSVC_ON: + gtk_list_store_set (store, &iter, 0, pixbuf_on); + break; + + case GSVC_OFF: + case GSVC_ERR: gtk_list_store_set (store, &iter, 0, pixbuf_off); + break; + + default: + break; } g_free (desc); g_free (namedesc); @@ -293,8 +295,8 @@ gservice_populate_services (void) while (gtk_events_pending()) gtk_main_iteration (); } gtk_tree_view_set_model (GTK_TREE_VIEW(gsvc_treeview_services), GTK_TREE_MODEL(store)); - //g_object_unref (pixbuf_on); - //g_object_unref (pixbuf_off); + g_object_unref (pixbuf_on); + g_object_unref (pixbuf_off); //g_object_unref (pixbuf_inactive); return; @@ -358,12 +360,14 @@ gservice_interface_init (void) gsvc_button_quit = gservice_get_widget ("gsvc_button_quit"); gtk_widget_show (gsvc_splash_screen); while (gtk_events_pending()) gtk_main_iteration (); + /* a li'l manual delay */ sleep (2); + while (gtk_events_pending()) gtk_main_iteration (); gservice_setup_treeview (); gservice_populate_services (); /* connect some signals */ - g_signal_connect (G_OBJECT(glade_xml_get_widget(xml,"menu_about")), + g_signal_connect (G_OBJECT(gservice_get_widget("menu_about")), "activate", G_CALLBACK(gservice_about), NULL); @@ -398,19 +402,38 @@ cb_gsvc_button_start_clicked (GtkButton *button, gpointer data) selection = gtk_tree_view_get_selection (GTK_TREE_VIEW(gsvc_treeview_services)); if (gtk_tree_selection_get_selected(selection,&model,&iter)) { - char *service = NULL; - char *status = NULL; - int retval = 0; + char *service = NULL; + char *status = NULL; + int retval = 0; + GdkPixbuf *pixbuf_on = gservice_get_icon ("gservice-running", 16); + GdkPixbuf *pixbuf_off = gservice_get_icon ("gservice-stopped", 16); gtk_tree_model_get (model, &iter, 3, &service, -1); if (service) { g_print ("STARTING: %s\n", service); status = gsvc_service_start (service, &retval); - gservice_adjust_service_buttons_from_status (retval); g_print ("STATUS: \n%s\n", status); + gservice_adjust_service_buttons_from_status (retval); + switch (retval) + { + case GSVC_ON: + { + gtk_list_store_set ((GtkListStore*)model, &iter, 0, pixbuf_on, -1); + break; + } + case GSVC_OFF: + case GSVC_ERR: + { + gtk_list_store_set ((GtkListStore*)model, &iter, 0, pixbuf_off, -1); + break; + } + default: break; + } g_free (status); } + g_object_unref (pixbuf_on); + g_object_unref (pixbuf_off); } return; @@ -427,18 +450,37 @@ cb_gsvc_button_stop_clicked (GtkButton *button, gpointer data) selection = gtk_tree_view_get_selection (GTK_TREE_VIEW(gsvc_treeview_services)); if (gtk_tree_selection_get_selected(selection,&model,&iter)) { - char *service = NULL; - char *status = NULL; - int retval = 0; + char *service = NULL; + char *status = NULL; + int retval = 0; + GdkPixbuf *pixbuf_on = gservice_get_icon ("gservice-running", 16); + GdkPixbuf *pixbuf_off = gservice_get_icon ("gservice-stopped", 16); gtk_tree_model_get (model, &iter, 3, &service, -1); if (service) { g_print ("STOPPING: %s\n", service); status = gsvc_service_stop (service, &retval); - gservice_adjust_service_buttons_from_status (retval); g_print ("STATUS: \n%s\n", status); + gservice_adjust_service_buttons_from_status (retval); + switch (retval) + { + case GSVC_ON: + { + gtk_list_store_set ((GtkListStore*)model, &iter, 0, pixbuf_on, -1); + break; + } + case GSVC_OFF: + case GSVC_ERR: + { + gtk_list_store_set ((GtkListStore*)model, &iter, 0, pixbuf_off, -1); + break; + } + default: break; + } g_free (status); } + g_object_unref (pixbuf_on); + g_object_unref (pixbuf_off); } return; From vmiklos at frugalware.org Sat Jan 17 15:50:47 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Jan 17 15:50:48 2009 Subject: [Frugalware-git] frugalware-current: ejabberd-2.0.3-1-i686 Message-ID: <20090117145047.B1EE711B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=220ec33fe9aa26c7243231dcd011b191bf0b7e1e commit 220ec33fe9aa26c7243231dcd011b191bf0b7e1e Author: Miklos Vajna Date: Sat Jan 17 14:08:52 2009 +0100 ejabberd-2.0.3-1-i686 - version bump diff --git a/source/network-extra/ejabberd/FrugalBuild b/source/network-extra/ejabberd/FrugalBuild index fb1686e..1d8babd 100644 --- a/source/network-extra/ejabberd/FrugalBuild +++ b/source/network-extra/ejabberd/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Miklos Vajna pkgname=ejabberd -pkgver=2.0.2 +pkgver=2.0.3 pkgrel=1 pkgdesc="A free and open source instant messaging server written in Erlang." url="http://ejabberd.jabber.ru/" @@ -13,7 +13,7 @@ archs=('i686' 'x86_64') up2date="lynx -dump http://www.process-one.net/en/ejabberd/archive/|grep -v beta |Flasttar" source=(http://www.process-one.net/downloads/ejabberd/${pkgver%%_*}/ejabberd-$pkgver.tar.gz \ rc.ejabberd README.Frugalware) -sha1sums=('7c82082b941277fe18aac25ca9b2016f25dc8472' \ +sha1sums=('ee3a503befea79378c4c8f7ce5be6151209bf474' \ 'ac41a05fd1a21dcb6a4f1e104c185e82b5262d43' \ '1b31169bb44dabd8d862c603f8a79a5d4c6fa69d') From vmiklos at frugalware.org Sat Jan 17 15:50:47 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Jan 17 15:50:53 2009 Subject: [Frugalware-git] frugalware-current: fxload-2008_10_13-1-i686 Message-ID: <20090117145047.CD09911B8630@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e622d18d0465e3a3d2b4e34281dbdeceb5d0ef55 commit e622d18d0465e3a3d2b4e34281dbdeceb5d0ef55 Author: Miklos Vajna Date: Sat Jan 17 14:12:15 2009 +0100 fxload-2008_10_13-1-i686 - version bump diff --git a/source/base-extra/fxload/FrugalBuild b/source/base-extra/fxload/FrugalBuild index d8512e0..f97398f 100644 --- a/source/base-extra/fxload/FrugalBuild +++ b/source/base-extra/fxload/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Rob Kennedy pkgname=fxload -pkgver=2002_04_11 +pkgver=2008_10_13 pkgrel=1 pkgdesc="Firmware downloader for USB Devices. Used with udev or devfs/hotplug" license="GPL2" @@ -13,7 +13,7 @@ _F_sourceforge_dirname="linux-hotplug" Finclude sourceforge url="http://linux-hotplug.sourceforge.net" source=(`echo $source|sed "s/${pkgver//_/-}/$pkgver/"`) -sha1sums=('8fc6ba63faac40b9f141a68ea2d088c51437c936') +sha1sums=('5d38b775b4899c9321c0a1274c9c408e2e6a9c08') build() { Fcd From vmiklos at frugalware.org Sat Jan 17 15:50:47 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Jan 17 15:50:54 2009 Subject: [Frugalware-git] frugalware-current: chicken-3.4.7-1-i686 Message-ID: <20090117145047.E110D11B8631@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bfb38927ea0397d0758b4f44c00b8bfb4a057446 commit bfb38927ea0397d0758b4f44c00b8bfb4a057446 Author: Miklos Vajna Date: Sat Jan 17 14:19:01 2009 +0100 chicken-3.4.7-1-i686 - version bump diff --git a/source/devel-extra/chicken/FrugalBuild b/source/devel-extra/chicken/FrugalBuild index 8c59e53..71ef9ad 100644 --- a/source/devel-extra/chicken/FrugalBuild +++ b/source/devel-extra/chicken/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: voroskoi pkgname=chicken -pkgver=3.4.5 +pkgver=3.4.7 pkgrel=1 pkgdesc="A compiler for Scheme, which produces portable, efficient C." url="http://www.call-with-current-continuation.org/" @@ -12,7 +12,7 @@ groups=('devel-extra') archs=('i686' 'x86_64' 'ppc') up2date="Flasttar http://chicken.wiki.br/dev-snapshots/current/" source=(http://chicken.wiki.br/dev-snapshots/current/$pkgname-$pkgver.tar.gz) -sha1sums=('7f6000e365c5f8afe06ffd8ef1f2120b0274659e') +sha1sums=('b25016c318599afcaf08d52f9febe404332b85d9') build() { unset MAKEFLAGS From vmiklos at frugalware.org Sat Jan 17 15:50:47 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Jan 17 15:50:56 2009 Subject: [Frugalware-git] frugalware-current: sqlite3-3.6.10-1-i686 Message-ID: <20090117145047.F10B511B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7817bbde32bdd6c95c69cacbfa6d4e765bb235ad commit 7817bbde32bdd6c95c69cacbfa6d4e765bb235ad Author: Miklos Vajna Date: Sat Jan 17 14:20:53 2009 +0100 sqlite3-3.6.10-1-i686 - version bump diff --git a/source/lib/sqlite3/FrugalBuild b/source/lib/sqlite3/FrugalBuild index c260588..54e80ff 100644 --- a/source/lib/sqlite3/FrugalBuild +++ b/source/lib/sqlite3/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: voroskoi pkgname=sqlite3 -pkgver=3.6.9 +pkgver=3.6.10 pkgrel=1 pkgdesc="A C library that implements an SQL database engine" url="http://www.sqlite.org/" @@ -14,7 +14,7 @@ archs=('i686' 'x86_64' 'ppc') _F_cd_path="sqlite-$pkgver" up2date="lynx -dump http://www.sqlite.org/ |grep Version |sed 's/.*n \(.*\) of.*/\1/'" source=(http://www.sqlite.org/sqlite-$pkgver.tar.gz) -sha1sums=('4291e9858a13c8bc4c203439f6a27d45a84ef8fa') +sha1sums=('75ad0e233cbbda2e7c487f7772f57d16ac9f3fb7') subpkgs=('lemon') subdescs=('The Lemon program is an LALR(1) parser generator.') From vmiklos at frugalware.org Sat Jan 17 15:50:48 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Jan 17 15:50:57 2009 Subject: [Frugalware-git] frugalware-current: libraw1394-2.0.1-1-i686 Message-ID: <20090117145048.1AF9311B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b65b29bfd73c4dc2ec140bd1f995d0f22a4e2d85 commit b65b29bfd73c4dc2ec140bd1f995d0f22a4e2d85 Author: Miklos Vajna Date: Sat Jan 17 14:22:03 2009 +0100 libraw1394-2.0.1-1-i686 - version bump diff --git a/source/lib/libraw1394/FrugalBuild b/source/lib/libraw1394/FrugalBuild index 81fabfe..bb221a1 100644 --- a/source/lib/libraw1394/FrugalBuild +++ b/source/lib/libraw1394/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: voroskoi pkgname=libraw1394 -pkgver=2.0.0 +pkgver=2.0.1 pkgrel=1 pkgdesc="Provides an API to the Linux IEEE1394 (FireWire) driver" url="http://www.linux1394.org/" @@ -12,6 +12,6 @@ groups=('lib') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump http://www.linux1394.org/|grep -m1 Latest|sed 's/.*]v\(.*\) .*(.*)/\1/'" source=(http://www.linux1394.org/dl/libraw1394-${pkgver}.tar.gz) -sha1sums=('6b11d6a5a73e264f28db1be25c3e6ce4da0dacc4') +sha1sums=('c95162148f81f12c3171a77a4960308f227ba877') # optimization OK From vmiklos at frugalware.org Sat Jan 17 15:50:48 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Jan 17 15:50:58 2009 Subject: [Frugalware-git] frugalware-current: libzrtpcpp-1.4.2-1-i686 Message-ID: <20090117145048.2E8E111B87A9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=28474eb89956a5e998efe834fee9840ff3a7bfe7 commit 28474eb89956a5e998efe834fee9840ff3a7bfe7 Author: Miklos Vajna Date: Sat Jan 17 14:23:37 2009 +0100 libzrtpcpp-1.4.2-1-i686 - version bump diff --git a/source/lib-extra/libzrtpcpp/FrugalBuild b/source/lib-extra/libzrtpcpp/FrugalBuild index 5de8bb1..55b3103 100644 --- a/source/lib-extra/libzrtpcpp/FrugalBuild +++ b/source/lib-extra/libzrtpcpp/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: voroskoi pkgname=libzrtpcpp -pkgver=1.4.1 +pkgver=1.4.2 pkgrel=1 pkgdesc="ZRTP extension for GNU ccRTP." url="http://wiki.gnutelephony.org/index.php/Zrtp_FAQ" diff --git a/source/lib-extra/libzrtpcpp/libzrtpcpp.key b/source/lib-extra/libzrtpcpp/libzrtpcpp.key new file mode 100644 index 0000000..12823e6 --- /dev/null +++ b/source/lib-extra/libzrtpcpp/libzrtpcpp.key @@ -0,0 +1,28 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.9 (GNU/Linux) + +mQGiBDkeE6IRBACeNegVBdwy6c/Et6JW+Xsn8QSvCm3NDnjxoltepm2F+cJTfSEG +uOs0/AUOW7Z/5z26xtfnR3DPh7UO7SYzGhkyLaFfP3KhkMjUZsdd16SZnZBURdHf +mPtgJiy36EUNyuxZ4jDDLuRBM6IXX2y9dxEnCeHz2U2CecF3sIHcfxvWNwCgm/Aj +f0ekF6tzRMw4aAoLgI3is78D/3VPheD2/hgch8+ZFd36PCqrYPKwLytZ9Tylpkcr +/fJOmGkMOE7HuO9XgWqcqBO14tbWzijYXDiNL9qhW/862bz/0EHqctsE1M5aQUx6 +eVwUrrZZpLYMnfFZtvUzBCH/zokAEBIoJzGfSB08iWv2Ovz5jGSgix3GlhyEaAkX +KMooA/9s2mm8HGkbNASBMZ7Um8dkzbXu8Aleov1SXFreLWZjpZ1JR7tyPBx8ZySd +vUcvIUWGDIN9HhEsY4BPN1AVqpHj2oRJQc3j/9wOLnWPJulxhvdud9IQcAOJUDra +jl9CUVAH7uwdeTux8vIjRziH3XduTbW7HgSXTDONVb5HKo+je7QbRGF2aWQgU3Vn +YXIgPGR5ZmV0QGdudS5vcmc+iEYEEBECAAYFAj0oIjwACgkQYgOKS92bmRASJwCc +CWslE8uWtx6QjnXXEHRJrrXgq0oAn0vRn7pRAL7wVFwTtFA7SxezX7UiiFYEExEC +ABYFAjkeE6IECwoEAwMVAwIDFgIBAheAAAoJEARqx5g5A6bdEsEAnj1VJLiwkKGY +ysZnkTRUiQMij1pDAJ9+MiaDWwEGJQco2hAqFO0jElSpeoheBBMRAgAWBQI5HhOi +BAsKBAMDFQMCAxYCAQIXgAASCRAEaseYOQOm3QdlR1BHAAEBEsEAnj1VJLiwkKGY +ysZnkTRUiQMij1pDAJ9+MiaDWwEGJQco2hAqFO0jElSperkBDQQ5HhOuEAQAyQG2 +Le3sED7wEc/FjAgeAYJ0ObqSYiMNbwieCW/KNoR2DTsDOV7awE6YGDnljgzzdtF6 ++maLJjlwiWLOEVasssZN+iHiYQnjih+qPaC7vvSk5SpumoCIbwl5lKQOqAW5QLRb +yoKsLh+wiuyPWAIZBDMfkFCAnNbSKj0aS1L/aAsAAwUD/1V5Ac/QtDd+UGf9FnyO +8BoH/B05AmrMKkDvqPtjBvuZDquGe9OOh4vjn4MaanylTvqfibm60ctN0qX7FjCl +llFlUWtHHdROfBJ0OWHgFiBuVJmJPiI3qfhHJPJq2zqmX2fgSWRRqhCtGW6aRXHV +XIeiryAlI6cUWCxcFFpQvmxkiE4EGBECAAYFAjkeE64AEgkQBGrHmDkDpt0HZUdQ +RwABAeNuAJ9/z3C7jK5exNEu8/c4PkYMJwzrpwCaA0YoPoSojF77JZ5xo95PxPRk +SDo= +=3EuX +-----END PGP PUBLIC KEY BLOCK----- From vmiklos at frugalware.org Sat Jan 17 15:50:48 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Jan 17 15:50:59 2009 Subject: [Frugalware-git] frugalware-current: texmaker-1.8-1-i686 Message-ID: <20090117145048.4840511B8630@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f8b0f866ff5b889b9f7da3e0ecef1d9e4a7fcb08 commit f8b0f866ff5b889b9f7da3e0ecef1d9e4a7fcb08 Author: Miklos Vajna Date: Sat Jan 17 14:27:09 2009 +0100 texmaker-1.8-1-i686 - version bump diff --git a/source/xapps-extra/texmaker/FrugalBuild b/source/xapps-extra/texmaker/FrugalBuild index ddc9ae2..4477bd4 100644 --- a/source/xapps-extra/texmaker/FrugalBuild +++ b/source/xapps-extra/texmaker/FrugalBuild @@ -2,17 +2,17 @@ # Maintainer: voroskoi pkgname=texmaker -pkgver=1.7.1 +pkgver=1.8 pkgrel=1 pkgdesc="Texmaker is a free LaTeX editor." url="http://www.xm1math.net/texmaker/" -depends=('libqtgui') +depends=('libqtgui' 'libqtnetwork') rodepends=('xghostscript') groups=('xapps-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url |grep Version |sed -ne 's/.*ion \(.*\) (.*/\1/;1p'" source=(http://www.xm1math.net/texmaker/texmaker-$pkgver.tar.bz2) -sha1sums=('055aabf865e8d9baafe2762594469cd2b7d75183') +sha1sums=('d5f188c0d207c637a445cec984d79ee017de6e1a') build() { Fcd From vmiklos at frugalware.org Sat Jan 17 15:50:48 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Jan 17 15:51:00 2009 Subject: [Frugalware-git] frugalware-current: drscheme-4.1.3-1-i686 Message-ID: <20090117145048.63BAA11B8631@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=69f5fabaf27ec730bc6769cbec9bb44d30e1f8c4 commit 69f5fabaf27ec730bc6769cbec9bb44d30e1f8c4 Author: Miklos Vajna Date: Sat Jan 17 14:56:39 2009 +0100 drscheme-4.1.3-1-i686 - version bump diff --git a/source/xapps-extra/drscheme/FrugalBuild b/source/xapps-extra/drscheme/FrugalBuild index 298cc70..5681991 100644 --- a/source/xapps-extra/drscheme/FrugalBuild +++ b/source/xapps-extra/drscheme/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: voroskoi pkgname=drscheme -pkgver=4.1.1 +pkgver=4.1.3 pkgrel=1 pkgdesc="DrScheme is an interactive, integrated, graphical programming environment for the Scheme, MzScheme, and MrEd programming languages." url="http://download.plt-scheme.org/drscheme/" @@ -12,7 +12,7 @@ groups=('xapps-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://download.plt-scheme.org/drscheme/ |grep 'Version:'|sed -e 's/.*: \(.*\) /\1/' -e 's/ .*//'" source=(http://gd.tuwien.ac.at/languages/scheme/plt/$pkgver/plt/plt-$pkgver-src-unix.tgz) -sha1sums=('c6e9cdbf7c0e1a1911a36a46f63ce22594fa282d') +sha1sums=('e6b2546dc24aa354694e4f3a23b2ac1c20af0050') build() { From vmiklos at frugalware.org Sat Jan 17 15:50:48 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Jan 17 15:51:01 2009 Subject: [Frugalware-git] frugalware-current: gajim-0.12.1-1-i686 Message-ID: <20090117145048.7F22B11B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1be0235137856db2120a3497591d9131567b581e commit 1be0235137856db2120a3497591d9131567b581e Author: Miklos Vajna Date: Sat Jan 17 14:59:01 2009 +0100 gajim-0.12.1-1-i686 - version bump diff --git a/source/xapps-extra/gajim/FrugalBuild b/source/xapps-extra/gajim/FrugalBuild index e88f9de..8db2234 100644 --- a/source/xapps-extra/gajim/FrugalBuild +++ b/source/xapps-extra/gajim/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: voroskoi pkgname=gajim -pkgver=0.12 +pkgver=0.12.1 pkgrel=1 pkgdesc="The goal of Gajim is to provide a full featured and easy to use Jabber client." url="http://www.gajim.org/" @@ -13,7 +13,7 @@ groups=('xapps-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://www.gajim.org/downloads.php?lang=en |grep tar.bz2 |sed 's/.*-\(.*\).t.*/\1/'" source=(http://www.gajim.org/downloads/gajim-$pkgver.tar.bz2) -sha1sums=('1d222d88a7908ff99b3024bde97d2390b7d7242c') +sha1sums=('e1a3fcec2b03f70f36edb443e8fa0cece3e164f6') options=('nodocs') # optimization OK From vmiklos at frugalware.org Sat Jan 17 15:50:48 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Jan 17 15:51:02 2009 Subject: [Frugalware-git] frugalware-current: klavaro-1.1.8-1-i686 Message-ID: <20090117145048.8F1FC11B87AA@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=76127fe8d019bf47b4f7e362c0ae0238717ed3f4 commit 76127fe8d019bf47b4f7e362c0ae0238717ed3f4 Author: Miklos Vajna Date: Sat Jan 17 15:50:32 2009 +0100 klavaro-1.1.8-1-i686 - version bump diff --git a/source/xapps-extra/klavaro/FrugalBuild b/source/xapps-extra/klavaro/FrugalBuild index 34cbd78..a73df71 100644 --- a/source/xapps-extra/klavaro/FrugalBuild +++ b/source/xapps-extra/klavaro/FrugalBuild @@ -2,15 +2,15 @@ # Maintainer: voroskoi pkgname=klavaro -pkgver=1.1.7 +pkgver=1.1.8 pkgrel=1 pkgdesc="Klavaro is just another free touch typing tutor program." -depends=('gtk+2') +depends=('gtk+2' 'curl') groups=('xapps-extra') archs=('i686' 'x86_64') _F_sourceforge_ext=.tar.bz2 Finclude sourceforge up2date="lynx -dump http://klavaro.sourceforge.net/en/index.html |grep bz2 |sed -ne 's/.*o-\(.*\).t.*/\1/;1p'" -sha1sums=('789d918af9da9be75995928bf0bca3ef335a3b1e') +sha1sums=('8b019c0eeabd7ae33c2437d41c2b666129751fb1') # optimization OK From priyank at frugalware.org Sat Jan 17 20:26:04 2009 From: priyank at frugalware.org (Priyank) Date: Sat Jan 17 20:26:06 2009 Subject: [Frugalware-git] xfce46: xfce4-fsguard-plugin-0.4.2-1-i686 Message-ID: <20090117192604.6C42411B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfce46.git;a=commitdiff;h=d7931508cc56a2a07fae5c936c2aa7846d3be4f7 commit d7931508cc56a2a07fae5c936c2aa7846d3be4f7 Author: Priyank Date: Sun Jan 18 00:55:00 2009 +0530 xfce4-fsguard-plugin-0.4.2-1-i686 * Version bump * Updated dependencies diff --git a/source/xfce4/xfce4-fsguard-plugin/FrugalBuild b/source/xfce4/xfce4-fsguard-plugin/FrugalBuild index d8965da..032d21c 100644 --- a/source/xfce4/xfce4-fsguard-plugin/FrugalBuild +++ b/source/xfce4/xfce4-fsguard-plugin/FrugalBuild @@ -2,15 +2,15 @@ # Maintainer: Priyank Gosalia pkgname=xfce4-fsguard-plugin -pkgver=0.4.1 +pkgver=0.4.2 pkgrel=1 pkgdesc="A filesystem usage monitor plugin for the Xfce4 panel" makedepends=('intltool') -depends=('libxfcegui4>=4.4.1' 'xfce4-panel>=4.4.1' 'libxml2') +depends=('libxfcegui4>=4.5.93' 'xfce4-panel>=4.5.93' 'libxml2') groups=('xfce4' 'xfce4-goodies') archs=('i686' 'x86_64') _F_gnome_iconcache=y Finclude xfce4 gnome-scriptlet -sha1sums=('af899dcd53db64eda9bf3fb5bfa915ee3000e636') +sha1sums=('1c7b4004aad6fe5669112297a46186de4a9e9d0e') # optimization OK From priyank at frugalware.org Sat Jan 17 20:34:22 2009 From: priyank at frugalware.org (Priyank) Date: Sat Jan 17 20:34:23 2009 Subject: [Frugalware-git] gservice: blacklist services: halt, reboot, single, bootclean and console (we don't want the user to fiddle with these) Message-ID: <20090117193422.5205B11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gservice.git;a=commitdiff;h=cc72ad7ec57d950b6c07db9dd0de857bfb91c8c3 commit cc72ad7ec57d950b6c07db9dd0de857bfb91c8c3 Author: Priyank Date: Sun Jan 18 01:03:53 2009 +0530 blacklist services: halt, reboot, single, bootclean and console (we don't want the user to fiddle with these) diff --git a/src/gservice-backend.c b/src/gservice-backend.c index 97f62a9..8acfcfd 100644 --- a/src/gservice-backend.c +++ b/src/gservice-backend.c @@ -53,6 +53,28 @@ gsvc_is_chkconfig_supported (const char *path) return ret; } +static gboolean +gsvc_is_service_blacklisted (const char *service) +{ + char *svc = g_strdup_printf (service); + gboolean ret = FALSE; + + /* if svc has a rc. prefix, then strip it */ + if (g_str_has_prefix(service,"rc.")) + { + int i; + for (i=0;i<=2;i++) + svc[i] = ' '; + } + g_strstrip (svc); + if (!strcmp(svc,"halt") || !strcmp(svc,"reboot") || !strcmp(svc,"single") || + !strcmp(svc,"console") || !strcmp(svc,"bootclean")) + ret = TRUE; + + g_free (svc); + return ret; +} + /* gets the description of a service */ static GList * gsvc_get_service_description (const char *name) @@ -63,7 +85,7 @@ gsvc_get_service_description (const char *name) gboolean found = FALSE; gboolean next = FALSE; gchar line[PATH_MAX+1]; - + path = g_strdup_printf ("%s/rc.%s", SERVICE_DIR, name); if ((fp=fopen(path,"r"))!=NULL) { @@ -201,6 +223,8 @@ gsvc_get_active_service_list (void) g_strstrip (service); for (i=0;i<=2;i++) service++; + if (gsvc_is_service_blacklisted(service)) + continue; ret = g_list_append (ret, g_strdup (service)); } pclose (pp); @@ -269,6 +293,12 @@ gsvc_service_get_list (void) g_free (temp); continue; } + /* skip if the service is blacklisted */ + else if (gsvc_is_service_blacklisted(file)) + { + g_free (temp); + continue; + } else { /* check if it supports chkconfig and add it to service list */ diff --git a/src/gservice-interface.c b/src/gservice-interface.c index aeaf04e..362f680 100644 --- a/src/gservice-interface.c +++ b/src/gservice-interface.c @@ -103,14 +103,6 @@ gservice_setup_treeview (void) store = gtk_list_store_new (5, GDK_TYPE_PIXBUF, /* status icon */ G_TYPE_STRING, /* service name & description */ - // G_TYPE_INT, /* runlevel 0 */ - // G_TYPE_INT, /* runlevel 1 */ - // G_TYPE_INT, /* runlevel 2 */ - // G_TYPE_INT, /* runlevel 3 */ - // G_TYPE_INT, /* runlevel 4 */ - // G_TYPE_INT, /* runlevel 5 */ - // G_TYPE_INT, /* runlevel 6 */ - // G_TYPE_BOOLEAN, /* status */ G_TYPE_STRING, /* service name for internal use */ G_TYPE_BOOLEAN); /* activation status for internal use */ @@ -150,67 +142,6 @@ gservice_setup_treeview (void) NULL); gtk_tree_view_column_set_resizable (column, FALSE); gtk_tree_view_append_column (GTK_TREE_VIEW(gsvc_treeview_services), column); - - renderer = gtk_cell_renderer_toggle_new (); - g_object_set (G_OBJECT(renderer), "activatable", TRUE, NULL); - g_signal_connect (renderer, "toggled", G_CALLBACK(cb_gsvc_r1_toggled), store); - column = gtk_tree_view_column_new_with_attributes ("1", - renderer, - "active", 3, - NULL); - gtk_tree_view_column_set_resizable (column, FALSE); - gtk_tree_view_append_column (GTK_TREE_VIEW(gsvc_treeview_services), column); - - renderer = gtk_cell_renderer_toggle_new (); - g_object_set (G_OBJECT(renderer), "activatable", TRUE, NULL); - g_signal_connect (renderer, "toggled", G_CALLBACK(cb_gsvc_r2_toggled), store); - column = gtk_tree_view_column_new_with_attributes ("2", - renderer, - "active", 4, - NULL); - gtk_tree_view_column_set_resizable (column, FALSE); - gtk_tree_view_append_column (GTK_TREE_VIEW(gsvc_treeview_services), column); - - renderer = gtk_cell_renderer_toggle_new (); - g_object_set (G_OBJECT(renderer), "activatable", TRUE, NULL); - g_signal_connect (renderer, "toggled", G_CALLBACK(cb_gsvc_r3_toggled), store); - column = gtk_tree_view_column_new_with_attributes ("3", - renderer, - "active", 5, - NULL); - gtk_tree_view_column_set_resizable (column, FALSE); - gtk_tree_view_append_column (GTK_TREE_VIEW(gsvc_treeview_services), column); - - renderer = gtk_cell_renderer_toggle_new (); - g_object_set (G_OBJECT(renderer), "activatable", TRUE, NULL); - g_signal_connect (renderer, "toggled", G_CALLBACK(cb_gsvc_r4_toggled), store); - column = gtk_tree_view_column_new_with_attributes ("4", - renderer, - "active", 6, - NULL); - gtk_tree_view_column_set_resizable (column, FALSE); - gtk_tree_view_append_column (GTK_TREE_VIEW(gsvc_treeview_services), column); - - renderer = gtk_cell_renderer_toggle_new (); - g_object_set (G_OBJECT(renderer), "activatable", TRUE, NULL); - g_signal_connect (renderer, "toggled", G_CALLBACK(cb_gsvc_r5_toggled), store); - column = gtk_tree_view_column_new_with_attributes ("5", - renderer, - "active", 7, - NULL); - gtk_tree_view_column_set_resizable (column, FALSE); - gtk_tree_view_append_column (GTK_TREE_VIEW(gsvc_treeview_services), column); - - renderer = gtk_cell_renderer_toggle_new (); - g_object_set (G_OBJECT(renderer), "activatable", TRUE, NULL); - g_signal_connect (renderer, "toggled", G_CALLBACK(cb_gsvc_r6_toggled), store); - column = gtk_tree_view_column_new_with_attributes ("6", - renderer, - "active", 8, - NULL); - gtk_tree_view_column_set_resizable (column, FALSE); - gtk_tree_view_column_set_expand (column, FALSE); - gtk_tree_view_append_column (GTK_TREE_VIEW(gsvc_treeview_services), column); */ gtk_tree_view_set_model (GTK_TREE_VIEW(gsvc_treeview_services), GTK_TREE_MODEL(store)); From vmiklos at frugalware.org Sat Jan 17 20:37:19 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Jan 17 20:37:20 2009 Subject: [Frugalware-git] pacman-tools: fix syncpkgcd description Message-ID: <20090117193719.426D511B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-tools.git;a=commitdiff;h=f286d0df9ff3c4263ace5c22c4b2a77956a2bafa commit f286d0df9ff3c4263ace5c22c4b2a77956a2bafa Author: Miklos Vajna Date: Sat Jan 17 20:36:47 2009 +0100 fix syncpkgcd description noticed by Priyank diff --git a/syncpkgd/rc.syncpkgcd b/syncpkgd/rc.syncpkgcd index 03f962d..c101e83 100755 --- a/syncpkgd/rc.syncpkgcd +++ b/syncpkgd/rc.syncpkgcd @@ -1,11 +1,11 @@ #!/bin/bash -# (c) 2007 Miklos Vajna +# (c) 2007, 2009 Miklos Vajna # rc.syncpkgcd for Frugalware # distributed under GPL License # chkconfig: 2345 95 05 -# description: Package builder daemon. +# description: Package builder client daemon. source /lib/initscripts/functions TEXTDOMAIN=syncpkgcd From priyank at frugalware.org Sat Jan 17 20:44:06 2009 From: priyank at frugalware.org (Priyank) Date: Sat Jan 17 20:44:07 2009 Subject: [Frugalware-git] gservice: blacklist zz-splash Message-ID: <20090117194406.E1C4311B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gservice.git;a=commitdiff;h=fd350b4d0bd6a0c6a25ecba5d93f8e470aa42c5f commit fd350b4d0bd6a0c6a25ecba5d93f8e470aa42c5f Author: Priyank Date: Sun Jan 18 01:13:08 2009 +0530 blacklist zz-splash gsvc_service_get_status(): no need to get status for blacklisted services diff --git a/src/gservice-backend.c b/src/gservice-backend.c index 8acfcfd..26dab78 100644 --- a/src/gservice-backend.c +++ b/src/gservice-backend.c @@ -68,7 +68,7 @@ gsvc_is_service_blacklisted (const char *service) } g_strstrip (svc); if (!strcmp(svc,"halt") || !strcmp(svc,"reboot") || !strcmp(svc,"single") || - !strcmp(svc,"console") || !strcmp(svc,"bootclean")) + !strcmp(svc,"console") || !strcmp(svc,"bootclean") || !strcmp(svc,"zz-splash")) ret = TRUE; g_free (svc); @@ -417,31 +417,11 @@ gsvc_service_get_status (const char *name) gint status = -1; /* some special services that shouldn't be touched */ - if (!strcmp(name,"reboot")) - { - return GSVC_OFF; - } - else - if (!strcmp(name,"halt")) - { - return GSVC_OFF; - } - else - if (!strcmp(name,"single")) - { - return GSVC_OFF; - } - else if (!strcmp(name,"splash")) { return GSVC_OFF; } else - if (!strcmp(name,"zz-splash")) - { - return GSVC_OFF; - } - else if (!strcmp(name,"random")) { return GSVC_ON; @@ -505,7 +485,6 @@ gsvc_service_start (const char *service, int *retval) } if (retval) { - g_print ("RETVAL SETTING\n"); *retval = gsvc_service_get_status (service); } ret = g_strdup (string->str); From vmiklos at frugalware.org Sat Jan 17 20:53:34 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Jan 17 20:53:35 2009 Subject: [Frugalware-git] frugalware-current: iptables-1.4.2-2-i686 Message-ID: <20090117195334.0257B11B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0a51b7d27351c6307059170f51e7347c769895e8 commit 0a51b7d27351c6307059170f51e7347c769895e8 Author: Miklos Vajna Date: Sat Jan 17 20:52:56 2009 +0100 iptables-1.4.2-2-i686 - add public key - add status support to rc.firewall diff --git a/source/network/iptables/FrugalBuild b/source/network/iptables/FrugalBuild index 5885126..3d59237 100644 --- a/source/network/iptables/FrugalBuild +++ b/source/network/iptables/FrugalBuild @@ -4,7 +4,7 @@ pkgname=iptables pkgver=1.4.2 -pkgrel=1 +pkgrel=2 pkgdesc="IP packet filter administration" url="http://www.iptables.org/" depends=('glibc') diff --git a/source/network/iptables/iptables.key b/source/network/iptables/iptables.key new file mode 100644 index 0000000..d32e170 --- /dev/null +++ b/source/network/iptables/iptables.key @@ -0,0 +1,38 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.9 (GNU/Linux) + +mQGiBEYKje4RBACE7W54AP4nQO5IDunSfcAvo7T8s2eExHV49mZAvCJkzHPeayTt +ed4QgOwWIrIUTUIZFTl8AU/s1kVT7QcJBfBmK/qQbCvpWezyq4Ew+46jl/TaY6zs +6PSCzQHuiUTLsH/xbs5FJ9lY0Be+010PSWD40wN4DTBTeKPXIovUTsOjkwCgxRlf +Fcv0rgVsXWjjpmwCI//oX5MD/i8os+tuUQ4Kr+v7OcCb8qDSNtNdeWGauHP0MNhU +f85PVlvPMJNEZzl1X0cUzomjnYPa3alnwjsvf5SKB5ppfcygDxZGzMzI2d63XBrZ +qfOmPfvSlLrRYVx/rTp8L0KN1NpEtdu2wyfMqIRkleH5qGw012jNpPINmtI1ZcSJ +hmbuA/9XBTME6czHZPDT311Wrd+z/4XQ5r1JHMgAMOYHYdnrB51q2MXRtTE8CxHY +JFlA7YEoMz3PGe+cgpTH3v+Ze5VZRSgHlaH8dCr5VpOQJraOI/P008c91BPzQKo7 +6loWx7Iv/xb2ygaOEcq4eaGPTogsfT5BZX+HH6MTd66GZ2ljPrQsTmV0ZmlsdGVy +IENvcmUgVGVhbSA8Y29yZXRlYW1AbmV0ZmlsdGVyLm9yZz6IRgQQEQIABgUCSJVH +GQAKCRBhR4k9EaOMX23HAKC/rvsmqbiWsphI6jMkAqGzXo/a3gCfUvclVk/vnUkA +et8HhVymPwwO+ymIZgQTEQIAJgUCRgqN7gIbAwUJB4TOAAYLCQgHAwIEFQIIAwQW +AgMBAh4BAheAAAoJEEGH+GUtCYfmIuEAnipH7Ff4iSaVaqsaNrTmrzLP/IWoAKCq +zDe/2mNKAHG4upI+NXAibsW1Y4kBHAQQAQIABgUCSHHxoAAKCRAi/Cu2xWn//p4T +B/98KW+JiXvn9v2RSsyH9YctxDju3Dx4zmizh8yB/mizIHnsDJzDYfDVFkVbqjzX +B3O6GOv1JcMYjZnA48yD0wzpexXjRfxBqSUa1KA9BxaLiG1XA93nhslObISe3QPR +doYXlMy5BRQWjgxo8ja44Ygd6mXq50HbxEMd/F3MGUX7BCvXuIdFpAQWuj7ipzhW +OPE822UTUhWhaHSoDQdmOu96LQidDqNmkYHKsxkBXiGcGAidwwRsvNmJTwRtIdQe +zQhFz1Q22QNXySuRcAjfLZ1QinULK21QJ3fOy8OKrlP/o4nGEJVXp40JfSuUpMYW +ebRrvR8bnk+3lH5goJQw9URtuQINBEYKjfsQCACJNU/NoCdnHJEblVGqnDSJ61KV +zocZZq3WmNUOPx/hxgYxXD+b+06yxPlb9djyxVud7kcVIKaQIkDjIbuoqLPXpjMw +rQm2rIBTAWcE9ED7IAsa2RyQ55LUopOaBXQ21RdPZY2qpqrw2VHXoh1m+AUFNYBn +zo4KTrYj0+rEjbI0+yqagr+Zvz0bw/YWBj4iPedn8gBy355bTpYvzjuBjPNPit5Y +wlKglnLJt2JW/UnE6wPgJdgczPeS1DIPyMqN3k0tWL3oUBK5fPwn/d3YCRoFMNzj +gU1pSNGsqNLZsGK5HQ6j3FeMGPqvQOsgKk/YVBzY2lHgrmA0TfuGojoeErDjAAMF +B/997rwY1VT2w9HF2qvqN8avNBg36FSmsOf2y1c01fwj+2pufPgnropsXotA0evx +ZUAua/l23Eksw/HIu/8jHd0Lzq0opGBiSO6o25W7GbvtB36FR0N8g0eLzn79bOjE +kUvR/WrobL7UYEs89sCq0JSg2OI/KEiG2AesITi9fE5kYXl/7/p7TYGkPexynOD1 +oIiGXgIcPACgc+6Yn8k3mx1g7TrXLMz3eqZNSNRUl8WfnaKqmMwk976ho3yxWGoy +8c6pd4qXcc4RqdfvFeubzxfTPF6AxNfTFGRILzGdEgnMfljfkmy352MVexynHVlG +pi+G2GFDIBhUUc6I7Sle/oPUiE8EGBECAA8FAkYKjfsCGwwFCQeEzgAACgkQQYf4 +ZS0Jh+aWdQCeMj+GkTwtWgucHR2D99PzSxyHZX0AnA4aRPctF+QzlS/kPx5h6Zg/ +oBNP +=3YJS +-----END PGP PUBLIC KEY BLOCK----- diff --git a/source/network/iptables/rc.firewall b/source/network/iptables/rc.firewall index aa32a38..392afd5 100644 --- a/source/network/iptables/rc.firewall +++ b/source/network/iptables/rc.firewall @@ -11,18 +11,22 @@ source /lib/initscripts/functions TEXTDOMAIN=firewall -actions=(restart start stop) +actions=(restart start stop status) daemon=$"iptables firewall" +pid="test -f /var/lock/subsys/firewall && echo running" + rc_start() { start_msg - if [ -e /etc/sysconfig/iptables ] ; then + if [ -z "$(eval $pid)" -a -e /etc/sysconfig/iptables ]; then source /etc/sysconfig/iptables if (( $forward == 1 )) ; then echo 1 > /proc/sys/net/ipv4/ip_forward fi /usr/sbin/iptables-restore < /etc/sysconfig/firewall + [ -d /var/lock/subsys ] || mkdir -p /var/lock/subsys + touch /var/lock/subsys/firewall ok $? else ok 999 @@ -32,12 +36,17 @@ rc_start() rc_stop() { stop_msg - echo 0 > /proc/sys/net/ipv4/ip_forward - iptables -F && \ - iptables -P INPUT ACCEPT && \ - iptables -P FORWARD ACCEPT && \ - iptables -P OUTPUT ACCEPT - ok $? + if [ -n "$(eval $pid)" ]; then + echo 0 > /proc/sys/net/ipv4/ip_forward + iptables -F && \ + iptables -P INPUT ACCEPT && \ + iptables -P FORWARD ACCEPT && \ + iptables -P OUTPUT ACCEPT + ok $? + rm -f /var/lock/subsys/firewall + else + ok 999 + fi } rc_exec $1 From priyank at frugalware.org Sat Jan 17 21:19:49 2009 From: priyank at frugalware.org (Priyank) Date: Sat Jan 17 21:19:50 2009 Subject: [Frugalware-git] gservice: gService gets an icon Message-ID: <20090117201949.0988411B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gservice.git;a=commitdiff;h=113449704ca2051689f6cfe14fae12917ab41d91 commit 113449704ca2051689f6cfe14fae12917ab41d91 Author: Priyank Date: Sun Jan 18 01:48:27 2009 +0530 gService gets an icon * Also closed some popened streams * Fixed a minor bug in gsvc_service_get_status() where it returned GSVC_OFF where it should have returned GSVC_ERR diff --git a/Makefile.am b/Makefile.am index c01c5fd..cd283fa 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,2 +1,8 @@ SUBDIRS = src data po +icondir = $(datadir)/pixmaps +icon_DATA = data/gservice.png + +EXTRA_DIST = $(icon_DATA) + + diff --git a/data/Makefile.am b/data/Makefile.am index 6ffe40c..e2ea645 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,7 +1,7 @@ SUBDIRS = icons gladedir = $(datadir)/gservice -glade_DATA = gservice.glade gservice-splash.png +glade_DATA = gservice.glade gservice-splash.png gservice.png EXTRA_DIST = $(glade_DATA) diff --git a/data/gservice.png b/data/gservice.png new file mode 100644 index 0000000..48a6e06 Binary files /dev/null and b/data/gservice.png differ diff --git a/src/gservice-about.c b/src/gservice-about.c index 2a05650..cc6afd4 100644 --- a/src/gservice-about.c +++ b/src/gservice-about.c @@ -52,7 +52,7 @@ static const gchar *authors[] = { \ }; static const gchar *artists[] = { \ - "Frugalware Logo - Viktor Gondor ", + "The gService icon is borrowed from the Tango project.", NULL }; @@ -68,7 +68,12 @@ gservice_about_dlg_create (void) GList *list; if (!about_pixbuf) - about_pixbuf = NULL; + { + gchar *path = g_strdup_printf ("%s/share/pixmaps/gservice.png", PREFIX); + g_print ("%s\n", path); + about_pixbuf = gdk_pixbuf_new_from_file (path, NULL); + g_free (path); + } about_dlg = gtk_about_dialog_new (); gtk_about_dialog_set_name (GTK_ABOUT_DIALOG(about_dlg), PACKAGE); gtk_about_dialog_set_version (GTK_ABOUT_DIALOG(about_dlg), VERSION); diff --git a/src/gservice-backend.c b/src/gservice-backend.c index 26dab78..a1f7d1a 100644 --- a/src/gservice-backend.c +++ b/src/gservice-backend.c @@ -204,7 +204,7 @@ gsvc_service_get_runlevel_info (gservice_entry_t *service) pclose (pp); g_free (sname); g_free (cmd); - + return TRUE; } @@ -232,6 +232,7 @@ gsvc_get_active_service_list (void) return ret; } +/* sort function for services list */ static int gsvc_list_sort_func (gconstpointer *a, gconstpointer *b) { @@ -457,6 +458,7 @@ gsvc_service_get_status (const char *name) case 1: ret = GSVC_OFF; break; case -1: ret = GSVC_ERR; + break; default: ret = GSVC_OFF; } @@ -490,6 +492,7 @@ gsvc_service_start (const char *service, int *retval) ret = g_strdup (string->str); g_string_free (string, TRUE); g_free (cmd); + pclose (pp); return ret; } @@ -520,6 +523,7 @@ gsvc_service_stop (const char *service, int *retval) ret = g_strdup (string->str); g_string_free (string, TRUE); g_free (cmd); + pclose (pp); return ret; } From vmiklos at frugalware.org Sat Jan 17 23:28:03 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sat Jan 17 23:28:04 2009 Subject: [Frugalware-git] frugalware-current: qemu-0.9.1-5-i686 Message-ID: <20090117222803.8392511B862F@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=958dd356757af19e6cadc83b9aaba9c4c2bea37c commit 958dd356757af19e6cadc83b9aaba9c4c2bea37c Author: Miklos Vajna Date: Sat Jan 17 23:27:26 2009 +0100 qemu-0.9.1-5-i686 - add patch to build with 2.6.28 kernel headers - fix exit code of service qemu status diff --git a/source/xapps-extra/qemu/FrugalBuild b/source/xapps-extra/qemu/FrugalBuild index 6f30d1b..5d5420b 100644 --- a/source/xapps-extra/qemu/FrugalBuild +++ b/source/xapps-extra/qemu/FrugalBuild @@ -3,7 +3,7 @@ pkgname=qemu pkgver=0.9.1 -pkgrel=4 +pkgrel=5 pkgdesc="QEMU is a FAST! processor emulator" url="http://bellard.org/qemu/" depends=('sdl' 'zlib' 'alsa-lib') @@ -13,13 +13,15 @@ archs=('i686' 'x86_64') up2date="lynx -dump $url/download.html|grep Source|sed 's/.*-\(.*\)\.t.*/\1/'" source=($url/$pkgname-$pkgver.tar.gz rc.qemu rc.qemu-hu.po \ rc.qemu-system qemu-system CVE-2008-2004.diff \ + qemu-0.9.1-dirent.patch \ README.Frugalware) sha1sums=('630ea20b5989f0df00128de7f7be661c573ed041' \ - '44a6af4642d5f258a7c66e46e3baf7d04bdca9de' \ + '563c18fe297f1e79b0172e3b426310ac5fbf1a83' \ 'ce31601e5712057938227923d4a9adf16eeb36e7' \ '2ba7e84a4bc38907202340ba1323a224dbd5f597' \ 'b1c2b53ef74d1461bbd4f83b8a4f1180187f6a30' \ 'b7d868669c5324c3afd8d0e0d75f7406150e9839' \ + '8b873471f2473fdbc9cb58bfc069f6a306a544d3' \ '17454e4d54872d32071d478774f96cbab8bb0902') build() diff --git a/source/xapps-extra/qemu/qemu-0.9.1-dirent.patch b/source/xapps-extra/qemu/qemu-0.9.1-dirent.patch new file mode 100644 index 0000000..3457176 --- /dev/null +++ b/source/xapps-extra/qemu/qemu-0.9.1-dirent.patch @@ -0,0 +1,11 @@ +--- qemu-0.9.1/linux-user/syscall.c.BAD 2008-12-31 20:20:00.000000000 -0600 ++++ qemu-0.9.1/linux-user/syscall.c 2008-12-31 20:20:27.000000000 -0600 +@@ -66,7 +66,7 @@ + #include + #include + #include +-#include ++#include + #include + + #include "qemu.h" diff --git a/source/xapps-extra/qemu/rc.qemu b/source/xapps-extra/qemu/rc.qemu index 1fa2e75..cdca7c3 100644 --- a/source/xapps-extra/qemu/rc.qemu +++ b/source/xapps-extra/qemu/rc.qemu @@ -1,6 +1,6 @@ #!/bin/bash -# (c) 2006 Miklos Vajan +# (c) 2006, 2009 Miklos Vajan # rc.qemu for Frugalware # distributed under GPL License @@ -12,12 +12,14 @@ source /lib/initscripts/functions TEXTDOMAIN=qemu TEXTDOMAINDIR=/lib/initscripts/messages +pid="ls /proc/sys/fs/binfmt_misc/qemu-* 2>/dev/null" + actions=(restart start status stop) rc_start() { start_msg $"Registering binary handler for qemu applications" - if ls /proc/sys/fs/binfmt_misc/qemu-* &>/dev/null; then + if [ -n "$(eval $pid)" ]; then ok 999 return 1 fi @@ -58,20 +60,10 @@ rc_start() ok $? } -rc_status() -{ - status_msg $"Qemu binary format handlers are" - if ! ls /proc/sys/fs/binfmt_misc/qemu-* &>/dev/null; then - ok 998 - else - ok 997 - fi -} - rc_stop() { stop_msg $"Unregistering binary handler for qemu applications" - if ! ls /proc/sys/fs/binfmt_misc/qemu-* &>/dev/null; then + if [ -z "$(eval $pid)" ]; then ok 999 return 1 fi @@ -83,5 +75,3 @@ rc_stop() } rc_exec $1 - -# vim: ft=sh From priyank at frugalware.org Sun Jan 18 07:04:26 2009 From: priyank at frugalware.org (Priyank) Date: Sun Jan 18 07:04:27 2009 Subject: [Frugalware-git] gservice: Also maintain status information of the service in a liststore Message-ID: <20090118060426.1CAA311B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gservice.git;a=commitdiff;h=d3e818ca8c6d5736bd94a9c6ad0a9d2bc55eeb41 commit d3e818ca8c6d5736bd94a9c6ad0a9d2bc55eeb41 Author: Priyank Date: Sun Jan 18 11:34:06 2009 +0530 Also maintain status information of the service in a liststore diff --git a/data/gservice.glade b/data/gservice.glade index 9eae825..7777202 100644 --- a/data/gservice.glade +++ b/data/gservice.glade @@ -1,6 +1,6 @@ - + 650 @@ -123,34 +123,21 @@ True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - 0 - 5 - 6 - gfpm - - - False - False - - - True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 1 7 - <span size="larger"><b>gService - Manage Services</b></span> + <span size="larger"><b>gService - Manage system services</b></span> True False - 1 + + + False diff --git a/src/gservice-interface.c b/src/gservice-interface.c index 362f680..a8a33a0 100644 --- a/src/gservice-interface.c +++ b/src/gservice-interface.c @@ -103,7 +103,7 @@ gservice_setup_treeview (void) store = gtk_list_store_new (5, GDK_TYPE_PIXBUF, /* status icon */ G_TYPE_STRING, /* service name & description */ - G_TYPE_BOOLEAN, /* status */ + G_TYPE_INT, /* service status for internal use */ G_TYPE_STRING, /* service name for internal use */ G_TYPE_BOOLEAN); /* activation status for internal use */ @@ -196,13 +196,7 @@ gservice_populate_services (void) gtk_list_store_append (GTK_LIST_STORE(store), &iter); gtk_list_store_set (store, &iter, 1, (char*)namedesc, - /*2, e->runlevel[0], - 3, e->runlevel[1], - 4, e->runlevel[2], - 5, e->runlevel[3], - 6, e->runlevel[4], - 7, e->runlevel[5], - 8, e->runlevel[6],*/ + 2, e->status, 3, (char*)e->name, 4, (e->enabled)?TRUE:FALSE, -1); @@ -349,13 +343,19 @@ cb_gsvc_button_start_clicked (GtkButton *button, gpointer data) { case GSVC_ON: { - gtk_list_store_set ((GtkListStore*)model, &iter, 0, pixbuf_on, -1); + gtk_list_store_set ((GtkListStore*)model, &iter, + 0, pixbuf_on, + 2, retval, + -1); break; } case GSVC_OFF: case GSVC_ERR: { - gtk_list_store_set ((GtkListStore*)model, &iter, 0, pixbuf_off, -1); + gtk_list_store_set ((GtkListStore*)model, &iter, + 0, pixbuf_off, + 2, retval, + -1); break; } default: break; @@ -471,7 +471,6 @@ cb_gsvc_service_selected (GtkTreeSelection *selection, gpointer data) { GList *list = gsvc_service_list; gtk_tree_model_get (model, &iter, 3, &service, -1); - g_print ("selected service: %s\n", service); while (list != NULL) { entry = list->data; @@ -482,7 +481,7 @@ cb_gsvc_service_selected (GtkTreeSelection *selection, gpointer data) gtk_widget_set_sensitive (gsvc_button_start, TRUE); gtk_widget_set_sensitive (gsvc_button_stop, TRUE); - g_print ("==> got %s\n", entry->name); + /* enable/disable the 'start' and 'stop' buttons depending on service status */ gservice_adjust_service_buttons_from_status (gsvc_service_get_status(entry->name)); From priyank at frugalware.org Sun Jan 18 07:13:20 2009 From: priyank at frugalware.org (Priyank) Date: Sun Jan 18 07:13:21 2009 Subject: [Frugalware-git] xfce46: xfce4-notes-plugin-1.6.3-1-i686 Message-ID: <20090118061320.04A8911B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfce46.git;a=commitdiff;h=14c3d0d9bcbf6f06bae3191dd7cfb291f6af8b9e commit 14c3d0d9bcbf6f06bae3191dd7cfb291f6af8b9e Author: Priyank Date: Sun Jan 18 11:42:35 2009 +0530 xfce4-notes-plugin-1.6.3-1-i686 * Version bump * updated deps diff --git a/source/xfce4/xfce4-notes-plugin/FrugalBuild b/source/xfce4/xfce4-notes-plugin/FrugalBuild index 389cf28..770ffef 100644 --- a/source/xfce4/xfce4-notes-plugin/FrugalBuild +++ b/source/xfce4/xfce4-notes-plugin/FrugalBuild @@ -2,15 +2,15 @@ # Maintainer: Priyank Gosalia pkgname=xfce4-notes-plugin -pkgver=1.6.1 +pkgver=1.6.3 pkgrel=1 pkgdesc="A notes plugin for the Xfce4 panel." makedepends=('intltool') -depends=('libxfcegui4>=4.4.2' 'xfce4-panel>=4.4.2' 'thunar>=0.9.0' 'libxml2') +depends=('libxfcegui4>=4.5.93' 'xfce4-panel>=4.5.93' 'thunar>=0.9.93' 'libxml2') groups=('xfce4' 'xfce4-goodies') archs=('i686' 'x86_64') _F_gnome_iconcache=y Finclude xfce4 gnome-scriptlet -sha1sums=('7fbca64244eb4d2e5091145972e8903beb89da99') +sha1sums=('23bc37ed267c539d988539ba3a05a1620a8536ce') # optimization OK From priyank at frugalware.org Sun Jan 18 07:29:32 2009 From: priyank at frugalware.org (Priyank) Date: Sun Jan 18 07:29:33 2009 Subject: [Frugalware-git] frugalware-current: ssf2bio-0.0.1-1-i686 Message-ID: <20090118062932.C3B5211B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ba6924207528a84a6d49a4020e05d284b3855230 commit ba6924207528a84a6d49a4020e05d284b3855230 Author: Priyank Date: Sun Jan 18 11:58:26 2009 +0530 ssf2bio-0.0.1-1-i686 * New package / Initial import diff --git a/source/apps-extra/ssf2bio/FrugalBuild b/source/apps-extra/ssf2bio/FrugalBuild new file mode 100644 index 0000000..d84dc30 --- /dev/null +++ b/source/apps-extra/ssf2bio/FrugalBuild @@ -0,0 +1,26 @@ +# Compiling Time: 0 SBU +# Maintainer: Priyank Gosalia + +pkgname=ssf2bio +pkgver=0.0.1 +pkgrel=1 +pkgdesc="An SSF (Shakti Standard Format) to BIO format converter." +url="http://frugalware.org/~priyank/ssf2bio" +depends=() +groups=('apps-extra') +archs=('i686' 'x86_64') +up2date="lynx -dump $url | grep -m1 Version | sed 's/.*n \(.*\) \[.*/\1/'" +source=($url/ssf2bio.c) +sha1sums=('e2764b13e81b24b867688326d64b8f4c4950211e') + +build() +{ + cd $Fsrcdir || Fdie + Fmessage "Compiling ssf2bio..." + Fmessage "gcc -o ssf2bio ${CFLAGS} ssf2bio.c" + gcc -o ssf2bio ${CFLAGS} ssf2bio.c || Fdie + Finstall 755 ssf2bio /usr/bin/ssf2bio +} + + +# optimization OK From priyank at frugalware.org Sun Jan 18 08:16:13 2009 From: priyank at frugalware.org (Priyank) Date: Sun Jan 18 08:16:14 2009 Subject: [Frugalware-git] gservice: gservice-backend: Added new functions for activating/deactivating servies Message-ID: <20090118071613.6BEB711B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gservice.git;a=commitdiff;h=89cba02d5ee0bfad08b1ac18583c8f3e69989a92 commit 89cba02d5ee0bfad08b1ac18583c8f3e69989a92 Author: Priyank Date: Sun Jan 18 12:45:37 2009 +0530 gservice-backend: Added new functions for activating/deactivating servies * gsvc_service_activate() and gsvc_service_deactivate() diff --git a/src/gservice-backend.c b/src/gservice-backend.c index a1f7d1a..a9ba9ac 100644 --- a/src/gservice-backend.c +++ b/src/gservice-backend.c @@ -369,42 +369,6 @@ gsvc_glist_to_string (GList *list) return ret; } -/* strips ON/OFF/FAILED from a cmd line output */ -gchar * -gsvc_strip_service_status (const char *line) -{ - char *temp = NULL; - char *ptr = NULL; - char *ret = NULL; - - temp = g_strdup (line); - ptr = g_strdup (g_strstrip(g_strcanon(line,"ON",' '))); - if (!strcmp(ptr,"ON")) - { - ret = g_strdup (ptr); - g_free (temp); - return ret; - } - temp = g_strdup (line); - ptr = g_strdup (g_strstrip(g_strcanon(line,"OFF",' '))); - if (!strcmp(ptr,"OFF")) - { - ret = g_strdup (ptr); - g_free (temp); - return ret; - } - temp = g_strdup (line); - ptr = g_strdup (g_strstrip(g_strcanon(line,"FAILED",' '))); - if (!strcmp(ptr,"FAILED")) - { - ret = g_strdup (ptr); - g_free (temp); - return ret; - } - - return ret; -} - /* returns the status of service GSVC_ON or GSVC_OFF */ /* returns GSVC_ERR if status not supported */ gint @@ -528,4 +492,35 @@ gsvc_service_stop (const char *service, int *retval) return ret; } +gboolean +gsvc_service_activate (const char *service) +{ + char *cmd = NULL; + char *svc = NULL; + gboolean ret = FALSE; + + svc = g_strdup_printf ("rc.%s", service); + cmd = g_strdup_printf ("chkconfig --add %s", svc); + g_free (svc); + if (!system(cmd)) + ret = TRUE; + + return ret; +} + +gboolean +gsvc_service_deactivate (const char *service) +{ + char *cmd = NULL; + char *svc = NULL; + gboolean ret = FALSE; + + svc = g_strdup_printf ("rc.%s", service); + cmd = g_strdup_printf ("chkconfig --del %s", svc); + g_free (svc); + if (!system(cmd)) + ret = TRUE; + + return ret; +} diff --git a/src/gservice-backend.h b/src/gservice-backend.h index 5bba6a9..2e1076f 100644 --- a/src/gservice-backend.h +++ b/src/gservice-backend.h @@ -35,5 +35,12 @@ char * gsvc_service_start (const char *service, int *retval); /* return value of the service command is specified in retval */ char * gsvc_service_stop (const char *service, int *retval); +/* activates a service. simply runs 'chkconfig --add rc.foo' */ +/* one should note that this doesn't start the service */ +gboolean gsvc_service_activate (const char *service); + +/* deactivates a service. simply runs 'chkconfig --del rc.foo' */ +gboolean gsvc_service_deactivate (const char *service); + #endif From devil505linux at gmail.com Sun Jan 18 09:04:52 2009 From: devil505linux at gmail.com (Devil505) Date: Sun Jan 18 09:04:52 2009 Subject: [Frugalware-git] frugalware-current: gramps-3.0.4-1-i686 Message-ID: <20090118080452.0513911B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=28dab9d1f214f79b7e80c4b550e3a988a8f2eed7 commit 28dab9d1f214f79b7e80c4b550e3a988a8f2eed7 Author: Devil505 Date: Sun Jan 18 09:02:19 2009 +0100 gramps-3.0.4-1-i686 * version bump * closes bug report FS#3401 diff --git a/source/gnome-extra/gramps/FrugalBuild b/source/gnome-extra/gramps/FrugalBuild index 80a3f63..1b308bd 100755 --- a/source/gnome-extra/gramps/FrugalBuild +++ b/source/gnome-extra/gramps/FrugalBuild @@ -2,11 +2,11 @@ # Maintainer: Devil505 pkgname=gramps -pkgver=3.0.2 +pkgver=3.0.4 pkgrel=1 pkgdesc="GRAMPS is a GNOME genealogy program that allows you to easily build and keep track of your family tree." -depends=('gconf' 'python' 'pygtk' 'gnome-python' 'gnome-vfs' 'reportlab' 'graphviz') -makedepends=('gettext' 'gnome-doc-utils' 'perl-xml-parser') +depends=('gconf' 'python' 'pygtk' 'gnome-python' 'gnome-vfs' 'reportlab' 'graphviz' 'bsddb3') +makedepends=('gettext' 'gnome-doc-utils' 'perl-xml-parser' 'intltool') options=('scriptlet') _F_sourceforge_realname="Stable" Finclude sourceforge @@ -16,4 +16,4 @@ Finclude gnome-scriptlet groups=('gnome-extra') archs=('i686' 'x86_64') Fconfopts="${Fconfopts[@]} --disable-mime-install" -sha1sums=('4b478e32a0b6851e0e476bf130c19afebe941054') +sha1sums=('42501cb29b7b6b60006db0ded4a732e838becd45') From devil505linux at gmail.com Sun Jan 18 09:45:26 2009 From: devil505linux at gmail.com (Devil505) Date: Sun Jan 18 09:45:27 2009 Subject: [Frugalware-git] frugalware-current: fet-5.8.0-1-x86_64 Message-ID: <20090118084526.1E4BE11B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=eb87eefab024192bf2dd30bef78806bd85848495 commit eb87eefab024192bf2dd30bef78806bd85848495 Author: Devil505 Date: Sun Jan 18 09:45:04 2009 +0100 fet-5.8.0-1-x86_64 * version bump diff --git a/source/xapps-extra/fet/FrugalBuild b/source/xapps-extra/fet/FrugalBuild index 0b1299a..da95bad 100644 --- a/source/xapps-extra/fet/FrugalBuild +++ b/source/xapps-extra/fet/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: uzsolt pkgname=fet -pkgver=5.7.7 +pkgver=5.8.0 pkgrel=1 pkgdesc="FET is a free timetabling program for schools, high-schools and some universities." url="http://www.lalescu.ro/liviu/$pkgname" @@ -13,7 +13,7 @@ groups=('xapps-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url/download | Flasttar" source=(http://www.lalescu.ro/liviu/fet/download/$pkgname-$pkgver.tar.bz2) -sha1sums=('f47bf96087919cfde5b44ce090fcaea605a91459') +sha1sums=('d7f30c31e0b3ce547495bfaefd4913e8246eaa95') build () { From devil505linux at gmail.com Sun Jan 18 10:12:47 2009 From: devil505linux at gmail.com (Devil505) Date: Sun Jan 18 10:12:48 2009 Subject: [Frugalware-git] frugalware-current: frugalware-emul-1.0pre2_1-1-x86_64 Message-ID: <20090118091247.64B8911B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=12b7b39d4a31d77a6804c76934be248b5a311724 commit 12b7b39d4a31d77a6804c76934be248b5a311724 Author: Devil505 Date: Sun Jan 18 10:12:23 2009 +0100 frugalware-emul-1.0pre2_1-1-x86_64 version bump diff --git a/source/emul-extra/frugalware-emul/FrugalBuild b/source/emul-extra/frugalware-emul/FrugalBuild index 13f46c2..5ca96fe 100644 --- a/source/emul-extra/frugalware-emul/FrugalBuild +++ b/source/emul-extra/frugalware-emul/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=frugalware-emul -pkgver=1.0pre1_1 +pkgver=1.0pre2_1 pkgrel=1 pkgdesc="Basic Frugalware Linux filesystem package (32 emulation)" url="http://frugalware.org" @@ -22,4 +22,4 @@ build() { ln -s . $Fdestdir/usr/lib/chroot32/usr/X11R6 || Fdie Fmkdir /usr/lib/chroot32/usr/lib/X11/fonts } -sha1sums=('b6f08e17bf641e8048e38d267ac6d15548185cf7') +sha1sums=('de2f01cf0ddb8404828c8fb879bbf97d11af7788') From devil505linux at gmail.com Sun Jan 18 10:16:08 2009 From: devil505linux at gmail.com (Devil505) Date: Sun Jan 18 10:16:10 2009 Subject: [Frugalware-git] frugalware-current: pango-emul-1.22.4_1-1-x86_64 Message-ID: <20090118091608.C8EEF11B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3c887950f35065a79a0d6b08b78ecde3bb349f05 commit 3c887950f35065a79a0d6b08b78ecde3bb349f05 Author: Devil505 Date: Sun Jan 18 10:15:09 2009 +0100 pango-emul-1.22.4_1-1-x86_64 version bump diff --git a/source/emul-extra/pango-emul/FrugalBuild b/source/emul-extra/pango-emul/FrugalBuild index 1ab9ab7..1961324 100644 --- a/source/emul-extra/pango-emul/FrugalBuild +++ b/source/emul-extra/pango-emul/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=pango-emul -pkgver=1.22.3_1 +pkgver=1.22.4_1 pkgrel=1 pkgdesc="A library for layout and rendering of text (32bit emul)" url="http://www.gtk.org" @@ -10,4 +10,4 @@ depends=('cairo-emul' 'libxft-emul' 'glib2-emul') groups=('emul-extra') archs=('!i686' 'x86_64') Finclude emul -sha1sums=('a591de28d034901f760de85452706d246b05f3cf') +sha1sums=('9cd40d1916548b83d70330ef40341e1ff0038605') From devil505linux at gmail.com Sun Jan 18 10:19:29 2009 From: devil505linux at gmail.com (Devil505) Date: Sun Jan 18 10:19:30 2009 Subject: [Frugalware-git] frugalware-current: sqlite3-emul-3.6.10_1-1-x86_64 Message-ID: <20090118091929.0721211B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=18602d2cc5bc3fd318aa0f63e40caafeb9123aa2 commit 18602d2cc5bc3fd318aa0f63e40caafeb9123aa2 Author: Devil505 Date: Sun Jan 18 10:18:50 2009 +0100 sqlite3-emul-3.6.10_1-1-x86_64 version bump diff --git a/source/emul-extra/sqlite3-emul/FrugalBuild b/source/emul-extra/sqlite3-emul/FrugalBuild index c55f93f..4c7e843 100644 --- a/source/emul-extra/sqlite3-emul/FrugalBuild +++ b/source/emul-extra/sqlite3-emul/FrugalBuild @@ -2,11 +2,11 @@ # Maintainer: Devil505 pkgname=sqlite3-emul -pkgver=3.6.7_1 +pkgver=3.6.10_1 pkgrel=1 pkgdesc="A C library that implements an SQL database engine for emulation of i686 on x86_64" url="http://www.sqlite.org/" depends=('readline-emul') groups=('emul-extra') Finclude emul -sha1sums=('af6851a11a48e66ec1b00d275255db1c8f80c4f6') +sha1sums=('cabe23ca7fb0c0359a79fc0d8962af631d148580') From priyank at frugalware.org Sun Jan 18 11:05:44 2009 From: priyank at frugalware.org (Priyank) Date: Sun Jan 18 11:05:45 2009 Subject: [Frugalware-git] gservice: Implemented icon-mapping for services Message-ID: <20090118100544.DC37111B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gservice.git;a=commitdiff;h=e83d977e2bf91eb1346ec37bd96e4d6a9132a44c commit e83d977e2bf91eb1346ec37bd96e4d6a9132a44c Author: Priyank Date: Sun Jan 18 15:27:57 2009 +0530 Implemented icon-mapping for services * Services can now have an associated icon to be displayed * Icon mapping is stored in /etc/gservice-icons.conf diff --git a/Makefile.am b/Makefile.am index cd283fa..36e2e40 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,6 +3,10 @@ SUBDIRS = src data po icondir = $(datadir)/pixmaps icon_DATA = data/gservice.png -EXTRA_DIST = $(icon_DATA) +confdir = $(sysconfdir)/ +conf_DATA = gservice-icons.conf + +EXTRA_DIST = $(icon_DATA) $(conf_DATA) + diff --git a/gservice-icons.conf b/gservice-icons.conf new file mode 100644 index 0000000..1d91303 --- /dev/null +++ b/gservice-icons.conf @@ -0,0 +1,18 @@ +# Icon mapping configuration for gService +# syntax: service_name = icon_name | path_to_icon_file +# where icon_name is a valid icon name recognized by your current icon theme. +# If you're unsure about the icon name, you might also specify an icon path. + +alsa = multimedia +cups = printer +gpm = mouse +keymap = keyboard +fun = system-software-update +syslog = logviewer +interfaces = gtk-network +vsftpd = server +lighttpd = server +samba = server +mount = folder +time = date + diff --git a/src/Makefile.am b/src/Makefile.am index 434ed29..0a5fe69 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -7,6 +7,7 @@ bin_PROGRAMS=gservice gservice_SOURCES= \ gservice.c \ gservice-backend.c \ + gservice-icon-mapping.c \ gservice-interface.c \ gservice-messages.c \ gservice-about.c diff --git a/src/gservice-icon-mapping.c b/src/gservice-icon-mapping.c new file mode 100644 index 0000000..c02abe7 --- /dev/null +++ b/src/gservice-icon-mapping.c @@ -0,0 +1,152 @@ +/* + * gservice-icon-mapping.c for gService + * + * Copyright (C) 2008-2009 by Priyank Gosalia + * + * 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 General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include +#include "gservice-icon-mapping.h" + +#define ICON_MAP_FILE "/etc/gservice-icons.conf" +#define FALLBACK_ICON "/share/gservice/gservice.png" + +/* get icon map value for a specified service key */ +static char * +gsvc_icon_mapping_get_value (const char *svc) +{ + FILE *fp = NULL; + char *ret = NULL; + char *tmp = NULL; + char line[PATH_MAX+1] = ""; + + fp = fopen (ICON_MAP_FILE, "r"); + if (!fp) + { + g_warning ("gservice: couldn't find icon map file.\n"); + return NULL; + } + while (fgets(line,PATH_MAX,fp)) + { + g_strstrip (line); + if (line[0] == '#' || strlen(line) == 0) + continue; + tmp = strtok (line, "="); + if (tmp != NULL) + { + char *var = strdup (tmp); + g_strstrip (var); + if (!strcmp(var,svc)) + { + char *tok = NULL; + tok = strtok (NULL, "="); + if (tok) + { + printf ("FOUND:%s\n", tok); + ret = strdup (g_strstrip(tok)); + free (var); + break; + } + } + free (var); + } + } + fclose (fp); + + return ret; +} + +/* Get a named icon from the current icon theme of specified size */ +static GdkPixbuf * +gsvc_icon_mapping_get_icon_from_name (const char *name, guint size) +{ + GtkIconTheme *icon_theme = NULL; + GdkPixbuf *ret = NULL; + GError *error = NULL; + + if (name) + { + icon_theme = gtk_icon_theme_get_default (); + ret = gtk_icon_theme_load_icon (icon_theme, name, size, 0, &error); + /* error checking */ + if (!ret) + { + g_warning ("gservice: couldn't load icon: %s\n", error->message); + } + } + + return ret; +} + +/* Get an icon from specified path and size */ +static GdkPixbuf * +gsvc_icon_mapping_get_icon_from_path (const char *path, guint size) +{ + GdkPixbuf *ret = NULL; + GError *error = NULL; + + if (path) + { + ret = gdk_pixbuf_new_from_file_at_size (path, size, size, &error); + /* error checking */ + if (!ret) + { + g_warning ("gservice: couldn't load icon: %s\n", error->message); + } + } + + return ret; +} + +GdkPixbuf * +gsvc_icon_mapping_get_icon_for_service (const char *svc, guint size) +{ + char *icon = NULL; + GdkPixbuf *ret = NULL; + + if (svc) + { + icon = gsvc_icon_mapping_get_value ((char*)svc); + if (icon) + { + /* check if it's a path to an icon */ + if (g_file_test(icon,G_FILE_TEST_EXISTS)) + { + ret = gsvc_icon_mapping_get_icon_from_path (icon, size); + } + else + { + ret = gsvc_icon_mapping_get_icon_from_name (icon, size); + } + g_free (icon); + } + } + /* fallback to a default icon if everything fails */ + if (!ret) + { + char *path = g_strdup_printf ("%s/%s", PREFIX, FALLBACK_ICON); + ret = gdk_pixbuf_new_from_file_at_size (path, size, size, NULL); + g_free (path); + } + + return ret; +} + + diff --git a/src/gservice-icon-mapping.h b/src/gservice-icon-mapping.h new file mode 100644 index 0000000..21d0c08 --- /dev/null +++ b/src/gservice-icon-mapping.h @@ -0,0 +1,8 @@ +#ifndef __GSERVICE_ICON_MAPPING_H__ +#define __GSERVICE_ICON_MAPPING_H__ + +#include "gservice.h" + +GdkPixbuf * gsvc_icon_mapping_get_icon_for_service (const char *svc, guint size); + +#endif diff --git a/src/gservice-interface.c b/src/gservice-interface.c index a8a33a0..f8f3dee 100644 --- a/src/gservice-interface.c +++ b/src/gservice-interface.c @@ -121,7 +121,7 @@ gservice_setup_treeview (void) gtk_cell_renderer_text_set_fixed_height_from_font (renderer, 5); column = gtk_tree_view_column_new_with_attributes (_("Service"), renderer, - "markup", 1, + "markup", 2, NULL); gtk_tree_view_column_set_resizable (column, FALSE); gtk_tree_view_column_set_expand (column, FALSE); @@ -191,14 +191,17 @@ gservice_populate_services (void) gservice_entry_t *e = temp->data; char *desc = NULL; char *namedesc = NULL; + GdkPixbuf *icon = NULL; desc = gsvc_glist_to_string (e->description); namedesc = g_markup_printf_escaped ("%s\n%s", e->name, desc); + icon = gsvc_icon_mapping_get_icon_for_service ((char*)e->name, 32); gtk_list_store_append (GTK_LIST_STORE(store), &iter); gtk_list_store_set (store, &iter, - 1, (char*)namedesc, - 2, e->status, - 3, (char*)e->name, - 4, (e->enabled)?TRUE:FALSE, + 1, icon, + 2, (char*)namedesc, + 3, e->status, + 4, (char*)e->name, + 5, (e->enabled)?TRUE:FALSE, -1); switch (e->status) { @@ -288,7 +291,10 @@ gservice_interface_init (void) /* a li'l manual delay */ sleep (2); while (gtk_events_pending()) gtk_main_iteration (); + + /* setup service treeview */ gservice_setup_treeview (); + /* populate service treeview */ gservice_populate_services (); /* connect some signals */ @@ -332,7 +338,7 @@ cb_gsvc_button_start_clicked (GtkButton *button, gpointer data) int retval = 0; GdkPixbuf *pixbuf_on = gservice_get_icon ("gservice-running", 16); GdkPixbuf *pixbuf_off = gservice_get_icon ("gservice-stopped", 16); - gtk_tree_model_get (model, &iter, 3, &service, -1); + gtk_tree_model_get (model, &iter, 4, &service, -1); if (service) { g_print ("STARTING: %s\n", service); @@ -345,7 +351,7 @@ cb_gsvc_button_start_clicked (GtkButton *button, gpointer data) { gtk_list_store_set ((GtkListStore*)model, &iter, 0, pixbuf_on, - 2, retval, + 3, retval, -1); break; } @@ -354,7 +360,7 @@ cb_gsvc_button_start_clicked (GtkButton *button, gpointer data) { gtk_list_store_set ((GtkListStore*)model, &iter, 0, pixbuf_off, - 2, retval, + 3, retval, -1); break; } @@ -386,7 +392,7 @@ cb_gsvc_button_stop_clicked (GtkButton *button, gpointer data) int retval = 0; GdkPixbuf *pixbuf_on = gservice_get_icon ("gservice-running", 16); GdkPixbuf *pixbuf_off = gservice_get_icon ("gservice-stopped", 16); - gtk_tree_model_get (model, &iter, 3, &service, -1); + gtk_tree_model_get (model, &iter, 4, &service, -1); if (service) { g_print ("STOPPING: %s\n", service); @@ -470,7 +476,7 @@ cb_gsvc_service_selected (GtkTreeSelection *selection, gpointer data) if (gtk_tree_selection_get_selected(selection, &model, &iter)) { GList *list = gsvc_service_list; - gtk_tree_model_get (model, &iter, 3, &service, -1); + gtk_tree_model_get (model, &iter, 4, &service, -1); while (list != NULL) { entry = list->data; From priyank at frugalware.org Sun Jan 18 11:05:45 2009 From: priyank at frugalware.org (Priyank) Date: Sun Jan 18 11:05:46 2009 Subject: [Frugalware-git] gservice: gservice-interface: set icons for services using gService icon mapping Message-ID: <20090118100545.0733411B87A9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gservice.git;a=commitdiff;h=77344a9d2c7c721abc2150aa157198690c59bf4c commit 77344a9d2c7c721abc2150aa157198690c59bf4c Author: Priyank Date: Sun Jan 18 15:31:09 2009 +0530 gservice-interface: set icons for services using gService icon mapping diff --git a/data/gservice.glade b/data/gservice.glade index 7777202..5e40c76 100644 --- a/data/gservice.glade +++ b/data/gservice.glade @@ -1,6 +1,6 @@ - + 650 diff --git a/src/gservice-backend.h b/src/gservice-backend.h index 2e1076f..3a2a91d 100644 --- a/src/gservice-backend.h +++ b/src/gservice-backend.h @@ -37,9 +37,11 @@ char * gsvc_service_stop (const char *service, int *retval); /* activates a service. simply runs 'chkconfig --add rc.foo' */ /* one should note that this doesn't start the service */ +/* returns TRUE on success, FALSE on failure */ gboolean gsvc_service_activate (const char *service); /* deactivates a service. simply runs 'chkconfig --del rc.foo' */ +/* returns TRUE on success, FALSE on failure */ gboolean gsvc_service_deactivate (const char *service); #endif diff --git a/src/gservice-interface.c b/src/gservice-interface.c index f8f3dee..793fef3 100644 --- a/src/gservice-interface.c +++ b/src/gservice-interface.c @@ -20,6 +20,7 @@ #include "gservice-interface.h" #include "gservice-backend.h" +#include "gservice-icon-mapping.h" #include "gservice-about.h" GtkWidget *gsvc_main_window = NULL; @@ -100,8 +101,9 @@ gservice_setup_treeview (void) GtkTreeSelection *selection = NULL; GtkTreeViewColumn *column = NULL; - store = gtk_list_store_new (5, + store = gtk_list_store_new (6, GDK_TYPE_PIXBUF, /* status icon */ + GDK_TYPE_PIXBUF, /* service icon */ G_TYPE_STRING, /* service name & description */ G_TYPE_INT, /* service status for internal use */ G_TYPE_STRING, /* service name for internal use */ @@ -114,6 +116,14 @@ gservice_setup_treeview (void) NULL); gtk_tree_view_column_set_resizable (column, FALSE); gtk_tree_view_append_column (GTK_TREE_VIEW(gsvc_treeview_services), column); + + renderer = gtk_cell_renderer_pixbuf_new (); + column = gtk_tree_view_column_new_with_attributes (_("Icon"), + renderer, + "pixbuf", 1, + NULL); + gtk_tree_view_column_set_resizable (column, FALSE); + gtk_tree_view_append_column (GTK_TREE_VIEW(gsvc_treeview_services), column); renderer = gtk_cell_renderer_text_new (); g_object_set (G_OBJECT(renderer), "wrap-mode", PANGO_WRAP_CHAR, NULL); From devil505linux at gmail.com Sun Jan 18 11:40:15 2009 From: devil505linux at gmail.com (Devil505) Date: Sun Jan 18 11:40:17 2009 Subject: [Frugalware-git] frugalware-current: glib2-emul-2.18.4_1-1-x86_64 Message-ID: <20090118104015.D329E11B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d12b0024cb8d4b4cc35a8920f12395c081ea6a7b commit d12b0024cb8d4b4cc35a8920f12395c081ea6a7b Author: Devil505 Date: Sun Jan 18 11:38:12 2009 +0100 glib2-emul-2.18.4_1-1-x86_64 version bump diff --git a/source/emul-extra/glib2-emul/FrugalBuild b/source/emul-extra/glib2-emul/FrugalBuild index 8bf067f..e10e38c 100644 --- a/source/emul-extra/glib2-emul/FrugalBuild +++ b/source/emul-extra/glib2-emul/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=glib2-emul -pkgver=2.18.3_1 +pkgver=2.18.4_1 pkgrel=1 pkgdesc="Common C routines used by GTK+2 and other libraries" url="http://www.gtk.org" @@ -10,4 +10,4 @@ depends=('glibc-emul') groups=('emul-extra') archs=('!i686' 'x86_64') Finclude emul -sha1sums=('9d69dd64b6cd1e855b09b1e0296d7a6d9c917041') +sha1sums=('c76c12c3647fd2a18e8810ea6d0ef85ac4c3ee99') From devil505linux at gmail.com Sun Jan 18 11:44:23 2009 From: devil505linux at gmail.com (Devil505) Date: Sun Jan 18 11:44:24 2009 Subject: [Frugalware-git] frugalware-current: shadow-emul-4.1.2.2_2-1-x86_64 Message-ID: <20090118104423.395AE11B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5e84d5731cad9c673d2fab343fa1be40d4a44a6d commit 5e84d5731cad9c673d2fab343fa1be40d4a44a6d Author: Devil505 Date: Sun Jan 18 11:42:42 2009 +0100 shadow-emul-4.1.2.2_2-1-x86_64 version bump diff --git a/source/emul-extra/shadow-emul/FrugalBuild b/source/emul-extra/shadow-emul/FrugalBuild index 0bb60e3..f7d8373 100644 --- a/source/emul-extra/shadow-emul/FrugalBuild +++ b/source/emul-extra/shadow-emul/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=shadow-emul -pkgver=4.1.2.2_1 +pkgver=4.1.2.2_2 pkgrel=1 pkgdesc="Shadow password file utilities" url="http://shadow.pld.org.pl" @@ -10,4 +10,4 @@ depends=('glibc') groups=('emul-extra') archs=('!i686' 'x86_64') Finclude emul -sha1sums=('8d4d8484bc5a4c5f7332928192f971ae75acddf1') +sha1sums=('8b79a32b8eef1a7f25c6c054d31af5da4239fac9') From devil505linux at gmail.com Sun Jan 18 11:48:26 2009 From: devil505linux at gmail.com (Devil505) Date: Sun Jan 18 11:48:27 2009 Subject: [Frugalware-git] frugalware-current: cairo-emul-1.8.6_1-1-x86_64 Message-ID: <20090118104826.5D17411B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a4e777f73bd2ff301c1a9952b81119551fe14242 commit a4e777f73bd2ff301c1a9952b81119551fe14242 Author: Devil505 Date: Sun Jan 18 11:47:25 2009 +0100 cairo-emul-1.8.6_1-1-x86_64 version bump diff --git a/source/emul-extra/cairo-emul/FrugalBuild b/source/emul-extra/cairo-emul/FrugalBuild index 4ae02dd..ed65625 100644 --- a/source/emul-extra/cairo-emul/FrugalBuild +++ b/source/emul-extra/cairo-emul/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=cairo-emul -pkgver=1.8.4_1 +pkgver=1.8.6_1 pkgrel=1 pkgdesc="A vector graphics library with cross-device output support (32bit emul)" url="http://cairographics.org" @@ -10,4 +10,4 @@ depends=('glitz-emul' 'libxrender-emul' 'fontconfig-emul' 'libpng-emul') groups=('emul-extra') archs=('!i686' 'x86_64') Finclude emul -sha1sums=('b573178fbe1e4205f35c12d7838fe35b1c46bbe0') +sha1sums=('e42dfaa1aad0aee42a1e60f4be894e2f7993531f') From devil505linux at gmail.com Sun Jan 18 11:59:43 2009 From: devil505linux at gmail.com (Devil505) Date: Sun Jan 18 11:59:44 2009 Subject: [Frugalware-git] frugalware-current: gtk+2-emul-2.14.7_1-1-x86_64 Message-ID: <20090118105943.3A0E611B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2f96a5562b06f19ea98e314172bbece1757b007b commit 2f96a5562b06f19ea98e314172bbece1757b007b Author: Devil505 Date: Sun Jan 18 11:54:50 2009 +0100 gtk+2-emul-2.14.7_1-1-x86_64 version bump diff --git a/source/emul-extra/gtk+2-emul/FrugalBuild b/source/emul-extra/gtk+2-emul/FrugalBuild index 1d9c66d..3bf39dc 100644 --- a/source/emul-extra/gtk+2-emul/FrugalBuild +++ b/source/emul-extra/gtk+2-emul/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=gtk+2-emul -pkgver=2.14.5_1 +pkgver=2.14.7_1 pkgrel=1 pkgdesc="The GTK+ Toolkit (2.x series) (32bit emul)" url="http://www.gtk.org/" @@ -12,4 +12,4 @@ depends=('libtiff-emul' 'atk-emul' 'libxi-emul' 'libxinerama-emul' 'fontconfig-e groups=('emul-extra') archs=('!i686' 'x86_64') Finclude emul -sha1sums=('85d852ff707a17c34022f6e12269605714f96076') +sha1sums=('c494ccdcd64fbb70eaa09af475accb6a829cca89') From devil505linux at gmail.com Sun Jan 18 12:03:49 2009 From: devil505linux at gmail.com (Devil505) Date: Sun Jan 18 12:03:51 2009 Subject: [Frugalware-git] frugalware-current: freetype2-emul-2.3.8_1-1-x86_64 Message-ID: <20090118110350.007FF11B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4142058ab920ca9605592477148b46bd4e3a4723 commit 4142058ab920ca9605592477148b46bd4e3a4723 Author: Devil505 Date: Sun Jan 18 12:02:43 2009 +0100 freetype2-emul-2.3.8_1-1-x86_64 version bump diff --git a/source/emul-extra/freetype2-emul/FrugalBuild b/source/emul-extra/freetype2-emul/FrugalBuild index b27f2ae..18bfc9b 100644 --- a/source/emul-extra/freetype2-emul/FrugalBuild +++ b/source/emul-extra/freetype2-emul/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=freetype2-emul -pkgver=2.3.7_1 +pkgver=2.3.8_1 pkgrel=1 pkgdesc="TrueType font rendering library - 2.0 series for emulation of i686 on x86_64" url="http://freetype.sourceforge.net" @@ -10,4 +10,4 @@ depends=('glibc-emul' 'zlib-emul') groups=('emul-extra') archs=('!i686' 'x86_64') Finclude emul -sha1sums=('731a1726f2aaa1ccb29c1f93bcb3a9cebc4bfeed') +sha1sums=('f13834b51948fb46dde51f0987468674bf7fbd64') From priyank at frugalware.org Sun Jan 18 12:04:33 2009 From: priyank at frugalware.org (Priyank) Date: Sun Jan 18 12:04:34 2009 Subject: [Frugalware-git] gservice: Added some more service icons Message-ID: <20090118110433.9F14C11B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gservice.git;a=commitdiff;h=4cd9820005dec5341a53220e37930d2ab0b210ed commit 4cd9820005dec5341a53220e37930d2ab0b210ed Author: Priyank Date: Sun Jan 18 16:34:21 2009 +0530 Added some more service icons diff --git a/configure.ac b/configure.ac index 250c2c3..b124bf0 100644 --- a/configure.ac +++ b/configure.ac @@ -68,6 +68,8 @@ data/icons/Makefile data/icons/16x16/Makefile data/icons/24x24/Makefile data/icons/32x32/Makefile +data/icons/48x48/Makefile +data/icons/scalable/Makefile po/Makefile.in Makefile ]) diff --git a/data/icons/48x48/Makefile.am b/data/icons/48x48/Makefile.am new file mode 100644 index 0000000..50b8e40 --- /dev/null +++ b/data/icons/48x48/Makefile.am @@ -0,0 +1,5 @@ +icondir = $(datadir)/icons/hicolor/48x48/apps +icon_DATA = gservice-clock.png \ + gservice-splash.png + +EXTRA_DIST = $(icon_DATA) diff --git a/data/icons/48x48/gservice-clock.png b/data/icons/48x48/gservice-clock.png new file mode 100644 index 0000000..295df71 Binary files /dev/null and b/data/icons/48x48/gservice-clock.png differ diff --git a/data/icons/48x48/gservice-splash.png b/data/icons/48x48/gservice-splash.png new file mode 100644 index 0000000..9219a8a Binary files /dev/null and b/data/icons/48x48/gservice-splash.png differ diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am index a57fb20..e509e4e 100644 --- a/data/icons/Makefile.am +++ b/data/icons/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = 16x16 24x24 32x32 +SUBDIRS = 16x16 24x24 32x32 48x48 scalable gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor diff --git a/data/icons/scalable/Makefile.am b/data/icons/scalable/Makefile.am new file mode 100644 index 0000000..94a9c56 --- /dev/null +++ b/data/icons/scalable/Makefile.am @@ -0,0 +1,5 @@ +icondir = $(datadir)/icons/hicolor/scalable/apps +icon_DATA = gservice-bluetooth.svg \ + gservice-power.svg + +EXTRA_DIST = $(icon_DATA) diff --git a/data/icons/scalable/gservice-bluetooth.svg b/data/icons/scalable/gservice-bluetooth.svg new file mode 100644 index 0000000..3624a88 --- /dev/null +++ b/data/icons/scalable/gservice-bluetooth.svg @@ -0,0 +1,234 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/icons/scalable/gservice-power.svg b/data/icons/scalable/gservice-power.svg new file mode 100644 index 0000000..83e97cf --- /dev/null +++ b/data/icons/scalable/gservice-power.svg @@ -0,0 +1,493 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/gservice-icons.conf b/gservice-icons.conf index 1d91303..8d152f2 100644 --- a/gservice-icons.conf +++ b/gservice-icons.conf @@ -13,6 +13,11 @@ interfaces = gtk-network vsftpd = server lighttpd = server samba = server -mount = folder -time = date +mount = gtk-harddisk +rmount = folder-remote +time = gservice-clock +bluetooth = gservice-bluetooth +apmd = gservice-power +acpid = gservice-power +splash = gservice-splash From priyank at frugalware.org Sun Jan 18 12:16:38 2009 From: priyank at frugalware.org (Priyank) Date: Sun Jan 18 12:16:42 2009 Subject: [Frugalware-git] gservice: Added icons for firewall and local services Message-ID: <20090118111638.825F711B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gservice.git;a=commitdiff;h=2d62e3e12a15fc0754e0b8dfaddbf3e122f9955b commit 2d62e3e12a15fc0754e0b8dfaddbf3e122f9955b Author: Priyank Date: Sun Jan 18 16:46:26 2009 +0530 Added icons for firewall and local services diff --git a/data/icons/scalable/Makefile.am b/data/icons/scalable/Makefile.am index 94a9c56..03cba07 100644 --- a/data/icons/scalable/Makefile.am +++ b/data/icons/scalable/Makefile.am @@ -1,5 +1,7 @@ icondir = $(datadir)/icons/hicolor/scalable/apps icon_DATA = gservice-bluetooth.svg \ - gservice-power.svg + gservice-power.svg \ + gservice-firewall.svg \ + gservice-local.svg EXTRA_DIST = $(icon_DATA) diff --git a/data/icons/scalable/gservice-firewall.svg b/data/icons/scalable/gservice-firewall.svg new file mode 100644 index 0000000..96b01d5 --- /dev/null +++ b/data/icons/scalable/gservice-firewall.svg @@ -0,0 +1,388 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Jakub Steiner + + + http://jimmac.musichall.cz + + Medium Security + + + security + level + medium + + + + + + + + + + + + + + + + + + + + diff --git a/data/icons/scalable/gservice-local.svg b/data/icons/scalable/gservice-local.svg new file mode 100644 index 0000000..36560ca --- /dev/null +++ b/data/icons/scalable/gservice-local.svg @@ -0,0 +1,562 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Lapo Calamandrei + + + System Run + + + + run + launch + exec + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/gservice-icons.conf b/gservice-icons.conf index 8d152f2..0fb1619 100644 --- a/gservice-icons.conf +++ b/gservice-icons.conf @@ -20,4 +20,8 @@ bluetooth = gservice-bluetooth apmd = gservice-power acpid = gservice-power splash = gservice-splash +hostname = computer +firewall = gservice-firewall +local = gservice-local + From priyank at frugalware.org Sun Jan 18 12:30:46 2009 From: priyank at frugalware.org (Priyank) Date: Sun Jan 18 12:30:48 2009 Subject: [Frugalware-git] gservice: Added service icons for wine and sshd Message-ID: <20090118113046.194E611B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gservice.git;a=commitdiff;h=c0016cabeb1c2a249d5095ea94d143ba34694666 commit c0016cabeb1c2a249d5095ea94d143ba34694666 Author: Priyank Date: Sun Jan 18 17:00:35 2009 +0530 Added service icons for wine and sshd diff --git a/data/icons/48x48/Makefile.am b/data/icons/48x48/Makefile.am index 50b8e40..19b4438 100644 --- a/data/icons/48x48/Makefile.am +++ b/data/icons/48x48/Makefile.am @@ -1,5 +1,6 @@ icondir = $(datadir)/icons/hicolor/48x48/apps icon_DATA = gservice-clock.png \ - gservice-splash.png + gservice-splash.png \ + wine.png EXTRA_DIST = $(icon_DATA) diff --git a/data/icons/48x48/wine.png b/data/icons/48x48/wine.png new file mode 100644 index 0000000..08ba962 Binary files /dev/null and b/data/icons/48x48/wine.png differ diff --git a/data/icons/scalable/Makefile.am b/data/icons/scalable/Makefile.am index 03cba07..5daa55a 100644 --- a/data/icons/scalable/Makefile.am +++ b/data/icons/scalable/Makefile.am @@ -2,6 +2,7 @@ icondir = $(datadir)/icons/hicolor/scalable/apps icon_DATA = gservice-bluetooth.svg \ gservice-power.svg \ gservice-firewall.svg \ - gservice-local.svg + gservice-local.svg \ + gservice-remote.svg EXTRA_DIST = $(icon_DATA) diff --git a/data/icons/scalable/gservice-remote.svg b/data/icons/scalable/gservice-remote.svg new file mode 100644 index 0000000..ba38596 --- /dev/null +++ b/data/icons/scalable/gservice-remote.svg @@ -0,0 +1,1477 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Remote Desktop + + + Jakub Steiner + + + + + Tuomas Kuosmanen + + + + http://jimmac.musichall.cz + + + vnc + remote + desktop + control + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/gservice-icons.conf b/gservice-icons.conf index 0fb1619..e0db61b 100644 --- a/gservice-icons.conf +++ b/gservice-icons.conf @@ -23,5 +23,6 @@ splash = gservice-splash hostname = computer firewall = gservice-firewall local = gservice-local - +sshd = gservice-remote +wine = wine From priyank at frugalware.org Sun Jan 18 12:40:56 2009 From: priyank at frugalware.org (Priyank) Date: Sun Jan 18 12:40:58 2009 Subject: [Frugalware-git] gservice: Fix a bug in gservice_cell_data_func() Message-ID: <20090118114056.B570711B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gservice.git;a=commitdiff;h=b90b7f0040c196494605a04cc5698efdf2f73f50 commit b90b7f0040c196494605a04cc5698efdf2f73f50 Author: Priyank Date: Sun Jan 18 17:09:17 2009 +0530 Fix a bug in gservice_cell_data_func() * Inactive services no longer greyed out after implementing icon mapping gservice-interface: * Changed icon size of services to 48x48 * Fixed a memory leak gservice-icons.conf: * a bit of reorganization diff --git a/src/gservice-interface.c b/src/gservice-interface.c index 793fef3..edb6374 100644 --- a/src/gservice-interface.c +++ b/src/gservice-interface.c @@ -79,7 +79,7 @@ gservice_cell_data_func (GtkTreeViewColumn *col, GtkCellRenderer *cell, gboolean val = FALSE; GdkColor color; - gtk_tree_model_get (model, iter, 4, &val, -1); + gtk_tree_model_get (model, iter, 5, &val, -1); if (!val) { gdk_color_parse ("gray", &color); @@ -204,7 +204,7 @@ gservice_populate_services (void) GdkPixbuf *icon = NULL; desc = gsvc_glist_to_string (e->description); namedesc = g_markup_printf_escaped ("%s\n%s", e->name, desc); - icon = gsvc_icon_mapping_get_icon_for_service ((char*)e->name, 32); + icon = gsvc_icon_mapping_get_icon_for_service ((char*)e->name, 48); gtk_list_store_append (GTK_LIST_STORE(store), &iter); gtk_list_store_set (store, &iter, 1, icon, @@ -213,6 +213,7 @@ gservice_populate_services (void) 4, (char*)e->name, 5, (e->enabled)?TRUE:FALSE, -1); + g_object_unref (icon); switch (e->status) { case GSVC_ON: From priyank at frugalware.org Sun Jan 18 12:40:56 2009 From: priyank at frugalware.org (Priyank) Date: Sun Jan 18 12:40:59 2009 Subject: [Frugalware-git] gservice: gservice-icons.conf: reorganization Message-ID: <20090118114056.C88D211B87A9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gservice.git;a=commitdiff;h=ba4640b95a825e7cbcd2b46ee570d36867d45310 commit ba4640b95a825e7cbcd2b46ee570d36867d45310 Author: Priyank Date: Sun Jan 18 17:10:46 2009 +0530 gservice-icons.conf: reorganization diff --git a/gservice-icons.conf b/gservice-icons.conf index e0db61b..861f5a6 100644 --- a/gservice-icons.conf +++ b/gservice-icons.conf @@ -10,8 +10,6 @@ keymap = keyboard fun = system-software-update syslog = logviewer interfaces = gtk-network -vsftpd = server -lighttpd = server samba = server mount = gtk-harddisk rmount = folder-remote @@ -26,3 +24,10 @@ local = gservice-local sshd = gservice-remote wine = wine +# some servers +mysqld = server +proftpd = server +lighttpd = server +httpd = server +vsftpd = server + From priyank at frugalware.org Sun Jan 18 15:43:57 2009 From: priyank at frugalware.org (Priyank) Date: Sun Jan 18 15:43:59 2009 Subject: [Frugalware-git] gservice: Services can now be activated/deactivated Message-ID: <20090118144357.43D7811B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gservice.git;a=commitdiff;h=055cf0caa8ae6149fd4ea652cefe0b11192d3fdc commit 055cf0caa8ae6149fd4ea652cefe0b11192d3fdc Author: Priyank Date: Sun Jan 18 20:13:45 2009 +0530 Services can now be activated/deactivated diff --git a/data/gservice.glade b/data/gservice.glade index 5e40c76..71deebb 100644 --- a/data/gservice.glade +++ b/data/gservice.glade @@ -1,13 +1,13 @@ - + - 650 + 600 500 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK gService - 650 + 600 500 @@ -28,48 +28,6 @@ True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - gtk-new - True - True - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - gtk-open - True - True - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - gtk-save - True - True - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - gtk-save-as - True - True - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -88,6 +46,18 @@ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK _View True + + + True + + + True + Hide service icons + True + + + + diff --git a/gservice-icons.conf b/gservice-icons.conf index 861f5a6..9867572 100644 --- a/gservice-icons.conf +++ b/gservice-icons.conf @@ -23,6 +23,7 @@ firewall = gservice-firewall local = gservice-local sshd = gservice-remote wine = wine +xconsolekit = terminal # some servers mysqld = server diff --git a/src/gservice-interface.c b/src/gservice-interface.c index edb6374..634874e 100644 --- a/src/gservice-interface.c +++ b/src/gservice-interface.c @@ -48,6 +48,8 @@ static void cb_gsvc_r5_toggled (GtkCellRendererToggle *toggle, gchar *path_str, static void cb_gsvc_r6_toggled (GtkCellRendererToggle *toggle, gchar *path_str, gpointer data); static void cb_gsvc_button_start_clicked (GtkButton *button, gpointer data); static void cb_gsvc_button_stop_clicked (GtkButton *button, gpointer data); +static void cb_gsvc_button_activate_clicked (GtkButton *button, gpointer data); +static void cb_gsvc_button_deactivate_clicked (GtkButton *button, gpointer data); static void cb_gsvc_service_selected (GtkTreeSelection *selection, gpointer data); static GtkWidget * @@ -321,7 +323,14 @@ gservice_interface_init (void) "clicked", G_CALLBACK(cb_gsvc_button_stop_clicked), NULL); - + g_signal_connect (G_OBJECT(gsvc_button_activate), + "clicked", + G_CALLBACK(cb_gsvc_button_activate_clicked), + NULL); + g_signal_connect (G_OBJECT(gsvc_button_deactivate), + "clicked", + G_CALLBACK(cb_gsvc_button_deactivate_clicked), + NULL); /* alrite, lets display the main window */ while (gtk_events_pending()) gtk_main_iteration (); gtk_widget_hide (gsvc_splash_screen); @@ -435,6 +444,111 @@ cb_gsvc_button_stop_clicked (GtkButton *button, gpointer data) } static void +cb_gsvc_button_activate_clicked (GtkButton *button, gpointer data) +{ + GtkTreeSelection *selection = NULL; + GtkTreeModel *model = NULL; + GtkListStore *store = NULL; + GtkTreeIter iter; + + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW(gsvc_treeview_services)); + if (gtk_tree_selection_get_selected(selection,&model,&iter)) + { + char *service = NULL; + + gtk_tree_model_get (model, &iter, 4, &service, -1); + if (service) + { + gboolean retval = FALSE; + retval = gsvc_service_activate (service); + if (!retval) + { + gsvc_error (_("Error"), _("Error activating service. The service could not be activated")); + } + else + { + gtk_list_store_set ((GtkListStore*)model, &iter, 5, TRUE, -1); + /* set the enabled flag to TRUE in gsvc_service_list */ + GList *list = gsvc_service_list; + gservice_entry_t *entry = NULL; + while (list != NULL) + { + entry = list->data; + if (!strcmp(entry->name,service)) + break; + list = g_list_next (list); + } + entry->enabled = TRUE; + gtk_widget_set_sensitive (gsvc_button_activate, FALSE); + gtk_widget_set_sensitive (gsvc_button_deactivate, TRUE); + gint ans; + ans = gsvc_question (_("Service is now activated and will be started the next time you boot your system.\n\nDo you wish to start the service now ?")); + if (ans == GTK_RESPONSE_YES) + { + cb_gsvc_button_start_clicked (NULL, NULL); + } + } + g_free (service); + } + } + + return; +} + +static void +cb_gsvc_button_deactivate_clicked (GtkButton *button, gpointer data) +{ + GtkTreeSelection *selection = NULL; + GtkTreeModel *model = NULL; + GtkListStore *store = NULL; + GtkTreeIter iter; + + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW(gsvc_treeview_services)); + if (gtk_tree_selection_get_selected(selection,&model,&iter)) + { + char *service = NULL; + + gtk_tree_model_get (model, &iter, 4, &service, -1); + if (service) + { + gboolean retval = FALSE; + retval = gsvc_service_deactivate (service); + if (!retval) + { + gsvc_error (_("Error"), _("Error deactivating service. The service could not be deactivated")); + } + else + { + /* set the activated flag to FALSE */ + gtk_list_store_set ((GtkListStore*)model, &iter, 5, FALSE, -1); + /* set the enabled flag to FALSE in gsvc_service_list */ + GList *list = gsvc_service_list; + gservice_entry_t *entry = NULL; + while (list != NULL) + { + entry = list->data; + if (!strcmp(entry->name,service)) + break; + list = g_list_next (list); + } + entry->enabled = FALSE; + gtk_widget_set_sensitive (gsvc_button_activate, TRUE); + gtk_widget_set_sensitive (gsvc_button_deactivate, FALSE); + gint ans; + ans = gsvc_question (_("Service is now deactivated and will be started the next time you boot your system.\n\nDo you wish to stop the service now ?")); + if (ans == GTK_RESPONSE_YES) + { + cb_gsvc_button_stop_clicked (NULL, NULL); + } + } + g_free (service); + } + } + + return; +} + +static void cb_gsvc_r0_toggled (GtkCellRendererToggle *toggle, gchar *path_str, gpointer data) { return; From hermier at frugalware.org Sun Jan 18 15:44:24 2009 From: hermier at frugalware.org (Michel Hermier) Date: Sun Jan 18 15:44:25 2009 Subject: [Frugalware-git] frugalware-current: nvidia-180.22-1-i686 Message-ID: <20090118144424.321D711B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=812b0449f10b2e6e65aa559f017d124fc99bb88d commit 812b0449f10b2e6e65aa559f017d124fc99bb88d Author: Michel Hermier Date: Sun Jan 18 14:43:11 2009 +0100 nvidia-180.22-1-i686 * Bump version (compile tested only) diff --git a/source/x11-extra/nvidia/FrugalBuild b/source/x11-extra/nvidia/FrugalBuild index 5039d58..875b6d0 100644 --- a/source/x11-extra/nvidia/FrugalBuild +++ b/source/x11-extra/nvidia/FrugalBuild @@ -2,12 +2,12 @@ # Maintainer: Michel Hermier pkgname=nvidia -pkgver=177.82 -pkgrel=4 +pkgver=180.22 +pkgrel=1 archs=('i686' 'x86_64' '!ppc') Finclude nvidia case "$_F_nvidia_arch" in -x86) sha1sums=('9052e205879e6a375f3508d60153ee45a225fa86');; -x86_64) sha1sums=('b99947e3732f11ddbad5bdcc033154ce55976fc3');; +x86) sha1sums=('24be38c6a6bc42f7c2d972370beededf49341624');; +x86_64) sha1sums=('5fb516644e1394917e9466dfe0d79c3b15dc6601');; esac From hermier at frugalware.org Sun Jan 18 15:44:24 2009 From: hermier at frugalware.org (Michel Hermier) Date: Sun Jan 18 15:44:26 2009 Subject: [Frugalware-git] frugalware-current: deluge-1.1.0-1-i686 Message-ID: <20090118144424.504DF11B87A9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8ecd9b53e48fad539355418bd3e1ce116ab4bdc7 commit 8ecd9b53e48fad539355418bd3e1ce116ab4bdc7 Author: Michel Hermier Date: Sun Jan 18 15:29:17 2009 +0100 deluge-1.1.0-1-i686 * Bump version diff --git a/source/gnome-extra/deluge/FrugalBuild b/source/gnome-extra/deluge/FrugalBuild index 8098c1d..5a4bf29 100644 --- a/source/gnome-extra/deluge/FrugalBuild +++ b/source/gnome-extra/deluge/FrugalBuild @@ -3,8 +3,8 @@ # Contributor: Artur Grunau pkgname=deluge -pkgver=1.0.7 -pkgrel=2 +pkgver=1.1.0 +pkgrel=1 pkgdesc="BitTorrent client written in Python and GTK+." url="http://deluge-torrent.org/" depends=('pygtk' 'pyxdg' 'libboost-mt>=1.37.0' 'notify-python' 'notification-daemon' 'setuptools' 'librsvg') @@ -16,6 +16,6 @@ up2date="lynx -dump http://deluge-torrent.org/|grep 'Released'|sed -e 's/.*ge \( source=(http://download.deluge-torrent.org/source/$pkgver/$pkgname-$pkgver.tar.gz) _F_gnome_iconcache=y Finclude gnome-scriptlet -sha1sums=('c601a0af4fd5c2fdf7b50eb6af2ddafcff58bfaa') +sha1sums=('837937e1f16448e142787f2acbac21d93a65c97b') # optimization OK From priyank at frugalware.org Sun Jan 18 16:55:36 2009 From: priyank at frugalware.org (Priyank) Date: Sun Jan 18 16:55:37 2009 Subject: [Frugalware-git] gservice: polished gui. Message-ID: <20090118155536.A653611B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gservice.git;a=commitdiff;h=90e8684b4808bbbd4b0d156a64f6834af091818b commit 90e8684b4808bbbd4b0d156a64f6834af091818b Author: Priyank Date: Sun Jan 18 21:25:27 2009 +0530 polished gui. diff --git a/data/gservice.glade b/data/gservice.glade index 71deebb..e78ec1d 100644 --- a/data/gservice.glade +++ b/data/gservice.glade @@ -1,14 +1,15 @@ - + - 600 + 570 500 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK gService - 600 + 570 500 + gservice True @@ -89,24 +90,93 @@ - + True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 1 - 7 - <span size="larger"><b>gService - Manage system services</b></span> - True + Start + gservice - False + True - + + True + Stop + gtk-stop + + + True + + + + + True + Restart + gtk-refresh + + + True + + + + + True + + + True + + + + + True + Activate + gtk-add + + + True + + + + + True + Deactivate + gtk-remove + + + True + + + + + True + + + True + + + + + True + Edit + gtk-edit + + + True + + + + + True + Quit + gtk-quit + + + True + @@ -115,235 +185,46 @@ - + True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + True - True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 5 - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_ETCHED_OUT - + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - True - - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 5 - 5 - True - GTK_BUTTONBOX_START - - - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0.80000001192092896 - gtk-execute - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - Start - - - 1 - - - - - - - - - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - gtk-stop - True - 0 - - - 1 - - - - - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0.80000001192092896 - gtk-refresh - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - Restart - - - 1 - - - - - - - 2 - - - - - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - gtk-edit - True - 0 - - - 3 - - - - - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0.80000001192092896 - gtk-add - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - Activate - - - 1 - - - - - - - 4 - - - - - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 + 5 + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_ETCHED_OUT - + + 300 True + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0.80000001192092896 - gtk-remove - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - Deactivate - - - 1 - - + False + True + True - - 5 - - - - - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - gtk-quit - True - 0 - - - 6 - - - False - 1 - + + False + True + @@ -374,6 +255,7 @@ GTK_SHADOW_ETCHED_OUT + 200 True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -386,7 +268,8 @@ - 1 + True + True @@ -394,6 +277,9 @@ 2 + + + diff --git a/src/gservice-interface.c b/src/gservice-interface.c index 634874e..565de6c 100644 --- a/src/gservice-interface.c +++ b/src/gservice-interface.c @@ -79,11 +79,11 @@ gservice_cell_data_func (GtkTreeViewColumn *col, GtkCellRenderer *cell, gpointer data) { gboolean val = FALSE; - GdkColor color; gtk_tree_model_get (model, iter, 5, &val, -1); if (!val) { + GdkColor color; gdk_color_parse ("gray", &color); g_object_set (G_OBJECT(cell), "foreground-gdk", &color, NULL); } @@ -117,6 +117,7 @@ gservice_setup_treeview (void) "pixbuf", 0, NULL); gtk_tree_view_column_set_resizable (column, FALSE); + gtk_tree_view_column_set_min_width (column, 48); gtk_tree_view_append_column (GTK_TREE_VIEW(gsvc_treeview_services), column); renderer = gtk_cell_renderer_pixbuf_new (); @@ -125,11 +126,12 @@ gservice_setup_treeview (void) "pixbuf", 1, NULL); gtk_tree_view_column_set_resizable (column, FALSE); + gtk_tree_view_column_set_min_width (column, 48); gtk_tree_view_append_column (GTK_TREE_VIEW(gsvc_treeview_services), column); renderer = gtk_cell_renderer_text_new (); g_object_set (G_OBJECT(renderer), "wrap-mode", PANGO_WRAP_CHAR, NULL); - g_object_set (G_OBJECT(renderer), "wrap-width", 400, NULL); + g_object_set (G_OBJECT(renderer), "wrap-width", 380, NULL); gtk_cell_renderer_text_set_fixed_height_from_font (renderer, 5); column = gtk_tree_view_column_new_with_attributes (_("Service"), renderer, From devil505linux at gmail.com Sun Jan 18 18:00:23 2009 From: devil505linux at gmail.com (Devil505) Date: Sun Jan 18 18:00:25 2009 Subject: [Frugalware-git] frugalware-current: mupen64plus-1_5-1-i686 Message-ID: <20090118170023.C236F11B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2295183ec278a0ec0d44b0fdcf708d9cadff15cf commit 2295183ec278a0ec0d44b0fdcf708d9cadff15cf Author: Devil505 Date: Sun Jan 18 17:59:17 2009 +0100 mupen64plus-1_5-1-i686 * new package diff --git a/source/games-extra/mupen64plus/FrugalBuild b/source/games-extra/mupen64plus/FrugalBuild new file mode 100644 index 0000000..2757954 --- /dev/null +++ b/source/games-extra/mupen64plus/FrugalBuild @@ -0,0 +1,24 @@ +# Compiling Time: 0.55 SBU +# Maintainer: Devil505 + +pkgname=mupen64plus +pkgver=1_5 +pkgrel=1 +pkgdesc="Nintendo64 Emulator" +depends=('freetype2' 'sdl' 'mesa' 'gtk+2' 'libxau' 'libxdmcp' 'libstdc++' 'libxml2' 'sdl_ttf') +_F_googlecode_ext="-src.tar.gz" +_F_googlecode_dirname="$pkgname" +_F_googlecode_name="Mupen64Plus" +Finclude googlecode +options=('scriptlet') +groups=('games-extra') +archs=('i686') +sha1sums=('ef200d6ea2eb3faa969ba9c82d2a771236c3145d') + +build() { + Fcd "Mupen64Plus-${pkgver//_/-}-src" + make PREFIX=/usr all || Fdie + make PREFIX=$Fdestdir/usr install || Fdie +} + +# optimization OK From devil505linux at gmail.com Sun Jan 18 18:06:25 2009 From: devil505linux at gmail.com (Devil505) Date: Sun Jan 18 18:06:27 2009 Subject: [Frugalware-git] frugalware-current: zenshot-0.6-1-i686 Message-ID: <20090118170625.CD29E11B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6415942c8582a02577d371d8dc45188444d66000 commit 6415942c8582a02577d371d8dc45188444d66000 Author: Devil505 Date: Sun Jan 18 18:04:22 2009 +0100 zenshot-0.6-1-i686 * new package diff --git a/source/xapps-extra/zenshot/FrugalBuild b/source/xapps-extra/zenshot/FrugalBuild new file mode 100644 index 0000000..fd04dab --- /dev/null +++ b/source/xapps-extra/zenshot/FrugalBuild @@ -0,0 +1,15 @@ +# Compiling Time: 0 SBU +# Maintainer: Devil505 + +pkgname=zenshot +pkgver=0.6 +pkgrel=1 +pkgdesc="Simple screenshot tool." +url="http://xrado.hopto.org/post/simple-screenshot-tool" +depends=('pygtk') +options=('scriptlet') +groups=('xapps-extra') +archs=('i686') +up2date="lynx -dump http://xrado.hopto.org/tag/python | grep tar.gz | Flasttar" +source=(http://xrado.hopto.org/file/open/6_3936c5fdf61bb8/$pkgname-$pkgver.tar.gz) +sha1sums=('293ff09e407a3afc37938e4e283af2fb1114159c') From vmiklos at frugalware.org Sun Jan 18 18:40:00 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Jan 18 18:40:02 2009 Subject: [Frugalware-git] homepage-ng: roadmap: update 1.0pre2 status Message-ID: <20090118174000.AD2B011B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=e5de8f948a283b5c74ab8d297716c26a2e942f5a commit e5de8f948a283b5c74ab8d297716c26a2e942f5a Author: Miklos Vajna Date: Sun Jan 18 18:39:52 2009 +0100 roadmap: update 1.0pre2 status diff --git a/frugalware/xml/roadmap.xml b/frugalware/xml/roadmap.xml index 9302030..6b2ec5e 100644 --- a/frugalware/xml/roadmap.xml +++ b/frugalware/xml/roadmap.xml @@ -40,7 +40,7 @@ pre2 Jan 13, 2009 - 0 + 1 pre1 From devil505linux at gmail.com Sun Jan 18 18:50:19 2009 From: devil505linux at gmail.com (Devil505) Date: Sun Jan 18 18:50:21 2009 Subject: [Frugalware-git] frugalware-current: smile-0.8.9-1-i686 Message-ID: <20090118175019.B3F1311B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=663825659cd04c38c4f6fafd7dde0e6f1097f2d6 commit 663825659cd04c38c4f6fafd7dde0e6f1097f2d6 Author: Devil505 Date: Sun Jan 18 18:41:03 2009 +0100 smile-0.8.9-1-i686 * new package * closes contribution FS#3581 diff --git a/source/xapps-extra/smile/FrugalBuild b/source/xapps-extra/smile/FrugalBuild new file mode 100644 index 0000000..1daf945 --- /dev/null +++ b/source/xapps-extra/smile/FrugalBuild @@ -0,0 +1,34 @@ +# Compiling Time: 0.06 SBU +# Maintainer: Devil505 +# Contributor: Fafab + +pkgname=smile +pkgver=0.8.9 +pkgrel=1 +pkgdesc="Slideshow Maker In Linux Environnement" +url="http://smile.tuxfamily.org/" +depends=('sox>=14.0.0' 'qt4>=4.4' 'mplayer' 'mencoder' 'imagemagick' 'libqtwebkit>=4.4') +options=('scriptlet') +groups=('xapps-extra') +archs=('i686') +up2date="Flasttar http://download.tuxfamily.org/smiletool/" +source=(http://download.tuxfamily.org/smiletool/$pkgname-$pkgver.tar.gz) +sha1sums=('0accd42cabacbd19d2990a6f54c88ce476316711') +_F_cd_path=$pkgname + +_F_desktop_name="Smile" +_F_desktop_icon="/usr/share/$pkgname/Interface/Theme/$pkgname.png" +_F_desktop_categories="Graphics;2DGraphics;" + +build() { + Fcd + qmake smile.pro || Fdie + Fmake + Fmkdir usr/share/$pkgname + Fcp $pkgname/$pkgname usr/share/$pkgname/$pkgname + Fcp $pkgname/Interface usr/share/$pkgname/ + Fcp $pkgname/BIB_ManSlide usr/share/$pkgname/ + Fcp $pkgname/*.qm usr/share/$pkgname/ + Fwrapper "/usr/share/$pkgname/$pkgname" $pkgname + Fdesktop2 +} From vmiklos at frugalware.org Sun Jan 18 19:25:57 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Jan 18 19:25:58 2009 Subject: [Frugalware-git] frugalware-current: camlp5-5.11-1-i686 Message-ID: <20090118182557.0881111B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3e2b9d3c0e48bb6de9f7a7d89a0c9883bfb67cd2 commit 3e2b9d3c0e48bb6de9f7a7d89a0c9883bfb67cd2 Author: Elentir Date: Sat Jan 17 16:16:32 2009 +0100 camlp5-5.11-1-i686 * new package diff --git a/source/devel-extra/camlp5/FrugalBuild b/source/devel-extra/camlp5/FrugalBuild new file mode 100644 index 0000000..a3882d0 --- /dev/null +++ b/source/devel-extra/camlp5/FrugalBuild @@ -0,0 +1,23 @@ +# Compiling Time: 0.10 SBU +# Maintainer: Miklos Vajna +# Contributor: Elentir + +pkgname=camlp5 +pkgver=5.11 +pkgrel=1 +pkgdesc="Camlp5 is a preprocessor-pretty-printer of OCaml." +url="http://pauillac.inria.fr/~ddr/camlp5" +source=("$url/distrib/src/$pkgname-$pkgver.tgz") +depends=('ocaml') +groups=('devel-extra') +archs=('i686') +up2date="Flasttar $url" +Fconfopts="-prefix /usr" +sha1sums=('59b9321427954e224846608bf4b4e9b1991c4ad4') + +build() { + unset MAKEFLAGS + Fmake + make opt || Fdie + Fmakeinstall +} From vmiklos at frugalware.org Sun Jan 18 19:31:12 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Jan 18 19:31:13 2009 Subject: [Frugalware-git] frugalware-current: mpd-0.14.1-1-i686 Message-ID: <20090118183112.6EF1011B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=52e48eb7cf69b3274679b0a7a53eeeec1ed6e48a commit 52e48eb7cf69b3274679b0a7a53eeeec1ed6e48a Author: Miklos Vajna Date: Sun Jan 18 19:31:04 2009 +0100 mpd-0.14.1-1-i686 - version bump diff --git a/source/multimedia/mpd/FrugalBuild b/source/multimedia/mpd/FrugalBuild index 505a262..9c27fb9 100644 --- a/source/multimedia/mpd/FrugalBuild +++ b/source/multimedia/mpd/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Miklos Vajna pkgname=mpd -pkgver=0.14 -pkgrel=4 +pkgver=0.14.1 +pkgrel=1 pkgdesc="the Music Player Daemon" _F_sourceforge_dirname="musicpd" _F_sourceforge_ext=".tar.bz2" @@ -16,7 +16,7 @@ groups=('multimedia') archs=('i686' 'x86_64') up2date="Flasttar $url" source=($source rc.mpd rc.mpd-hu.po) -sha1sums=('e9de568ffd9c1d414ffaca6f84671891bfe03158' \ +sha1sums=('e87424caafca366c15744a31cbc34197474862f9' \ '729f3b2ee9e8003343c8df49394e1c5762dae5ce' \ 'b5813f55e9e895d977b869c77667daa85c303e57') From vmiklos at frugalware.org Sun Jan 18 20:10:01 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Jan 18 20:10:03 2009 Subject: [Frugalware-git] frugalware-current: qemu-0.9.1-5-ppc Message-ID: <20090118191001.CF2AD11B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=88301345b92589b88c2ae742d01a71d06dacf69f commit 88301345b92589b88c2ae742d01a71d06dacf69f Author: Miklos Vajna Date: Sun Jan 18 01:32:02 2009 +0100 qemu-0.9.1-5-ppc added ppc to archs() diff --git a/source/xapps-extra/qemu/FrugalBuild b/source/xapps-extra/qemu/FrugalBuild index 5d5420b..ab61c14 100644 --- a/source/xapps-extra/qemu/FrugalBuild +++ b/source/xapps-extra/qemu/FrugalBuild @@ -9,7 +9,7 @@ url="http://bellard.org/qemu/" depends=('sdl' 'zlib' 'alsa-lib') makedepends=('gcc-3.3' 'texi2html') groups=('xapps-extra') -archs=('i686' 'x86_64') +archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump $url/download.html|grep Source|sed 's/.*-\(.*\)\.t.*/\1/'" source=($url/$pkgname-$pkgver.tar.gz rc.qemu rc.qemu-hu.po \ rc.qemu-system qemu-system CVE-2008-2004.diff \ From priyank at frugalware.org Sun Jan 18 20:32:55 2009 From: priyank at frugalware.org (Priyank) Date: Sun Jan 18 20:32:56 2009 Subject: [Frugalware-git] gservice: Added a service edit dialog to edit runlevel info of a service Message-ID: <20090118193255.5582811B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gservice.git;a=commitdiff;h=5f652a9ddaae7fa7c6b2b8001b2ce2a39a5e21a9 commit 5f652a9ddaae7fa7c6b2b8001b2ce2a39a5e21a9 Author: Priyank Date: Mon Jan 19 01:02:40 2009 +0530 Added a service edit dialog to edit runlevel info of a service diff --git a/data/gservice.glade b/data/gservice.glade index e78ec1d..dd959a3 100644 --- a/data/gservice.glade +++ b/data/gservice.glade @@ -1,6 +1,6 @@ - + 570 @@ -259,6 +259,7 @@ True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False @@ -296,4 +297,231 @@ + + Edit Service + False + True + GTK_WIN_POS_CENTER_ON_PARENT + gservice + gsvc_main_window + + + True + 5 + 5 + + + True + 5 + + + True + True + True + 0 + + + True + 10 + gtk-bold + 6 + 48 + + + + + False + + + + + True + 3 + + + True + 0 + Service name + True + + + False + + + + + True + 0 + Service description + True + PANGO_WRAP_WORD_CHAR + 65 + + + False + 1 + + + + + True + 0 + GTK_SHADOW_ETCHED_OUT + + + True + 5 + 12 + + + True + 10 + + + True + True + 0 + 0 + True + + + False + False + + + + + True + True + 1 + 0 + True + + + False + False + 1 + + + + + True + True + 2 + 0 + True + + + False + 2 + + + + + True + True + 3 + 0 + True + + + False + False + 3 + + + + + True + True + 4 + 0 + True + + + False + False + 4 + + + + + True + True + 5 + 0 + True + + + False + False + 5 + + + + + True + True + 6 + 0 + True + + + False + False + 6 + + + + + + + + + True + <b>Runlevels</b> + True + + + label_item + + + + + False + 2 + + + + + False + 1 + + + + + + + True + GTK_BUTTONBOX_END + + + True + True + True + gtk-close + True + 0 + + + + + + False + 1 + + + + + diff --git a/src/gservice-interface.c b/src/gservice-interface.c index 565de6c..a093bf8 100644 --- a/src/gservice-interface.c +++ b/src/gservice-interface.c @@ -34,6 +34,18 @@ static GtkWidget *gsvc_button_edit = NULL; static GtkWidget *gsvc_button_quit = NULL; static GtkWidget *gsvc_treeview_services = NULL; static GtkWidget *gsvc_textview_status = NULL; +static GtkWidget *gsvc_service_edit_dlg = NULL; +static GtkWidget *gsvc_service_edit_dlg_svcname = NULL; +static GtkWidget *gsvc_service_edit_dlg_svcdesc = NULL; +static GtkWidget *gsvc_service_edit_dlg_svcicon = NULL; +static GtkWidget *gsvc_service_edit_dlg_svcbtn = NULL; +static GtkWidget *gsvc_service_edit_dlg_r0 = NULL; +static GtkWidget *gsvc_service_edit_dlg_r1 = NULL; +static GtkWidget *gsvc_service_edit_dlg_r2 = NULL; +static GtkWidget *gsvc_service_edit_dlg_r3 = NULL; +static GtkWidget *gsvc_service_edit_dlg_r4 = NULL; +static GtkWidget *gsvc_service_edit_dlg_r5 = NULL; +static GtkWidget *gsvc_service_edit_dlg_r6 = NULL; extern GladeXML *xml; static GList *gsvc_service_list = NULL; @@ -50,6 +62,7 @@ static void cb_gsvc_button_start_clicked (GtkButton *button, gpointer data); static void cb_gsvc_button_stop_clicked (GtkButton *button, gpointer data); static void cb_gsvc_button_activate_clicked (GtkButton *button, gpointer data); static void cb_gsvc_button_deactivate_clicked (GtkButton *button, gpointer data); +static void cb_gsvc_button_edit_clicked (GtkButton *button, gpointer data); static void cb_gsvc_service_selected (GtkTreeSelection *selection, gpointer data); static GtkWidget * @@ -75,8 +88,8 @@ gservice_get_icon (const char *icon, int size) /* while the active ones are rendered in usual colors */ static void gservice_cell_data_func (GtkTreeViewColumn *col, GtkCellRenderer *cell, - GtkTreeModel *model, GtkTreeIter *iter, - gpointer data) + GtkTreeModel *model, GtkTreeIter *iter, + gpointer data) { gboolean val = FALSE; @@ -301,6 +314,19 @@ gservice_interface_init (void) gsvc_button_deactivate = gservice_get_widget ("gsvc_button_deactivate"); gsvc_button_edit = gservice_get_widget ("gsvc_button_edit"); gsvc_button_quit = gservice_get_widget ("gsvc_button_quit"); + gsvc_service_edit_dlg = gservice_get_widget ("gsvc_service_edit"); + gsvc_service_edit_dlg_svcname = gservice_get_widget ("gsvc_edit_dlg_service_name"); + gsvc_service_edit_dlg_svcdesc = gservice_get_widget ("gsvc_edit_dlg_service_desc"); + gsvc_service_edit_dlg_svcicon = gservice_get_widget ("gsvc_edit_dlg_service_icon"); + gsvc_service_edit_dlg_svcbtn = gservice_get_widget ("gsvc_edit_dlg_service_btn"); + gsvc_service_edit_dlg_r0 = gservice_get_widget ("r0_check"); + gsvc_service_edit_dlg_r1 = gservice_get_widget ("r1_check"); + gsvc_service_edit_dlg_r2 = gservice_get_widget ("r2_check"); + gsvc_service_edit_dlg_r3 = gservice_get_widget ("r3_check"); + gsvc_service_edit_dlg_r4 = gservice_get_widget ("r4_check"); + gsvc_service_edit_dlg_r5 = gservice_get_widget ("r5_check"); + gsvc_service_edit_dlg_r6 = gservice_get_widget ("r6_check"); + gtk_widget_show (gsvc_splash_screen); while (gtk_events_pending()) gtk_main_iteration (); /* a li'l manual delay */ @@ -333,6 +359,18 @@ gservice_interface_init (void) "clicked", G_CALLBACK(cb_gsvc_button_deactivate_clicked), NULL); + g_signal_connect (G_OBJECT(gsvc_button_edit), + "clicked", + G_CALLBACK(cb_gsvc_button_edit_clicked), + NULL); + g_signal_connect (G_OBJECT(gsvc_main_window), + "delete-event", + G_CALLBACK(gtk_main_quit), + NULL); + g_signal_connect (G_OBJECT(gsvc_button_quit), + "clicked", + G_CALLBACK(gtk_main_quit), + NULL); /* alrite, lets display the main window */ while (gtk_events_pending()) gtk_main_iteration (); gtk_widget_hide (gsvc_splash_screen); @@ -635,4 +673,54 @@ cb_gsvc_service_selected (GtkTreeSelection *selection, gpointer data) return; } +static void +cb_gsvc_button_edit_clicked (GtkButton *button, gpointer data) +{ + GtkTreeModel *model; + GtkTreeIter iter; + gchar *service; + gservice_entry_t *entry = NULL; + GtkTreeSelection *selection; + + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW(gsvc_treeview_services)); + if (gtk_tree_selection_get_selected(selection,&model,&iter)) + { + GList *list = gsvc_service_list; + gtk_tree_model_get (model, &iter, 4, &service, -1); + while (list != NULL) + { + entry = list->data; + if (!strcmp(entry->name,service)) + break; + list = g_list_next (list); + } + if (entry) + { + gchar *markup = NULL; + gchar *desc = NULL; + /* service name */ + markup = g_markup_printf_escaped ("%s", entry->name); + gtk_label_set_markup (GTK_LABEL(gsvc_service_edit_dlg_svcname), markup); + g_free (markup); + /* service description */ + desc = gsvc_glist_to_string (entry->description); + gtk_label_set_text (GTK_LABEL(gsvc_service_edit_dlg_svcdesc), desc); + g_free (desc); + /* populate runlevel info */ + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(gsvc_service_edit_dlg_r0), entry->runlevel[0]); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(gsvc_service_edit_dlg_r1), entry->runlevel[1]); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(gsvc_service_edit_dlg_r2), entry->runlevel[2]); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(gsvc_service_edit_dlg_r3), entry->runlevel[3]); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(gsvc_service_edit_dlg_r4), entry->runlevel[4]); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(gsvc_service_edit_dlg_r5), entry->runlevel[5]); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(gsvc_service_edit_dlg_r6), entry->runlevel[6]); + /* and the service icon */ + GdkPixbuf *pixbuf = gsvc_icon_mapping_get_icon_for_service (entry->name, 48); + gtk_image_set_from_pixbuf (GTK_IMAGE(gsvc_service_edit_dlg_svcicon), pixbuf); + g_object_unref (pixbuf); + /* display the edit dialog */ + gtk_widget_show (gsvc_service_edit_dlg); + } + } +} From priyank at frugalware.org Sun Jan 18 21:08:50 2009 From: priyank at frugalware.org (Priyank) Date: Sun Jan 18 21:08:52 2009 Subject: [Frugalware-git] gservice: added missing return statement Message-ID: <20090118200850.0A44011B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gservice.git;a=commitdiff;h=31ac273f8899937fe0c3208463b2334afd708029 commit 31ac273f8899937fe0c3208463b2334afd708029 Author: Priyank Date: Mon Jan 19 01:38:39 2009 +0530 added missing return statement diff --git a/src/gservice-interface.c b/src/gservice-interface.c index a093bf8..f11b143 100644 --- a/src/gservice-interface.c +++ b/src/gservice-interface.c @@ -722,5 +722,7 @@ cb_gsvc_button_edit_clicked (GtkButton *button, gpointer data) gtk_widget_show (gsvc_service_edit_dlg); } } + + return; } From bouleetbil at frogdev.info Sun Jan 18 21:33:29 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Sun Jan 18 21:33:30 2009 Subject: [Frugalware-git] frugalware-current: freetuxtv-0.2.1-1-i686 Message-ID: <20090118203329.EC38C11B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b0bc0c8d5b295cc356b84862bfb0bc8f51f32f85 commit b0bc0c8d5b295cc356b84862bfb0bc8f51f32f85 Author: bouleetbil Date: Sun Jan 18 21:25:34 2009 +0100 freetuxtv-0.2.1-1-i686 *version bump diff --git a/source/xapps-extra/freetuxtv/FrugalBuild b/source/xapps-extra/freetuxtv/FrugalBuild index 298183e..e6ef450 100644 --- a/source/xapps-extra/freetuxtv/FrugalBuild +++ b/source/xapps-extra/freetuxtv/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: bouleetbil pkgname=freetuxtv -pkgver=0.2.0 +pkgver=0.2.1 pkgrel=1 pkgdesc="Watch the TV with your box" depends=('libglade' 'freetype2' 'libxau' 'libxdmcp' 'curl>=7.19.0' \ @@ -12,6 +12,6 @@ groups=('xapps-extra') archs=('i686' 'x86_64') options=('scriptlet') Finclude googlecode -sha1sums=('48f4dc322600198e1b189f337f05a347269effcf') +sha1sums=('9f4cb848a38cdb56066b2d282d45924225a1ec01') # optimization OK From bouleetbil at frogdev.info Sun Jan 18 21:43:39 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Sun Jan 18 21:43:41 2009 Subject: [Frugalware-git] frugalware-current: bareftp-0.1.3-1-i686 Message-ID: <20090118204339.A3B2F11B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d5ea664b894eab503018794a9f1407619cc6a621 commit d5ea664b894eab503018794a9f1407619cc6a621 Author: bouleetbil Date: Sun Jan 18 21:37:32 2009 +0100 bareftp-0.1.3-1-i686 *version bump diff --git a/source/gnome-extra/bareftp/FrugalBuild b/source/gnome-extra/bareftp/FrugalBuild index 0b796aa..8c321c6 100644 --- a/source/gnome-extra/bareftp/FrugalBuild +++ b/source/gnome-extra/bareftp/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: bouleetbil pkgname=bareftp -pkgver=0.1.2 +pkgver=0.1.3 pkgrel=1 pkgdesc="bareFTP is a file transfer client supporting the FTP and SSH" url="http://www.bareftp.org/" @@ -16,7 +16,7 @@ _F_gnome_desktop=y _F_gnome_iconcache=y _F_mono_aot=0 Finclude mono gnome-scriptlet -sha1sums=('976b31e7862380ba67846d252ab786734415a5ce') +sha1sums=('7a97d135166325165481d788471933f2f4eb02be') build() { unset MAKEFLAGS From bouleetbil at frogdev.info Sun Jan 18 21:56:33 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Sun Jan 18 21:56:34 2009 Subject: [Frugalware-git] mono: libgdiplus-2.2-1-i686 Message-ID: <20090118205633.728AC11B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=mono.git;a=commitdiff;h=ca8832adf30d64a201ef5dc4fba3cb89f4eaa1a8 commit ca8832adf30d64a201ef5dc4fba3cb89f4eaa1a8 Author: bouleetbil Date: Sun Jan 18 21:50:30 2009 +0100 libgdiplus-2.2-1-i686 *version bump diff --git a/source/xlib/libgdiplus/FrugalBuild b/source/xlib/libgdiplus/FrugalBuild index 932a2ef..2481f7c 100644 --- a/source/xlib/libgdiplus/FrugalBuild +++ b/source/xlib/libgdiplus/FrugalBuild @@ -3,16 +3,16 @@ # Contributor: AlexExtreme pkgname=libgdiplus -pkgver=2.0 +pkgver=2.2 pkgrel=1 pkgdesc="libgdiplus is an implementation of the GDI+ library on Windows" url="http://www.mono-project.com" -depends=('glib2>=2.18.2' 'libungif' 'libjpeg' 'libtiff' 'libexif' 'cairo>=1.8.0') +depends=('glib2>=2.18.4' 'libungif' 'libjpeg' 'libtiff' 'libexif' 'cairo>=1.8.6') groups=('xlib') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump http://www.go-mono.com/sources-stable/|grep -m1 'libgdiplus-'|sed 's/.*-\(.*\).t.*/\1/'" source=( http://ftp.novell.com/pub/mono/sources/$pkgname/$pkgname-$pkgver.tar.bz2) Fconfopts="$Fconfopts --with-cairo=system" -sha1sums=('3f4fc1cb2808932e946aa2bb049494fd87fdaa5d') +sha1sums=('34437288affd63f9d1f857525f5ca28ad404dbd0') # optimization OK From vmiklos at frugalware.org Sun Jan 18 22:27:21 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Sun Jan 18 22:27:23 2009 Subject: [Frugalware-git] frugalware-current: docs: copy merge.conf to the localized build dir Message-ID: <20090118212721.EF8AB11B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=fbd954de72ae38a79989d6a19bb69d1905536200 commit fbd954de72ae38a79989d6a19bb69d1905536200 Author: Miklos Vajna Date: Sun Jan 18 22:26:59 2009 +0100 docs: copy merge.conf to the localized build dir diff --git a/docs/Makefile b/docs/Makefile index b8f8dac..a9fa600 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -63,6 +63,7 @@ I18NBUILD = po4a -k 0 po4a.cfg; \ sed -i 's| ../source | ../../source |' $$i/Makefile; \ sed -i 's| -maxdepth 3 | -maxdepth 4 |' $$i/Makefile; \ sed -i 's/^\(=\+\)/\n\1/' $$i/*.txt; \ + cp merge.conf $$i/; \ $(MAKE) -C $$i $(1) || exit 1; \ done From bouleetbil at frogdev.info Sun Jan 18 22:48:49 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Sun Jan 18 22:48:51 2009 Subject: [Frugalware-git] mono: mono-2.2-1-i686 Message-ID: <20090118214849.7267211B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=mono.git;a=commitdiff;h=415ef05730edcd88e484b21e007422f02cbc214a commit 415ef05730edcd88e484b21e007422f02cbc214a Author: bouleetbil Date: Sun Jan 18 22:36:51 2009 +0100 mono-2.2-1-i686 *version bump *change m8r diff --git a/source/devel/mono/FrugalBuild b/source/devel/mono/FrugalBuild index 70af0c4..1c8a271 100644 --- a/source/devel/mono/FrugalBuild +++ b/source/devel/mono/FrugalBuild @@ -1,13 +1,13 @@ # Compiling time: 3.45 SBU -# Maintainer: AlexExtreme +# Maintainer: bouleetbil pkgname=mono -pkgver=2.0.1 +pkgver=2.2 pkgrel=1 pkgdesc="Mono runtime and class libraries, a C# compiler/interpreter" url="http://www.mono-project.com/" depends=('glib2' 'zlib') -makedepends=('libgdiplus>=2.0') +makedepends=('libgdiplus>=2.2') rodepends=('libxml2') groups=('devel') archs=('i686' 'x86_64' 'ppc') @@ -17,7 +17,7 @@ source=(http://www.go-mono.com/sources/$pkgname/$pkgname-$pkgver.tar.bz2 rc.mono Fconfopts="$Fconfopts --with-tls=__thread --with-libgdiplus=installed --with-moonlight=yes \ --with-preview=yes --with-glib=system --with-gc=included" #Don't enable --enable-big-arrays we should have >3Go of ram -sha1sums=('1c06d614b9b83ca0c8cff98d06136fd5a17344e2' \ +sha1sums=('028c061ba4f4631c4ff10a15b832211a67ec5858' \ '70d030d677bc38c90ccd208f5cfea4a7b244e085' \ '6c19f98462d7bb1ecba79a3ad284ea02a1eac2ec') From bouleetbil at frogdev.info Sun Jan 18 23:02:40 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Sun Jan 18 23:02:41 2009 Subject: [Frugalware-git] mono: mono-debugger-2.2-1-i686 Message-ID: <20090118220240.62EC211B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=mono.git;a=commitdiff;h=a9e882cb9d094cb18ae07f3f7a3db4db09f92395 commit a9e882cb9d094cb18ae07f3f7a3db4db09f92395 Author: bouleetbil Date: Sun Jan 18 22:56:35 2009 +0100 mono-debugger-2.2-1-i686 *version bump diff --git a/source/devel-extra/mono-debugger/FrugalBuild b/source/devel-extra/mono-debugger/FrugalBuild index 28ba90f..cee80a5 100644 --- a/source/devel-extra/mono-debugger/FrugalBuild +++ b/source/devel-extra/mono-debugger/FrugalBuild @@ -2,16 +2,15 @@ # Maintainer: bouleetbil pkgname=mono-debugger -pkgver=2.0 +pkgver=2.2 pkgrel=1 pkgdesc="The Mono Debugger (MDB) can debug both managed and unmanaged applications." url="http://www.mono-project.com/" -depends=('mono>=2.0.1') +depends=('mono>=2.2') groups=('devel-extra') archs=('i686') _F_mono_aot=0 Finclude mono up2date="lynx -dump http://www.go-mono.com/sources-stable/|grep -m1 'mono-debugger-'|sed 's/.*-\(.*\).t.*/\1/'" source=(http://www.go-mono.com/sources/$pkgname/$pkgname-$pkgver.tar.bz2) -sha1sums=('359b78547644f71475d413ddf47fd689c8e0b0bd') - +sha1sums=('3b49b688625290ff658feac5bc5f9ca8ca1ca532') From voroskoi at frugalware.org Sun Jan 18 23:13:09 2009 From: voroskoi at frugalware.org (András VöröskÅ‘i) Date: Sun Jan 18 23:13:11 2009 Subject: [Frugalware-git] frugalware-current: pidgin-2.5.4-1-i686 Message-ID: <20090118221309.8F8E811B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e3dd7b71696686063c4a1023cffca29060487bf4 commit e3dd7b71696686063c4a1023cffca29060487bf4 Author: András VöröskÅ‘i Date: Sun Jan 18 23:11:14 2009 +0100 pidgin-2.5.4-1-i686 version bump diff --git a/source/xapps/pidgin/FrugalBuild b/source/xapps/pidgin/FrugalBuild index f943648..98c608b 100644 --- a/source/xapps/pidgin/FrugalBuild +++ b/source/xapps/pidgin/FrugalBuild @@ -3,8 +3,8 @@ # Contributor: voroskoi pkgname=pidgin -pkgver=2.5.3 -pkgrel=3 +pkgver=2.5.4 +pkgrel=1 pkgdesc="A multi-protocol instant messaging (IM) client" depends=('gtk+2>=2.12.1' 'libao' 'audiofile' 'gtkspell' 'startup-notification>=0.9' \ 'libxscrnsaver' 'dbus-x11' 'gstreamer') @@ -21,7 +21,7 @@ Finclude sourceforge source=($source perl-fix.patch) url="http://www.pidgin.im/" options=('scriptlet') -sha1sums=('bd3f6eca0a0c9b221be8a664e904450db8589314' \ +sha1sums=('80f7a9e311d4ed6f2438f2ee16a4bdc66edcc2ad' \ '54a38213ee7cf04989fe7a0707dac471b13893d8') subpkgs=("libpurple") From priyank at frugalware.org Mon Jan 19 06:59:52 2009 From: priyank at frugalware.org (Priyank) Date: Mon Jan 19 06:59:55 2009 Subject: [Frugalware-git] frugalware-current: lastfmsubmitd-0.37-3-i686 Message-ID: <20090119055952.D380411B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9d3031385683840c17b8162eec9492868c6c8a69 commit 9d3031385683840c17b8162eec9492868c6c8a69 Author: Priyank Date: Mon Jan 19 11:28:36 2009 +0530 lastfmsubmitd-0.37-3-i686 * Added status support to rc.lastfmsubmitd diff --git a/source/multimedia-extra/lastfmsubmitd/FrugalBuild b/source/multimedia-extra/lastfmsubmitd/FrugalBuild index 5a747d0..d1fdee2 100644 --- a/source/multimedia-extra/lastfmsubmitd/FrugalBuild +++ b/source/multimedia-extra/lastfmsubmitd/FrugalBuild @@ -3,7 +3,7 @@ pkgname=lastfmsubmitd pkgver=0.37 -pkgrel=2 +pkgrel=3 pkgdesc="A Last.fm client for MPD, implemented in Python." url="http://www.red-bean.com/~decklin/software/lastfmsubmitd/" rodepends=('procps') @@ -18,7 +18,7 @@ source=(http://www.red-bean.com/~decklin/software/$pkgname/$pkgname-$pkgver.tar. README.Frugalware) sha1sums=('521f8ad6e9d866af6516b38b0b49b3e220e84739' \ '159c4ccfa4d3869378924a4cc84d3397c2da076b' \ - '93c70941be1de389e14d51b2010e8ec113bd3386' \ + '21407a9da4ca2053336a0b3b880ed5b048aac475' \ '0ac1aa3b596508b19ec5410c04f91c403c8da12c' \ '00b779153b261a1381ac9767525ff8fc6ffe71ab' \ '47604ce9797df81a05631174d0c10989a290a0b7') diff --git a/source/multimedia-extra/lastfmsubmitd/rc.lastfmsubmitd b/source/multimedia-extra/lastfmsubmitd/rc.lastfmsubmitd index 4f142b8..a5b8cf5 100644 --- a/source/multimedia-extra/lastfmsubmitd/rc.lastfmsubmitd +++ b/source/multimedia-extra/lastfmsubmitd/rc.lastfmsubmitd @@ -11,7 +11,7 @@ source /lib/initscripts/functions TEXTDOMAIN=lastfmsubmitd TEXTDOMAINDIR=/lib/initscripts/messages -actions=(restart start stop) +actions=(restart start stop status) daemon=$"LastFM Submit daemon" pid="ps aux | grep lastfmsubmitd | grep python 2> /dev/null" From priyank at frugalware.org Mon Jan 19 07:15:27 2009 From: priyank at frugalware.org (Priyank) Date: Mon Jan 19 07:15:28 2009 Subject: [Frugalware-git] frugalware-current: lastfmsubmitd-0.37-4-i686 Message-ID: <20090119061527.4B21B11B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=17dcd2cce6f141dee57a9acd456edc4044197b66 commit 17dcd2cce6f141dee57a9acd456edc4044197b66 Author: Priyank Date: Mon Jan 19 11:44:24 2009 +0530 lastfmsubmitd-0.37-4-i686 * Added status support to rc.lastmp diff --git a/source/multimedia-extra/lastfmsubmitd/FrugalBuild b/source/multimedia-extra/lastfmsubmitd/FrugalBuild index d1fdee2..d79a0c5 100644 --- a/source/multimedia-extra/lastfmsubmitd/FrugalBuild +++ b/source/multimedia-extra/lastfmsubmitd/FrugalBuild @@ -3,7 +3,7 @@ pkgname=lastfmsubmitd pkgver=0.37 -pkgrel=3 +pkgrel=4 pkgdesc="A Last.fm client for MPD, implemented in Python." url="http://www.red-bean.com/~decklin/software/lastfmsubmitd/" rodepends=('procps') @@ -17,7 +17,7 @@ source=(http://www.red-bean.com/~decklin/software/$pkgname/$pkgname-$pkgver.tar. rc.lastmp rc.lastfmsubmitd lastfmsubmitd.conf lastmp.conf \ README.Frugalware) sha1sums=('521f8ad6e9d866af6516b38b0b49b3e220e84739' \ - '159c4ccfa4d3869378924a4cc84d3397c2da076b' \ + '6440e74ed4e5902ab9decede52c5927f4280ee9c' \ '21407a9da4ca2053336a0b3b880ed5b048aac475' \ '0ac1aa3b596508b19ec5410c04f91c403c8da12c' \ '00b779153b261a1381ac9767525ff8fc6ffe71ab' \ diff --git a/source/multimedia-extra/lastfmsubmitd/rc.lastmp b/source/multimedia-extra/lastfmsubmitd/rc.lastmp index b42a9f9..17207b1 100644 --- a/source/multimedia-extra/lastfmsubmitd/rc.lastmp +++ b/source/multimedia-extra/lastfmsubmitd/rc.lastmp @@ -12,7 +12,7 @@ source /lib/initscripts/functions TEXTDOMAIN=lastmp TEXTDOMAINDIR=/lib/initscripts/messages -actions=(restart start stop) +actions=(restart start stop status) daemon=$"LastMP" pid="ps aux | grep lastmp | grep python 2> /dev/null" From priyank at frugalware.org Mon Jan 19 07:40:58 2009 From: priyank at frugalware.org (Priyank) Date: Mon Jan 19 07:40:59 2009 Subject: [Frugalware-git] frugalware-current: asterisk-1.4.21.2-3-i686 Message-ID: <20090119064058.1F4F311B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=716c66b906940fa9ff6c9f7aa72673eb211e3310 commit 716c66b906940fa9ff6c9f7aa72673eb211e3310 Author: Priyank Date: Mon Jan 19 12:10:23 2009 +0530 asterisk-1.4.21.2-3-i686 * Convert old initscript to new format and add status information diff --git a/source/apps-extra/asterisk/FrugalBuild b/source/apps-extra/asterisk/FrugalBuild index d4f3d01..83303a6 100644 --- a/source/apps-extra/asterisk/FrugalBuild +++ b/source/apps-extra/asterisk/FrugalBuild @@ -4,7 +4,7 @@ pkgname=asterisk pkgver=1.4.21.2 -pkgrel=2 +pkgrel=3 pkgdesc="Open Source Private Branch Exchange (PBX)." url="http://asterisk.org/" backup=(etc/asterisk/*) @@ -26,7 +26,7 @@ build() Fbuild Fmessage "Creating sample config files..." make DESTDIR=$Fdestdir samples - Frcd + Frcd2 } # optimization ok diff --git a/source/apps-extra/asterisk/messages/asterisk.de b/source/apps-extra/asterisk/messages/asterisk.de deleted file mode 100644 index f31f98e..0000000 --- a/source/apps-extra/asterisk/messages/asterisk.de +++ /dev/null @@ -1,2 +0,0 @@ -stopasterisk="Stoppe Asterisk" -startasterisk="Starte Asterisk" diff --git a/source/apps-extra/asterisk/messages/asterisk.en b/source/apps-extra/asterisk/messages/asterisk.en deleted file mode 100644 index 40c354f..0000000 --- a/source/apps-extra/asterisk/messages/asterisk.en +++ /dev/null @@ -1,2 +0,0 @@ -stopasterisk="Stopping Asterisk" -startasterisk="Starting Asterisk" diff --git a/source/apps-extra/asterisk/messages/asterisk.hu b/source/apps-extra/asterisk/messages/asterisk.hu deleted file mode 100644 index e5605e0..0000000 --- a/source/apps-extra/asterisk/messages/asterisk.hu +++ /dev/null @@ -1,2 +0,0 @@ -stopasterisk="Az Asterisk leállítása" -startasterisk="Az Asterisk indítása" diff --git a/source/apps-extra/asterisk/rc.asterisk b/source/apps-extra/asterisk/rc.asterisk index a4b3526..efc5e34 100644 --- a/source/apps-extra/asterisk/rc.asterisk +++ b/source/apps-extra/asterisk/rc.asterisk @@ -1,30 +1,50 @@ #!/bin/sh # (c) 2006 Balint Kovacs +# (c) 2009 Priyank Gosalia # rc.asterisk for Frugalware # distributed under GPL License . /etc/rc.d/rc.functions -# chkconfig: 2345 92 92 +# chkconfig: 2345 92 08 # description: Open Source Private Branch eXchange (PBX) -if [ "$1" = "stop" ]; then - if [ -r /var/run/asterisk/asterisk.pid ]; then - stop "$stopasterisk" - /usr/sbin/rasterisk -x "stop now" 2> /dev/null - ok $? - fi; -elif [ "$1" = "restart" ]; then - "$0" stop - sleep 1 - "$0" start -elif [ "$1" = "reload" ]; then - if [ -r /var/run/asterisk/asterisk.pid ]; then - /usr/sbin/rasterisk -x reload - fi; -else # start - start "$startasterisk" - sudo -u asterisk /usr/sbin/asterisk - ok $? -fi +source /lib/initscripts/functions +TEXTDOMAIN=asterisk +TEXTDOMAINDIR=/lib/initscripts/messages +daemon=$"Asterisk daemon" +actions=(restart start stop status) +pid="cat /var/run/asterisk.pid 2> /dev/null" + +rc_start() +{ + start_msg + if [[ "$(eval $pid)" == "" ]] ; then + sudo -u asterisk /usr/sbin/asterisk + ok $? + else + ok 999 + fi +} + +rc_stop() +{ + stop_msg + if [[ "$(eval $pid)" != "" ]]; then + /usr/sbin/rasterisk -x "stop now" 2> /dev/null + ok $? + else + ok 999 + fi +} + +rc_reload() +{ + if [[ "$(eval $pid)" != "" ]]; then + /usr/sbin/rasterisk -x reload + fi +} + +rc_exec $1 + From priyank at frugalware.org Mon Jan 19 07:42:55 2009 From: priyank at frugalware.org (Priyank) Date: Mon Jan 19 07:42:57 2009 Subject: [Frugalware-git] frugalware-current: asterisk-1.4.21.2-4-i686 Message-ID: <20090119064255.F17E611B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7886abd532353426a630610d5e8012fbce090148 commit 7886abd532353426a630610d5e8012fbce090148 Author: Priyank Date: Mon Jan 19 12:12:34 2009 +0530 asterisk-1.4.21.2-4-i686 * Forgot to add reload action to rc.asterisk diff --git a/source/apps-extra/asterisk/FrugalBuild b/source/apps-extra/asterisk/FrugalBuild index 83303a6..cc85c90 100644 --- a/source/apps-extra/asterisk/FrugalBuild +++ b/source/apps-extra/asterisk/FrugalBuild @@ -4,7 +4,7 @@ pkgname=asterisk pkgver=1.4.21.2 -pkgrel=3 +pkgrel=4 pkgdesc="Open Source Private Branch Exchange (PBX)." url="http://asterisk.org/" backup=(etc/asterisk/*) diff --git a/source/apps-extra/asterisk/rc.asterisk b/source/apps-extra/asterisk/rc.asterisk index efc5e34..0ed9a94 100644 --- a/source/apps-extra/asterisk/rc.asterisk +++ b/source/apps-extra/asterisk/rc.asterisk @@ -14,7 +14,7 @@ source /lib/initscripts/functions TEXTDOMAIN=asterisk TEXTDOMAINDIR=/lib/initscripts/messages daemon=$"Asterisk daemon" -actions=(restart start stop status) +actions=(restart start stop status reload) pid="cat /var/run/asterisk.pid 2> /dev/null" rc_start() From priyank at frugalware.org Mon Jan 19 07:50:53 2009 From: priyank at frugalware.org (Priyank) Date: Mon Jan 19 07:50:55 2009 Subject: [Frugalware-git] frugalware-current: asterisk-1.4.21.2-4-i686 Message-ID: <20090119065053.B1A5611B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=74b05fb3e81f9abddafffdc4a19f4e221c6eb652 commit 74b05fb3e81f9abddafffdc4a19f4e221c6eb652 Author: Priyank Date: Mon Jan 19 12:20:33 2009 +0530 asterisk-1.4.21.2-4-i686 * bah forgot to update sha1sums diff --git a/source/apps-extra/asterisk/FrugalBuild b/source/apps-extra/asterisk/FrugalBuild index cc85c90..74b6a59 100644 --- a/source/apps-extra/asterisk/FrugalBuild +++ b/source/apps-extra/asterisk/FrugalBuild @@ -18,7 +18,7 @@ up2date="lynx -dump http://ftp.digium.com/pub/asterisk/|grep asterisk-[0-9\.]*ta source=(http://ftp.digium.com/pub/$pkgname/$pkgname-$pkgver.tar.gz \ rc.asterisk) sha1sums=('8c0dcf57f69ce27929f7836081316a2695eb76fa' \ - '1c18155cdece83d556e2295b54508636ff74f307') + 'b5ece002e8d32ade8634ec9c653a5d713759e307') build() { From priyank at frugalware.org Mon Jan 19 07:55:41 2009 From: priyank at frugalware.org (Priyank) Date: Mon Jan 19 07:55:43 2009 Subject: [Frugalware-git] frugalware-current: cpuspeed-1.2.1-2-i686 Message-ID: <20090119065541.879E611B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7e1a629bc5f00832bd7342bff48280ff67a930bb commit 7e1a629bc5f00832bd7342bff48280ff67a930bb Author: Priyank Date: Mon Jan 19 12:25:06 2009 +0530 cpuspeed-1.2.1-2-i686 * Fix spelling in rc.cpuspeed diff --git a/source/apps-extra/cpuspeed/FrugalBuild b/source/apps-extra/cpuspeed/FrugalBuild index 6796323..d18310a 100644 --- a/source/apps-extra/cpuspeed/FrugalBuild +++ b/source/apps-extra/cpuspeed/FrugalBuild @@ -3,7 +3,7 @@ pkgname=cpuspeed pkgver=1.2.1 -pkgrel=1 +pkgrel=2 pkgdesc="A daemon that saves laptop battery by controlling the cpu speed" url="http://carlthompson.net/Software/CPUSpeed" depends=('glibc') @@ -31,7 +31,7 @@ build() Fdoc README.Frugalware } -sha1sums=('370d863902e19db0f3f58e3f8864787b19d01ab8'\ - '50287878a1a82f79060beaa101e4ffadabe55c17'\ +sha1sums=('370d863902e19db0f3f58e3f8864787b19d01ab8' \ + '3367e0ac78e3300451f78f147e1d3d6b52580229' \ '89ebfe7a4f25b1652a560d9537c0c3b79ab95d97') # optimization OK diff --git a/source/apps-extra/cpuspeed/rc.cpuspeed b/source/apps-extra/cpuspeed/rc.cpuspeed index 7c0f528..ebea0b1 100644 --- a/source/apps-extra/cpuspeed/rc.cpuspeed +++ b/source/apps-extra/cpuspeed/rc.cpuspeed @@ -6,7 +6,7 @@ # distributed under GPL License # chkconfig: 2345 85 15 -# description: cpuspeed is a daemon that minimizes power consumption by dynamicall changing cpu speed (for laptops) +# description: A daemon that minimizes power consumption by dynamically changing CPU speed (for laptops) source /lib/initscripts/functions TEXTDOMAIN=cpuspeed From priyank at frugalware.org Mon Jan 19 08:06:39 2009 From: priyank at frugalware.org (Priyank) Date: Mon Jan 19 08:06:41 2009 Subject: [Frugalware-git] frugalware-current: ypbind-mt-1.19.1-2-i686 Message-ID: <20090119070639.915D011B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f096d52499eaf0f11d1d33cb9aad601e2d3e1c85 commit f096d52499eaf0f11d1d33cb9aad601e2d3e1c85 Author: Priyank Date: Mon Jan 19 12:36:17 2009 +0530 ypbind-mt-1.19.1-2-i686 * Add status support to rc.ypbind-mt diff --git a/source/network-extra/ypbind-mt/FrugalBuild b/source/network-extra/ypbind-mt/FrugalBuild index 2a3b33b..da6dac6 100644 --- a/source/network-extra/ypbind-mt/FrugalBuild +++ b/source/network-extra/ypbind-mt/FrugalBuild @@ -3,7 +3,7 @@ pkgname=ypbind-mt pkgver=1.19.1 -pkgrel=1 +pkgrel=2 pkgdesc="A multi-threaded implementation of a NIS binding daemon" url="http://www.linux-nis.org" depends=('portmap') @@ -14,7 +14,8 @@ archs=('i686' 'x86_64') up2date="lynx -dump http://www.kernel.org/pub/linux/utils/net/NIS/ | grep ypbind | head -n1 | sed -n 's/.*-\(.*\)\.t.*/\1/;$ p'" source=(ftp://ftp.kernel.org/pub/linux/utils/net/NIS/$pkgname-$pkgver.tar.bz2 \ rc.ypbind) -sha1sums=('1090431bd5641014f0066b61a9098e961b6f6e3e' 'b04f449981aed7a3975cb2764af592ca4d2bad13') +sha1sums=('1090431bd5641014f0066b61a9098e961b6f6e3e' \ + '9cada4ae13380eca33481b5e82c02d2c72b542c8') build() { diff --git a/source/network-extra/ypbind-mt/rc.ypbind b/source/network-extra/ypbind-mt/rc.ypbind index 90b2862..9771e0a 100644 --- a/source/network-extra/ypbind-mt/rc.ypbind +++ b/source/network-extra/ypbind-mt/rc.ypbind @@ -1,6 +1,6 @@ #!/bin/sh -# (c) 2006 Priyank M.G. +# (c) 2006, 2009 Priyank Gosalia # (c) 2003 Vajna Miklos # rc.ypbind for Frugalware # distributed under GPL License @@ -12,7 +12,7 @@ source /lib/initscripts/functions TEXTDOMAIN=ypbind TEXTDOMAINDIR=/lib/initscripts/messages -actions=(restart start stop) +actions=(restart start stop status) daemon=$"ypbind" pid="pidof ypbind 2> /dev/null" From priyank at frugalware.org Mon Jan 19 08:12:02 2009 From: priyank at frugalware.org (Priyank) Date: Mon Jan 19 08:12:05 2009 Subject: [Frugalware-git] frugalware-current: cpuspeed-1.2.1-3-i686 Message-ID: <20090119071202.B7C1311B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bed74fac01e6adf2fa257f3dfa7f155e11935ccb commit bed74fac01e6adf2fa257f3dfa7f155e11935ccb Author: Priyank Date: Mon Jan 19 12:36:38 2009 +0530 cpuspeed-1.2.1-3-i686 * Added a patch to fix build diff --git a/source/apps-extra/cpuspeed/FrugalBuild b/source/apps-extra/cpuspeed/FrugalBuild index d18310a..cbbfb7f 100644 --- a/source/apps-extra/cpuspeed/FrugalBuild +++ b/source/apps-extra/cpuspeed/FrugalBuild @@ -3,7 +3,7 @@ pkgname=cpuspeed pkgver=1.2.1 -pkgrel=2 +pkgrel=3 pkgdesc="A daemon that saves laptop battery by controlling the cpu speed" url="http://carlthompson.net/Software/CPUSpeed" depends=('glibc') @@ -12,11 +12,12 @@ archs=('i686' 'x86_64') backup=('etc/cpuspeed.conf') up2date="Flasttar http://carlthompson.net/downloads/$pkgname/" source=(http://carlthompson.net/downloads/$pkgname/$pkgname-$pkgver.tar.gz \ - rc.cpuspeed README.Frugalware) + rc.cpuspeed README.Frugalware $pkgname-$pkgver-buildfix.diff) build() { Fcd + Fpatchall CFLAGS+=" -fno-exceptions" Fmessage "Compiling cpuspeed" @@ -33,5 +34,6 @@ build() sha1sums=('370d863902e19db0f3f58e3f8864787b19d01ab8' \ '3367e0ac78e3300451f78f147e1d3d6b52580229' \ - '89ebfe7a4f25b1652a560d9537c0c3b79ab95d97') + '89ebfe7a4f25b1652a560d9537c0c3b79ab95d97' \ + '96201f87e1a6aee0f077c6e201e2427cf0b0422e') # optimization OK diff --git a/source/apps-extra/cpuspeed/cpuspeed-1.2.1-buildfix.diff b/source/apps-extra/cpuspeed/cpuspeed-1.2.1-buildfix.diff new file mode 100644 index 0000000..930f547 --- /dev/null +++ b/source/apps-extra/cpuspeed/cpuspeed-1.2.1-buildfix.diff @@ -0,0 +1,12 @@ +diff -Naur cpuspeed-1.2.1/cpuspeed.cc cpuspeed-1.2.1.new/cpuspeed.cc +--- cpuspeed-1.2.1/cpuspeed.cc 2005-01-10 04:33:35.000000000 +0530 ++++ cpuspeed-1.2.1.new/cpuspeed.cc 2009-01-19 12:32:46.000000000 +0530 +@@ -563,7 +563,7 @@ + } + + int +-main(unsigned argc, char * argv[]) ++main(int argc, char * argv[]) + { + const char * const NAME = basename(strdup(argv[0])); + From priyank at frugalware.org Mon Jan 19 09:55:09 2009 From: priyank at frugalware.org (Priyank) Date: Mon Jan 19 09:55:11 2009 Subject: [Frugalware-git] frugalware-current: keytouch-2.4.1-1-i686 Message-ID: <20090119085509.F05E011B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=806935d05a844ebc1a6d075ac0c6d5cff951c5d9 commit 806935d05a844ebc1a6d075ac0c6d5cff951c5d9 Author: Priyank Date: Mon Jan 19 14:22:57 2009 +0530 keytouch-2.4.1-1-i686 * Version bump * Merged rc.keytouch and rc.keytouch-acpid into rc.keytouch * Added a README.Frugalware illustrating how to start keytouch * Fixed up2date diff --git a/source/gnome-extra/keytouch/FrugalBuild b/source/gnome-extra/keytouch/FrugalBuild index 05cfcce..8e07943 100644 --- a/source/gnome-extra/keytouch/FrugalBuild +++ b/source/gnome-extra/keytouch/FrugalBuild @@ -2,24 +2,24 @@ # Maintainer: Priyank Gosalia pkgname=keytouch -pkgver=2.4.0 +pkgver=2.4.1 pkgrel=1 pkgdesc="A program which allows you to easily configure the extra function keys of your keyboard." Finclude sourceforge url="http://keytouch.sourceforge.net/" -depends=('gtk+2' 'libxtst' 'gnome-menus' 'gksu' 'acpid' 'alsa-lib') +depends=('gtk+2>=2.14.7' 'libxtst' 'gnome-menus>=2.24.2' 'gksu' 'acpid' 'alsa-lib') makedepends=('pkgconfig') groups=('gnome-extra') archs=('i686' 'x86_64') -up2date="lynx -dump "http://sourceforge.net/project/showfiles.php?group_id=111201" | grep $pkgname | grep -m1 tar.gz | sed 's/.*-\(.*\).t.*/\1/'" -source=(${source[@]} rc.keytouch rc.keytouch-acpid) +up2date="lynx -dump "http://keytouch.sourceforge.net/dl-keytouch.php" | grep -m1 source | sed 's/.*h \(.*\) -.*/\1/'" +source=(${source[@]} rc.keytouch README.Frugalware) _F_desktop_name="Keytouch" _F_desktop_desc="Keyboard configuration tool" _F_desktop_icon="keytouch.png" _F_desktop_categories="Utility;" -sha1sums=('6b9aaa6cd60ff0ba42c39d325f2d80e51bc1e968' \ - 'b1c3e5e3fa8b865a40e20d406bd937ac2b752ff9' \ - '307f01df920314b41b3c0b05064732422c1fadcf') +sha1sums=('f1f26dc95c21afd404aebe2b1066e75c8313ca80' \ + '594fa5fc0b38af200319024e612c578d598ca4d9' \ + '6607455f94d2af444aa3e21ce19385aa13e80835') build() { @@ -36,8 +36,10 @@ build() # Install rc scripts Frcd2 - Frcd2 keytouch-acpid + # Menu entry Fdesktop2 + # documentation + Fdoc README.Frugalware } # optimization OK diff --git a/source/gnome-extra/keytouch/README.Frugalware b/source/gnome-extra/keytouch/README.Frugalware new file mode 100644 index 0000000..c2db7af --- /dev/null +++ b/source/gnome-extra/keytouch/README.Frugalware @@ -0,0 +1,19 @@ +In order to use keytouch, you must start the keytouch daemon. This can +be done by executing the following command (as root): + +----------------------------- +# service keytouch start +----------------------------- + +To start it automatically everytime your system boots, just type + +----------------------------- +# service keytouch add +----------------------------- + +Now, before you can use keytouch, you need to start one more daemon +(this time as user) called keytouchd. You might even want to add +keytouchd to the list of startup programs in your respective Desktop +Environment. For e.g.: In GNOME, point to System->Preferences->Personal and +open Sessions to open the session preferences. Now you can add keytouchd to the +list of startup programs. diff --git a/source/gnome-extra/keytouch/rc.keytouch b/source/gnome-extra/keytouch/rc.keytouch index b2d8906..eedb68a 100644 --- a/source/gnome-extra/keytouch/rc.keytouch +++ b/source/gnome-extra/keytouch/rc.keytouch @@ -1,26 +1,26 @@ #!/bin/sh # (c) 2006 Priyank M.G. -# (c) 2003 Vajna Miklos -# rc.keytouch for Frugalware +# rc.keytouch-acpid for Frugalware # distributed under GPL License # chkconfig: 2345 85 15 -# description: A program which allows you to configure multimedia keys on your keyboard +# description: A program which allows you to configure multimedia keys on your keyboard (acpid) source /lib/initscripts/functions TEXTDOMAIN=keytouch-init TEXTDOMAINDIR=/lib/initscripts/messages -actions=(restart start stop) -daemon=$"Keytouch Daemon" -pid="pidof keytouch-init 2> /dev/null" +actions=(restart start stop status) +daemon=$"keytouch-acpid" +pid="pidof keytouch-acpid 2> /dev/null" rc_start() { start_msg if [ -z "$(eval $pid)" ]; then /usr/bin/keytouch-init + /usr/bin/keytouch-acpid & ok $? else ok 999 @@ -31,7 +31,7 @@ rc_stop() { stop_msg if [ ! -z "$(eval $pid)" ]; then - killall keytouch-init + killall keytouch-acpid ok $? else ok 999 diff --git a/source/gnome-extra/keytouch/rc.keytouch-acpid b/source/gnome-extra/keytouch/rc.keytouch-acpid deleted file mode 100644 index 6297009..0000000 --- a/source/gnome-extra/keytouch/rc.keytouch-acpid +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh - -# (c) 2006 Priyank M.G. -# rc.keytouch-acpid for Frugalware -# distributed under GPL License - -# chkconfig: 2345 85 15 -# description: A program which allows you to configure multimedia keys on your keyboard (acpid) - -source /lib/initscripts/functions - -TEXTDOMAIN=keytouch-init -TEXTDOMAINDIR=/lib/initscripts/messages -actions=(restart start stop) -daemon=$"keytouch-acpid" -pid="pidof keytouch-acpid 2> /dev/null" - -rc_start() -{ - start_msg - if [ -z "$(eval $pid)" ]; then - /usr/bin/keytouch-acpid - ok $? - else - ok 999 - fi -} - -rc_stop() -{ - stop_msg - if [ ! -z "$(eval $pid)" ]; then - killall keytouch-acpid - ok $? - else - ok 999 - fi -} - -rc_exec $1 From priyank at frugalware.org Mon Jan 19 10:03:45 2009 From: priyank at frugalware.org (Priyank) Date: Mon Jan 19 10:03:47 2009 Subject: [Frugalware-git] frugalware-current: motion-3.2.11-1-i686 Message-ID: <20090119090345.DC4F211B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f6b8f8d8bc2512c60589f31a89f1d16fe5eaa337 commit f6b8f8d8bc2512c60589f31a89f1d16fe5eaa337 Author: Priyank Date: Mon Jan 19 14:32:02 2009 +0530 motion-3.2.11-1-i686 * Version bump * Added status support to rc.motion diff --git a/source/xmultimedia-extra/motion/FrugalBuild b/source/xmultimedia-extra/motion/FrugalBuild index 313b275..3dabe98 100644 --- a/source/xmultimedia-extra/motion/FrugalBuild +++ b/source/xmultimedia-extra/motion/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: enda pkgname=motion -pkgver=3.2.10.1 +pkgver=3.2.11 pkgrel=1 pkgdesc="A program that monitors the video signal from one or more cameras and is able to detect if a significant part of the picture has changed." Finclude sourceforge @@ -12,8 +12,8 @@ depends=('libjpeg' 'ffmpeg>=20080427' 'zlib' 'libogg' 'libx11') groups=('xmultimedia-extra') archs=('i686' 'x86_64') source=($source rc.motion README.Frugalware) -sha1sums=('57cd8c5bdcf7c4d49e46fa3201630a018e67dcca' \ - '1d85dce27289f756bdf9c96c78c9587d258190cf' \ +sha1sums=('bc171b1fa6c6a1a72f7fa3eecea2396fdcb8a02c' \ + 'b253e7162ab1e8b1042aec5c7dfcc571679f1672' \ 'b0598b9068e3e136d4a4864f5fc66749c787d7f6') build() diff --git a/source/xmultimedia-extra/motion/rc.motion b/source/xmultimedia-extra/motion/rc.motion index 5f34110..ae4cacd 100644 --- a/source/xmultimedia-extra/motion/rc.motion +++ b/source/xmultimedia-extra/motion/rc.motion @@ -1,6 +1,6 @@ #!/bin/sh -# (c) 2006 Priyank M.G. +# (c) 2006, 2009 Priyank Gosalia # (c) 2003 Vajna Miklos # rc.motion for Frugalware # distributed under GPL License @@ -12,7 +12,7 @@ source /lib/initscripts/functions TEXTDOMAIN=motion TEXTDOMAINDIR=/lib/initscripts/messages -actions=(restart start stop) +actions=(restart start stop status) daemon=$"motion" pid="pidof motion 2> /dev/null" From vmiklos at frugalware.org Mon Jan 19 10:30:48 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jan 19 10:30:50 2009 Subject: [Frugalware-git] frugalware-current: pciutils-3.1.0-1-i686 Message-ID: <20090119093048.5DC7C153C002@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=854880755d3ea2b992039c562698d3b18603b08f commit 854880755d3ea2b992039c562698d3b18603b08f Author: Miklos Vajna Date: Mon Jan 19 10:25:16 2009 +0100 pciutils-3.1.0-1-i686 - version bump - add gpg key - remove useless .so.0 symlink, ldconfig will create the right one anyway diff --git a/source/base/pciutils/FrugalBuild b/source/base/pciutils/FrugalBuild index 068cbbc..1dbb73f 100644 --- a/source/base/pciutils/FrugalBuild +++ b/source/base/pciutils/FrugalBuild @@ -2,15 +2,15 @@ # Maintainer: Miklos Vajna pkgname=pciutils -pkgver=3.0.3 +pkgver=3.1.0 pkgrel=1 pkgdesc="PCI utilities" url="http://atrey.karlin.mff.cuni.cz/~mj/pciutils.html" depends=('zlib>=1.2.3-6') groups=('base') archs=('i686' 'x86_64' 'ppc') -up2date="Flasttar http://www.eu.kernel.org/pub/software/utils/pciutils/" -source=(http://www.eu.kernel.org/pub/software/utils/$pkgname/$pkgname-$pkgver.tar.bz2 \ +up2date="Flasttar http://www.kernel.org/pub/software/utils/pciutils/" +source=(http://www.kernel.org/pub/software/utils/$pkgname/$pkgname-$pkgver.tar.bz2 \ pciutils-2.2.1-scan.patch \ pciutils-2.2.1-fix-pciids-path.patch) signatures=($source.sign '' '') @@ -32,7 +32,6 @@ build() Ffilerel lib/libpci.a /usr/lib/ Ffileschmod usr/lib/libpci.so.$pkgver 0755 Fln libpci.so.$pkgver /usr/lib/libpci.so - Fln libpci.so.$pkgver /usr/lib/libpci.so.0 } # optimization OK diff --git a/source/base/pciutils/pciutils.key b/source/base/pciutils/pciutils.key new file mode 100644 index 0000000..a3b77cc --- /dev/null +++ b/source/base/pciutils/pciutils.key @@ -0,0 +1,734 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.9 (GNU/Linux) + +mQGiBDnirDkRBADCTL/iUTeZKb0tiAcKdZdsUP/KSnrGGjlinolUAsUC0D6/hUB1 +RdCpJOOERTIEr1yvehqDM7veRhNMoxJNQxa/sSrkywey5qc8uaskUNEqenimq/70 +bahWJeoWXjad68mQFh65lULnHQrrioeJnh9UpyGJppNb/yIjdnymH9aYEwCglgP7 +UegBzH22h8NVQEK2PWWbyUUD/jQA4lI0wRWcL9HpkYkHcH0LTKRB9zYpQYtyvzJi +yTGwJyFMfYNXy0RT11dICeLkf3HMR84hkPERKMhALobLxVUbfc7j2AygmzGphWGy +DH/xjptQP/zrsq87ylYRONK18w1J42cm+yZa4XThMDPJMrb9/l8qnxU1JnW7W1al +HKTpBACbs+91KLqrnIGcF44TMwxgUj5CUrayPoEnLU+ZMBqfSjmu8RqEYmTxJCKv +7erBFSuazBGj5X7twunrtrW3bxO63MbLbHjfXSRrMnKOb8dRULIg6eWAnoAx8VVZ +YjrOpwAntU3WxYOpbiCHt9kLbb+N5rvNtFcmOqRRQaCIUFOOaLQ8TGludXggS2Vy +bmVsIEFyY2hpdmVzIFZlcmlmaWNhdGlvbiBLZXkgPGZ0cGFkbWluQGtlcm5lbC5v +cmc+iEUEEBECAAYFAjrr4eEACgkQj8C3jQmzMQaChQCVGbbtSJqr4WSQifztRrhq +qKYaGACeIg55vp9JYGpJhAVSCs6sKw0GqxSIRQQQEQIABgUCQrV83QAKCRDPHxWT +14OSWtAQAJUSmIyDG5c/S65bzlVAXCQwk+kRAKDFzx4OT3lH4+ShLFubSNWHkiiC +aYhGBBARAgAGBQI54rBcAAoJEH2d7s4ry8YhmjsAoMUW9RxfXBSos0A6LwGd+5pX +v/MRAKCYFLG2T4GSV+qfiRsXnrgDHQHD04hGBBARAgAGBQI54rOZAAoJEPKlddwe +GoeC/+sAoL5f7JF21mReZ8VV4nhh7prm+idSAKCMXDWW/tBOeJDYpiEhgyGSGgJJ +WohGBBARAgAGBQI55v8hAAoJEEQ0VrKnu+CcckcAn0bINySI33ekx/9fubh24CpL +OLKiAJ0YK1rjnurjCW5sCvn08YPy21vtbYhGBBARAgAGBQI59jioAAoJENSvrXiR +cWfcXcMAoICAQOde9cxQl8U64Eslg24KTK+pAJ9tCfaUCdcQhxiR/bZUpjRaUk9H +14hGBBARAgAGBQI6CNeWAAoJEMKNxEgYd9TGiIAAoMirDh1RADAVWM1UzQX5pn0g +dNTFAJ9Wn275P+nGM/NzE/L9zwZi76WGg4hGBBARAgAGBQI6DAnMAAoJEAMS6MNd +jNp7hoEAnjPjL8v4O9itus0TUdRlQn195AnXAJ4zm6OvtlZBhNCAg9pzGywG5U46 +bohGBBARAgAGBQI6GKxMAAoJELslbetxrfyH/r0AnR/b0nUl7lRLun7ZOo8fkU2c +/nzuAJ9YQ4H8n9oK666Gxd3mdcmHYafFW4hGBBARAgAGBQI6JJUzAAoJEAhV/hRe +J6UOUp0AnimdgCRcmEw6NdKXwiM/MruyoLGyAJ9hi+Wm9SY/b+Crf+E7Ct2izr5l +44hGBBARAgAGBQI6JeeCAAoJEBz/8ajp1waIZKIAnj9bfT6gMVhFE57aiO1YacrY +NFq9AKCRr72sk5jlvXWeh0ozetAri762FIhGBBARAgAGBQI6K0cEAAoJECdM9+ma +YseeupkAnifLbVudq8u60Po3B5rH4jkj7VeTAJ9BALdvcFH3QsMPNi3zstiF88rc +TYhGBBARAgAGBQI6N1IcAAoJEG6ULP1pTeNwmyQAoPvtkAnDnH+aIp3fv0uGfEpT +3FyQAJwL0u/eqJO81suhPaDADkahVwrqh4hGBBARAgAGBQI6R+rYAAoJEBtgNPR2 +t58gjQEAn0xo189rO8p7H6qs9J8JJsqJBPVwAJ4wNhL6xjOciTjSdSVPfX6Dcu3C +3IhGBBARAgAGBQI6VYiNAAoJEFaYkXshRaolSKQAnAynoaYFVvVfD+k1lMkPq4nT +1T/PAJsGdVrp7QYXUd5MaS1hjfH/wEji84hGBBARAgAGBQI6eFk9AAoJEG/2vJcC +FjKGD4MAoK2neQwpeaThU6LM1jBtIlBTKQ8gAJ0ecbyEpPZgXwQRx4EUulWvK6xH +iohGBBARAgAGBQI6hc+BAAoJEJ853fBeKcbCalcAn3ogb9+jPhGUGJjKB2XegKge +PH9TAKC2Lli6xVbQe30SRKws26QC8PnmvYhGBBARAgAGBQI6jS5fAAoJEGIEVKJ5 +Fu5nBPYAnj/8r3k9TzuK/JuIHJu06/61K6t/AJ993rxumjiqbbj/dju/YipMUrng +CIhGBBARAgAGBQI6nDT7AAoJEBUjaPzZBkwIgj8AnRp1lSjaloBXq/5swZmL7hy+ +TiXlAJ4qL5JGcsoUmij1ngg9vMFkSFwYeIhGBBARAgAGBQI6pEiuAAoJECQDiafu +TpyZ2rAAn2If/DH3iNvuqwZ7J+3YwCKkFVZgAJ0V/7WpYpFcawWxv/rAZmMhU81R +5ohGBBARAgAGBQI6pYc7AAoJEPGffNTDGmB2GDwAnicqxgtqmDme6twd9DY5cUsv +N37FAJ40nGio+42zjDMDtp4gOGU2nTHxfohGBBARAgAGBQI6qnIvAAoJEC27dr+t +1MkzYvoAn3KF0mCWkDVM8Fw1uE/W/1wl8LKvAJ9rCldbFWkfdCcyjclGycUWL/GW +1YhGBBARAgAGBQI6usg0AAoJEBOyyzrEsO5/fmwAoJWrls0jODCOjYxR9e69AvWT +B5MbAJ95n7qp2uXFxrJdn42cKKo1yMES6IhGBBARAgAGBQI6wmlRAAoJEEFe8BGJ +GukbpeoAn0EfQclzQPYItq09Uaav5ROv4UFtAJ91g5G5Dt7eLcPHyFzGz4LWGE69 +YohGBBARAgAGBQI6xnWvAAoJEOo/YuNyt+xvGWAAoLKijh3Dh/5R2VcPp2Ocpujx +n/5HAKDOzlEqaM2MPYOEZ+UIbhaLrYEUY4hGBBARAgAGBQI63xpfAAoJEAWyDkpQ +EKwBmL0An1x2j1NwzQm1jn8FeYIArOTHq9DyAKCD85+dlI1lsu9wH8cNJMImOu/I +MYhGBBARAgAGBQI66kliAAoJECQOWLWWm1jHJAIAnR/G/NurrSoFKH4dEASjHwmY +QxonAJ9BwbrWBFXT3MYqJ6uRYRhSQwp9n4hGBBARAgAGBQI6/Qt1AAoJEJFoqRmv +fNykw+QAn3THEBn/mKfKDW9MghM0qaxidK1WAJ9tOUNRb2FHipuoAU1bbkBwpPWI +cohGBBARAgAGBQI6/QubAAoJEMfg9pSiTYtOt7cAn1Z7+S/FNK9lbAf8oX+rX8C5 +kC1oAJ4th4NJwPN22luGe4shy3BzMSCTGYhGBBARAgAGBQI7KdY3AAoJEOdLHWLf +LQjTVrcAn2hRQjQT//FjrxyOVU8rzqxIMq9iAJ9YNtp8UwOi/hR0UdVwFrZQAETL +pYhGBBARAgAGBQI7LGSnAAoJEP7/Vgr4rY654g4AoKbliAaWyq1+rco7gFavOnvy +MNLVAKCjEyOENkj4nqdPebkNgyY37d5v9YhGBBARAgAGBQI7LyFCAAoJELfvQnza +EeDxGIEAn2f6DHVSE1K0BTiVdQn9MBViyMXdAJ9OfUM/q43GV00lORZaOk/hZ/98 +lIhGBBARAgAGBQI7MjUBAAoJEDEk1AjQUtfiXXAAnA6gDnCoGLFyosa945N1w6je +3B9pAJ4vqkDssJdNFWRst/9cWOYFzRWueohGBBARAgAGBQI7QTarAAoJEJT43AfT +0aeUdesAnRW/dJuTr4pmdXofBD3y5/6ChStfAKCq9w1xwgUkmR49/Qn5rQSqJFZ/ +NohGBBARAgAGBQI7T+ehAAoJEF5FAjJziIFAm2sAnR0sfHjywW2o21HtI8c+yren +u2AjAKCbXNlk8uHNXXltLRoQpJqdX7QC3ohGBBARAgAGBQI7WRniAAoJEHACK1GR +KxDvAp8An0OJdJ57hcqBd5D5dt8zpTW/Pm8KAKDyff4QJQqyD5qmXiKKaKHGe9dv +6ohGBBARAgAGBQI7XneGAAoJEJEg4lCDAGaKpEsAn1hDapGy6YsO5YGfKT60ypYl +1vqRAJ9wgswR5mWF29kJXl2EHLDHD8QmCIhGBBARAgAGBQI7X0TaAAoJEINou1lm ++8GMGn0AnjdsL3vZMLBsqLQE2yqCz69y9QPXAJ90/fE8uFK5YL9kC7T/3iM/yf04 +FIhGBBARAgAGBQI7X1XhAAoJEKSIOfUNNb7WersAnjmQ8hHnp9K2zNSE0WOYFR24 +a24xAKCzjIvccz3PQHHNZw5t+MNLzx00pohGBBARAgAGBQI7X5hmAAoJECH91RW/ +uICj67UAn1cCputlrFo/kOEUoqEUxig1oorSAKCEBTWwYJvaHJbJzbJWGOutS3Zs +EYhGBBARAgAGBQI7YAH0AAoJEJJg+ae1MRyXtS4An3OLpdWm9EpyM2kew4qwWCtv +R/RlAJ4s5yfUX3jOJ0t0zIxsWmQiI2yKGIhGBBARAgAGBQI7YHXAAAoJEP0DJi5R +IL7dLG8An1yxXe4p/F6e59RvycOvRy9tEXE8AJ93uwmiDp051qmhmFxcECrFtyv8 +aIhGBBARAgAGBQI7ZJlDAAoJEDmVGBY0lpqJTdIAoNskgLufJnhPAnqRl2cFV9go +34kGAKDFe7zygzThFdGyTjc3cWyR2tmA24hGBBARAgAGBQI7ZMpfAAoJEIOaY7NL +8uIXonEAn3OPrQESXUFaF85jOQOmxQ6mNXUrAKCZp1jfEYeysXdq29JqwAqJLVr3 +2YhGBBARAgAGBQI7ZtvPAAoJEAL7lOCM6iM9NS4AoJNaMvaMsCXDzZhLDDbapNqj +49WnAJ4nMdRTjCLK6NkaSVY+peO/EbmjtohGBBARAgAGBQI7aBocAAoJEPC/nJck +ksmN1qAAnjs0sYTVMtM3LjA5L5MdgRDt3cGeAJ9N8OTgCfgjUSJRzKPFJab6/4LO +MIhGBBARAgAGBQI7cPDFAAoJEO1k8W8gDrGszAUAn2FZGxJUX06Vv+qtionYkaZ2 +/zKQAJ9qvT9IPFShp+OUTfs5US4MRmwfF4hGBBARAgAGBQI7eAeAAAoJECL47xGG +GqbxneUAn1uQaE9mZ96rWqKYEEtEdyFfsvOHAJ4//yK9QWRgG1+XZ4VDRPoxkDcK +sIhGBBARAgAGBQI7eAgnAAoJEAdlxIbJ6f2507YAoOZCycGfx1EXMJnyl0S/5MPs +Hi22AKDa+zihYw2grBp2GW+CtACQBziSuohGBBARAgAGBQI7kzsfAAoJEMzAYxYa +L5ROtLsAoNej9559dwaN2ofcN39ZBF5DH3zdAKCRPoORuu9QBDN5NyazOZ+kIaMi +eohGBBARAgAGBQI7lNQuAAoJEPTmanzCDfJzkCwAoIY1Rr0IiD+1M0oKMqUAYq3I +LullAKCmFXoQwE+xiy/VEmdPd9km0zEq3IhGBBARAgAGBQI7l3F9AAoJEMj6RZFu +NvzLgXcAn27vbmJCUmt6+syLthzd0bF3OEf7AKCvg7BV3EBd95Q7ysfc+N9HpF67 +AIhGBBARAgAGBQI7mDUoAAoJEJAtvZGMOKkKMPQAniUGRCHZ1wQ5fKOyjm4+I98v +OQpVAJ4gXezEyN4WGVgM3qwFi6MLoVqB1ohGBBARAgAGBQI7m5+NAAoJEJrsYtco +DbV7K8MAn2gbYisKbDQZzFNnmSoEEQzZjVRFAJ41RV6VsYFY1c2ThTbiwNTEkW/s +/4hGBBARAgAGBQI7naceAAoJEHrutSqgoQIwYZ4An1ybRJrCmGqcZXBYypS3UhP9 +HxcxAJ9JigciXL7+FPfBLJ2el4Fh9aLg2YhGBBARAgAGBQI7r/tFAAoJEK/pfcjv +k+XKjY0AoLYvwljCU1qBOZF7VAj3dvCLpUoRAKCUXIVzesjvXMLRe7ym0Sj8ha/H +c4hGBBARAgAGBQI7spe8AAoJEFbSDSk9B4OE0wQAoJO5CHadEHRtN6F167vDK+oq +n67ZAKCRT7nGS47ITh2aT7OmNm6Nb97ru4hGBBARAgAGBQI7vI/0AAoJEC2MsKpL +IGAaf90AnRzxBUKBh3XWZ7VPCqUQscG0yNGvAKCCwW9uF8yZhHBRUPGXHY5BrLFq +64hGBBARAgAGBQI7vtolAAoJEKbTq9mc0w09j7IAoK0mkEz2c7K5NzpTpwcL4AgU +4zztAJ9JSCd9vWiXoQZzfrG1jwNUnlvRd4hGBBARAgAGBQI7z0z0AAoJEFJNXXIX +gc6eFw0An2zWG+p8BnXKfQtQgv4uwIOFYFBtAJ44ZTTJ+qx5kcrisYci2iCLwlUX +W4hGBBARAgAGBQI71tyXAAoJEMlssZlC71NDPxgAoJ/o1CPbWOsoW2zo92b4b29q +id5XAKCS7/E+G9ha4tQy1MOzRaRQRzfzYIhGBBARAgAGBQI72WLCAAoJEAhxAzKd +IEMNJqMAoI7kp1dVNrsmCZM2jTPyXTwY7cg8AJ4lPshwYcdz3rL79o9mXCKjnVgG +WYhGBBARAgAGBQI72YmFAAoJELarRoGSJN8B/xgAoMTx81Uz4PD6Q+/lZsZo3IEF +nrfeAJ90v6mpKSNRGkIOSGdT6MWppkhlaohGBBARAgAGBQI72pSwAAoJEPPWtYVq +mhiIR48AnR3+5FC2OYuVHImQxCJsz1Qi7ywFAJ9r9wT6azMWdlfAd3RI57SpbMej +sYhGBBARAgAGBQI73t6RAAoJEIeovXamM4UatPkAoInrHXewx6NZZqyaHNh5sr6f +VBynAJ9npQA2Yr9ky/3yX2DVS5GNXQrgRYhGBBARAgAGBQI755ZGAAoJEKTthPEm +gaDBhnMAnRxjJxiHJ2j78UyOu9C7z72H1eCTAKDkqyOQdHJUhfnxQyxEYIR4mg9V +4ohGBBARAgAGBQI77HmMAAoJEC9bSjKZmx9MgNsAoIdxNM8UjqvLbvVaNkbh8Bp7 +1BKSAKDOZ7BwM8mrmx/XD6YOipSe04xWD4hGBBARAgAGBQI7/WkXAAoJEHSw4O4U +PSqjjIYAoOG6XIMKU7g/CVdsGvFzUYm0CVoYAJ9M6wvSgI/DFl+Bwd+vQSITX9wG +AIhGBBARAgAGBQI7/mykAAoJEOPXfh+VFhmRJd4An2+aZepi98cEBatBB1LDDbhK +v2vrAKCbqJAC5nljubc2qcjzI40RbbWq+4hGBBARAgAGBQI8A95CAAoJEFC9fhbz +KKIlvgEAnR19TSJDi/uv1CO187rZtPeCwkrXAJwMsWOgWBXQxKfvtfwtIlnewuZE +8ohGBBARAgAGBQI8FfRRAAoJEPOcY6P4Kr3iuQQAnRr8FgsPuQqNHkUO7iEL4q9C +Hp32AKDuomJcIOaRWL43DdnjFqUZY20J+4hGBBARAgAGBQI8LMEXAAoJENbA7t24 +jHClAWgAn37AOqlwgfmYZzT6jcMmDz0DEUA9AJ9KYQmSzEh4myFwX74uVykBXYaI +04hGBBARAgAGBQI8NaPJAAoJEH0JHgBCHFE0RycAn19b7ADV+k6QF0fsiJB1Gdfz +YUvAAKDHMJdOb+lDNNMBoOi9WGPrvdTfd4hGBBARAgAGBQI8Ndw1AAoJEDW+QZ+7 +crLy4A8AoP4Jnz7QslvDj4XKpiNfzwdEhPLYAKDc/8YjnLPZtyb0LryNMZBEMROQ +fohGBBARAgAGBQI8QL1LAAoJEKM0cBFY7CJeRPsAn1dHXOuTt5INmW6ap0kI2KvA ++9r/AJ43DVFgRGv+H6qu+aYFZFxxtf6OSIhGBBARAgAGBQI8QL4bAAoJEKM0cBFY +7CJeHMIAnjISNeBQeAd9pwcHt2E+2bsiSDtDAJ0RH2Dwbm4gHBw+RnVN/V4PRCmv +kYhGBBARAgAGBQI8R8PMAAoJEBuS8hRhTVzrrhMAnjKBEZQMXoZHhwKmmu5dvLSs +/epjAKCCMWQDEVWiZE3EHk7I9CfT8OBdPYhGBBARAgAGBQI8XZKGAAoJEBYgylCw +05FLUPUAnjlrxStaBrPvw9lbqpS0vnsWitUXAKCAF1TmDVzBWnwciRvJnMiWFsrI +eYhGBBARAgAGBQI8Xd0qAAoJEKhI//AqOpR4m9AAnArimK0JeoWrBJPPgLvxM4Gi +M5lkAJ97Lynn8odEdq5v22IujTK0d6SndohGBBARAgAGBQI8YdhTAAoJEHNrIT3/ +LCafrsYAoIQx6WfJrHJ4g5Fe6aNXCOt6/sj7AJ4jxyE/fymdBfLeO4TSeJ7WVO/4 +7IhGBBARAgAGBQI8Zis1AAoJELQv5xx/w62WZHUAnAlY4cQ4+sSdC79z6U/xcpDd +JwmzAKChg1TX/ZMijYMdtff0J4u4SRJfEIhGBBARAgAGBQI8cLg6AAoJEA+RMJUG +nXlDwtIAoI8nfP6uWnHWF7XeLZCFNQFFg6KhAJ9rpP3i7oFpYwSwCw1pWwT8YUyx +cohGBBARAgAGBQI8eYHsAAoJEKFAK9C//vl7iQsAoMhgEgfGTNj6AFjHfd4IzNyl +WmZRAKCOVNQjavS6iFlGnDd8WUXMkenpX4hGBBARAgAGBQI8gmL5AAoJELKmxNwR +9aIAfOQAnjq2FB5fp2iLqaGjHPswwO69SUmEAJ4goGNH8J+qGBpbtQtVe0G+YWIw +HIhGBBARAgAGBQI8hUwyAAoJELVe6MJnNHp4BDQAn09J+sXhb0W4YyrTg8AES/sl +9v3AAJ9oTlYilADltoiZytpIb6046Qot24hGBBARAgAGBQI8yYfvAAoJEKqU1G7N +adXGQKUAnjRx1AaYMIcJSxhgfifx16WewnaxAJ9Lf0YejaO371bvOYLL4KoA+DUm +RIhGBBARAgAGBQI85nKfAAoJECsGXILOeY1D9SEAoMPfsWlqx7Bierx5cWVWIxdT +UCj9AKDW2+HoMdKoLRWyOwoLUZiJUPyVyIhGBBARAgAGBQI88olRAAoJEHhJT71S +Gpp0XpMAn1xVztMq73+eC73l48IVazqAddrEAJ9xPl6JeF+J3QapgcmlSSAgLhzQ +PIhGBBARAgAGBQI8+LcOAAoJECG8g0ecvNX3jK4An01ag3CdFycA6axHDFZdrEMi +bi7AAJ9GSFPsvD9t7QgdYHvHyn/f1yLj5IhGBBARAgAGBQI9PEDoAAoJEMKsoQ8H +PiRxC+AAn3QUUDayhrs6lPiXRAM/an9QYfANAKDjqtfKbBHaluRHULxWMNCb/b5X +uohGBBARAgAGBQI9P97VAAoJEE9FrEM/9JdMEu0An3VtjLAoEdhEcoS9gNsfERHb +4Z+XAJ0Y/laseoSnfdNBHqW+7A8ckuqbCYhGBBARAgAGBQI9TRurAAoJEEDzfHCU +zYj6AZoAoLAXn+LddnUvW9/5nV4BRSQWBh/wAJ40ER0zc55csBsF7Xqcijm0BA/A +GIhGBBARAgAGBQI9WqNPAAoJEOnIFOyf/eScQHEAn28vMhhgCYWOKb0qDOPd/W6R +gkbWAJoCESjupIaQdDJooaxCOnc4hR9XmohGBBARAgAGBQI9aVsUAAoJELkDFiBr +ZvE0+QgAnjP7i84xhI5/5/VvCof6lieMm9Z5AJ4koNdQKsNPS+sz1a/suFa4IIbj +johGBBARAgAGBQI9atErAAoJEG31OrleHxvO54wAn2dA4SdVBl/9X+W7UDrkvh+k +NVbYAKDwVO2j1Z8ZXT2f4eaOF1qc9sl0+4hGBBARAgAGBQI9bJ3AAAoJEPaF+9ng +DdZUqfkAoKIYsrD9tFnBVfW3SH6slU7t79ohAJ4ynZMje48CNPGtnjrFDIpqawK4 +iYhGBBARAgAGBQI9dzzCAAoJEKVTPRWmIVDglCAAn3q+cLuBr8oq6KbRozfBy8XI +5ojbAJ90xJOW01jy1hn1/yqef6QXATw3XohGBBARAgAGBQI9immSAAoJEPNrrivA +6TQgBYQAnAss9U9x7fZf6gXU/XCS/Ekda4eWAJ9TNxeVRjpjnYJ0oyHxMJOi5MzR +pYhGBBARAgAGBQI9jpSJAAoJEABQ5fqhZP0NWwEAoIeMb4wuRVQnlko+ZWmMMOcD +5avoAJwL1amvPNw5S2dB4t1O9d+TECdxd4hGBBARAgAGBQI9kzWFAAoJEBGN2aC+ +bid41jYAn3pAucf6uaOAFw2+oaC0VsYSdh36AJ9UeFjDnfjXr04iYc/idHnbERCr +J4hGBBARAgAGBQI9mwc/AAoJEINwzzPW0mDKqHUAn1tENWF6FKj7SPj22rz2+H3s +dCM3AJ45j7+dkIBYsNpTe0vYMTexKIJcVohGBBARAgAGBQI9pFnPAAoJEHY3ZUKB +z+ddzwcAn15Gry83Pf2eOEDTVzAXWSmrgPEeAJ9bePtI2ZNrXZW3Z6Fppu7fF2kI +SYhGBBARAgAGBQI90WlqAAoJEChq6QqtSOhUOSIAoM0Q6u+D9KTs9KxFcyPwPdLV +fok4AJ46TJ/zpHzuVFH6O2hGWv64VNkSh4hGBBARAgAGBQI95FORAAoJEG4IsMyA +UEaj7AUAoMjZHs5MikTNNsl46m/SDIXdr67dAJwND9DbkY7uRJ7E6JPq/qUbPZtV +C4hGBBARAgAGBQI95UUEAAoJECgttlU4B+PUbHkAn2ZjTGvweSbXs4HkDk9ehWWW +gHNZAJwNVZ9WasuwxHNLFxkZRRFds7Qcx4hGBBARAgAGBQI97V9gAAoJELsVthMW +Vol9LXQAnRe2Ms4tvWfZoKOSw/vSBWEMiNeuAKCgFc89dPEymkW9085rRF1asWBV +kohGBBARAgAGBQI97hKHAAoJELoDJB4PwPXhYAQAn2xadWTe94lLes9whiQGy748 +XnOdAJ9ZEgXGRaYwCX3Fchs1T4HanXjPJohGBBARAgAGBQI+CBHUAAoJEEXXpfYZ +YGoGtpIAn380xN67BIp8cFPbG3aaKHgXcB3WAJ0R+VHiKUZhlbaP9FEtRjb3goFq +24hGBBARAgAGBQI+Kch3AAoJEIPQlUhkteA3VjoAoLe7eWCzTt38QRqWO9Z6hRQo +3lgOAJ4qYIlorPixGSowm4rKsFe0eHFZeohGBBARAgAGBQI+j990AAoJED7kfHOI +4RSiKh0An2vNuD0eCep1M86D40cM5XeFKpt/AJ0d4GUYECEPGbLjb5eQlNEGUQ/E +mohGBBARAgAGBQI+n5WoAAoJEJXokIbkKnBmv5QAoL++DCZRNeUPIHTqO8fG20M4 +zaWwAJ9r5uR5WdWWCO4Op6RF0+mlDdZDjYhGBBARAgAGBQI+vh12AAoJEIS5JcWt +DFnXmV0AoMltK2xSm4E0MJ7JoUyYrBK5i90IAKC6uHJuNuJfz8o5kuEB6/og0VOB +5YhGBBARAgAGBQI++KdDAAoJEPsu8vRWxd2Qbc0AoMicrijobF+qWzOMZTxj9LBc +YV2jAJ4na1w9iC6ERmfkuylXFdKKF9xAzIhGBBARAgAGBQI/FmynAAoJEG8Ew0TE +D6HcSI8AoIkvt7VGfam5V+ZjQQ9Bw5OdU+gsAJ9V/vDyyHquO2zEf3hGAsDql98f +/4hGBBARAgAGBQI/GoRGAAoJEJPls5v6M5vpTS0An1gaWP+g44tNJGZeeQjkk3Ac +5FuIAJ0b4bXOXQ7RD63i42gnHPToFyLCb4hGBBARAgAGBQI/JS/NAAoJEHAGggfi +QyBXkDEAoLYWeDzFuekyMR7kNYQfujh0zQqDAJ90FJH+jIwRVmkgmvGS7mSrNxOF +YIhGBBARAgAGBQI/R0FTAAoJEPsu8vRWxd2QJb4An2ta85lz41aQS2lvICZlGfih +PtT2AKDAx1jrDRpcz4tHnGeYxW8CqdAGBohGBBARAgAGBQI/S39gAAoJEKPqsa8g +4rZQeLwAoMVSjRy046/1uIWt3UzcnAiolu3mAKC6pPwOXXr2tZOOtcgVMFmoNe6X +t4hGBBARAgAGBQI/Vj8BAAoJEKGKVhk3xO5A6vMAoLiggy0x49EEJkieUbqL8uog +tTl3AKCbCqo24lT/DROnFU6DwwHk0S1PBYhGBBARAgAGBQI/Z+dWAAoJEJ5kvbCO +onwtKjcAn3BrcJ6xwx2BfHFwg+g0qJgpjm+qAJ95WKjL184rugmpBwLZ/+cSbf0D +cIhGBBARAgAGBQI/kIozAAoJEDAvn3cB6Dsles4AoMaa3pQXmcit/HUEKNA9Yt9R +kdF9AKC3SLe/dBUAUS+08/cEfR65O5JmfYhGBBARAgAGBQI/z+akAAoJEF31MJsy +FQixW8AAn1bE2K5ANJw/L4bv+heAZK3mM94EAJ0ewmit5KQu42doji/pySU/ppev +XYhGBBARAgAGBQI/5AHnAAoJEJPvY17FslvTLSwAn1SIY/gqJVEgKPtEkC/nV8u/ +0D8mAJsE/wofPdtWHucigKo+/9tnDTnGp4hGBBARAgAGBQJABlBxAAoJEBMIZhaN +9iDXilsAn0vKp9C+ofA4W8YYWDkyBv2BsJ2oAKCGUmZVJp5j2F566xGOMC8ruCWQ +l4hGBBARAgAGBQJACBopAAoJEFK4jOSjp5c2BeQAoICX0KtPcAhb6OYNcFa1jnX8 +mLixAKCCJ/9NvLTCK960CCFkwjCwyO0gi4hGBBARAgAGBQJAMzlgAAoJEOnWfire +QXIWn6MAoLbBNi8a0mLEximjL3jLyY1JvMJ7AJ0UxcVJJiVtaYJZT8OBUaKVix5h +BohGBBARAgAGBQJANoS+AAoJEObP5hTmLttVHqgAn0P+k1hOlggq9kKoDg6t4UE0 +To1cAJ0Rr0x7yf2Mnf6/bMfRD+kzmRT+kYhGBBARAgAGBQJAOMSUAAoJEJXBrOsK +O47lWCEAn2PJLJgXT+1uuHbQsG7aLuD2+LlxAJwLd8SAlW5I29qxSAb2fws/dHgQ +gYhGBBARAgAGBQJAVAUnAAoJEFJTyEmOou8meJIAnj4/pPH+Fm5bxEjf92zUe7Ns +ujdwAJ9r7zdcWEkk1u3nL46ptVYOk8DuP4hGBBARAgAGBQJAYu8WAAoJELOn5Stm +JDKa9GUAn2oXTzZ/zR9/GGOeEFvIw4qpwmMDAJ9XSR5tq5ka60sOvKTwjLpG9Ps+ +EYhGBBARAgAGBQJAbUrGAAoJEJgPCexN5Y9gkl0AoJzX3Kzk3Uq3+tYuGLD94Gfd +BeC/AJ9xAfFLmzgVkml6dDHiFIuBc5ryr4hGBBARAgAGBQJAbtiaAAoJEAsA24E9 +Ijhb1xIAoP7nXMRdXxkoGZZF+wdKgiA/mvG6AJ4htu9FBeu7gqNZQkekmex+vRxu +eIhGBBARAgAGBQJAchjAAAoJELcDJlbQA7v76E4AoMPYhEW+VHw23yteFnie7O2h +86RdAKDxK1shqL+KzD3XAZQ8HqfHpbHfv4hGBBARAgAGBQJAmPcYAAoJEHGcAqvJ +mvMf3ncAn1bPQRhysYFCvu3Uj4/Q48pt2IHVAKDIo9GPDrV9VMN/WBfX84t8h3pd +wYhGBBARAgAGBQJAoBWHAAoJEANxTXifOqmaqDsAoIOlRezJfUEuz+2gniQgumhH +PotYAKCOPXnTy22eXsQVEM91Rka4ctt0XYhGBBARAgAGBQJA3cTbAAoJECvSjTKR +/0IRDmgAniCU2NibnsdV5lPyw5VdCTn0NxnAAKDAitR3poo5HyIJ3WtJqjOAFjpM +s4hGBBARAgAGBQJA4+tVAAoJECW4bu2k1fklO9gAnjFcusi1iaxMbc/j5N/4mYYJ +y/qvAKC0s7CtdhbVkEJ2st/nUAO9BquoMohGBBARAgAGBQJA5NfoAAoJEPBDeCMw +RkRs0xIAn2XnrHPYldmVuIkKGSX5gWTGxBECAJ4lnm+JZHWbRxE+3omoBi9/cmnS +4IhGBBARAgAGBQJA+9KTAAoJENnYzYh+1wFaRQEAn0ofr7ziipnmiwiuQv84TRJz +eb9aAKDVpBgC/LXXJtoQwPcuYI8Q20vGSYhGBBARAgAGBQJA+9LbAAoJEA9pxIZ3 +VfoykwEAoIw7bgcb164IjkZxjCskOa4emt4GAJ9zhTs5PB2vs8xkbNFxPwiR4gSY +4IhGBBARAgAGBQJBleu/AAoJEPNU76pBgMMbSIYAnR0hgXnGkfo0hdcZyHE4Lg1h +3Gg1AKCX6ne0+OVXeliPWynyRDzO90Q/EIhGBBARAgAGBQJBnyYcAAoJEJu0iT+m +UAyH4O4AnAzHuxSEqB8eDKX/VZu2AIjeUm2oAJ9UFRlsMQ1iEbFSe/7OhJxk3Cxd +MYhGBBARAgAGBQJB1pHrAAoJEJp5NWn767wXVD0An1mnbEon4yzmkBE6GaM/2tCz +sUeCAJ9D8pTdnmFEhX2Mkr7YMAKjFfND/YhGBBARAgAGBQJB5FtWAAoJEDn85ni8 +0AmkqEUAoN6+juKQPddMzybnFP7+NiQ1TM3MAKDd0/NGLetZbXLrIzO/XUCkVT8v +WYhGBBARAgAGBQJCA+aGAAoJEBzN8VUhr9h96XkAnRNdafaq1mYQ3q11nj9VOkf1 +w5dXAJoDK6L+aaY88IRBxoLYOgLiscwyoohGBBARAgAGBQJCH7i+AAoJED6m/eNV +pA7LgjkAmgIIy2zTBBDHZae7PoiL6J67UwyaAKCHYffg76kGDV0cLcZZmLKr1oMW +OYhGBBARAgAGBQJCIeeDAAoJEFq966VJU6h+pX8AniGnV+g84IpKQ51XtnReNBh/ +uZ49AKDjmZFxnzpSb+vISEizQkvkLHkQq4hGBBARAgAGBQJCK8FbAAoJEOYbpIkV +67mrKgQAoL/GaEKYbx+iEyQeLVhGDMmbZUPNAKC+ItE46y1bA+6Mjhz/pTUy8Awk +U4hGBBARAgAGBQJCLEK/AAoJEI2VW5m0PFj+zJYAn2mwomWTAZf7bl9AiWgut7Sm +sUowAJ4k3IrN33emoAvanYXLGaMQTFLFuohGBBARAgAGBQJCPZffAAoJEMkWdnrP +Zu5uwUcAn1f4xdn5aj34EjonG/sOiGmpE5GIAKC/ZkbqgRJ3bq1ua7p3icW8sL/q +QYhGBBARAgAGBQJCiIsCAAoJEDOPu3DP4VNE7sAAn3/UQSQto22nk2w0u0URw63K +7U2sAJ4pzjKzDTxg6KET7Ur2jaj42Yk+bohGBBARAgAGBQJCmHPJAAoJEE225xuA +Yagw5A4AoOWl0nrrajwZkxlwBrkGf3MEs2bdAKDeFI4wk3eoLHu7hYfm6egwE2+u +nohGBBARAgAGBQJCuw7OAAoJEEmc1wj9vBgJHCkAoL3NsMJTfulYHNlIq9gdlT2T +3ZZtAJ936ffVtCMBMAQCXcukL7SE72NBsohGBBARAgAGBQJDSnk7AAoJEO+et8MN +HeJuKl4AnRju71L/5jkUoxV3aeK63j4SA/53AKCwge7jSjCUHuDkX4T8AYeaSp2A +iYhGBBARAgAGBQJDwvcAAAoJEFpIaGqaOpl1L+kAoJltJPnCjKZ6Pn6U7fxtLg2W +PIbrAJwO3wY5n+IyqEqn0F8M0/5czdWNzYhGBBARAgAGBQJD/ITCAAoJEB5SAwxw +i3XDP6gAn0cUTolakjKdTQAtA0pMFnXhBZy/AJ475ZUmlasPCe4/N6cXD1MpHFW5 +8YhGBBARAgAGBQJD/kM9AAoJECGal3KGhxuzJ8UAn3ePhNxhGcGt8HKadMc2epw5 +iUjYAJ45Q7PYgjH1aOTgPHNaUu5ryhPy+IhGBBARAgAGBQJEGu+nAAoJECEL8quf +cdRJwroAn0os/e7OFT1Th0ymj0TeifGWOfUJAJ9jqLNV4o0RZb/zPlb6mUTZo6G8 +oohGBBARAgAGBQJENR/RAAoJEPa/Zl7B4hfK4eAAn0+Iax7c7+c6lSKvhj2TwkQ3 +SgfwAKCQny4b05zf98/eqv6rMmpRBW7RdIhGBBARAgAGBQJENnwyAAoJEBawdU0H +prdtuFgAnRvX8nFz4GStpRzsIiNDku3FBySoAJsG8k8nfk2Y2L9w8bLQe2k0aNfe +uIhGBBARAgAGBQJEU9vIAAoJEOCf7yXZZISsMFMAn0IvQPMq7OKVPJBjHncpTqjS +VNBjAJ4xCuJzp71lN1vzhUd+BOo7mVc2YohGBBARAgAGBQJEdqSGAAoJEO11JWwe +5R9posAAoJX1ihcCqP2gN0pd6VAx6422f0yGAJ9cn2avPBpmCAbH89uamIDQRnWc +QohGBBARAgAGBQJEmOZNAAoJEPtJ5jgU9OJvqK4An2IFmvJMsY0YKWSrL9LUVFsp +z85HAJ9gTwvg8EMbclo9Ii1snk4f/NUi94hGBBARAgAGBQJE4TcCAAoJEHCJVbb3 +EeZeu3oAoOrurwcV2AMLWRM48mphnGeOiNofAJ4ho88fruJh8SJyK/xHwDoak5W6 +24hGBBARAgAGBQJE/ZvRAAoJEPv1X67WAvD/xncAn3MSrRSQv9OQ9azex1IGrGB+ +oRyWAJ9zPQi7KR+UathOwQByPfW22D42ZohGBBARAgAGBQJFW9C2AAoJEM83u/Sm +FkkjUGAAn2wu03GX/mwDCaEgFJA4KHDiSPedAKCAV+Ybi9OIaG7E6K/2AZUpJy3d +94hGBBARAgAGBQJFa11KAAoJEL7CV5qValrPKIkAnip4hJcj3i1RCsHDBB6Wf8sa +YcM9AJ45DRz/5J7W5VL8I1VXYzE4CltVmIhGBBARAgAGBQJFk3GkAAoJEP34VFez +3YwyyjIAn3TfKmK9KLyWK/QPMxkG9bcw2L5HAKCz/frD2TIxLF3SQYQqvPYM8Y8l +aohGBBARAgAGBQJFx4QzAAoJEMtBMASb5ByDx40AoIdOcJ62rxQrCNPbiqbiIr9o +JFhAAKCjVARHlopdD7Gfw/blN8xxVstwqohGBBARAgAGBQJGIjfMAAoJEIWUOBoy +lR9dERwAn3S0xKK+x+cpEr4HAWZviK+j6LGVAKCfxHehdNxBOx15G4DjVRaiZ0jo +rIhGBBARAgAGBQJGK8LuAAoJEKmhj8wLJfeCWZQAnApRSTDz+PJKZL9U7qSr2c0D +F8wmAJ9mW/eJO4MZ37iVMhmdgs5m4vS94ohGBBARAgAGBQJGaGwbAAoJEF5CYu82 +DeyDSkEAn0N+YbLFlyqXAvAjknyW+PPQuTLCAJ4pn6rTjO+JYij6bQIdEnDd3XLY +ZYhGBBARAgAGBQJGql1QAAoJELL7BFAn0JCmT8UAn0y/k7PH8vijVS2EF8HU2EPw +2lKvAJ9/MBjPNupX6vElG0jokiQO4nSHiohGBBARAgAGBQJG2265AAoJEKniGX1a +QF2MZykAnRD3CskloeyNsVcgP0mrPayeX0xUAJ9pNGQDzSDCkXrvHotnqwTi051b +b4hGBBARAgAGBQJHOMwhAAoJEMAfKQvhoDKs31kAoK7YRrasciUqJgJPTZvd0Bo+ +N0CVAKDFcv0AgdZ6NtkTkne4Cu4WrmyM1ohGBBARAgAGBQJHjx2IAAoJEFGvRX7a +bdUyJmoAn0e2tuyqxgeN0/AL1KR06mXZlhHSAKCSpZ0YFiIr8tAbRgOtAyu555ZU +FohGBBARAgAGBQJHoV/8AAoJEDZmiDpTY1CcI90AniwNHedrBov9SadKbyWOAaSS +Q1QVAKCUpMZdRuBtEQ40qOoDDRHCjEAMcIhGBBARAgAGBQJH1u0oAAoJECJk82W6 +QGLwEr0AoJuhU2viYNIQHU1qFP5jzc6CLKDJAJ9ccfNRkjHyzj1aS/KY7Kz8/5zt +vYhGBBARAgAGBQJICyjKAAoJELi1JEMxekHaAG4An1s5xR++oMJhFqxrnGi34oSs +d+IbAJ0RFe2jCmdMTdlNNpoDuE75/UqXFIhGBBARAgAGBQJIFhEuAAoJEDOHB3X/ +9NXtE48AoIvS8hz+zyI64a48KwRNoaR/+y2GAJ9PGNlD3Mo09CN12lgdOx7Dvh2V +hIhGBBARAgAGBQJIJg9QAAoJEPmmuuH0LuvdNVwAniu3XrpNN8AzF4eGxuMlWnyQ +/ZS9AJ44DzyprCvK9CiUAzi7cX0n1HHzGohGBBARAgAGBQJIo6iRAAoJEIxKHvwt +br9J+PEAn0PMxmZN9fhwme38kmOi53ZInnVWAJ48JjP8ftfBKvjMKF7/BGq9e+vI +3ohGBBARAgAGBQJI87cHAAoJED0JbNdBEQBniq4An12BSqbGPVxPTfYNjg+HQBaq +NNGAAKCcdEac3HF6IszpDT2ImDBDUZvTN4hGBBARAgAGBQJJDMtfAAoJEAd/Hop7 +sUfVmZkAnjjFX8r4zsCsoCQNEUSVB7XV1QTpAJ9IMefpwwhaBKTXsUZB/vUBJLnz +TIhGBBERAgAGBQI9T4gEAAoJENOhxR3NTfIFnF8AnA0D2hw6qVOSSspyi7RTM+bi +Yp4mAJ9OoOMQIKyFOrykdITVzr0koU8aZIhGBBERAgAGBQJAOZi/AAoJEGyTjnEA +oyph/VcAn3ffxcfFWcs9+5zbmK0knmpNdjuuAKDQgWvvJBZjpk9bO1pdQ/TOFoNz +HohGBBERAgAGBQJB0b86AAoJEPiDedjAuJQw/4wAn2rU/jiQRQLQBmOSf6/YK/6x +UtEWAJ4sgIzsci/ArgHm60TdeWoPAr7ByYhGBBERAgAGBQJDvYlVAAoJEGjNgM6p +wfGQQZQAoKkP2Nhj6/EOWcAdmza0iWnlG7chAJ0YZtR3rQIrV5ZxB9rF94BK4DGE +VohGBBIRAgAGBQI9Sb0MAAoJENX0/2PBGjh6qCUAn3VNcel2GP1grva6MZPKRsU6 +RpxrAJ9jFzuwyw8Doxv/rZ6Vq9V2WshXBohGBBIRAgAGBQI9c/XcAAoJEEmSwrX1 +c3K8qdIAnilCrQ7tQDRXVqhvHPQ02h6GycNJAJ4xfSQh1+EFSy441C3pTn4AR3QN +v4hGBBIRAgAGBQI975GZAAoJENy+GP+gNVO82OgAoMGoOfIkIXl8mmtuVJhYmGbI ++oXDAJ0URPO1ywr5YMkv6zlu/Sj60IS+VohGBBIRAgAGBQI+AHt4AAoJEJnInBtQ +F/WCfzAAn0IkYz4eDEPCBR6NzgZ54hWxMdlkAJ0R4JCj0ZLg+vnqXrzxkjc1VtBe +0ohGBBIRAgAGBQI+R9koAAoJEO3RUpKXBcNb60AAn3dO2lX9QoQ7Q6URnLusCGbZ +vEHaAJ9EnAQjxaThspM//tRwG+jUTTFxkIhGBBIRAgAGBQI+jq56AAoJEMXAxcch +jRjXjkAAoMUvnYF8kXtcbcJscVKUqCGTgI71AKDtu2jmwFxHFvnbmzqkxDpCdtk1 +W4hGBBIRAgAGBQI+mKOkAAoJEI5cpMLbUON8nGUAnjhiNww9RCCujz6mi+hrR8YI +fGKNAJ0eHCtAWvHilG0ICWNuKV1NAnNP+ohGBBIRAgAGBQI+7v1CAAoJEIBOmxXE +8PnwY34AoJmsn0/o468Vf3Rq+SK5wKY20MJwAJ0cb+vrGnfFiWHMoxbKQvwKLe7j +NIhGBBIRAgAGBQI/iY9FAAoJEOTlTRGaDNqZJVQAn1cu7t+cSWyHB/RTmQ8Bn5Gx +ef1PAKCwIjKzG+QAtroqRGG+9fc+TJjbEYhGBBIRAgAGBQI/kE/SAAoJEEgeh4Qy +mfaKcp0An2w10jst7m39hBmum+gUESo2s6GOAKCgXTGnegMGNq0qYdthjC4SJJBf +uYhGBBIRAgAGBQI/se/1AAoJEL0i+r1xJN0kNnEAni7HP9tFNqzCrElT+cFZcgJw +K4UXAJ9rs/N8qA+nGu3qS8nRdaFlye76tohGBBIRAgAGBQI/xdCGAAoJEJpv8FQp +nhtsT5cAnjVrookkQXkbGC2WJ4rxKTpkBNelAJ9m6RGagvqpv5bA8p+9ycQ5Cy2O +2ohGBBIRAgAGBQI/zon2AAoJEMps9rQLyK359FgAmwQUR8aaU/Ay93OKpVLe9n97 +1EvhAJ9kzDVzIiARqiD6W1a9hHMH1FGzC4hGBBIRAgAGBQJAAU0DAAoJELk4CjHm +lh2NipcAoIGgzK6bLXXln6kAIMwEwzB8D+KKAJ49lsgzEd7Kju5TG6grl6eV/6h1 +mohGBBIRAgAGBQJAAuKQAAoJEFU3ABLBsEnH2tcAoMNDajZzn8Jr5m/NDxnPmCr4 +SFnqAJ9HT7hREpqF/XsXiHjw+hGKbuhqx4hGBBIRAgAGBQJABBKQAAoJEMZfhluO +kZidY9kAniEcIGhvP3o7iLLq9RltOjJCybwqAJ0VkRHrBYOEDYT3khxS1r2KMV45 +yYhGBBIRAgAGBQJALq5HAAoJEPxo4Q6sdjs1Pv8An0uWMGg2tsWlV9XASJjlWIIT +XozoAJ99brwgZeHhruXPE/Ex32TfzzfNj4hGBBIRAgAGBQJAn3mfAAoJEF7Z9UG+ +lQRyuxoAnRnYvFzMMtjgmajA7/nRRBebXyHHAJ4w/T0MhB9DpxlURrLw1Rr4cgBw +W4hGBBIRAgAGBQJBEhjDAAoJEDnKK/Q9aopfyzcAn3zhl2/Rd8Mt+s5YM6JQFD9C +thz2AKDGEYlxaq9viL2rpEBzNm+M13xDYIhGBBIRAgAGBQJBGfuLAAoJEEwwlyFq +IXIpm5wAoJ141I74BYc0YAwaeb5UZqmMRXGKAKDFy6RR0P/PW+3aJQOmgHGHJXcC +Y4hGBBIRAgAGBQJBIF3KAAoJEDxjyj+gs+iLV4AAoJodHJh9YPxZlhyi6Q/sQnoW +C8D8AKCehg9Fri2YqR+HBfF2kdF5t5d7WIhGBBIRAgAGBQJBO5QZAAoJEE5gbDa1 +mq/YqsIAoIbXf+2oLq49JEg/e8IykF1AzgXvAJ9oE0QmEF/qIjcsWsgujAQSKttY +UohGBBIRAgAGBQJBZ3NKAAoJEMpaPV4A31QE3DwAn2eZXzf3BZF84aqygp3aJ033 +n7mgAKC9ZQlO27KgALjN4a+RoUb/ik8Z9ohGBBIRAgAGBQJBdVr6AAoJELMQKtJN +6F74JlgAn1Ex3TC8sXrcb2mbgXcXRCLYKTO1AJwLfOTIuGEttlQsh075hrvMvNYM +DohGBBIRAgAGBQJB4o1iAAoJEOYH1ipc7CdKIMkAoI6Vdw+QGvicOD3c2KiKEffQ +wt6dAKCjjkftseM1c54bRaIVcNJRtORpcohGBBIRAgAGBQJB77IyAAoJEI0tXWWh +biFAdAEAn390RXjoQ45sU9/hXZ7eTkxBfN6+AJ90aU9fhBDz8epvJs52OSqKluMW +uohGBBIRAgAGBQJEbJXqAAoJEMQQFkjRE1pLGCoAoKZZvSwpAy0djc1qfkBiW3ow +vIuGAKDBaLZV/dxxU3ovqSp0wv56ijOkr4hGBBIRAgAGBQJFDFtoAAoJEGkKdDpe +A9cWBmYAoNXX5EIsWWS60Ul9D9vRSV04stXAAKCD4VxxYDXGZqKIErSVW5vFspbf +T4hGBBMRAgAGBQI9L8t1AAoJEIvYLm8wuUtcKfcAnjRp07TXOzsr4klmVldF5Aqx +S52dAJkBu51LQ4vhudxpXlh8k3D3n2fG5IhGBBMRAgAGBQI9v+PJAAoJEC8hGeLP +vmTAfP0AoKVCo5/+NO4tiGQiehYwlnnWD9f0AJ9hUhK+12EzvdZSTK9mQXbA3rxV +YYhGBBMRAgAGBQI+CuilAAoJEC2r55+p3AAlVlsAn0hY/FwjCg6XWqaLapefMSm+ +cuCjAKDAVyWXX6QkqA9UlrVV80vxU4h0V4hGBBMRAgAGBQI+Twp8AAoJEG31Orle +HxvOdW8AoJTmHT0pQE+ynOkjhwYlgN3kDscJAKDotNUQGSfzO7tb51FogUL52y63 +Y4hGBBMRAgAGBQI+VLQYAAoJENkpKCV+qUXfJKMAn3pZHYlymfuy5unJjkT9PqmF +w+LoAJwNCcGwACj0WyFvCQmek/lNUh++AIhGBBMRAgAGBQI+8JBVAAoJEDSzBkBH +uNNZRW4AnRTER+6orBGqcxjR0sprQ73nscFAAKDFBjzKFNyI27mXR2FdEpn4+f+W +sIhGBBMRAgAGBQI/sC4kAAoJEGDNOu240KtiOzAAnRIJtk3X36JDQ1OeXn9RRJAu +GE03AJ9WKOp+z/TQZbkGxr23XaogY8yKkYhGBBMRAgAGBQI/+vLlAAoJEKeydKUT +qwZjYX0AnjQOA0oCqNPAnf0CzcDLQrieK/1yAJ9LnGU3v37PAP8OtWaIB0G585d1 +PYhGBBMRAgAGBQJALPu0AAoJEDm6YqgAm7+cG4YAn0+EAmyYHIFuSnzXv5a9b33M +OuphAKCsUmW5/83xvS/TE+VwaGgR/8IzDIhGBBMRAgAGBQJAV+wCAAoJEGbv28jN +gv0+YYsAniyA2Ne/uTyTa854yc4NhvPu9m4BAJ9bZZl0XDyQBS8ocpmKEDsKbmAG +johGBBMRAgAGBQJAdieMAAoJENrArTcPEkCiOZAAniY9O8rGOUngGz6urxBaA9Be +6x+CAKCanpBpmZ+KfQvt9P9yx/d1WpGx1ohGBBMRAgAGBQJAikASAAoJENnlgkXL +zYjFuD4Ani2iDbJ0ywckhKQ5cLz0VJh4k9UoAJ49LJ0ukY4M6dpEybEaRO4mTgbW +GohGBBMRAgAGBQJArdJWAAoJELkMYBTGRp1+d+0An147e3uwvY1uhRJMMkowktdt +frWtAKCrRcUrbUbA2f5HWBinNltK8YEgYIhGBBMRAgAGBQJBCaUqAAoJEHp8mR5p +P2MT2X0AoIQNyrMgGDftQ59fFXN7bMo9V4LjAJ4jJ7pcv5F0FoFSluc8iMkbSrZc +UIhGBBMRAgAGBQJBFiA0AAoJEPsZWED7KptdGo4AoKWiRnzdtZKdhm/bwSx+4oeu +hE7UAJ9RrIsoWxyt+XQyrNT4MsVod7QbP4hGBBMRAgAGBQJBIwctAAoJELyGwNCp +644IoBYAni9V1LQIqJSbHO0CYLX+vY4Lf5cKAJ4tfrQeqU0cHajR7N/7uriu+rDR +F4hGBBMRAgAGBQJBOASQAAoJEBzN8VUhr9h9jOwAn0ketCRSj/Bq/BDyGlpZMOaz +fwJVAJ9/15hqPc4WFdk9DBLG6R+gU3CRuYhGBBMRAgAGBQJBXHHgAAoJECv909cf +TQLM3A4An0Xf3Vofb29fnPuPv1KmMJtPihD2AJ4zeVJxIto0WFSorqsxRwQfGZ05 +BohGBBMRAgAGBQJB9p4YAAoJEPW0eMZmqaUQ0bUAoI4DWKF30X7tOkISJismOkE0 +JzYmAJ4lf4nQSF7F6N7sZTb64RIq3+8XJ4hGBDARAgAGBQI+HIoXAAoJELsVthMW +Vol957QAoOV2LgfRF+KsrBLAABTDDE8S3pyqAJ4vI2xnYaBlx92U1iQ43tJ7xOMF +9YhJBBIRAgAJBQI/1S9cAgcAAAoJEBX+akWWCq7yAlcAnRlMy6IPn/eYrcF86sdt +gnhrtZwCAJ9lEUtbgfNhF2aLKWFSpVFz5J+02IhJBBIRAgAJBQJAaF+BAgcAAAoJ +EGVi/IXxXUHp7msAni7YuR5ZF/HQfiU7wrDyprXkH3dtAJwIMA7OrlObfa7b/Kz7 +G/v1b0aKpYhJBDARAgAJBQI6a0EdAh0gAAoJEMmPt4AT3gdZh20AnjlOAWa3WfWo +b5DJvSeIoD2+Z2GgAJ91PYm+Rg/2nD1Rua9AhCShnih8d4hJBDARAgAJBQJB0b+O +Ah0AAAoJEPiDedjAuJQwqWwAn0AB2A/yfV0PAGPPC8TggJpWWuuGAJ4tyoegqrxE +k9n6lySUtn36SPcWX4hJBDARAgAJBQJDNGqmAh0AAAoJEPTmanzCDfJzgywAn0Hx +MKr2vnxhWx0kOTiA82AIWJdwAJ46K1GDg+G2foONZksTmv584Q/VBohJBDARAgAJ +BQJD/IZtAh0AAAoJEB5SAwxwi3XDKz4An2Qqybn9vxLg9em89tTL7bcegI9SAKCO +Jdw6UhIw7jBuPaevjvOkaWHNM4hKBBARAgAKBQJGSFJkAwUBeAAKCRDCSg9jfjZI +VlRWAJ4467iAV9Anp/DZSctR7oyobFDvMACfXJHKBuZ3Hq+URfwQ4O07UDH9u1iI +TAQQEQIADAUCO96pwwUDAFMOgAAKCRDjPKcIjmJ+pPtLAKDO/S80LqHjCz9NbZzE +JnPJAaTesQCePY5ciEEV1hYMtTOhS5Ew2umWdvqIVQQTEQIAFQUCOeKsOQMLCgMD +FQMCAxYCAQIXgAAKCRDIa6BqUX0PDgw0AJ4mJBPIKZDM8ai7ZyX9HI5ePv2RhgCc +CxPrG3vaGn88WLLBgz28GwNW/2eIVQQwEQIAFQUCP5BSIw4dAGRpZG5vdHZlcmlm +eQAKCRBIHoeEMpn2iqmCAJwLbII+Z34JItCPri+3scYlJgnXYQCgh8/smFrRaxEE +AloXgF5++6VdJWyIWgQwEQIAGgUCQ1dBNBMdAHNpZ25lZCBieSBtaXN0YWtlAAoJ +EPTmanzCDfJz0iYAoK291WXHE06oVHK1pSsdLE90rGhqAJoDMKDWR0funP5jOCYP +DQRIwcCxvYhbBDARAgAbBQI+TwbsFB0AcmVwbGFjaW5nIDB4MTAgc2lnAAoJEG31 +OrleHxvOtLcAoNkObhg8A/BnIfET+vni3crwdLoSAKCz27BnOtGZ8O1oSoc8yotM +v8CLwohdBBMRAgAVBQI54qw5AwsKAwMVAwIDFgIBAheAABIJEMhroGpRfQ8OB2VH +UEcAAQEMNACeJiQTyCmQzPGou2cl/RyOXj79kYYAnAsT6xt72hp/PFiywYM9vBsD +Vv9niGAEMBECACAFAkJ3OEIZHQBTaG91bGQgaGF2ZSBiZWVuIGxvY2FsLgAKCRA5 +yiv0PWqKX7ERAJ4+hfOYx+yBvJzD8qtawcylltJMkQCcDxJQGod8n41mszmRsk/o +yn0AZWiIiQQwEQIASQUCSJOJCkIdAFRoaXMga2V5IHdhcyBzaWduZWQgaW4gZXJy +b3IuIEkgaGF2ZSBubyBkaXJlY3QgbGluayB0byB0aGlzIGtleS4ACgkQKGrpCq1I +6FQ/IACcCOtOtNMjNVCaLj26LE3RC0mbslUAoLMafTkoQ9XDa44pReahUzCGHnhZ +iIwEMBECAEwFAjyR8tBFHSBTb3JyeSwgSSBzaG91bGQgbmV2ZXIgaGF2ZSBzaWdu +ZWQgdGhpcyBrZXksIEkgZG9udCBrbm93IHRoZW0gYXQgYWxsAAoJEMlssZlC71ND +WRYAnR/iMZ2VQex92cIa7bjonfLtjGfCAJ97qpnjK2BWlmx78rVcmch4vLwYo4kA +lQIFEDti5lp30qslsMhxPQEB/bcD/0mu4UfOi3O/cOgfyeQ9Xl2mUEGoO4h9Fyz4 +JxDsko673e087X7HrFnCBVI8wfzW7qKIj0cgahmtdryEnr7hkGAj9w1Fg05ZTXWZ +H/9lpdRTgngEil2EDvHo2h51WUIpjh7/3/ZOQTT0iC7K341h6VjxC0DRH6IFd35Q +QSTunf1JiQCVAwUQO19nIX4xUKZ2O+kBAQG23gP+JKE70oAsDF0VLGFFV+dZCZNn +2N+weP0CRZjPGZWE9ONsmA4zkHlmyfWe9eIFRcfWTWUf7Ckdu3hoqKF+/ZvF6Ylg +idiYw1sLzhWRTyJjP3IPYWYVyTvBH/k9MPosOSLaYnlADB2ofD6pqcxZmfEWzjyt +U+B4mfq6V0UDJnx6kA2JAJUDBRA7yHMwuwzLYoNo0g0BAad6BACNlvTijIPaoMp2 +8EvNpkuJji1TvrkRF9oVtefRmdVqW2P4yapffHigVWeqNvrQ1QWLxTkoH+eboVwP +EzXaTMVnHeYUUSlH5ZP/d+FVW7CRn6TH3NLhlQ7zywpOESUvkVGGVjVGp4eaeuIh +QlflkPTLSfFdsTRpJa/qKvcFM4IHEIicBBABAgAGBQJAqxz8AAoJEMPCvFg7oIwN +JC8D/i+rxZN6xy3jFE7g0Ef9dHXk9L0kbHzDMs34wRL+3B5bdgWKR3PmTUiV217m +rd2GjjJAomzkkN2Pve2PkvBQacg1166WCnb13aqP+kId+1Zvyg8JH5oDLAD1askR +OVQZ6fvd8Hv8lrGmGj25PvzJbkSB8WKKAKOfItjWi2yI+jb4iNwEEAECAAYFAkNR +Fn0ACgkQ0dlSBAnpodWgYAX+OKPdkAw2H82rtPL4q0zh8vLQlaLIJz++9g+25TQ2 ++mFEQZkYl3TeBAaK/3efbS/5vaEQOPFG9d4NCbIPQoY/QCvn1fBbiWI3ORbyj3Co +vBmm25cMUdjvfv9pezvhMzWLZgqJ9AlGBWLh1JaYO22sreqR/3NursHxTlpqW+a7 +B3RxeRx0IriAoRzFtAIPZ2oYFTgOG7pNBk7/yqGbXa/ACR3X9n4XqBHi0UJUB240 +eSJ90HvcDSGvHWgcAvfdXNdaiQEUBBABAgAGBQI9oe3RAAoJEI8u8DzpeueD0dAH +v01m7F4a5Y1KXjGIZ8mBAfa+i1A8DRCKLYHQp0WBKx/ubo8z6JpeKWDRBKItgwbm +vqfrt1sDyW2+4nTxv/P1xNe9OkeDbLdDBHBD1LVGQea6mGXw76t+KvD+w/ITdvoo +ZeaE9h4lM55/pHar9nU4eV4gPCFUQmVBXOXuwz2wwlEkGYBoNja4Buk6xBt50P9U +ZK6zqQBCQ7bwgPonkEvdmENR9GCDI38euIkIPOCSoELdt0gyxR/Rvqv8uXuM1bI+ +UGHgHOvX+AWaCQibpJcssr1VVR2v4kn86ka8bzchWYHw4+7PCZoLqgXfyAJer+C2 +72d6CVyF+v8PiQEVAwUQOeKwNWx5eAAqlgcFAQEdZgf/Vn2dMKrn8021NhavP0uA +3pHGRmdKQ2WJBdLiN2tvLkpAioZtho+op+xBz8j1zdIJQ/7XWko869KHge2BAFwA +8rWDzjtaAWdE0Jo/NiARepUwV2FdRRwSxIcNG2CCPyJnfPokRqjdl2z9k2PkwidH +Sq+2k6JxCWnOcIXChSKfkHnemtA65ixAlhuxvyN3MPuYs1jAHyDGcyMfomp1qH9t +XFQhhyXRrG2eMAfslstCXGXLcoLN3O2BMR/fG2GlV6kOqGOvoMIW3clVeQLQ9B1y +yekKiVY6Vg+CgK5qhg8z9tjH4f33zzNDwsx1WSCOU/1LIPzFBNbR9QtTF2XmOUfR +s4kBHAQQAQEABgUCOgvVuAAKCRAeBs330MOyIeruB/95MhNG0d5sJsagf2lBkTWC +mlrR+YkmKFctBYWdsbLWzPbwe0diXsMNAxeyDeEpitdorcEMOrkrTgOkJBSrEql7 +VQC5DPDFEKZZM9ie3WI9vnD1OxF5UJrLDL8UtU8dTvtGofBwOjo3qkVQC1g91o4D +yvTyc+pxhusHrG7HYrL0UaN3qvj1eF+uBVl9BuD6HY6SL58tnHVLGz2xZFuJ8ttg +8GrH1r+Ae5RyElubjMptHDkv6vG1tI1iM+kvlVywEDqVWaHP3A/ANzR4n6bUEGOo +vxcjhNUASBMOv8BeZJaLiDfXuIQnRvM5I5NK+UVXbOoty8EGBm7kUgCUSPdTUDs2 +iQEcBBABAgAGBQI7xrIlAAoJEEK3C5DOCL2RcpEH/ijY4Gqoaku5jt3yugQVwCS9 +LhxVUHDo2rLIRLT9OjQ5Gwgdr5k457j75vcNNVItDj+THKxtCMA6yAFVJPc1gdXc +0eJWbjZ565mvATAFUrswd8BG3ik7N8NWGpy2WASVVWX3Gl2Qb2XaQU2+P8I11EWr +/vh7ta0kn05dzEtHHWeRQCQFTijcntHem9b+y8/llOpu2YFxlrOabUfKdau4X8xD +7vInJ0xY3ikNPdOh58owx38+4mUo9wZn2cdlS5/9FTdSQ2k930sVAiHn32pVQfyR +xRdDmZu9manlv3MK+ZdYl1L7eV1UDCzFjYemcyKsPxRpnAz58cRsgWHSfcx9ItGJ +ARwEEAECAAYFAkhSQp4ACgkQIvwrtsVp//7HGgf+POYJzW8MA4CHpE0axj5SPmcW ++tkWdeA6rBUDBaIyBOUsD3IXVyDg+aujfHthA02u4kTy3Ynxi6ddXV/6Aarbxj57 +lCRJtaZ2wY6oRqijFqoa5HyPul+dvRWiOWbhtvuomMmd+ZfMKqOeNJdQDFUuUlxW +muZCxE9qqCKqjnXxVtU3w37us5ombGmBD+XvnTQCGOAyKSbTdCsYA/TuRgmUsVEw +MzEdN/xveNvT5FirANKeDPuRWJFc4CI/KAy4MXuN8ItUVPWp9Vnb6hMO9Jwyyzdh +JZZTQkA6uBONgg6m7AzDQtaTukdVgxR53xBajHHLoL9x3KbHpAjIpBRAN9MHEIkB +HAQSAQEABgUCPki7qwAKCRDEAJ57OR3B6SBSB/92kwHFYGbwsA5Maqg5Sptz/cCC +IzAmlZ6QZ1mdESFVKvXderVk4jvGEHTbOQXXzk8HDzekH/Dk/LNc1jvk4i7qFrzE +YCQ0DGPY+lA+zOQrJ8MFkEQdcZtEQXPOG/n5h2ObQYyckDXkQ/Virk1mEhy6pgsz +Kkx7Hno0fgJ75eM8PlO33HFzH4NlBPVdVCEWIHoTg5PDTAfdcTSWlR1TYZtI1dgH +beODtxo6XdYaYhELi9LxB6g9k3+mpWM+CaPCjxFJj7hD7/QP58SasbwtuhrWuk8J +RiqNLonI26nRXlLVmQRUaiClDtDJFH3MwEK1qGJAZhaYdiYUV86BnyVmWXfNiQEc +BBIBAgAGBQI/za7gAAoJEDDvhERxNeNmOFUIAJJm6B03F1LpQfxljPjOXY4ut409 +cnMy+76z6xCps01c/ePRJM4XynEFu+uMXC/JsW1p5gncz/rnWJgzOy375CLQYLju +tgw+0txUi7M1vrieBM3O2j5B+MEISuZMfkvtm+2EeCyR2EIuur/E+ORimbbQQjz4 +9Gi6UEQ8fJX1lTtUw+LOwBiNBQOw17k5pmIcfLF+YzBweIJATHqswl4Rr+6u9UQ3 +nlaW/GS9A3HjL9bOhVFyER2frhICCzF6CGxsZiAzFs2MoVZw9qSa0/M4WDAbg5k8 +kCL2scycJfb3C8IjuIbl0sU7BREqjcpLCvyQsyFclMATR+mjYDDQHvaLna2JARwE +EwECAAYFAj/ht+IACgkQC56ssbtLKad/KQf9ETXtEW+JEIQeoWC8nj97rGVuLYvj +9zGtRhyPyLVYijIIiVo+PQru8hCYyEG1fPm3BVy7g9yPQlCMSi59J1C3orezTXm1 +o8jSJWYVNv9iqz23gzfgmv7Lo3z2H2Az5+9thMRUFEEkMyiTLYMgqsJArvLqIQB8 +4FcQMySjnaAHZPfG6qwn4MBk/Lsj7Z20Pq74nPCpk+lfOQCZ/+gJJREzPMlgt+OT +YPFO2PegiWeNyikyr2S2IPmjAeUnMo5Nf7ycLGCfYmkv7r3pQPaaTPlGWqFhue3B +jLfH3Q1GGg/AnDjthaPUMfuz4heZE4AvlSP/LnI9shiYcQ6ZnSWeeJrxzIkBIgQQ +AQIADAUCQhuMKgUDABJ1AAAKCRCXELibyletfHTtCACNdoTBQQD58nbSX2bAw6BL +JvWE2zAjoqQQRSLPbbB/kAn67CErURd8z2jYQPZWJi1syAQ+AZq8cGhnGdKHyyOP +URxxbe2uQJQ0NLWLgdXrnVUnvD5r6pclq5JhBNdQwtarWWP+XUKL8irOV4WaM/5A +LngMXJXSPUw+jUaS+EoJTnZB7pH6nlWqJuQjKpz+QryHHoSpESc/anDjWouB4yPi +07b3ms11pgrBN1Kiv+OjrUFPoxcHagxdFDPVBZEw1tDsfoKZbaQnFrDaks5eglLu +LZc762ob0bc0GxLKK3uWTi9XqIQzxZK861s7Xm32eZ6rc3kV8zY02Kf9kjsBPXlJ +iQEiBBABAgAMBQJCPdcVBQMAEnUAAAoJEJcQuJvKV618v0AH/3KBcwiqMqnvmkI9 +23n9cNBJFgzFOlbTX0D+eZu0GYxJXVAp/uJFmhESQLDM5xk4ozzgOzRaPgLvpGfI +iQZsDqKp+3FG2RHrdGKAsoeEu88+A8KP/HKjFdQfxaGjkpE3+R8Ua97PdE9m7Pgx +5+HrQRv5BYC8AJpbXQaG1cOjugemiVdLu3t72lIHw7+QyZTCyTU9SXxHZWqJQXxH +8QKd8e7an2qp3JtGNEySlLYEtbjQzMclZ2eKgnMKtSpWD1IAvkCGzokRwg3L76R6 +JhFXO8w57vP7l5y1ogxYwn9YEJHrpNRQnfxN2kZPFTeUntg89Z0k5RQI68m1vwab +QyAR+cKJASIEEAECAAwFAkJPyT0FAwASdQAACgkQlxC4m8pXrXyupgf/cyT+BV1K +B+L+WQANU59UibjCbhCJ+K9q1UeLhQUUCXNAk0salWVUSvcnQSWzxUA4uo8EdKFw +6GK2lzT19V1yulLpb/gWztykO2/GGGdxH0UFPJS6aaIPFAgtz8xWPQoxOLMuc9yA +82ZAj618lG1nmt8K9tZD3FWWL/HrAq7IKITMTQc7RlZYo2gPQPTjGoZJ70t6jfc1 +yx0GOVJk83qmubPUb2nTih1JfR7tLLGBzD3aJei6j1r2HgBqd3myaKd5zqTpBQ7m +opJdZE4XrwiddrMVp0Ye03kAjcMc5zMG6ajPYtuLLB/bJIjhqrJD0r6A/+mAm94n +9hBCZF96Az2OGIkBIgQQAQIADAUCQmIvyAUDABJ1AAAKCRCXELibyletfA4AB/91 +cJISdWMcsk3TnIleTju/+Nxkx/VuR+/ML8X3gcvmvvkMpOFussdwsK5XpmS6hbk7 +eWVfE1A6DwgiMdT06QCEqUk9FWw8g9A5PKH9JI/tWUuszM0FSH7epCLYmzwTrmHx +EdkZldjky1D6Ch8YQ78juN5jgF+DKcEY9h85bMBkDSqwCqTjgSTjaOQLOvm+Qzjx +0/7XTZLiqXRtMGMOJYBlETvG1NNG7Yp2pvCoIRpxI+OAucmKOJlE1NCezbVAG4Nq +ffD5wiOXqHDPhwtWwrom2FMgWdKE/xdSuMwujlLsaNBde5k6zLESrbUZEi5tG2/o +07UIt1gXSI7LRUmdvj9KiQEiBBABAgAMBQJCYrjLBQMAEnUAAAoJEJcQuJvKV618 +P4YIAL/5jBF7rqMr3ZKE7PCRgvBAcx8u6ehNyU9Ni5mEJkqEjihaerAVbSYJX5w3 +d0KwOVfknUXqWiDWdkrsd5OMdUhNhnDBnyOm7/5xlAhaa9z4mqd4xrmq6hh9s0Yl +eMTKIXtpi1EQFbmIxvL2fWpa2dl35xE8ufw0Y4QhH44T+4j5sGV7kkBRVufsCca9 +KUNzXqCEdeoTX3Aq8vpi670yQdA4G3VBkbYoc5hWoB2wmazB5qNFBO+g9th/yJEL +vS/BjGfbeJ4gIo3Py6Dn8Ae5S1/0Y3vJl6PVc63bJ7x4U+aY7KAmFiPqMBiHNFsj +ZA6HjaVT33MjanpAMHbchQBZsCKJASIEEAECAAwFAkJjCWMFAwASdQAACgkQlxC4 +m8pXrXxNVQf/Vmvkhjz0izVwqk/5Zx4e69pb8E/whnPsOQ/ojd64mvcGxXtZF1C9 +w2j6F/uuZUWPKGohI3Xzhn6LIFNMXf1sTn0rgd3SLPL9pM02SgX8bpLNXGOXzrdp +OI2OO1PetRnqhX0YBC1kLWZyb05qIPu8DetcUIL6C0n0W0ECQU+jS7wkGxNEW4Gt +y2o3V+hv/4ah8zdBSeA/4VDiZ3dnr0j/NbAcFvztSCWMU2Y4MOGDIqYAS+MhJlaT +CrOdUycVUQDj4FuZaj805xVLemmhUmQ8EptJkBrvG5Q6pL9kPOqde47w5W480BMl +AqjoslY3z9zZltGr5+MDJwz+xDVc1i+BXokBIgQQAQIADAUCQnVFQgUDABJ1AAAK +CRCXELibyletfPxDB/9P67wdaTf5wfoi2PYPhHfmYDHEoZhuauzwr+3N+jQNc3mK +JkiEZgyYXXTkwHBMGaqn61gljbzcgP1nF/w+9hJJlFl/eTZIRNlt0rxzoatXaXyp +Ual0ArCd/NDWxoXy4ISnZ7mXZ643F5y/vYUe4gwq3qrVPZd5dlt3UBPIll7d9WeX +gndwhMkRKRmIOu36aKbd4Fb1K8XJICXelyQPY6lSXjJOhRkgS87lAONfHG4Gs94V +J76bxgCynfowoLtLKVdufcckHkNjN4SLCVDRGHpnoDJEuHdJsLmcHccq2zGTu1u8 +l4Aqy/TDe3cf7a2MfUTHgt6NuDVq1y6XtzOGu5JqiQEiBBABAgAMBQJChxcLBQMA +EnUAAAoJEJcQuJvKV618OiwIAMLXEzKqiyIDshmV2oh+X2wkPnQUB8dMDFQdywXi +1Rd0oa+SQ6Huca0snieNKmRYzoLxWtEomto9GU8yN6bybt7G4xAHF0gSdixJPPnY +OBPccWgkQRmMMIWNNyU5MHJ9dH0me4w9srbym5MeLtpkL6FiHhPW+RsDmZBT1iZ1 +xnjjDEg70pMQp+cFzR62GPj0CWAPQZlFZZ5JPIW4FiihYptjnbqzQer9w6Dg2Vzm +LxMSDSF2lNOTD/mVOe3Mn44GhsbXiH6Jbd5MA5DRoXqykCoQZe7AbtRTNiT7VOs8 +FDdvr2sP009P56SOcVyrpiE6nbPG/5lUChxpWxM6yDdCApyJASIEEAECAAwFAkKJ +vcwFAwASdQAACgkQlxC4m8pXrXyslgf/Xs5cdfavyNRntmwAnlWS7zTXaxoPy5Lg +wAKdS8CMjA0Kq/uVH9PJKZ/juUn1C2oecU0yFrMh05AbscK/qNuCfFimI5vtKJbP +spDA9GLEnS/JYbOdnL11BuncnrYvpu/aOJI5ypZISeBY5yN+962SM3aXSiaaPyQB +CEOmTZrg0XxyZwLUBZh/6qJVmwUm0/eP5uWsi9Whh1VBdOmSg+4MZdFfddbCuwXH +HN/OvSgTyCVdSIGDavIdt0HmWjcsTKh3zECXMRXP+AW1cv5WLHTCxihjJjgsTGs/ +387oj9BUtPFQ5JtYq0zr6fCbYh8XDmg5x7i0va6qx+sNV0mSXB9jP4kBIgQQAQIA +DAUCQpzcjAUDABJ1AAAKCRCXELibyletfAkpB/4z3GmQK5MJh0uE3h/dzWgRzEGI +XbfS+Hhx/rdY5pMoUqZ3OMH9P0m3+/owjFpQGpN8lcACEGPnjC9paS2Yslggq9Ih +/gBPY7L+LWsIKuCIhFLg+ZXrGMAmU2CsNZSOdC7WykUu+ic/QHmmjg0KgjLMEcxr +81Rpgs8xgwlry2u0qd/1j/qib83Pa3JcAe85UttMnMjrqXnjdo2e+3rUydjwuFkw +v11OYPTsoJNujAXyPMqbx9TkWAKAGuCfKEqMXBXzwNullPSYwUvPSJ/YgoaUaG8o +BC8fkrGfUbk32m901XDO1Ik6+Yrcz6YBkLNmSTqNewk80VCSkpnOfSitzQ7EiQEi +BBABAgAMBQJCtz9hBQMAEnUAAAoJEJcQuJvKV618KzsH/RQSvI5eKE6jBmRzdkk+ +6G2WzMhM6IdK/pG7pSlwn0Y08SB5PFOanIDzk0c03KDpRR4kziHkPqYU1R4YKz9+ +81gWdBczJ4ZWkNFnh0r7m/gyjVr1ilcfVz8jbUocIl8t+qgYXVv1TS+g8HYXYhDl +sLcga5wWIB0u6jXiu8BO4AS0wO4w3xF0zlxdwsYbBRQGLBv/bGug9llnl870/qz6 +YuOb9JSft+gBJGTpP9zdhyV1tWe8iGE3b8O2AZqxREFbBBwVw3jXS5iiq+V6euN2 +ZdlZWE9KOeKpnAcH58tJWfLwrYNlyqAlGbsfDMmyiNjLrkELXRa1oChZJtko+AHs +lKiJASIEEAECAAwFAkLRAqIFAwASdQAACgkQlxC4m8pXrXwoHgf/cuR4O30Rkkzw +DsZwHmjVgBPM9jItU+ysYu71nqNvT+bHWL5V6waYQdFpZ/NtAhS7ST8DnEq2jYeI +kDPK2HoD/zbsmVkTe9EYYImL6LZAVRXEg0kV4lELL0Na555FX9oKlcZp4mU4ZDWm +pOHY7wx59+sHog6nqRNHmnC3J3/SHdSLHHpa+JDmqTAMBnrDKWAjr7whKwuaBT+P +I2jhUVyyHSZCcSKTbuyVVnLF4PVxVGeMm0HYGAHKb+lReIcTl4xdieN9ibDhsBtI +w/e2usZVw0L0fNEk16O6hFmJ8kHXq185KvdkJ1ci5BAFm76+QoU5KJ135pqQYygf +AtpHDoAumokBIgQQAQIADAUCQtGnsAUDABJ1AAAKCRCXELibyletfGA8B/4/OjXf +nx3WkOO+77uDY8hByFAzMlfIo2au1kvT8ftaLh/gHEc+xD4f+nPvUFxh4kCSFSgp +7hEvpe5g/QJ94SxfFQ6u2FO/jIq4QhaIDot1S00qifEc+TtrjyP+JLu09HjnBj+j +eWTiM2Qn+Qs/gGFU8WeB/NCXNXY12d+5Kr90JhrM7wxN1MzXoCmjv74vZD41d99J +CyJW/qC5/FEkeyLlpw/dKGxLh7+xc5qFspUwJS71WZyRMWSNZ559Hw6gK8na3eXL +14cbYu7zLK2NniBjIaLtephJ/zcxcm8HGMcMw3/078wq68ecUYqQ9awmxCYce0+H +WQI0j6QTzj70DxFKiQEiBBABAgAMBQJC43H9BQMAEnUAAAoJEJcQuJvKV618pK0H +/iyoHUthNwWNFjBo76XFvflXtF0ONj3d38ltbhtDMz6SaelrenZTAGQhkzL3jsDR ++4uP8Pz/A1W98EHD0kG9Qpcfru+8fbFyT/xF/dA2H4nmLAwspmwcN2iO0FIRfaZ+ +21mpTft6NsyBjkjgSnM74wqBbojFJlPEDF9TuJrTiZaVfEFcEU6d9ysDpLf0id3X +ZQljWHq3bLEonLULHoxRgg2cp5IXKEZljA+GH6g4mgOpY/Dm7cfoQYKvybZze+qK +lpDgFhoXr7QDbpT+Dv5+qsDknVbHF4E6wchND3ozNQDLpegGdCoY00zfVSxO5paT +8ByB4wEr/XKtEPHw4rIz9AeJASIEEAECAAwFAkLsr1UFAwASdQAACgkQlxC4m8pX +rXxPwwgAw14l3KqebXRhoBs9Z6gx8zTcrTcK/yRp6ZK2kNkIKTHVTO95m9u2Sfyr +mVyyQR1757pxtjq2SGUFwc+Zczi/r+g0zWcSx1NLgB92Ob2jWxmrJ4TyhnW1+aO7 +7f+PtT4CvGGf5z2Xn6qyG5nUZLmNaKPmCQepjct3S4jTPpJPoFTP7+gjvV106c1H +c1877XfqkafjCmld45McBATjTd7pZL9fy361jUavHyflaXBVmBba2Ru9UYbS9w46 +ZAKJWcHegbEBYLqM09+YiPm2CUuVkH4yI2ZvJSQKJJlhW28fQ4zcVCZQAWwgFIXZ +UaHqXphollew7atSNLgUH89bekxoIIkBIgQQAQIADAUCQu1WKAUDABJ1AAAKCRCX +ELibyletfHjUCAC0DF7h35OGXHrOipBKfZdZEUWmkamwl593Paujhy4Cpde4sfnG +aJwKA6E9JPD2r2wc6iY4cINaCaiGsgghRsbP5KRvTKE9eynSH/xlfa02JvOtDxpq +QTA9Lz/BDBLp5p3y2BrX8rWBSS3H0ExJykdIam4joxVbUGTqIiVQOzcJEo1EOShQ +BnKIb1RzoldC69rIfjU34wPZTQMJWd0ikhg1Qj5TrI7zgEuO8DUVHSkhnkOaFOR2 +/3QhRrYXYO8HZDAVlOBLNIbBaWnRXAHpGP4YDPUcwtO2b8WgJ6X5k8EEZxaqE44n +54FQmL4GJe0NMY378EO9eN9RX8NbH5NMUdnxiQEiBBABAgAMBQJHxYMzBQMAEnUA +AAoJEJcQuJvKV618PIwH/iS1xBT1k91n4dkcshsBSeunzlZjYAHASeP8o8V1fBi7 +kZGEwlcOgy347u3x8zVhGto/Ca9KyZ4QduGZN73Ayx1vKQo00pZ9avFmXrPh25mA +vTtwgQLF1SBYbViNyoNi4yEuB2Ck8Eaq4jlrMkQ0QdNnui7OqvUGvytReqN8UXIU +eSIlSpoRbJ6Wl0VDrd3DtrL6czU80XUc5tPC/J4Z7uPDZpVlUJsHSRucBdj9bXCa +Z63UPU75fqm/WgBso0cvRyd6/xtvEWchuZ6q9wbR6MVwcgqVnKLvrDkyzTOJla6T +TmszeWGJ9nwS3BZxTWsSGCYSFJ8QlbPB5v4XN+qL7aSJASIEEAECAAwFAkfx7GkF +AwASdQAACgkQlxC4m8pXrXzTLAgAqpD2xhJ0DSa/952Bg9E6lCgPQ2QdITkIweGx +Mlvw270F1WCWX9WnWfUAoXpdg8s/jEUsGxvKsu5E3A2V7G+/0LaO9EwLavC9lzuh +xtbyk2lh6rfPT2pXNri7L5y6PVXFYcZqVNTEsNtCvxrJpSeSPnL+HZj4t6a2z4yk +w0f+c9iXCI0tInAA72D33zlRKL5WNqC9ro4boHqxfLSHEL9VEdoSMtL0gLQ9jh+3 +jqXcxEWuJru+KWpf0sGSFGp9I3M6SAwdO0rdOKHNE+6HuNH8h4DtdlMotEm+BsDo +46nQQtHi1DtPNTHgTGzqFIY3FCp3bDX6dS8CVmfoRvnGD/YIb4kBIgQQAQIADAUC +SAO2ngUDABJ1AAAKCRCXELibyletfNu7B/0XUorsm7gZeCTzBfDkNLoLjkGpMCFz +FyCLRyLyC/aeUPvxzIPix1gCvNz+qfUl4JcOxMh78ib7NpBwMC4m/D+OGxsKPmA4 +7pY9UJQeSj08z+4YK5Wbsz3sqLe//hMQEIkVveCF3ENvrvoScmPllh0KHeiUCwkP +TKUuMGFazPHqtA+0yz1lOVo19eC44WKH+oakb6AT2kkVrAsgVCw9olhftAE0jYlG +q9OJAix3e8chqe2/bATB8EsSZl3h/SjrqU2LmE7yBoYx6rBdMX9Z4hO00wvDZ8bA +bns4sfNhdIp761chOH9ACIWMo08JMIELsyly9ToqWOwxO4GRVn3bvHqRiQEiBBAB +AgAMBQJIJ0/pBQMAEnUAAAoJEJcQuJvKV618GqgH/0XLCOqmXyh3vgfAzh+ETTTv +M+xyiBS9WD6wVoCbpa7SoPHE8ydQ+9oWZ4vPPs4ePCDOAUdD3RiAghK2K5JqrNqV +9CMzaKR7PT9YFTnrrwru8YWVyHY8W4TlfxijDtM7/fh9mXHGdgr6XmkprmBy1YQE +PGV9faSqjUjgAmajWMrWnB/oopnOXyEp3isLMYFlznxFhJEyJqhbBO3M5cwLTa7k ++FCQ/SN5hzh8euYkgJvV/DSxZ/bMB6t4P8SN48OH13klomuUFKC7vUkLVPcbz+3e +c2ahxnewZQqyF1NJ6ogWElWbsIT78HsGJ+WvStRkVvPsyUWoKrhT9o2a0A6tcByJ +ASIEEAECAAwFAkg5HmYFAwASdQAACgkQlxC4m8pXrXz2Xwf/YB853LdW3c3WyMno +LU7rfwhTmiKeP3IC2d7AaNNaVQjIAeBPNzYomBJ655woKW3ZFM5vc0GiAHwj2+cY +d0IBlBrbcF0BLxf2qcuPabpJEaMOpDasNKr62E69gsZT1lb6AWPzVcoKi3cspoSF +vbx+6T4V1gCqjAw79HBKo4eTgFaiH7NENyrKSXKzMGmUvW1ZqUSmXaftzp6a3Al6 +fIeRvBT3bO1NiLR56LbQDwOqszzirYOlM+CanUhv1RrMgEXCrFqdz7ZwfDmB7R46 +d5P40bFVUcAwWmtXl5UUuiB++osmgfGEaxx9JUMLLJ7LrmBWj+T0vMj6OQ4worPR +MsaqIIkBIgQQAQIADAUCSErgVwUDABJ1AAAKCRCXELibyletfDutB/9InRadbq7A +J+f9o2ffbrbl2eLyvuYauzIR9QqJ5en3zfErHQYGADrBSt3+Psjq0xCKX0CjXog9 +SVc8miwdO1WNQ/xKZTSIpdsmFtAXfr+FgOEFT/CQHr+d60oQ2uj/QnS2aAf6o4m2 +6Obi5RwSbAt+BtOWWsV2OQW5fyZLAM6u40LmevB6rBj0XNR8VebHwtoN4YzF5hLO +7Sx7YrfDWttO/+34ecx8vbrp56hFqbeIhFGv00LAz79PiuBpfrdEJDsirkKopONJ +USDJUJvdTo778tA9kbLBhLGztj70L2bMJpbAreCQlX3sdOy7HjIJtfKgduML7Ilw +0kUEI8HOjqH9iQEiBBABAgAMBQJIXAy1BQMAEnUAAAoJEJcQuJvKV618vA8IAMAf +jX7b9kSkuxJbABiqdI8wBb3eCJOLCyBf8T4kgA2q8lCsUVeke1m+3VF/HUsVUJPi +7HmAQ+Pc9WQ9kolRQmQv4Xie86aXy1XttjMoNdCP7zIbNZKAgoAljSezgB/hHQFo +ET/M9WadcVK5yZVzPEmQat2BilxC56V/muT1/EYcuz6GsjMqhCPAp+fCxZsM1TFB +I4wWFqT+Xbrq3AhpnrFdgwgQ8vVriFDolQaI/hyLpmpb5kAAfi7vg0xRgrS+GDaN +W6jPHn1zYoCcPD6EqsOOj3/j4+J3auvJN/Bi3hHZOAuSPdNrXHWE29WSaE2y1h53 +hmRRI9sf8eQY4bEe4EaJASIEEAECAAwFAkhnorEFAwASdQAACgkQlxC4m8pXrXwg ++wgAnLwmXQpfHDzKmiBvL2E8sj76WZoHUFaeHzyZbPojzpfCW9grkLfIEDrQjwgi +Pxk5LLHckIT7F0XvDJfLFhTzhHdYuoRnm5O4POPknpwpoTc6eEv/DROKGKKFoOik +FUZwhxDiKZOzTdp0NHqx6/S7tEEPxOZcLGT7vHxuvXe9DejWcDcTUypxyBdcQIXR +e/esdYPE/5SZZJdvKb634LKQrbdzB+yWsK3PeKWW2wNy7O6knYeC6/luG+7TYFGN +z3sR9HOmql8BFleCU05SBy1zNv7xAGEXLiU22H1JBaxp2MQgRwewmG1pvh02OBSG +GfapALntdp4MegAxjKEdC2N7/4kBIgQQAQIADAUCSJRwygUDABJ1AAAKCRCXELib +yletfF9aB/4kLbGCpSlQR9cM4meEeqyhygvsh055MX3uQw45yXxRCkIP1Ab2AGXO +bA7INJLTKxwW2Cz2Bs/P4wEYoTWnJ5M/uG4FbiPUQNiXXGxJaID01WbvDrgZuZ4H +vrUWMQKIvwr2DQYi+lRakArtCkpKifVGt0vQLB2b+mQK4sg8DegEGsDbEttB2wLP +o1NOEg7ttLGYTpTTqPYKSIg7oPZ/3/GaZs4g9tNbUEnvFuMtku3EOuGkw2AOAVmI +YxO23frnO+7i1p3gtY8YpvfB27bekiEprIT7Mvcia6NUUHa9vLdS33l976cXrYQ+ +vulBQDUpVPQm3ZTo5DwrtZJm2D4R3ig/iQEiBBABAgAMBQJIozdrBQMAEnUAAAoJ +EJcQuJvKV618EmoIAL35yrzcTjNQq+wkBdYir0QqyHz6jIVeTy6Es3nxcejhXbJK +rnoF2PFUEvk4d9e8fI+O9CjOYUGGiKiXfajEMEuPbsQSLxRU4xMu7UZ2glaALAa4 +A9uln1Mwia556Gt/q24OZ+OcYBhnyvMhHFPsm7OGQ0uBWlx01Ow83dYJWxULW2LO +kSZr+8rwVsCCXHY0jfMCT0thDPFIWU/ZR55oXy/lLSZ6NEYfX5h5WyeONOymMgHS +yDwhdozVsPoN7LlvdJ8OUYgE64G/Em2v40pX5VWnnR1Gt0qDeIyl2MzCY9k6h7mn +3AdQwOaBvsunOJGlSnV6v7j/JoA9JelhanJf5ieJAZwEEAEDAAYFAj9Lf0MACgkQ +K9BVKpsB48Auqwv+KkDvNTRFvKa/WU8PZQ6B57l/GislQA9g6Wv07mcpZWtW02YY +QN0gXfcoGY4TqPip0uxMmtReMZJDZYpE5SGAEkLNmpY1Intn2eY9cDnFqzcCCaCv +YpwNBhD9TBkoievCivLpjlzQsmx2z2fonEiOhHtpNpiOhcPPKLK+INsmio0ABekW +oi8nmhDePNB7m3acm6gRTOqZG4oAnrINzwwafrcYBmes39dU9Op1UZPYOkwugdrH +o/Rv3J9MTw0DSgSSjYv1tjJEejxsmj95qe8JAzhQmU/wIUuW3ICcOmiSyq7V4QFk +WIhACtUcd8KSvC0AcQKuYR/lAXSYN59vvJNTAVnnLnGCqfZ02EYRC+fmD6phugoR +6SM7hYZX/4Cdbiof+O/8rrXXHgdGFL6vWzikoBVdBueEUtjTEZX4V4oDv7k+hOyM +qtghwftRfgbwsYyNUthmudGTNobO+/Z7Qhn9BnX8G/GJC6hlNQVA2NEdKSeaH/fJ +ouuBAJzbcWxZ2OByiQIcBBABAgAGBQI7vtqdAAoJEKEASX4BtFziFMUQAJYgHofb +3baHCzuKXwzqO9mhP32aTSvwpF0orTrR4YhGNLdu1b74rFOwFD3CvIbL9nxZWHcQ +bwf5qG3PBu6S3DIxU53NWprB/c+l7HUEBnDVWOnJQKkwvpDmRVqaCA5Jn+QqXcfs +UNJENosHTdMlkwSiKWEPPFx0HXD5LJbo+lm9XP2HeKu4ENsOBy2BQcl1TMu7ApBD +xSucGxEBz3kUFcJCOr/dAzHQg/pPd6M3C387etBSSG0h+zKTAdRxlotDiohDD686 +hY/A9iDUb/KBefh6ymHtIQqSz6Tb3qhkYMzG319b2igKbH/rjV1cvfwB2HSDECJw +cRKarECmMJt19nshGMpC56YGBjzqmS1FzBedGT7naINkZuRHNS6YTllQ0OYTHpYh +IxQt0CiHWxz0iOQNbg8HtQryp+h+PDK89Ykq9fBxxgpzW+EN4e3fPOKP1bbJE8gm +WaL/uIn5OHGoAtm9+KN35+YlZQoM1KrZp8pG3x/UMVXssp2KZA0euSFEjDHmGIFJ +9OzFJadswd5dYIzFkP+4byWIbipaRD5rMMYqY0ecLTaOmesA4uisoFpluAcwrHOB +G1ig14zqCeZD28ZYaxQinmac0fHjgKGBvdQF8QGNIywOS5VTJ+V06MnPexFLEAU3 +ccqkB18MNrc0MbobVc0niBxZON3QEXCoCYBOiQIcBBABAgAGBQI8Kxh7AAoJELEm +yajfoR0VLmcP/3faYEuha7qlozIVza0w4twysEBzfA9TbOGicL5Sp7+JeMEAqj6Q +4AiI5NnVt95k5cBzj4uoHjhVzJYwcSNouUFFUBOAJtGhm7DPkOrZ2Jw5WK8VG5WD +8fKIjI6ssIAqj3DE23a7yMBij/S0LE3wN2rXg9E4+DwEix0mj1M4YAMw7AvAYxKH +TGWYUP0jP2VojvuJ6Joxj6xMwY4iT3esL5UqPImihnmHI7HiRIWLus0o6HzkmNmG +RpwIN4qis2rak+L+Psw70RCo+EzcwIeUM0zQlxVZivfOtOxVG14ZkrF1GBit99K3 +KjFRCpTecQ+OKW6uLO8iFeILiVwdGejuYmRwPFAHwAkxdYkWR9BVV3ui6BBTz97N +rG+f8Rj07yHW+7x07ocr3cYSqmbFpEXGNBKURH1r8L7wYH5TTowPl32qiJ7jOblF +d2IIEl8N5PbCoK4UNG2ODud8O/DMVtxKFGyY4+JJnG7pHt6y1NQT16LQZXzqWI3y +dG4tfTTfRTUdWq4LnhstDU4fmUGbAjAo4gZ/hI+Toj9/inpkjQ4vs7CMlTvrcLnc +HSzFW3poqBFdL+EJcX0DZUJS6wEzreg+CLWSE2HDhXrCUzG1K4LM9QQWm6jH1pax +95tNpN5mOFURygUr0ZTNbmiAmlLjDkJMEW0isXQOrcymLTZIpbKC/EGmiQIcBBAB +AgAGBQJAG/hRAAoJECNCZCZrkyM/C/EP/iMjzTC+KVYe+t95ky70EFfNaS6qRTfa +v9y4Ct7m2eYxyZ2JVhEeMoE1Y/ZfPG1WWcD+olSxrUbiTMxVb8RdlvPzK4tWLRj+ +UECpIoIYpMN0QoObr8iX8VnVrMmgg2+WeGI45q3hwrtqdfboe8FkRswZbOaIVeX9 +ZaH8f4z+VLkQRE3JorgS978osYv7SoJDUoDn0mWOTLJ491iJO3QLa0BZ47ZThNFx +WkOtGEDXTp/YXMABvt/QyNUMWnc27Gel56MJp9okB3V2NfoiYhAqaOsLUtSS64tt +SlRJ1qfyFPu8vnJt35KurJB1B8KpQv7YhGRT3LeX0vuHbRT6+0qu/hwIljcbBmgV +AiJiTevIRT1NiY1JtLfWgj793buxHM23wis2QTs/lPfbm8ecvGta972Zb9INxTzQ +7Fn3EIpCcyaWhOvVrvt9ArrJbRhQxoKIkQy/tSi0vMzwk9px3VtiDcwwi5ckr/A7 +4GgC+rVf4N7sSGf3YPAaGkFlJWGIvRAtZ+JZ1iKJFHULIL5GAYhvLX6r+YHQIH1I +nNbv+MNMvcFWfQkHo07TRvSTMmB0zRH75LxMooLe186VifIYRM/oNtjHGK2WPv8e +BBYOQRV5nNXL0oNU5ZRfVAbHbzTJyqa3Je6ZDyIusDDzxuRwA6oC2vG3kiRvfgN4 +jr2xk6mNGLODiQIcBBABAgAGBQJCurz8AAoJEOmwllNIRzQ2QDkP/RV2IANoYTCA +W0k4WnpwvmLYF0EByr5o/OxifT9ns/AT6wyJ4cAIkyWalRhSljuXLzgqpZnxgSwW +morsZeG3TIzI8VkNoBRTdCNqwM9sQ7ZegXCY0b2tqFPOqbfRsYBKnacCRXLS1wn5 +qNbG3weRiB3H8vdSn+pT56y8gjHnUtLess8wpjJv1OcrTT7vmduwd0dY13AR6D0O +JpCXY3J7AawLLxOe4YMjvG2d17+Nd2Q7bP3qk18gLwxjpWW9nz8Xc0oADpzdIx3X +RxQR36/CixTAg8JKumuO2UWvnnMp4GiiiSmTm4OU3ncDby8K0unYsRQmaI5l+7uw +IpNbYCDyQ6nv1SKa6U81wIFfkZr3F6bYFIvo961tEmojcVP1cuXvsCPLhK3HA9cb +5NartFG1GtKDN6lNF1KCeW7LlrSfCmVmH2SgbiqMI4aidq/hgtZj3E3w1rt90Us3 +T6EirdqTGSwOucQDkUNAHEwpkT7Zn47LXBebSPFFKWPnG9M14UIQBl/FOvkyN4Rz +i11D6cnqFxIjdAUumQA9bBX3/MBQNwULFyivbjpTg4nl4XL6orabWf9z6caq2caH +CCIcSJ0xx1F/VJj1ylXDbL/KvG4UGesDqAvsTUeR36rVkoGk04wtF6G5ksNn2yZ7 +MLTnn3Obzeb+Za77frT1i7ClHecMStp2iQIcBBABAgAGBQJDvA5hAAoJEP9K37xX +Yl36pc0P/2atXTHCzn13hTiD3b23hU8DoonEn4hlcbj4TLwwYC4YQAVgf95FLfRg +NThivFzwXV2VT8vTRKbN1vuxcAi+nv3wjHo3orHHQPjkSdN4dBJxZlP/i7Gq2Zj6 +8XWuUhJnY7IqcJf2droh9nu7rpT88ZZLLKidCG3e64J9GRaWK7d0qfDJdsdeHrwc +VcwQ3C+IkoISpl6i/08mBYDbZlXuFwO/zYCQMdYHVmP75T28Ybfbbv4POJT2YevM +/7vytb97pqlMdxT5EIaNox+952elBMhv4UWy5lgOn4qK54Pe+V0YlNzZE+FKaeDA +fCWSD+y47gWdjWPAlqhbEQ8hGLVtClnWk+6Q8Z9mvwun/wptqz6eXeVWTX1vtpBh +K4a0f/1n5w6IfCMD0FWeA3Vl/RUOsL3EGH1e0LVQU//61t6ZB6Ezj1Yh5YelMX8P +qI1R/HfAY5edBS9Hu3KiPpqjlLl6D38ADHqgd8yaXQ8e1YDYRcd6Ywm5FigFXNXE +MYcf1e+ByiWYQYdviUDEpCVp/hAEelBL79Q2SDaBbEQNYkHclugFsVqFcizRYq9O +1BGy7HMgv2WRjaAdRfR8QRFbhMq1Z8llf+m0qXz72WB7C0JyGufmlDcnfgDLsCGZ +jPXH1GEj9TyLAFI7+dwAu6Ih219ocWKiWjmK7Cnuwll3/8+uM2zviQIfBDABAgAJ +BQJF5uymAh0AAAoJEP9K37xXYl36N+wP+gPnItYa3iYi5GVpIRTh6HrBc+f/NIZg ++xyA3zWSi9/nS0kTBK2bLkmK3X2xD0TtnEQ+boS9o3bOF3YWAsM+mprS9/DD4rxc +FbeWZpwSjv/5x5xXKUI2wcUBC2Lzd4C81oLjeDmLODKSoqLHLPVsjXj2ko1jibwW +bPu8YJRgLh6yMku7YtDvZfW3JXRioK64scmOHp3xj6rRhiZUmHqj9njaNbEwPdTa +9Sh7cd+yCf9UEZduW7M9Xo4Gl3HjflyizF/c0wZbN5cvMkF4Gx5X/MBmVQVpz6td +4BjTdR/ZeISYrpSPGpFf2nZOvT87DnZU70UzSXcFMiBVLz3FtL1de6QrnU9AF92X +pj7BxqA3nkDIHDYTz/W0o6I3Oe2rRIlHDqCumQ/NhBjywY7XrNfNw60uABInMx5h +IwuLg55blU9h/ONQgehxhwL7MVtNJUg0ZmUM/ePmUmnntdeNvqfEGSXqFqXptDBS +JZG2hUC/pNt3H0U7731VYBPuF01NeP04Awu5TSkXX/CASiZFgRWt2j5+yQQu4Sqk +OkYKHzm8x7fEagX7w9Pfgti0ZKz6oFZmMspVlls+6XGoTTPo5QraAopvoxmr1lX2 +AMx4wYwZEo/F1EfZmXKKwaX/9XssE0PELlVkqzedHkaouWJTLyb9KnAIuD6rDFJ/ +jdsfhaqt1RYdiQIiBBABAgAMBQI/cU0eBQMAgTMAAAoJEIoML/M6I414R/UQAKZS +08kPvzW+ktIzm8Os2wMmmYqj27Bn6n14/Y0B39+7dSt4+KM5+4S8l6T7up5nMcDC +CAcCOkVCUz4pX/plQ5KuCYA4qkruzDz8d3fdJgelvrWFKPithvaDvZlL2J67sLET +fIBYCe7VXPIm73S0xPCDe98OfzORh1oNenawvtUFvTKZYsRfpQmOmRG9rGOMtWzl +4ejFIH3pVQpeiory9CW2U3DsWor4ZI+3iybj1Scuu3FxinHlBGxhGKW1UUnh6KYi +LOxevkmrDinve/3/PKmyeUE2n7eQ6QOznshBCglHW+emojSW3Kr1wKt+/YpSmxeI +dmED16Pe58DCBNs3s+BF8kJtPCZqCZGfyNbzwGc6etc61xfY0KOvNBMAtAPrSC6u +OTsYpY2QvSnbcKYNqKBdh+8umGvM0II0R2ALguy0cAkaxrivrquBqintyKmWjkh4 +lHL6fIDDiWiJPiQamSTfE+13wtpu5tvoyS71j1qdtNzObIsHRgxsoRk0Xn9o11Nh +Kx7THQDfFz3Y6Rx9kYOvQqwgFgutrvUsHM1DEePSGsQH4NYqLie1KyPNGIARM8o8 +aA4Ej7MHg9WGoTlqAw582LoM5yjYAIpGIR8KDTmMUDMDJSwhI2EnbgX7ZdPvim0y +SC0mC8qflNqH8SqXa89XSeJcgp6nRVOmqfQiljyDuQQNBDnir5wQEACNGZu3FqZx +n0RixBOdC9UvaXq9jlGdtzUkN1zIcRXWQfk7Blaq9yQvhCAooFtNDDIH2kKjScYr +g+QFuvAvSi618dDmOX0NTNMoi75qxZTJ/d/F9RXqPYDoEyjn0o2cnNTInb4Hmdro +03ycSoS2aiBE62NPwuQ69jCoPgD/mt7a/C2J76HnJToD4lvIZAXqUXFOFmPhYZy0 +GAJwMGpGQ8AbwMUUB143lIwACuS0Ji5QZeLarzwQOg6zdiTDSQHz5kUQLP/j9v3e +yjla3aELXlzEAmhcV9HeZcebjQQfMx0S5uVZXhuUHYq8WhxALvj8fvhA9SRxaVzo +SE+h0q9y459OKYPFdqIY0U41Q+A0CYJd5Wg5ql1alvfHuI4c/BJpd4lKs719zga1 +WMO/3QNPZ6Qrty9iTyzoHe3untbbVeL6FGCvDrcHccSWvTWB0xljlcDl7L9aafIF +Los7FeWdUET7a5JD5pkeqsuldxG+rZmic7OINITSL3jRm8jCVLOfRTkFBaX2EEND +DvxFpxipoW+WlwaI+PvltJwHh56bFXpZ2j2a0rRWuv71tZJxccS/t2J3hf7u0FYp +sDwz6Db3Q5LON5AEYu4+ZuPHMQof2NxS6bMHPMLnHkYWHs6f1MtdDgr+hFPpBClL +3ditNVtHrQbgwqx49YsmaDsiBhS010saOwADBQ//RoACrwKZa2i6uPVfE1ikWY4B +Tjl3rl89ZVp0rIX74H64PJE1g3sdAKqsnt12fSwfs4G2UTzJoFiBHRMWXL334upA +7ivggYLDZMGADm0qc5ag8YTO+st6jFHdKc+soGUO/HpGv2Hc4n1RXm780uGYI/2I +3XSBYIbOxZs41zqoPo+6BtO6vjgPqzgJEr3F+WJKu0bcYEdb3XhQqMl4H2x7ehzW +uSY2/f2Qpy7ffDhdURMCPiqlefCgm/Lrf11++dC3VNYWMi3bSI/ub6ORPcFvnbq4 +nka4mXqvyybk5hhGzlwuKC9TNFlWBieOOqVFEALHRZyKcornkuLY+ripxFW9ITlO +veRNRMbF2bLXXcVuxyuEuF6wYAu/cdvuN55YLyO+IYRoemmBS6ZHq/SGwjWtncry +QKMVEBhXw4q1wR4yqOi4CsaLl2fQKWYbiXAfhIR2oL9NE1YYb6JWlZ/nIKP2a+29 +SEu2XpCNccusl1IbJp++pHURAwlp0W3hRG/HQzu2pkhzA9Sdv7s5z4n3qmh78RCa +ebqsWdOlbPQFtjiZskLu9QfgnIuzSeXGIqsGNo70LUNIAoGmOpqBrx1B7VmQs4jY +XshYV4pXYtoyX5m+99YwQI1yo1bZ+QK4/0WnPkr7GDbVPCi9XL3dpYqAUvrTqMrn +WhCnd9bzrFcr1kYpipCITgQYEQIABgUCOeKvnAASCRDIa6BqUX0PDgdlR1BHAAEB +TPUAoIYZh2pc1n/AdwFa4z67a0RwNb5YAJ92EZVOZdFeVtYl7x10AlByBEqYJg== +=3KE9 +-----END PGP PUBLIC KEY BLOCK----- From vmiklos at frugalware.org Mon Jan 19 10:30:49 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jan 19 10:30:53 2009 Subject: [Frugalware-git] frugalware-current: xmonad-0.8.1-1-i686 Message-ID: <20090119093049.4BDCE153C003@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=47f1d092b148b79cec97f653ba244794f043fd51 commit 47f1d092b148b79cec97f653ba244794f043fd51 Author: Miklos Vajna Date: Mon Jan 19 10:27:24 2009 +0100 xmonad-0.8.1-1-i686 - version bump diff --git a/source/x11-extra/xmonad/FrugalBuild b/source/x11-extra/xmonad/FrugalBuild index b107695..31ff5eb 100644 --- a/source/x11-extra/xmonad/FrugalBuild +++ b/source/x11-extra/xmonad/FrugalBuild @@ -3,13 +3,13 @@ # Contributor: Rhyhann/Othmane Benkirane pkgname=xmonad -pkgver=0.8 -pkgrel=2 +pkgver=0.8.1 +pkgrel=1 pkgdesc="A lightweight X11 tiled window manager written in Haskell" groups=('x11-extra') archs=('i686' 'x86_64') depends=('ghc>=6.10.1' 'gmp' 'haskell-x11') -sha1sums=('26eb5e80ba83da43cec963435daec6b925e3b1a7') +sha1sums=('ea9ef82b6921131e356caf996aa97e977731dcb6') Finclude haskell url="http://xmonad.org/" From vmiklos at frugalware.org Mon Jan 19 10:30:49 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jan 19 10:30:54 2009 Subject: [Frugalware-git] frugalware-current: xmonad-contrib-0.8.1-1-i686 Message-ID: <20090119093049.645CF11B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=dcebe45a3cf09f21c9694676c8d71338fc65520d commit dcebe45a3cf09f21c9694676c8d71338fc65520d Author: Miklos Vajna Date: Mon Jan 19 10:28:58 2009 +0100 xmonad-contrib-0.8.1-1-i686 - version bump diff --git a/source/x11-extra/xmonad-contrib/FrugalBuild b/source/x11-extra/xmonad-contrib/FrugalBuild index 8b64b8c..eadb7d9 100644 --- a/source/x11-extra/xmonad-contrib/FrugalBuild +++ b/source/x11-extra/xmonad-contrib/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: Rhyhann/Othmane Benkirane pkgname=xmonad-contrib -pkgver=0.8 +pkgver=0.8.1 pkgrel=1 pkgdesc="Add-ons for xmonad" archs=('i686' 'x86_64') @@ -11,5 +11,5 @@ url="http://xmonad.org/" groups=('x11-extra') depends=('xmonad') makedepends=('ghc') -sha1sums=('cff987fb5b3343b87fb92b290bed18322b51aef9') +sha1sums=('47b57adb665b4898fcd714b942ed7fca4a8b90d6') Finclude haskell From vmiklos at frugalware.org Mon Jan 19 10:30:49 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jan 19 10:30:55 2009 Subject: [Frugalware-git] frugalware-current: ecm-6.2.1-1-i686 Message-ID: <20090119093049.86E5311B87AA@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=dd8d751c4136ff57d60f3da255a516d9e987ed58 commit dd8d751c4136ff57d60f3da255a516d9e987ed58 Author: Elentir Date: Sun Jan 18 19:55:59 2009 +0100 ecm-6.2.1-1-i686 * new package diff --git a/source/apps-extra/ecm/FrugalBuild b/source/apps-extra/ecm/FrugalBuild new file mode 100644 index 0000000..8cf9aba --- /dev/null +++ b/source/apps-extra/ecm/FrugalBuild @@ -0,0 +1,18 @@ +# Compiling Time: 0.11 SBU +# Maintainer: Miklos Vajna +# Contributor: Elentir + +pkgname=ecm +pkgver=6.2.1 +rel_id=4837 +pkgrel=1 +pkgdesc="Elliptic Curve Method for Integer Factorization" +url="http://ecm.gforge.inria.fr/" +source=("http://gforge.inria.fr/frs/download.php/$rel_id/$pkgname-$pkgver.tar.gz") +depends=('gmp') +groups=('apps-extra') +archs=('i686') +up2date="Flasttar http://gforge.inria.fr/frs/?group_id=135" +sha1sums=('bb08c4f1b412110ef64572c387baa5bc45ae8a60') + +# optimization OK From vmiklos at frugalware.org Mon Jan 19 10:37:20 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jan 19 10:37:23 2009 Subject: [Frugalware-git] kernel2628: kernel-2.6.28-1-x86_64 Message-ID: <20090119093720.CCAB211B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kernel2628.git;a=commitdiff;h=14b30ed8b077f23f38f25129567f1db420ef4a5d commit 14b30ed8b077f23f38f25129567f1db420ef4a5d Author: crazy Date: Sun Jan 18 23:17:12 2009 +0100 kernel-2.6.28-1-x86_64 * Version bump * updated x86_{32,64} configs for .28 * atl2 is in kernel now , added replaces() for it * backported 3ac52669c7a24b93663acfcab606d1065ed1accd from 2.6.29 * lots of other drivers enabled diff --git a/source/base/kernel/FrugalBuild b/source/base/kernel/FrugalBuild index d4caa4d..1125fce 100644 --- a/source/base/kernel/FrugalBuild +++ b/source/base/kernel/FrugalBuild @@ -1,5 +1,5 @@ # Compiling Time: 11.50 SBU # Maintainer: Miklos Vajna -_F_kernel_patches=(http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/patches/usb.current/usb-storage-unusual_devs.h-nokia-3109c-addition.patch) +_F_kernel_patches=(resources-skip-sanity-check-of-busy-resources.patch) Finclude kernel diff --git a/source/base/kernel/config.i686 b/source/base/kernel/config.i686 index daf8979..8e92bbf 100644 --- a/source/base/kernel/config.i686 +++ b/source/base/kernel/config.i686 @@ -1,14 +1,13 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.27.8 -# Fri Dec 12 12:27:51 2008 +# Linux kernel version: 2.6.28.1 +# Sun Jan 18 23:09:23 2009 # # CONFIG_64BIT is not set CONFIG_X86_32=y # CONFIG_X86_64 is not set CONFIG_X86=y CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig" -# CONFIG_GENERIC_LOCKBREAK is not set CONFIG_GENERIC_TIME=y CONFIG_GENERIC_CMOS_UPDATE=y CONFIG_CLOCKSOURCE_WATCHDOG=y @@ -24,16 +23,15 @@ CONFIG_GENERIC_ISA_DMA=y CONFIG_GENERIC_IOMAP=y CONFIG_GENERIC_BUG=y CONFIG_GENERIC_HWEIGHT=y -# CONFIG_GENERIC_GPIO is not set +CONFIG_GENERIC_GPIO=y CONFIG_ARCH_MAY_HAVE_PC_FDC=y # CONFIG_RWSEM_GENERIC_SPINLOCK is not set CONFIG_RWSEM_XCHGADD_ALGORITHM=y -# CONFIG_ARCH_HAS_ILOG2_U32 is not set -# CONFIG_ARCH_HAS_ILOG2_U64 is not set CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y CONFIG_GENERIC_CALIBRATE_DELAY=y # CONFIG_GENERIC_TIME_VSYSCALL is not set CONFIG_ARCH_HAS_CPU_RELAX=y +CONFIG_ARCH_HAS_DEFAULT_IDLE=y CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y CONFIG_HAVE_SETUP_PER_CPU_AREA=y # CONFIG_HAVE_CPUMASK_OF_CPU_MAP is not set @@ -42,12 +40,12 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y # CONFIG_ZONE_DMA32 is not set CONFIG_ARCH_POPULATES_NODE_MAP=y # CONFIG_AUDIT_ARCH is not set -CONFIG_ARCH_SUPPORTS_AOUT=y CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y CONFIG_GENERIC_HARDIRQS=y CONFIG_GENERIC_IRQ_PROBE=y CONFIG_GENERIC_PENDING_IRQ=y CONFIG_X86_SMP=y +CONFIG_USE_GENERIC_SMP_HELPERS=y CONFIG_X86_32_SMP=y CONFIG_X86_HT=y CONFIG_X86_BIOS_REBOOT=y @@ -81,15 +79,18 @@ CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=17 # CONFIG_CGROUPS is not set CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y -# CONFIG_GROUP_SCHED is not set -CONFIG_SYSFS_DEPRECATED=y -CONFIG_SYSFS_DEPRECATED_V2=y +CONFIG_GROUP_SCHED=y +CONFIG_FAIR_GROUP_SCHED=y +CONFIG_RT_GROUP_SCHED=y +CONFIG_USER_SCHED=y +# CONFIG_CGROUP_SCHED is not set +# CONFIG_SYSFS_DEPRECATED_V2 is not set CONFIG_RELAY=y CONFIG_NAMESPACES=y CONFIG_UTS_NS=y CONFIG_IPC_NS=y -# CONFIG_USER_NS is not set -# CONFIG_PID_NS is not set +CONFIG_USER_NS=y +CONFIG_PID_NS=y CONFIG_BLK_DEV_INITRD=y CONFIG_INITRAMFS_SOURCE="" CONFIG_CC_OPTIMIZE_FOR_SIZE=y @@ -114,7 +115,9 @@ CONFIG_SIGNALFD=y CONFIG_TIMERFD=y CONFIG_EVENTFD=y CONFIG_SHMEM=y +CONFIG_AIO=y CONFIG_VM_EVENT_COUNTERS=y +CONFIG_PCI_QUIRKS=y CONFIG_SLUB_DEBUG=y # CONFIG_SLAB is not set CONFIG_SLUB=y @@ -122,17 +125,14 @@ CONFIG_SLUB=y CONFIG_PROFILING=y # CONFIG_MARKERS is not set CONFIG_OPROFILE=m +CONFIG_OPROFILE_IBS=y CONFIG_HAVE_OPROFILE=y # CONFIG_KPROBES is not set CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y CONFIG_HAVE_IOREMAP_PROT=y CONFIG_HAVE_KPROBES=y CONFIG_HAVE_KRETPROBES=y -# CONFIG_HAVE_ARCH_TRACEHOOK is not set -# CONFIG_HAVE_DMA_ATTRS is not set -CONFIG_USE_GENERIC_SMP_HELPERS=y -# CONFIG_HAVE_CLK is not set -CONFIG_PROC_PAGE_MONITOR=y +CONFIG_HAVE_ARCH_TRACEHOOK=y CONFIG_HAVE_GENERIC_DMA_COHERENT=y CONFIG_SLABINFO=y CONFIG_RT_MUTEXES=y @@ -143,7 +143,7 @@ CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y # CONFIG_MODULE_FORCE_UNLOAD is not set CONFIG_MODVERSIONS=y -# CONFIG_MODULE_SRCVERSION_ALL is not set +CONFIG_MODULE_SRCVERSION_ALL=y CONFIG_KMOD=y CONFIG_STOP_MACHINE=y CONFIG_BLOCK=y @@ -165,8 +165,8 @@ CONFIG_IOSCHED_CFQ=y CONFIG_DEFAULT_CFQ=y # CONFIG_DEFAULT_NOOP is not set CONFIG_DEFAULT_IOSCHED="cfq" -CONFIG_PREEMPT_NOTIFIERS=y # CONFIG_CLASSIC_RCU is not set +CONFIG_FREEZER=y # # Processor type and features @@ -183,10 +183,17 @@ CONFIG_X86_PC=y # CONFIG_X86_VOYAGER is not set # CONFIG_X86_GENERICARCH is not set # CONFIG_X86_VSMP is not set -# CONFIG_X86_VISWS is not set -# CONFIG_X86_RDC321X is not set +CONFIG_X86_VISWS=y +CONFIG_X86_RDC321X=y CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y -# CONFIG_PARAVIRT_GUEST is not set +CONFIG_PARAVIRT_GUEST=y +# CONFIG_VMI is not set +CONFIG_KVM_CLOCK=y +CONFIG_KVM_GUEST=y +CONFIG_LGUEST_GUEST=y +CONFIG_PARAVIRT=y +CONFIG_PARAVIRT_CLOCK=y +# CONFIG_PARAVIRT_DEBUG is not set CONFIG_MEMTEST=y # CONFIG_M386 is not set # CONFIG_M486 is not set @@ -204,7 +211,6 @@ CONFIG_M686=y # CONFIG_MCRUSOE is not set # CONFIG_MEFFICEON is not set # CONFIG_MWINCHIPC6 is not set -# CONFIG_MWINCHIP2 is not set # CONFIG_MWINCHIP3D is not set # CONFIG_MGEODEGX1 is not set # CONFIG_MGEODE_LX is not set @@ -230,11 +236,18 @@ CONFIG_X86_TSC=y CONFIG_X86_CMOV=y CONFIG_X86_MINIMUM_CPU_FAMILY=4 CONFIG_X86_DEBUGCTLMSR=y +CONFIG_CPU_SUP_INTEL=y +CONFIG_CPU_SUP_CYRIX_32=y +CONFIG_CPU_SUP_AMD=y +CONFIG_CPU_SUP_CENTAUR_32=y +CONFIG_CPU_SUP_TRANSMETA_32=y +CONFIG_CPU_SUP_UMC_32=y +# CONFIG_X86_DS is not set CONFIG_HPET_TIMER=y CONFIG_HPET_EMULATE_RTC=y CONFIG_DMI=y # CONFIG_IOMMU_HELPER is not set -CONFIG_NR_CPUS=8 +CONFIG_NR_CPUS=16 CONFIG_SCHED_SMT=y CONFIG_SCHED_MC=y # CONFIG_PREEMPT_NONE is not set @@ -244,6 +257,7 @@ CONFIG_PREEMPT_RCU=y # CONFIG_RCU_TRACE is not set CONFIG_X86_LOCAL_APIC=y CONFIG_X86_IO_APIC=y +CONFIG_X86_VISWS_APIC=y CONFIG_X86_MCE=y CONFIG_X86_MCE_NONFATAL=m CONFIG_X86_MCE_P4THERMAL=y @@ -252,6 +266,8 @@ CONFIG_TOSHIBA=m CONFIG_I8K=m CONFIG_X86_REBOOTFIXUPS=y CONFIG_MICROCODE=m +CONFIG_MICROCODE_INTEL=y +CONFIG_MICROCODE_AMD=y CONFIG_MICROCODE_OLD_INTERFACE=y CONFIG_X86_MSR=m CONFIG_X86_CPUID=m @@ -260,6 +276,7 @@ CONFIG_HIGHMEM4G=y # CONFIG_HIGHMEM64G is not set CONFIG_PAGE_OFFSET=0xC0000000 CONFIG_HIGHMEM=y +# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set CONFIG_ARCH_FLATMEM_ENABLE=y CONFIG_ARCH_SPARSEMEM_ENABLE=y CONFIG_ARCH_SELECT_MEMORY_MODEL=y @@ -270,22 +287,25 @@ CONFIG_FLATMEM_MANUAL=y CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y CONFIG_SPARSEMEM_STATIC=y -# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_SPLIT_PTLOCK_CPUS=4 -# CONFIG_RESOURCES_64BIT is not set +CONFIG_RESOURCES_64BIT=y +# CONFIG_PHYS_ADDR_T_64BIT is not set CONFIG_ZONE_DMA_FLAG=1 CONFIG_BOUNCE=y CONFIG_VIRT_TO_BUS=y -CONFIG_MMU_NOTIFIER=y +CONFIG_UNEVICTABLE_LRU=y # CONFIG_HIGHPTE is not set +CONFIG_X86_CHECK_BIOS_CORRUPTION=y +CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y CONFIG_X86_RESERVE_LOW_64K=y # CONFIG_MATH_EMULATION is not set CONFIG_MTRR=y -# CONFIG_MTRR_SANITIZER is not set +CONFIG_MTRR_SANITIZER=y +CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0 +CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 CONFIG_X86_PAT=y # CONFIG_EFI is not set -# CONFIG_IRQBALANCE is not set CONFIG_SECCOMP=y # CONFIG_HZ_100 is not set # CONFIG_HZ_250 is not set @@ -301,10 +321,11 @@ CONFIG_PHYSICAL_START=0x100000 CONFIG_PHYSICAL_ALIGN=0x100000 CONFIG_HOTPLUG_CPU=y # CONFIG_COMPAT_VDSO is not set +# CONFIG_CMDLINE_BOOL is not set CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y # -# Power management options +# Power management and ACPI options # CONFIG_PM=y # CONFIG_PM_DEBUG is not set @@ -326,7 +347,6 @@ CONFIG_ACPI_BUTTON=m CONFIG_ACPI_VIDEO=m CONFIG_ACPI_FAN=m CONFIG_ACPI_DOCK=y -CONFIG_ACPI_BAY=m CONFIG_ACPI_PROCESSOR=m CONFIG_ACPI_HOTPLUG_CPU=y CONFIG_ACPI_THERMAL=m @@ -336,9 +356,7 @@ CONFIG_ACPI_TOSHIBA=m # CONFIG_ACPI_CUSTOM_DSDT is not set CONFIG_ACPI_BLACKLIST_YEAR=0 # CONFIG_ACPI_DEBUG is not set -CONFIG_ACPI_EC=y CONFIG_ACPI_PCI_SLOT=m -CONFIG_ACPI_POWER=y CONFIG_ACPI_SYSTEM=y CONFIG_X86_PM_TIMER=y CONFIG_ACPI_CONTAINER=m @@ -359,7 +377,7 @@ CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_TABLE=m # CONFIG_CPU_FREQ_DEBUG is not set CONFIG_CPU_FREQ_STAT=m -# CONFIG_CPU_FREQ_STAT_DETAILS is not set +CONFIG_CPU_FREQ_STAT_DETAILS=y # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y @@ -415,7 +433,8 @@ CONFIG_PCI_DOMAINS=y CONFIG_PCIEPORTBUS=y CONFIG_HOTPLUG_PCI_PCIE=m CONFIG_PCIEAER=y -# CONFIG_PCIEASPM is not set +CONFIG_PCIEASPM=y +# CONFIG_PCIEASPM_DEBUG is not set CONFIG_ARCH_SUPPORTS_MSI=y CONFIG_PCI_MSI=y CONFIG_PCI_LEGACY=y @@ -469,8 +488,11 @@ CONFIG_HOTPLUG_PCI_SHPC=m # Executable file formats / Emulations # CONFIG_BINFMT_ELF=y +# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set +CONFIG_HAVE_AOUT=y CONFIG_BINFMT_AOUT=m CONFIG_BINFMT_MISC=m +CONFIG_HAVE_ATOMIC_IOMAP=y CONFIG_NET=y # @@ -540,7 +562,6 @@ CONFIG_DEFAULT_BIC=y # CONFIG_DEFAULT_RENO is not set CONFIG_DEFAULT_TCP_CONG="bic" # CONFIG_TCP_MD5SIG is not set -# CONFIG_IP_VS is not set CONFIG_IPV6=m CONFIG_IPV6_PRIVACY=y CONFIG_IPV6_ROUTER_PREF=y @@ -595,15 +616,17 @@ CONFIG_NF_CONNTRACK_SANE=m CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_TFTP=m CONFIG_NF_CT_NETLINK=m +CONFIG_NETFILTER_TPROXY=m CONFIG_NETFILTER_XTABLES=m CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m CONFIG_NETFILTER_XT_TARGET_CONNMARK=m CONFIG_NETFILTER_XT_TARGET_DSCP=m CONFIG_NETFILTER_XT_TARGET_MARK=m -CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m CONFIG_NETFILTER_XT_TARGET_NFLOG=m +CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m CONFIG_NETFILTER_XT_TARGET_NOTRACK=m CONFIG_NETFILTER_XT_TARGET_RATEEST=m +CONFIG_NETFILTER_XT_TARGET_TPROXY=m CONFIG_NETFILTER_XT_TARGET_TRACE=m CONFIG_NETFILTER_XT_TARGET_SECMARK=m CONFIG_NETFILTER_XT_TARGET_TCPMSS=m @@ -616,41 +639,45 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m CONFIG_NETFILTER_XT_MATCH_DCCP=m CONFIG_NETFILTER_XT_MATCH_DSCP=m CONFIG_NETFILTER_XT_MATCH_ESP=m +CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m CONFIG_NETFILTER_XT_MATCH_HELPER=m CONFIG_NETFILTER_XT_MATCH_IPRANGE=m CONFIG_NETFILTER_XT_MATCH_LENGTH=m CONFIG_NETFILTER_XT_MATCH_LIMIT=m CONFIG_NETFILTER_XT_MATCH_MAC=m CONFIG_NETFILTER_XT_MATCH_MARK=m +CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m CONFIG_NETFILTER_XT_MATCH_OWNER=m CONFIG_NETFILTER_XT_MATCH_POLICY=m -CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m CONFIG_NETFILTER_XT_MATCH_QUOTA=m CONFIG_NETFILTER_XT_MATCH_RATEEST=m CONFIG_NETFILTER_XT_MATCH_REALM=m +CONFIG_NETFILTER_XT_MATCH_RECENT=m +# CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set CONFIG_NETFILTER_XT_MATCH_SCTP=m +CONFIG_NETFILTER_XT_MATCH_SOCKET=m CONFIG_NETFILTER_XT_MATCH_STATE=m CONFIG_NETFILTER_XT_MATCH_STATISTIC=m CONFIG_NETFILTER_XT_MATCH_STRING=m CONFIG_NETFILTER_XT_MATCH_TCPMSS=m CONFIG_NETFILTER_XT_MATCH_TIME=m CONFIG_NETFILTER_XT_MATCH_U32=m -CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m +# CONFIG_IP_VS is not set # # IP: Netfilter Configuration # +CONFIG_NF_DEFRAG_IPV4=m CONFIG_NF_CONNTRACK_IPV4=m CONFIG_NF_CONNTRACK_PROC_COMPAT=y CONFIG_IP_NF_QUEUE=m CONFIG_IP_NF_IPTABLES=m -CONFIG_IP_NF_MATCH_RECENT=m -CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_ADDRTYPE=m CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_ECN=m CONFIG_IP_NF_MATCH_TTL=m -CONFIG_IP_NF_MATCH_ADDRTYPE=m CONFIG_IP_NF_FILTER=m CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_TARGET_LOG=m @@ -658,8 +685,8 @@ CONFIG_IP_NF_TARGET_ULOG=m CONFIG_NF_NAT=m CONFIG_NF_NAT_NEEDED=y CONFIG_IP_NF_TARGET_MASQUERADE=m -CONFIG_IP_NF_TARGET_REDIRECT=m CONFIG_IP_NF_TARGET_NETMAP=m +CONFIG_IP_NF_TARGET_REDIRECT=m CONFIG_NF_NAT_SNMP_BASIC=m CONFIG_NF_NAT_PROTO_DCCP=m CONFIG_NF_NAT_PROTO_GRE=m @@ -673,9 +700,9 @@ CONFIG_NF_NAT_PPTP=m CONFIG_NF_NAT_H323=m CONFIG_NF_NAT_SIP=m CONFIG_IP_NF_MANGLE=m +CONFIG_IP_NF_TARGET_CLUSTERIP=m CONFIG_IP_NF_TARGET_ECN=m CONFIG_IP_NF_TARGET_TTL=m -CONFIG_IP_NF_TARGET_CLUSTERIP=m CONFIG_IP_NF_RAW=m CONFIG_IP_NF_SECURITY=m CONFIG_IP_NF_ARPTABLES=m @@ -688,16 +715,16 @@ CONFIG_IP_NF_ARP_MANGLE=m CONFIG_NF_CONNTRACK_IPV6=m CONFIG_IP6_NF_QUEUE=m CONFIG_IP6_NF_IPTABLES=m -CONFIG_IP6_NF_MATCH_RT=m -CONFIG_IP6_NF_MATCH_OPTS=m +CONFIG_IP6_NF_MATCH_AH=m +CONFIG_IP6_NF_MATCH_EUI64=m CONFIG_IP6_NF_MATCH_FRAG=m +CONFIG_IP6_NF_MATCH_OPTS=m CONFIG_IP6_NF_MATCH_HL=m CONFIG_IP6_NF_MATCH_IPV6HEADER=m -CONFIG_IP6_NF_MATCH_AH=m CONFIG_IP6_NF_MATCH_MH=m -CONFIG_IP6_NF_MATCH_EUI64=m -CONFIG_IP6_NF_FILTER=m +CONFIG_IP6_NF_MATCH_RT=m CONFIG_IP6_NF_TARGET_LOG=m +CONFIG_IP6_NF_FILTER=m CONFIG_IP6_NF_TARGET_REJECT=m CONFIG_IP6_NF_MANGLE=m CONFIG_IP6_NF_TARGET_HL=m @@ -708,10 +735,6 @@ CONFIG_IP6_NF_SECURITY=m # DECnet: Netfilter Configuration # CONFIG_DECNET_NF_GRABULATOR=m - -# -# Bridge: Netfilter Configuration -# CONFIG_BRIDGE_NF_EBTABLES=m CONFIG_BRIDGE_EBT_BROUTE=m CONFIG_BRIDGE_EBT_T_FILTER=m @@ -734,14 +757,33 @@ CONFIG_BRIDGE_EBT_SNAT=m CONFIG_BRIDGE_EBT_LOG=m # CONFIG_BRIDGE_EBT_ULOG is not set CONFIG_BRIDGE_EBT_NFLOG=m -# CONFIG_IP_DCCP is not set +CONFIG_IP_DCCP=m +CONFIG_INET_DCCP_DIAG=m +CONFIG_IP_DCCP_ACKVEC=y + +# +# DCCP CCIDs Configuration (EXPERIMENTAL) +# +CONFIG_IP_DCCP_CCID2=m +# CONFIG_IP_DCCP_CCID2_DEBUG is not set +CONFIG_IP_DCCP_CCID3=m +# CONFIG_IP_DCCP_CCID3_DEBUG is not set +CONFIG_IP_DCCP_CCID3_RTO=100 +CONFIG_IP_DCCP_TFRC_LIB=m + +# +# DCCP Kernel Hacking +# +# CONFIG_IP_DCCP_DEBUG is not set CONFIG_IP_SCTP=m # CONFIG_SCTP_DBG_MSG is not set # CONFIG_SCTP_DBG_OBJCNT is not set # CONFIG_SCTP_HMAC_NONE is not set # CONFIG_SCTP_HMAC_SHA1 is not set CONFIG_SCTP_HMAC_MD5=y -# CONFIG_TIPC is not set +CONFIG_TIPC=m +# CONFIG_TIPC_ADVANCED is not set +# CONFIG_TIPC_DEBUG is not set CONFIG_ATM=m CONFIG_ATM_CLIP=m # CONFIG_ATM_CLIP_NO_ICMP is not set @@ -751,6 +793,7 @@ CONFIG_ATM_BR2684=m # CONFIG_ATM_BR2684_IPFILTER is not set CONFIG_STP=m CONFIG_BRIDGE=m +# CONFIG_NET_DSA is not set CONFIG_VLAN_8021Q=m # CONFIG_VLAN_8021Q_GVRP is not set CONFIG_DECNET=m @@ -784,6 +827,7 @@ CONFIG_NET_SCH_HTB=m CONFIG_NET_SCH_HFSC=m CONFIG_NET_SCH_ATM=m CONFIG_NET_SCH_PRIO=m +CONFIG_NET_SCH_MULTIQ=m CONFIG_NET_SCH_RED=m CONFIG_NET_SCH_SFQ=m CONFIG_NET_SCH_TEQL=m @@ -803,11 +847,11 @@ CONFIG_NET_CLS_ROUTE4=m CONFIG_NET_CLS_ROUTE=y CONFIG_NET_CLS_FW=m CONFIG_NET_CLS_U32=m -# CONFIG_CLS_U32_PERF is not set +CONFIG_CLS_U32_PERF=y CONFIG_CLS_U32_MARK=y CONFIG_NET_CLS_RSVP=m CONFIG_NET_CLS_RSVP6=m -# CONFIG_NET_CLS_FLOW is not set +CONFIG_NET_CLS_FLOW=m CONFIG_NET_EMATCH=y CONFIG_NET_EMATCH_STACK=32 CONFIG_NET_EMATCH_CMP=m @@ -824,6 +868,7 @@ CONFIG_NET_ACT_IPT=m CONFIG_NET_ACT_NAT=m CONFIG_NET_ACT_PEDIT=m # CONFIG_NET_ACT_SIMP is not set +CONFIG_NET_ACT_SKBEDIT=m CONFIG_NET_CLS_IND=y CONFIG_NET_SCH_FIFO=y @@ -929,6 +974,7 @@ CONFIG_BT_RFCOMM_TTY=y CONFIG_BT_BNEP=m CONFIG_BT_BNEP_MC_FILTER=y CONFIG_BT_BNEP_PROTO_FILTER=y +CONFIG_BT_CMTP=m CONFIG_BT_HIDP=m # @@ -951,13 +997,12 @@ CONFIG_BT_HCIVHCI=m CONFIG_AF_RXRPC=m # CONFIG_AF_RXRPC_DEBUG is not set CONFIG_RXKAD=m +CONFIG_PHONET=m CONFIG_FIB_RULES=y - -# -# Wireless -# +CONFIG_WIRELESS=y CONFIG_CFG80211=m CONFIG_NL80211=y +CONFIG_WIRELESS_OLD_REGULATORY=y CONFIG_WIRELESS_EXT=y CONFIG_WIRELESS_EXT_SYSFS=y CONFIG_MAC80211=m @@ -966,7 +1011,9 @@ CONFIG_MAC80211=m # Rate control algorithm selection # CONFIG_MAC80211_RC_PID=y +CONFIG_MAC80211_RC_MINSTREL=y CONFIG_MAC80211_RC_DEFAULT_PID=y +# CONFIG_MAC80211_RC_DEFAULT_MINSTREL is not set CONFIG_MAC80211_RC_DEFAULT="pid" CONFIG_MAC80211_MESH=y CONFIG_MAC80211_LEDS=y @@ -981,7 +1028,8 @@ CONFIG_RFKILL=y CONFIG_RFKILL_INPUT=m CONFIG_RFKILL_LEDS=y CONFIG_NET_9P=m -# CONFIG_NET_9P_VIRTIO is not set +CONFIG_NET_9P_VIRTIO=m +CONFIG_NET_9P_RDMA=m # CONFIG_NET_9P_DEBUG is not set # @@ -1015,6 +1063,7 @@ CONFIG_MTD_AR7_PARTS=m # User Modules And Translation Layers # CONFIG_MTD_CHAR=m +CONFIG_HAVE_MTD_OTP=y CONFIG_MTD_BLKDEVS=m CONFIG_MTD_BLOCK=m CONFIG_MTD_BLOCK_RO=m @@ -1083,6 +1132,8 @@ CONFIG_MTD_PMC551=m CONFIG_MTD_PMC551_BUGFIX=y # CONFIG_MTD_PMC551_DEBUG is not set CONFIG_MTD_DATAFLASH=m +# CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set +# CONFIG_MTD_DATAFLASH_OTP is not set CONFIG_MTD_M25P80=m CONFIG_M25PXX_USE_FAST_READ=y CONFIG_MTD_SLRAM=m @@ -1107,7 +1158,11 @@ CONFIG_MTD_NAND_VERIFY_WRITE=y # CONFIG_MTD_NAND_ECC_SMC is not set # CONFIG_MTD_NAND_MUSEUM_IDS is not set CONFIG_MTD_NAND_IDS=m -# CONFIG_MTD_NAND_DISKONCHIP is not set +CONFIG_MTD_NAND_DISKONCHIP=m +CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED=y +CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0 +CONFIG_MTD_NAND_DISKONCHIP_PROBE_HIGH=y +CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE=y CONFIG_MTD_NAND_CAFE=m CONFIG_MTD_NAND_CS553X=m CONFIG_MTD_NAND_NANDSIM=m @@ -1116,7 +1171,7 @@ CONFIG_MTD_ALAUDA=m CONFIG_MTD_ONENAND=m CONFIG_MTD_ONENAND_VERIFY_WRITE=y CONFIG_MTD_ONENAND_OTP=y -# CONFIG_MTD_ONENAND_2X_PROGRAM is not set +CONFIG_MTD_ONENAND_2X_PROGRAM=y CONFIG_MTD_ONENAND_SIM=m # @@ -1142,7 +1197,7 @@ CONFIG_PARPORT_AX88796=m CONFIG_PARPORT_1284=y CONFIG_PARPORT_NOT_PC=y CONFIG_PNP=y -# CONFIG_PNP_DEBUG is not set +# CONFIG_PNP_DEBUG_MESSAGES is not set # # Protocols @@ -1203,7 +1258,7 @@ CONFIG_CDROM_PKTCDVD=m CONFIG_CDROM_PKTCDVD_BUFFERS=8 CONFIG_CDROM_PKTCDVD_WCACHE=y CONFIG_ATA_OVER_ETH=m -# CONFIG_VIRTIO_BLK is not set +CONFIG_VIRTIO_BLK=m # CONFIG_BLK_DEV_HD is not set CONFIG_MISC_DEVICES=y CONFIG_IBM_ASM=m @@ -1217,9 +1272,11 @@ CONFIG_ASUS_LAPTOP=m CONFIG_FUJITSU_LAPTOP=m # CONFIG_FUJITSU_LAPTOP_DEBUG is not set CONFIG_TC1100_WMI=m -# CONFIG_HP_WMI is not set +CONFIG_HP_WMI=m +CONFIG_ICS932S401=m CONFIG_MSI_LAPTOP=m -# CONFIG_COMPAL_LAPTOP is not set +CONFIG_PANASONIC_LAPTOP=m +CONFIG_COMPAL_LAPTOP=m CONFIG_SONY_LAPTOP=m CONFIG_SONYPI_COMPAT=y CONFIG_THINKPAD_ACPI=m @@ -1230,10 +1287,11 @@ CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y CONFIG_INTEL_MENLOW=m CONFIG_EEEPC_LAPTOP=m CONFIG_ENCLOSURE_SERVICES=m -# CONFIG_HP_ILO is not set +CONFIG_HP_ILO=m +CONFIG_C2PORT=m +CONFIG_C2PORT_DURAMAR_2150=m CONFIG_HAVE_IDE=y CONFIG_IDE=y -CONFIG_BLK_DEV_IDE=y # # Please see Documentation/ide/ide.txt for help/info on IDE drives @@ -1241,17 +1299,17 @@ CONFIG_BLK_DEV_IDE=y CONFIG_IDE_TIMINGS=y CONFIG_IDE_ATAPI=y # CONFIG_BLK_DEV_IDE_SATA is not set -CONFIG_BLK_DEV_IDEDISK=y -CONFIG_IDEDISK_MULTI_MODE=y +CONFIG_IDE_GD=y +CONFIG_IDE_GD_ATA=y +CONFIG_IDE_GD_ATAPI=y CONFIG_BLK_DEV_IDECS=m CONFIG_BLK_DEV_DELKIN=m CONFIG_BLK_DEV_IDECD=y CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y CONFIG_BLK_DEV_IDETAPE=m -CONFIG_BLK_DEV_IDEFLOPPY=m # CONFIG_BLK_DEV_IDESCSI is not set -# CONFIG_BLK_DEV_IDEACPI is not set -# CONFIG_IDE_TASK_IOCTL is not set +CONFIG_BLK_DEV_IDEACPI=y +CONFIG_IDE_TASK_IOCTL=y CONFIG_IDE_PROC_FS=y # @@ -1533,6 +1591,7 @@ CONFIG_PATA_WINBOND_VLB=m # CONFIG_PATA_SCH is not set CONFIG_MD=y CONFIG_BLK_DEV_MD=y +CONFIG_MD_AUTODETECT=y CONFIG_MD_LINEAR=y CONFIG_MD_RAID0=y CONFIG_MD_RAID1=y @@ -1686,6 +1745,9 @@ CONFIG_IBMLANA=m # CONFIG_IBM_NEW_EMAC_RGMII is not set # CONFIG_IBM_NEW_EMAC_TAH is not set # CONFIG_IBM_NEW_EMAC_EMAC4 is not set +# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set +# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set +# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set CONFIG_NET_PCI=y CONFIG_PCNET32=m CONFIG_AMD8111_ETH=m @@ -1726,16 +1788,17 @@ CONFIG_NET_POCKET=y CONFIG_ATP=m CONFIG_DE600=m CONFIG_DE620=m +CONFIG_ATL2=m CONFIG_NETDEV_1000=y CONFIG_ACENIC=m # CONFIG_ACENIC_OMIT_TIGON_I is not set CONFIG_DL2K=m CONFIG_E1000=m -# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set CONFIG_E1000E=m CONFIG_IP1000=m CONFIG_IGB=m # CONFIG_IGB_LRO is not set +CONFIG_IGB_DCA=y CONFIG_NS83820=m CONFIG_HAMACHI=m CONFIG_YELLOWFIN=m @@ -1752,20 +1815,26 @@ CONFIG_BNX2=m CONFIG_QLA3XXX=m CONFIG_ATL1=m CONFIG_ATL1E=m +CONFIG_JME=m CONFIG_NETDEV_10000=y CONFIG_CHELSIO_T1=m CONFIG_CHELSIO_T1_1G=y CONFIG_CHELSIO_T3=m +CONFIG_ENIC=m CONFIG_IXGBE=m +CONFIG_IXGBE_DCA=y CONFIG_IXGB=m CONFIG_S2IO=m CONFIG_MYRI10GE=m +CONFIG_MYRI10GE_DCA=y CONFIG_NETXEN_NIC=m CONFIG_NIU=m +CONFIG_MLX4_EN=m CONFIG_MLX4_CORE=m CONFIG_MLX4_DEBUG=y CONFIG_TEHUTI=m CONFIG_BNX2X=m +CONFIG_QLGE=m CONFIG_SFC=m CONFIG_TR=y CONFIG_IBMTR=m @@ -1805,6 +1874,8 @@ CONFIG_LIBERTAS_USB=m CONFIG_LIBERTAS_CS=m CONFIG_LIBERTAS_SDIO=m # CONFIG_LIBERTAS_DEBUG is not set +CONFIG_LIBERTAS_THINFIRM=m +CONFIG_LIBERTAS_THINFIRM_USB=m CONFIG_AIRO=m CONFIG_HERMES=m CONFIG_PLX_HERMES=m @@ -1873,25 +1944,18 @@ CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y CONFIG_ZD1211RW=m # CONFIG_ZD1211RW_DEBUG is not set CONFIG_RT2X00=m -CONFIG_RT2X00_LIB=m -CONFIG_RT2X00_LIB_PCI=m -CONFIG_RT2X00_LIB_USB=m -CONFIG_RT2X00_LIB_FIRMWARE=y -CONFIG_RT2X00_LIB_RFKILL=y -CONFIG_RT2X00_LIB_LEDS=y CONFIG_RT2400PCI=m -CONFIG_RT2400PCI_RFKILL=y -CONFIG_RT2400PCI_LEDS=y CONFIG_RT2500PCI=m -CONFIG_RT2500PCI_RFKILL=y -CONFIG_RT2500PCI_LEDS=y CONFIG_RT61PCI=m -CONFIG_RT61PCI_RFKILL=y -CONFIG_RT61PCI_LEDS=y CONFIG_RT2500USB=m -CONFIG_RT2500USB_LEDS=y CONFIG_RT73USB=m -CONFIG_RT73USB_LEDS=y +CONFIG_RT2X00_LIB_PCI=m +CONFIG_RT2X00_LIB_USB=m +CONFIG_RT2X00_LIB=m +CONFIG_RT2X00_LIB_FIRMWARE=y +CONFIG_RT2X00_LIB_CRYPTO=y +CONFIG_RT2X00_LIB_RFKILL=y +CONFIG_RT2X00_LIB_LEDS=y # CONFIG_RT2X00_DEBUG is not set # @@ -1905,6 +1969,7 @@ CONFIG_USB_USBNET=m CONFIG_USB_NET_AX8817X=m CONFIG_USB_NET_CDCETHER=m CONFIG_USB_NET_DM9601=m +CONFIG_USB_NET_SMSC95XX=m CONFIG_USB_NET_GL620A=m CONFIG_USB_NET_NET1080=m CONFIG_USB_NET_PLUSB=m @@ -1944,16 +2009,6 @@ CONFIG_HDLC_PPP=m CONFIG_HDLC_X25=m CONFIG_PCI200SYN=m CONFIG_WANXL=m -CONFIG_PC300=m -CONFIG_PC300_MLPPP=y - -# -# Cyclades-PC300 MLPPP support is disabled. -# - -# -# Refer to the file README.mlppp, provided by PC300 package. -# CONFIG_PC300TOO=m CONFIG_N2=m CONFIG_C101=m @@ -2028,7 +2083,44 @@ CONFIG_NETPOLL=y CONFIG_NETPOLL_TRAP=y CONFIG_NET_POLL_CONTROLLER=y CONFIG_VIRTIO_NET=m -# CONFIG_ISDN is not set +CONFIG_ISDN=y +CONFIG_MISDN=m +CONFIG_MISDN_DSP=m +CONFIG_MISDN_L1OIP=m + +# +# mISDN hardware drivers +# +CONFIG_MISDN_HFCPCI=m +CONFIG_MISDN_HFCMULTI=m +# CONFIG_ISDN_I4L is not set +CONFIG_ISDN_CAPI=m +CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y +CONFIG_CAPI_TRACE=y +CONFIG_ISDN_CAPI_MIDDLEWARE=y +CONFIG_ISDN_CAPI_CAPI20=m +CONFIG_ISDN_CAPI_CAPIFS_BOOL=y +CONFIG_ISDN_CAPI_CAPIFS=m + +# +# CAPI hardware drivers +# +CONFIG_CAPI_AVM=y +CONFIG_ISDN_DRV_AVMB1_B1ISA=m +CONFIG_ISDN_DRV_AVMB1_B1PCI=m +CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y +CONFIG_ISDN_DRV_AVMB1_T1ISA=m +CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m +CONFIG_ISDN_DRV_AVMB1_AVM_CS=m +CONFIG_ISDN_DRV_AVMB1_T1PCI=m +CONFIG_ISDN_DRV_AVMB1_C4=m +CONFIG_CAPI_EICON=y +CONFIG_ISDN_DIVAS=m +CONFIG_ISDN_DIVAS_BRIPCI=y +CONFIG_ISDN_DIVAS_PRIPCI=y +CONFIG_ISDN_DIVAS_DIVACAPI=m +CONFIG_ISDN_DIVAS_USERIDI=m +CONFIG_ISDN_DIVAS_MAINT=m CONFIG_PHONE=m CONFIG_PHONE_IXJ=m CONFIG_PHONE_IXJ_PCMCIA=m @@ -2061,6 +2153,7 @@ CONFIG_KEYBOARD_LKKBD=m CONFIG_KEYBOARD_XTKBD=m CONFIG_KEYBOARD_NEWTON=m CONFIG_KEYBOARD_STOWAWAY=m +# CONFIG_KEYBOARD_GPIO is not set CONFIG_INPUT_MOUSE=y CONFIG_MOUSE_PS2=y CONFIG_MOUSE_PS2_ALPS=y @@ -2068,7 +2161,9 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y CONFIG_MOUSE_PS2_SYNAPTICS=y CONFIG_MOUSE_PS2_LIFEBOOK=y CONFIG_MOUSE_PS2_TRACKPOINT=y +# CONFIG_MOUSE_PS2_ELANTECH is not set # CONFIG_MOUSE_PS2_TOUCHKIT is not set +CONFIG_MOUSE_PS2_OLPC=y CONFIG_MOUSE_SERIAL=m CONFIG_MOUSE_APPLETOUCH=m # CONFIG_MOUSE_BCM5974 is not set @@ -2077,6 +2172,7 @@ CONFIG_MOUSE_ATIXL=y CONFIG_MOUSE_LOGIBM=m CONFIG_MOUSE_PC110PAD=m CONFIG_MOUSE_VSXXXAA=m +# CONFIG_MOUSE_GPIO is not set CONFIG_INPUT_JOYSTICK=y CONFIG_JOYSTICK_ANALOG=m CONFIG_JOYSTICK_A3D=m @@ -2124,7 +2220,7 @@ CONFIG_TOUCHSCREEN_HTCPEN=m CONFIG_TOUCHSCREEN_PENMOUNT=m CONFIG_TOUCHSCREEN_TOUCHRIGHT=m CONFIG_TOUCHSCREEN_TOUCHWIN=m -CONFIG_TOUCHSCREEN_UCB1400=m +# CONFIG_TOUCHSCREEN_UCB1400 is not set CONFIG_TOUCHSCREEN_WM97XX=m CONFIG_TOUCHSCREEN_WM9705=y CONFIG_TOUCHSCREEN_WM9712=y @@ -2152,6 +2248,7 @@ CONFIG_INPUT_ATI_REMOTE2=m CONFIG_INPUT_KEYSPAN_REMOTE=m CONFIG_INPUT_POWERMATE=m CONFIG_INPUT_YEALINK=m +CONFIG_INPUT_CM109=m CONFIG_INPUT_UINPUT=m # @@ -2200,6 +2297,8 @@ CONFIG_SX=m CONFIG_RIO=m # CONFIG_RIO_OLDPCI is not set CONFIG_STALDRV=y +CONFIG_STALLION=m +CONFIG_ISTALLION=m CONFIG_NOZOMI=m # @@ -2238,7 +2337,7 @@ CONFIG_PRINTER=m CONFIG_LP_CONSOLE=y CONFIG_PPDEV=m CONFIG_HVC_DRIVER=y -CONFIG_VIRTIO_CONSOLE=m +CONFIG_VIRTIO_CONSOLE=y CONFIG_IPMI_HANDLER=m # CONFIG_IPMI_PANIC_EVENT is not set CONFIG_IPMI_DEVICE_INTERFACE=m @@ -2263,7 +2362,7 @@ CONFIG_SONYPI=m CONFIG_SYNCLINK_CS=m CONFIG_CARDMAN_4000=m CONFIG_CARDMAN_4040=m -# CONFIG_IPWIRELESS is not set +CONFIG_IPWIRELESS=m CONFIG_MWAVE=m CONFIG_PC8736x_GPIO=m CONFIG_NSC_GPIO=m @@ -2314,6 +2413,7 @@ CONFIG_I2C_VIAPRO=m # # I2C system bus drivers (mostly embedded / system-on-chip) # +# CONFIG_I2C_GPIO is not set CONFIG_I2C_OCORES=m CONFIG_I2C_SIMTEC=m @@ -2344,10 +2444,8 @@ CONFIG_SCx200_ACB=m CONFIG_DS1682=m CONFIG_AT24=m CONFIG_SENSORS_EEPROM=m -# CONFIG_SENSORS_PCF8574 is not set -# CONFIG_PCF8575 is not set -# CONFIG_SENSORS_PCA9539 is not set CONFIG_SENSORS_PCF8591=m +# CONFIG_TPS65010 is not set CONFIG_SENSORS_MAX6875=m CONFIG_SENSORS_TSL2550=m # CONFIG_I2C_DEBUG_CORE is not set @@ -2372,7 +2470,30 @@ CONFIG_SPI_AT25=m CONFIG_SPI_SPIDEV=m CONFIG_SPI_TLE62X0=m CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y -# CONFIG_GPIOLIB is not set +CONFIG_GPIOLIB=y +# CONFIG_DEBUG_GPIO is not set +CONFIG_GPIO_SYSFS=y + +# +# Memory mapped GPIO expanders: +# + +# +# I2C GPIO expanders: +# +CONFIG_GPIO_MAX732X=m +CONFIG_GPIO_PCA953X=m +CONFIG_GPIO_PCF857X=m + +# +# PCI GPIO expanders: +# + +# +# SPI GPIO expanders: +# +CONFIG_GPIO_MAX7301=m +CONFIG_GPIO_MCP23S08=m CONFIG_W1=m CONFIG_W1_CON=y @@ -2382,6 +2503,7 @@ CONFIG_W1_CON=y CONFIG_W1_MASTER_MATROX=m CONFIG_W1_MASTER_DS2490=m CONFIG_W1_MASTER_DS2482=m +# CONFIG_W1_MASTER_GPIO is not set # # 1-wire Slaves @@ -2391,11 +2513,13 @@ CONFIG_W1_SLAVE_SMEM=m CONFIG_W1_SLAVE_DS2433=m CONFIG_W1_SLAVE_DS2433_CRC=y CONFIG_W1_SLAVE_DS2760=m +CONFIG_W1_SLAVE_BQ27000=m CONFIG_POWER_SUPPLY=y # CONFIG_POWER_SUPPLY_DEBUG is not set CONFIG_PDA_POWER=m CONFIG_BATTERY_DS2760=m CONFIG_BATTERY_OLPC=m +CONFIG_BATTERY_BQ27x00=m CONFIG_HWMON=y CONFIG_HWMON_VID=m CONFIG_SENSORS_ABITUGURU=m @@ -2409,6 +2533,7 @@ CONFIG_SENSORS_ADM1026=m CONFIG_SENSORS_ADM1029=m CONFIG_SENSORS_ADM1031=m CONFIG_SENSORS_ADM9240=m +CONFIG_SENSORS_ADT7462=m CONFIG_SENSORS_ADT7470=m CONFIG_SENSORS_ADT7473=m CONFIG_SENSORS_K8TEMP=m @@ -2440,6 +2565,7 @@ CONFIG_SENSORS_LM87=m CONFIG_SENSORS_LM90=m CONFIG_SENSORS_LM92=m CONFIG_SENSORS_LM93=m +CONFIG_SENSORS_MAX1111=m CONFIG_SENSORS_MAX1619=m CONFIG_SENSORS_MAX6650=m CONFIG_SENSORS_PC87360=m @@ -2463,6 +2589,7 @@ CONFIG_SENSORS_W83L786NG=m CONFIG_SENSORS_W83627HF=m CONFIG_SENSORS_W83627EHF=m CONFIG_SENSORS_HDAPS=m +CONFIG_SENSORS_LIS3LV02D=m CONFIG_SENSORS_APPLESMC=m # CONFIG_HWMON_DEBUG_CHIP is not set CONFIG_THERMAL=y @@ -2487,9 +2614,11 @@ CONFIG_I6300ESB_WDT=m CONFIG_ITCO_WDT=m CONFIG_ITCO_VENDOR_SUPPORT=y CONFIG_IT8712F_WDT=m +CONFIG_IT87_WDT=m CONFIG_HP_WATCHDOG=m CONFIG_SC1200_WDT=m CONFIG_PC87413_WDT=m +CONFIG_RDC321X_WDT=m CONFIG_60XX_WDT=m CONFIG_SBC8360_WDT=m CONFIG_SBC7240_WDT=m @@ -2497,6 +2626,7 @@ CONFIG_CPU5_WDT=m CONFIG_SMSC37B787_WDT=m CONFIG_W83627HF_WDT=m CONFIG_W83697HF_WDT=m +CONFIG_W83697UG_WDT=m CONFIG_W83877F_WDT=m CONFIG_W83977F_WDT=m CONFIG_MACHZ_WDT=m @@ -2521,11 +2651,11 @@ CONFIG_WDT_501_PCI=y # USB-based Watchdog Cards # CONFIG_USBPCWATCHDOG=m +CONFIG_SSB_POSSIBLE=y # # Sonics Silicon Backplane # -CONFIG_SSB_POSSIBLE=y CONFIG_SSB=m CONFIG_SSB_SPROM=y CONFIG_SSB_BLOCKIO=y @@ -2543,8 +2673,20 @@ CONFIG_SSB_DRIVER_PCICORE=y # # CONFIG_MFD_CORE is not set CONFIG_MFD_SM501=m +# CONFIG_MFD_SM501_GPIO is not set CONFIG_HTC_PASIC3=m +CONFIG_UCB1400_CORE=m # CONFIG_MFD_TMIO is not set +CONFIG_MFD_WM8400=m +CONFIG_MFD_WM8350=m +CONFIG_MFD_WM8350_I2C=m +CONFIG_REGULATOR=y +# CONFIG_REGULATOR_DEBUG is not set +# CONFIG_REGULATOR_FIXED_VOLTAGE is not set +CONFIG_REGULATOR_VIRTUAL_CONSUMER=m +CONFIG_REGULATOR_BQ24022=m +CONFIG_REGULATOR_WM8350=m +CONFIG_REGULATOR_WM8400=m # # Multimedia devices @@ -2597,6 +2739,7 @@ CONFIG_VIDEO_TVEEPROM=m CONFIG_VIDEO_TUNER=m CONFIG_VIDEO_CAPTURE_DRIVERS=y # CONFIG_VIDEO_ADV_DEBUG is not set +# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set CONFIG_VIDEO_HELPER_CHIPS_AUTO=y CONFIG_VIDEO_IR_I2C=m CONFIG_VIDEO_TVAUDIO=m @@ -2645,7 +2788,6 @@ CONFIG_VIDEO_CPIA_USB=m CONFIG_VIDEO_CPIA2=m CONFIG_VIDEO_SAA5246A=m CONFIG_VIDEO_SAA5249=m -CONFIG_TUNER_3036=m CONFIG_VIDEO_STRADIS=m CONFIG_VIDEO_ZORAN=m CONFIG_VIDEO_ZORAN_DC30=m @@ -2660,7 +2802,6 @@ CONFIG_VIDEO_SAA7134=m CONFIG_VIDEO_SAA7134_ALSA=m CONFIG_VIDEO_SAA7134_DVB=m CONFIG_VIDEO_MXB=m -CONFIG_VIDEO_DPC=m CONFIG_VIDEO_HEXIUM_ORION=m CONFIG_VIDEO_HEXIUM_GEMINI=m CONFIG_VIDEO_CX88=m @@ -2674,10 +2815,40 @@ CONFIG_VIDEO_IVTV=m CONFIG_VIDEO_FB_IVTV=m CONFIG_VIDEO_CX18=m CONFIG_VIDEO_CAFE_CCIC=m +CONFIG_SOC_CAMERA=m +CONFIG_SOC_CAMERA_MT9M001=m +# CONFIG_MT9M001_PCA9536_SWITCH is not set +CONFIG_SOC_CAMERA_MT9M111=m +CONFIG_SOC_CAMERA_MT9V022=m +# CONFIG_MT9V022_PCA9536_SWITCH is not set +CONFIG_SOC_CAMERA_PLATFORM=m +CONFIG_VIDEO_SH_MOBILE_CEU=m CONFIG_V4L_USB_DRIVERS=y CONFIG_USB_VIDEO_CLASS=m CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y CONFIG_USB_GSPCA=m +CONFIG_USB_M5602=m +CONFIG_USB_GSPCA_CONEX=m +CONFIG_USB_GSPCA_ETOMS=m +CONFIG_USB_GSPCA_FINEPIX=m +CONFIG_USB_GSPCA_MARS=m +CONFIG_USB_GSPCA_OV519=m +CONFIG_USB_GSPCA_PAC207=m +CONFIG_USB_GSPCA_PAC7311=m +CONFIG_USB_GSPCA_SONIXB=m +CONFIG_USB_GSPCA_SONIXJ=m +CONFIG_USB_GSPCA_SPCA500=m +CONFIG_USB_GSPCA_SPCA501=m +CONFIG_USB_GSPCA_SPCA505=m +CONFIG_USB_GSPCA_SPCA506=m +CONFIG_USB_GSPCA_SPCA508=m +CONFIG_USB_GSPCA_SPCA561=m +CONFIG_USB_GSPCA_STK014=m +CONFIG_USB_GSPCA_SUNPLUS=m +CONFIG_USB_GSPCA_T613=m +CONFIG_USB_GSPCA_TV8532=m +CONFIG_USB_GSPCA_VC032X=m +CONFIG_USB_GSPCA_ZC3XX=m CONFIG_VIDEO_PVRUSB2=m # CONFIG_VIDEO_PVRUSB2_SYSFS is not set # CONFIG_VIDEO_PVRUSB2_DVB is not set @@ -2703,11 +2874,6 @@ CONFIG_USB_PWC=m CONFIG_USB_ZR364XX=m # CONFIG_USB_STKWEBCAM is not set CONFIG_USB_S2255=m -CONFIG_SOC_CAMERA=m -CONFIG_SOC_CAMERA_MT9M001=m -CONFIG_SOC_CAMERA_MT9V022=m -CONFIG_SOC_CAMERA_PLATFORM=m -CONFIG_VIDEO_SH_MOBILE_CEU=m CONFIG_RADIO_ADAPTERS=y CONFIG_RADIO_CADET=m CONFIG_RADIO_RTRACK=m @@ -2726,6 +2892,7 @@ CONFIG_RADIO_TYPHOON_PROC_FS=y CONFIG_RADIO_ZOLTRIX=m CONFIG_USB_DSBR=m CONFIG_USB_SI470X=m +CONFIG_USB_MR800=m CONFIG_DVB_CAPTURE_DRIVERS=y # @@ -2762,16 +2929,12 @@ CONFIG_DVB_USB_OPERA1=m CONFIG_DVB_USB_AF9005=m CONFIG_DVB_USB_AF9005_REMOTE=m CONFIG_DVB_USB_DW2102=m +CONFIG_DVB_USB_CINERGY_T2=m CONFIG_DVB_USB_ANYSEE=m +CONFIG_DVB_USB_DTV5100=m +CONFIG_DVB_USB_AF9015=m CONFIG_DVB_TTUSB_BUDGET=m CONFIG_DVB_TTUSB_DEC=m -CONFIG_DVB_CINERGYT2=m -CONFIG_DVB_CINERGYT2_TUNING=y -CONFIG_DVB_CINERGYT2_STREAM_URB_COUNT=32 -CONFIG_DVB_CINERGYT2_STREAM_BUF_SIZE=512 -CONFIG_DVB_CINERGYT2_QUERY_INTERVAL=250 -CONFIG_DVB_CINERGYT2_ENABLE_RC_INPUT_DEVICE=y -CONFIG_DVB_CINERGYT2_RC_QUERY_INTERVAL=50 CONFIG_DVB_SIANO_SMS1XXX=m CONFIG_DVB_SIANO_SMS1XXX_SMS_IDS=y @@ -2794,6 +2957,11 @@ CONFIG_DVB_BT8XX=m CONFIG_DVB_PLUTO2=m # +# Supported SDMC DM1105 Adapters +# +CONFIG_DVB_DM1105=m + +# # Supported DVB Frontends # @@ -2809,6 +2977,8 @@ CONFIG_DVB_CX24110=m CONFIG_DVB_CX24123=m CONFIG_DVB_MT312=m CONFIG_DVB_S5H1420=m +CONFIG_DVB_STV0288=m +CONFIG_DVB_STB6000=m CONFIG_DVB_STV0299=m CONFIG_DVB_TDA8083=m CONFIG_DVB_TDA10086=m @@ -2816,6 +2986,8 @@ CONFIG_DVB_VES1X93=m CONFIG_DVB_TUNER_ITD1000=m CONFIG_DVB_TDA826X=m CONFIG_DVB_TUA6100=m +CONFIG_DVB_CX24116=m +CONFIG_DVB_SI21XX=m # # DVB-T (terrestrial) frontends @@ -2868,6 +3040,13 @@ CONFIG_DVB_TUNER_DIB0070=m CONFIG_DVB_LNBP21=m CONFIG_DVB_ISL6405=m CONFIG_DVB_ISL6421=m +CONFIG_DVB_LGS8GL5=m + +# +# Tools to develop new frontends +# +CONFIG_DVB_DUMMY_FE=m +CONFIG_DVB_AF9013=m CONFIG_DAB=y CONFIG_USB_DABUSB=m @@ -2901,6 +3080,7 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y CONFIG_FB=y CONFIG_FIRMWARE_EDID=y CONFIG_FB_DDC=m +CONFIG_FB_BOOT_VESA_SUPPORT=y CONFIG_FB_CFB_FILLRECT=y CONFIG_FB_CFB_COPYAREA=y CONFIG_FB_CFB_IMAGEBLIT=y @@ -2930,9 +3110,10 @@ CONFIG_FB_TILEBLITTING=y CONFIG_FB_VGA16=y CONFIG_FB_UVESA=m CONFIG_FB_VESA=y -# CONFIG_FB_EFI is not set CONFIG_FB_N411=m # CONFIG_FB_HGA is not set +# CONFIG_FB_SGIVW is not set +# CONFIG_FB_GBE is not set # CONFIG_FB_S1D13XXX is not set # CONFIG_FB_NVIDIA is not set # CONFIG_FB_RIVA is not set @@ -2966,6 +3147,7 @@ CONFIG_FB_S3=m CONFIG_FB_SIS=m CONFIG_FB_SIS_300=y CONFIG_FB_SIS_315=y +CONFIG_FB_VIA=m # CONFIG_FB_NEOMAGIC is not set # CONFIG_FB_KYRO is not set # CONFIG_FB_3DFX is not set @@ -2979,10 +3161,13 @@ CONFIG_FB_SIS_315=y # CONFIG_FB_GEODE is not set CONFIG_FB_SM501=m # CONFIG_FB_VIRTUAL is not set +# CONFIG_FB_METRONOME is not set +# CONFIG_FB_MB862XX is not set CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_LCD_CLASS_DEVICE=m CONFIG_LCD_LTV350QV=m CONFIG_LCD_ILI9320=m +CONFIG_LCD_TDO24M=m CONFIG_LCD_VGG2432A4=m CONFIG_LCD_PLATFORM=m CONFIG_BACKLIGHT_CLASS_DEVICE=y @@ -2990,6 +3175,7 @@ CONFIG_BACKLIGHT_CORGI=m CONFIG_BACKLIGHT_PROGEAR=m CONFIG_BACKLIGHT_CARILLO_RANCH=m CONFIG_BACKLIGHT_MBP_NVIDIA=m +CONFIG_BACKLIGHT_SAHARA=m # # Display device support @@ -3006,7 +3192,6 @@ CONFIG_DISPLAY_SUPPORT=m CONFIG_VGA_CONSOLE=y CONFIG_VGACON_SOFT_SCROLLBACK=y CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64 -CONFIG_VIDEO_SELECT=y CONFIG_MDA_CONSOLE=m CONFIG_DUMMY_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE=y @@ -3025,6 +3210,7 @@ CONFIG_FONT_8x16=y # CONFIG_FONT_10x18 is not set # CONFIG_LOGO is not set CONFIG_SOUND=m +CONFIG_SOUND_OSS_CORE=y CONFIG_SND=m CONFIG_SND_TIMER=m CONFIG_SND_PCM=m @@ -3059,8 +3245,7 @@ CONFIG_SND_MPU401=m CONFIG_SND_PORTMAN2X4=m CONFIG_SND_AC97_POWER_SAVE=y CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0 -CONFIG_SND_AD1848_LIB=m -CONFIG_SND_CS4231_LIB=m +CONFIG_SND_WSS_LIB=m CONFIG_SND_SB_COMMON=m CONFIG_SND_SB8_DSP=m CONFIG_SND_SB16_DSP=m @@ -3143,11 +3328,13 @@ CONFIG_SND_FM801_TEA575X_BOOL=y CONFIG_SND_FM801_TEA575X=m CONFIG_SND_HDA_INTEL=m CONFIG_SND_HDA_HWDEP=y +# CONFIG_SND_HDA_INPUT_BEEP is not set CONFIG_SND_HDA_CODEC_REALTEK=y CONFIG_SND_HDA_CODEC_ANALOG=y CONFIG_SND_HDA_CODEC_SIGMATEL=y CONFIG_SND_HDA_CODEC_VIA=y CONFIG_SND_HDA_CODEC_ATIHDMI=y +CONFIG_SND_HDA_CODEC_NVHDMI=y CONFIG_SND_HDA_CODEC_CONEXANT=y CONFIG_SND_HDA_CODEC_CMEDIA=y CONFIG_SND_HDA_CODEC_SI3054=y @@ -3183,6 +3370,7 @@ CONFIG_SND_USB_AUDIO=m CONFIG_SND_USB_USX2Y=m CONFIG_SND_USB_CAIAQ=m CONFIG_SND_USB_CAIAQ_INPUT=y +CONFIG_SND_USB_US122L=m CONFIG_SND_PCMCIA=y CONFIG_SND_VXPOCKET=m CONFIG_SND_PDAUDIOCF=m @@ -3198,15 +3386,36 @@ CONFIG_HIDRAW=y # USB Input Devices # CONFIG_USB_HID=y -# CONFIG_USB_HIDINPUT_POWERBOOK is not set -CONFIG_HID_FF=y CONFIG_HID_PID=y +CONFIG_USB_HIDDEV=y + +# +# Special HID drivers +# +CONFIG_HID_COMPAT=y +CONFIG_HID_A4TECH=y +CONFIG_HID_APPLE=y +CONFIG_HID_BELKIN=y +CONFIG_HID_BRIGHT=y +CONFIG_HID_CHERRY=y +CONFIG_HID_CHICONY=y +CONFIG_HID_CYPRESS=y +CONFIG_HID_DELL=y +CONFIG_HID_EZKEY=y +CONFIG_HID_GYRATION=y +CONFIG_HID_LOGITECH=y CONFIG_LOGITECH_FF=y CONFIG_LOGIRUMBLEPAD2_FF=y +CONFIG_HID_MICROSOFT=y +CONFIG_HID_MONTEREY=y +CONFIG_HID_PANTHERLORD=y CONFIG_PANTHERLORD_FF=y +CONFIG_HID_PETALYNX=y +CONFIG_HID_SAMSUNG=y +CONFIG_HID_SONY=y +CONFIG_HID_SUNPLUS=y CONFIG_THRUSTMASTER_FF=y CONFIG_ZEROPLUS_FF=y -CONFIG_USB_HIDDEV=y CONFIG_USB_SUPPORT=y CONFIG_USB_ARCH_HAS_HCD=y CONFIG_USB_ARCH_HAS_OHCI=y @@ -3224,6 +3433,9 @@ CONFIG_USB_DYNAMIC_MINORS=y CONFIG_USB_SUSPEND=y # CONFIG_USB_OTG is not set # CONFIG_USB_MON is not set +CONFIG_USB_WUSB=m +CONFIG_USB_WUSB_CBAF=m +# CONFIG_USB_WUSB_CBAF_DEBUG is not set # # USB Host Controller Drivers @@ -3231,11 +3443,11 @@ CONFIG_USB_SUSPEND=y CONFIG_USB_C67X00_HCD=m CONFIG_USB_EHCI_HCD=m CONFIG_USB_EHCI_ROOT_HUB_TT=y -# CONFIG_USB_EHCI_TT_NEWSCHED is not set +CONFIG_USB_EHCI_TT_NEWSCHED=y CONFIG_USB_ISP116X_HCD=m CONFIG_USB_ISP1760_HCD=m CONFIG_USB_OHCI_HCD=m -# CONFIG_USB_OHCI_HCD_SSB is not set +CONFIG_USB_OHCI_HCD_SSB=y # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set CONFIG_USB_OHCI_LITTLE_ENDIAN=y @@ -3244,6 +3456,8 @@ CONFIG_USB_U132_HCD=m CONFIG_USB_SL811_HCD=m CONFIG_USB_SL811_CS=m CONFIG_USB_R8A66597_HCD=m +CONFIG_USB_WHCI_HCD=m +CONFIG_USB_HWA_HCD=m # CONFIG_USB_GADGET_MUSB_HDRC is not set # @@ -3252,13 +3466,14 @@ CONFIG_USB_R8A66597_HCD=m CONFIG_USB_ACM=m CONFIG_USB_PRINTER=m CONFIG_USB_WDM=m +CONFIG_USB_TMC=m # -# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' +# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; # # -# may also be needed; see USB_STORAGE Help for more information +# see USB_STORAGE Help for more information # CONFIG_USB_STORAGE=y # CONFIG_USB_STORAGE_DEBUG is not set @@ -3271,7 +3486,7 @@ CONFIG_USB_STORAGE_SDDR09=y CONFIG_USB_STORAGE_SDDR55=y CONFIG_USB_STORAGE_JUMPSHOT=y CONFIG_USB_STORAGE_ALAUDA=y -# CONFIG_USB_STORAGE_ONETOUCH is not set +CONFIG_USB_STORAGE_ONETOUCH=y CONFIG_USB_STORAGE_KARMA=y CONFIG_USB_STORAGE_CYPRESS_ATACB=y # CONFIG_USB_LIBUSUAL is not set @@ -3349,6 +3564,7 @@ CONFIG_USB_SERIAL_OMNINET=m CONFIG_USB_EMI62=m CONFIG_USB_EMI26=m CONFIG_USB_ADUTUX=m +CONFIG_USB_SEVSEG=m CONFIG_USB_RIO500=m CONFIG_USB_LEGOTOWER=m CONFIG_USB_LCD=m @@ -3370,6 +3586,7 @@ CONFIG_USB_TRANCEVIBRATOR=m CONFIG_USB_IOWARRIOR=m CONFIG_USB_TEST=m CONFIG_USB_ISIGHTFW=m +CONFIG_USB_VST=m CONFIG_USB_ATM=m CONFIG_USB_SPEEDTOUCH=m CONFIG_USB_CXACRU=m @@ -3379,20 +3596,22 @@ CONFIG_USB_GADGET=m # CONFIG_USB_GADGET_DEBUG is not set # CONFIG_USB_GADGET_DEBUG_FILES is not set # CONFIG_USB_GADGET_DEBUG_FS is not set +CONFIG_USB_GADGET_VBUS_DRAW=2 CONFIG_USB_GADGET_SELECTED=y -# CONFIG_USB_GADGET_AMD5536UDC is not set +# CONFIG_USB_GADGET_AT91 is not set # CONFIG_USB_GADGET_ATMEL_USBA is not set # CONFIG_USB_GADGET_FSL_USB2 is not set -CONFIG_USB_GADGET_NET2280=y -CONFIG_USB_NET2280=m -# CONFIG_USB_GADGET_PXA25X is not set -# CONFIG_USB_GADGET_M66592 is not set -# CONFIG_USB_GADGET_PXA27X is not set -# CONFIG_USB_GADGET_GOKU is not set # CONFIG_USB_GADGET_LH7A40X is not set # CONFIG_USB_GADGET_OMAP is not set +# CONFIG_USB_GADGET_PXA25X is not set +# CONFIG_USB_GADGET_PXA27X is not set # CONFIG_USB_GADGET_S3C2410 is not set -# CONFIG_USB_GADGET_AT91 is not set +# CONFIG_USB_GADGET_M66592 is not set +# CONFIG_USB_GADGET_AMD5536UDC is not set +# CONFIG_USB_GADGET_FSL_QE is not set +CONFIG_USB_GADGET_NET2280=y +CONFIG_USB_NET2280=m +# CONFIG_USB_GADGET_GOKU is not set # CONFIG_USB_GADGET_DUMMY_HCD is not set CONFIG_USB_GADGET_DUALSPEED=y CONFIG_USB_ZERO=m @@ -3405,12 +3624,18 @@ CONFIG_USB_G_SERIAL=m CONFIG_USB_MIDI_GADGET=m CONFIG_USB_G_PRINTER=m CONFIG_USB_CDC_COMPOSITE=m +CONFIG_UWB=y +CONFIG_UWB_HWA=m +CONFIG_UWB_WHCI=m +CONFIG_UWB_WLP=m +CONFIG_UWB_I1480U=m +CONFIG_UWB_I1480U_WLP=m CONFIG_MMC=m # CONFIG_MMC_DEBUG is not set # CONFIG_MMC_UNSAFE_RESUME is not set # -# MMC/SD Card Drivers +# MMC/SD/SDIO Card Drivers # CONFIG_MMC_BLOCK=m CONFIG_MMC_BLOCK_BOUNCE=y @@ -3418,7 +3643,7 @@ CONFIG_SDIO_UART=m # CONFIG_MMC_TEST is not set # -# MMC/SD Host Controller Drivers +# MMC/SD/SDIO Host Controller Drivers # CONFIG_MMC_SDHCI=m CONFIG_MMC_SDHCI_PCI=m @@ -3426,7 +3651,20 @@ CONFIG_MMC_SDHCI_PCI=m CONFIG_MMC_WBSD=m CONFIG_MMC_TIFM_SD=m CONFIG_MMC_SDRICOH_CS=m -# CONFIG_MEMSTICK is not set +CONFIG_MEMSTICK=m +# CONFIG_MEMSTICK_DEBUG is not set + +# +# MemoryStick drivers +# +# CONFIG_MEMSTICK_UNSAFE_RESUME is not set +CONFIG_MSPRO_BLOCK=m + +# +# MemoryStick Host Controller Drivers +# +CONFIG_MEMSTICK_TIFM_MS=m +CONFIG_MEMSTICK_JMICRON_38X=m CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=m @@ -3434,6 +3672,8 @@ CONFIG_LEDS_CLASS=m # LED drivers # # CONFIG_LEDS_PCA9532 is not set +# CONFIG_LEDS_GPIO is not set +CONFIG_LEDS_HP_DISK=m # CONFIG_LEDS_CLEVO_MAIL is not set # CONFIG_LEDS_PCA955X is not set @@ -3444,6 +3684,7 @@ CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_IDE_DISK=y CONFIG_LEDS_TRIGGER_HEARTBEAT=m +CONFIG_LEDS_TRIGGER_BACKLIGHT=m CONFIG_LEDS_TRIGGER_DEFAULT_ON=m # CONFIG_ACCESSIBILITY is not set CONFIG_INFINIBAND=m @@ -3497,27 +3738,34 @@ CONFIG_RTC_DRV_M41T80=m CONFIG_RTC_DRV_M41T80_WDT=y CONFIG_RTC_DRV_S35390A=m CONFIG_RTC_DRV_FM3130=m +CONFIG_RTC_DRV_RX8581=m # # SPI RTC drivers # -# CONFIG_RTC_DRV_M41T94 is not set -# CONFIG_RTC_DRV_DS1305 is not set +CONFIG_RTC_DRV_M41T94=m +CONFIG_RTC_DRV_DS1305=m +CONFIG_RTC_DRV_DS1390=m CONFIG_RTC_DRV_MAX6902=m CONFIG_RTC_DRV_R9701=m CONFIG_RTC_DRV_RS5C348=m +CONFIG_RTC_DRV_DS3234=m # # Platform RTC drivers # CONFIG_RTC_DRV_CMOS=m +CONFIG_RTC_DRV_DS1286=m CONFIG_RTC_DRV_DS1511=m CONFIG_RTC_DRV_DS1553=m CONFIG_RTC_DRV_DS1742=m CONFIG_RTC_DRV_STK17TA8=m CONFIG_RTC_DRV_M48T86=m +CONFIG_RTC_DRV_M48T35=m CONFIG_RTC_DRV_M48T59=m +CONFIG_RTC_DRV_BQ4802=m CONFIG_RTC_DRV_V3020=m +CONFIG_RTC_DRV_WM8350=m # # on-CPU RTC drivers @@ -3547,6 +3795,8 @@ CONFIG_UIO_CIF=m # CONFIG_UIO_PDRV is not set # CONFIG_UIO_PDRV_GENIRQ is not set # CONFIG_UIO_SMX is not set +CONFIG_UIO_SERCOS3=m +# CONFIG_STAGING is not set # # Firmware Drivers @@ -3557,7 +3807,8 @@ CONFIG_FIRMWARE_MEMMAP=y CONFIG_DELL_RBU=m CONFIG_DCDBAS=m CONFIG_DMIID=y -# CONFIG_ISCSI_IBFT_FIND is not set +CONFIG_ISCSI_IBFT_FIND=y +CONFIG_ISCSI_IBFT=m # # File systems @@ -3571,10 +3822,11 @@ CONFIG_EXT3_FS=y CONFIG_EXT3_FS_XATTR=y CONFIG_EXT3_FS_POSIX_ACL=y CONFIG_EXT3_FS_SECURITY=y -CONFIG_EXT4DEV_FS=m -CONFIG_EXT4DEV_FS_XATTR=y -CONFIG_EXT4DEV_FS_POSIX_ACL=y -CONFIG_EXT4DEV_FS_SECURITY=y +CONFIG_EXT4_FS=m +CONFIG_EXT4DEV_COMPAT=y +CONFIG_EXT4_FS_XATTR=y +CONFIG_EXT4_FS_POSIX_ACL=y +CONFIG_EXT4_FS_SECURITY=y CONFIG_JBD=y CONFIG_JBD_DEBUG=y CONFIG_JBD2=m @@ -3592,6 +3844,7 @@ CONFIG_JFS_SECURITY=y # CONFIG_JFS_DEBUG is not set CONFIG_JFS_STATISTICS=y CONFIG_FS_POSIX_ACL=y +CONFIG_FILE_LOCKING=y CONFIG_XFS_FS=y CONFIG_XFS_QUOTA=y CONFIG_XFS_POSIX_ACL=y @@ -3605,11 +3858,12 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m CONFIG_OCFS2_FS_STATS=y CONFIG_OCFS2_DEBUG_MASKLOG=y CONFIG_OCFS2_DEBUG_FS=y +CONFIG_OCFS2_COMPAT_JBD=y CONFIG_DNOTIFY=y CONFIG_INOTIFY=y CONFIG_INOTIFY_USER=y CONFIG_QUOTA=y -# CONFIG_QUOTA_NETLINK_INTERFACE is not set +CONFIG_QUOTA_NETLINK_INTERFACE=y # CONFIG_PRINT_QUOTA_WARNING is not set CONFIG_QFMT_V1=m CONFIG_QFMT_V2=m @@ -3646,6 +3900,7 @@ CONFIG_NTFS_RW=y CONFIG_PROC_FS=y CONFIG_PROC_KCORE=y CONFIG_PROC_SYSCTL=y +CONFIG_PROC_PAGE_MONITOR=y CONFIG_SYSFS=y CONFIG_TMPFS=y CONFIG_TMPFS_POSIX_ACL=y @@ -3709,6 +3964,7 @@ CONFIG_NFS_COMMON=y CONFIG_SUNRPC=m CONFIG_SUNRPC_GSS=m CONFIG_SUNRPC_XPRT_RDMA=m +# CONFIG_SUNRPC_REGISTER_V4 is not set CONFIG_RPCSEC_GSS_KRB5=m # CONFIG_RPCSEC_GSS_SPKM3 is not set CONFIG_SMB_FS=m @@ -3835,6 +4091,7 @@ CONFIG_SLUB_STATS=y CONFIG_DEBUG_BUGVERBOSE=y # CONFIG_DEBUG_INFO is not set # CONFIG_DEBUG_VM is not set +# CONFIG_DEBUG_VIRTUAL is not set # CONFIG_DEBUG_WRITECOUNT is not set CONFIG_DEBUG_MEMORY_INIT=y # CONFIG_DEBUG_LIST is not set @@ -3843,25 +4100,35 @@ CONFIG_DEBUG_MEMORY_INIT=y # CONFIG_BOOT_PRINTK_DELAY is not set # CONFIG_RCU_TORTURE_TEST is not set # CONFIG_BACKTRACE_SELF_TEST is not set +# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set # CONFIG_FAULT_INJECTION is not set # CONFIG_LATENCYTOP is not set CONFIG_SYSCTL_SYSCALL_CHECK=y -CONFIG_HAVE_FTRACE=y +CONFIG_HAVE_FUNCTION_TRACER=y CONFIG_HAVE_DYNAMIC_FTRACE=y -# CONFIG_FTRACE is not set +CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y + +# +# Tracers +# +# CONFIG_FUNCTION_TRACER is not set # CONFIG_IRQSOFF_TRACER is not set # CONFIG_PREEMPT_TRACER is not set # CONFIG_SYSPROF_TRACER is not set # CONFIG_SCHED_TRACER is not set # CONFIG_CONTEXT_SWITCH_TRACER is not set +# CONFIG_BOOT_TRACER is not set +# CONFIG_STACK_TRACER is not set # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set # CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set +# CONFIG_DYNAMIC_PRINTK_DEBUG is not set # CONFIG_SAMPLES is not set CONFIG_HAVE_ARCH_KGDB=y # CONFIG_KGDB is not set # CONFIG_STRICT_DEVMEM is not set CONFIG_X86_VERBOSE_BOOTUP=y CONFIG_EARLY_PRINTK=y +# CONFIG_EARLY_PRINTK_DBGP is not set # CONFIG_DEBUG_STACKOVERFLOW is not set # CONFIG_DEBUG_STACK_USAGE is not set # CONFIG_DEBUG_PAGEALLOC is not set @@ -3891,6 +4158,7 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0 CONFIG_KEYS=y CONFIG_KEYS_DEBUG_PROC_KEYS=y CONFIG_SECURITY=y +CONFIG_SECURITYFS=y CONFIG_SECURITY_NETWORK=y # CONFIG_SECURITY_NETWORK_XFRM is not set # CONFIG_SECURITY_FILE_CAPABILITIES is not set @@ -3907,11 +4175,19 @@ CONFIG_CRYPTO=y # # Crypto core or helper # +CONFIG_CRYPTO_FIPS=y CONFIG_CRYPTO_ALGAPI=y +CONFIG_CRYPTO_ALGAPI2=y CONFIG_CRYPTO_AEAD=m +CONFIG_CRYPTO_AEAD2=y CONFIG_CRYPTO_BLKCIPHER=m +CONFIG_CRYPTO_BLKCIPHER2=y CONFIG_CRYPTO_HASH=y +CONFIG_CRYPTO_HASH2=y +CONFIG_CRYPTO_RNG=m +CONFIG_CRYPTO_RNG2=y CONFIG_CRYPTO_MANAGER=y +CONFIG_CRYPTO_MANAGER2=y CONFIG_CRYPTO_GF128MUL=m CONFIG_CRYPTO_NULL=m CONFIG_CRYPTO_CRYPTD=m @@ -3946,6 +4222,7 @@ CONFIG_CRYPTO_XCBC=m # Digest # CONFIG_CRYPTO_CRC32C=m +CONFIG_CRYPTO_CRC32C_INTEL=m CONFIG_CRYPTO_MD4=m CONFIG_CRYPTO_MD5=y CONFIG_CRYPTO_MICHAEL_MIC=m @@ -3987,6 +4264,11 @@ CONFIG_CRYPTO_TWOFISH_586=m # CONFIG_CRYPTO_DEFLATE=m CONFIG_CRYPTO_LZO=m + +# +# Random Number Generation +# +CONFIG_CRYPTO_ANSI_CPRNG=m CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_DEV_PADLOCK=m CONFIG_CRYPTO_DEV_PADLOCK_AES=m @@ -3994,14 +4276,10 @@ CONFIG_CRYPTO_DEV_PADLOCK_SHA=m CONFIG_CRYPTO_DEV_GEODE=m CONFIG_CRYPTO_DEV_HIFN_795X=m CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y -CONFIG_HAVE_KVM=y CONFIG_VIRTUALIZATION=y -CONFIG_KVM=m -CONFIG_KVM_INTEL=m -CONFIG_KVM_AMD=m # CONFIG_LGUEST is not set -CONFIG_VIRTIO=m -CONFIG_VIRTIO_RING=m +CONFIG_VIRTIO=y +CONFIG_VIRTIO_RING=y CONFIG_VIRTIO_PCI=m CONFIG_VIRTIO_BALLOON=m diff --git a/source/base/kernel/config.x86_64 b/source/base/kernel/config.x86_64 index d0c9739..ed1d48a 100644 --- a/source/base/kernel/config.x86_64 +++ b/source/base/kernel/config.x86_64 @@ -1,14 +1,13 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.27.8 -# Fri Dec 12 12:27:51 2008 +# Linux kernel version: 2.6.28.1 +# Sun Jan 18 23:08:39 2009 # CONFIG_64BIT=y # CONFIG_X86_32 is not set CONFIG_X86_64=y CONFIG_X86=y CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig" -# CONFIG_GENERIC_LOCKBREAK is not set CONFIG_GENERIC_TIME=y CONFIG_GENERIC_CMOS_UPDATE=y CONFIG_CLOCKSOURCE_WATCHDOG=y @@ -24,16 +23,15 @@ CONFIG_GENERIC_ISA_DMA=y CONFIG_GENERIC_IOMAP=y CONFIG_GENERIC_BUG=y CONFIG_GENERIC_HWEIGHT=y -# CONFIG_GENERIC_GPIO is not set +CONFIG_GENERIC_GPIO=y CONFIG_ARCH_MAY_HAVE_PC_FDC=y CONFIG_RWSEM_GENERIC_SPINLOCK=y # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set -# CONFIG_ARCH_HAS_ILOG2_U32 is not set -# CONFIG_ARCH_HAS_ILOG2_U64 is not set CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_ARCH_HAS_CPU_RELAX=y +CONFIG_ARCH_HAS_DEFAULT_IDLE=y CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y CONFIG_HAVE_SETUP_PER_CPU_AREA=y CONFIG_HAVE_CPUMASK_OF_CPU_MAP=y @@ -42,12 +40,12 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y CONFIG_ZONE_DMA32=y CONFIG_ARCH_POPULATES_NODE_MAP=y CONFIG_AUDIT_ARCH=y -CONFIG_ARCH_SUPPORTS_AOUT=y CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y CONFIG_GENERIC_HARDIRQS=y CONFIG_GENERIC_IRQ_PROBE=y CONFIG_GENERIC_PENDING_IRQ=y CONFIG_X86_SMP=y +CONFIG_USE_GENERIC_SMP_HELPERS=y CONFIG_X86_64_SMP=y CONFIG_X86_HT=y CONFIG_X86_BIOS_REBOOT=y @@ -81,14 +79,18 @@ CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=17 # CONFIG_CGROUPS is not set CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y -# CONFIG_GROUP_SCHED is not set +CONFIG_GROUP_SCHED=y +CONFIG_FAIR_GROUP_SCHED=y +CONFIG_RT_GROUP_SCHED=y +CONFIG_USER_SCHED=y +# CONFIG_CGROUP_SCHED is not set # CONFIG_SYSFS_DEPRECATED_V2 is not set CONFIG_RELAY=y CONFIG_NAMESPACES=y CONFIG_UTS_NS=y CONFIG_IPC_NS=y -# CONFIG_USER_NS is not set -# CONFIG_PID_NS is not set +CONFIG_USER_NS=y +CONFIG_PID_NS=y CONFIG_BLK_DEV_INITRD=y CONFIG_INITRAMFS_SOURCE="" CONFIG_CC_OPTIMIZE_FOR_SIZE=y @@ -113,7 +115,9 @@ CONFIG_SIGNALFD=y CONFIG_TIMERFD=y CONFIG_EVENTFD=y CONFIG_SHMEM=y +CONFIG_AIO=y CONFIG_VM_EVENT_COUNTERS=y +CONFIG_PCI_QUIRKS=y CONFIG_SLUB_DEBUG=y # CONFIG_SLAB is not set CONFIG_SLUB=y @@ -121,17 +125,14 @@ CONFIG_SLUB=y CONFIG_PROFILING=y # CONFIG_MARKERS is not set CONFIG_OPROFILE=m +CONFIG_OPROFILE_IBS=y CONFIG_HAVE_OPROFILE=y # CONFIG_KPROBES is not set CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y CONFIG_HAVE_IOREMAP_PROT=y CONFIG_HAVE_KPROBES=y CONFIG_HAVE_KRETPROBES=y -# CONFIG_HAVE_ARCH_TRACEHOOK is not set -# CONFIG_HAVE_DMA_ATTRS is not set -CONFIG_USE_GENERIC_SMP_HELPERS=y -# CONFIG_HAVE_CLK is not set -CONFIG_PROC_PAGE_MONITOR=y +CONFIG_HAVE_ARCH_TRACEHOOK=y # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set CONFIG_SLABINFO=y CONFIG_RT_MUTEXES=y @@ -142,13 +143,13 @@ CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y # CONFIG_MODULE_FORCE_UNLOAD is not set CONFIG_MODVERSIONS=y -# CONFIG_MODULE_SRCVERSION_ALL is not set +CONFIG_MODULE_SRCVERSION_ALL=y CONFIG_KMOD=y CONFIG_STOP_MACHINE=y CONFIG_BLOCK=y CONFIG_BLK_DEV_IO_TRACE=y CONFIG_BLK_DEV_BSG=y -# CONFIG_BLK_DEV_INTEGRITY is not set +CONFIG_BLK_DEV_INTEGRITY=y CONFIG_BLOCK_COMPAT=y # @@ -165,6 +166,7 @@ CONFIG_DEFAULT_CFQ=y CONFIG_DEFAULT_IOSCHED="cfq" CONFIG_PREEMPT_NOTIFIERS=y # CONFIG_CLASSIC_RCU is not set +CONFIG_FREEZER=y # # Processor type and features @@ -181,8 +183,14 @@ CONFIG_X86_PC=y # CONFIG_X86_VOYAGER is not set # CONFIG_X86_GENERICARCH is not set # CONFIG_X86_VSMP is not set -# CONFIG_PARAVIRT_GUEST is not set -# CONFIG_MEMTEST is not set +CONFIG_PARAVIRT_GUEST=y +# CONFIG_XEN is not set +CONFIG_KVM_CLOCK=y +CONFIG_KVM_GUEST=y +CONFIG_PARAVIRT=y +CONFIG_PARAVIRT_CLOCK=y +# CONFIG_PARAVIRT_DEBUG is not set +CONFIG_MEMTEST=y # CONFIG_M386 is not set # CONFIG_M486 is not set # CONFIG_M586 is not set @@ -199,7 +207,6 @@ CONFIG_X86_PC=y # CONFIG_MCRUSOE is not set # CONFIG_MEFFICEON is not set # CONFIG_MWINCHIPC6 is not set -# CONFIG_MWINCHIP2 is not set # CONFIG_MWINCHIP3D is not set # CONFIG_MGEODEGX1 is not set # CONFIG_MGEODE_LX is not set @@ -220,15 +227,19 @@ CONFIG_X86_CMPXCHG64=y CONFIG_X86_CMOV=y CONFIG_X86_MINIMUM_CPU_FAMILY=64 CONFIG_X86_DEBUGCTLMSR=y +CONFIG_CPU_SUP_INTEL=y +CONFIG_CPU_SUP_AMD=y +CONFIG_CPU_SUP_CENTAUR_64=y +# CONFIG_X86_DS is not set CONFIG_HPET_TIMER=y CONFIG_HPET_EMULATE_RTC=y CONFIG_DMI=y CONFIG_GART_IOMMU=y # CONFIG_CALGARY_IOMMU is not set -# CONFIG_AMD_IOMMU is not set +CONFIG_AMD_IOMMU=y CONFIG_SWIOTLB=y CONFIG_IOMMU_HELPER=y -CONFIG_NR_CPUS=8 +CONFIG_NR_CPUS=16 CONFIG_SCHED_SMT=y CONFIG_SCHED_MC=y # CONFIG_PREEMPT_NONE is not set @@ -243,9 +254,12 @@ CONFIG_X86_MCE_INTEL=y CONFIG_X86_MCE_AMD=y CONFIG_I8K=m CONFIG_MICROCODE=m +CONFIG_MICROCODE_INTEL=y +CONFIG_MICROCODE_AMD=y CONFIG_MICROCODE_OLD_INTERFACE=y CONFIG_X86_MSR=m CONFIG_X86_CPUID=m +CONFIG_ARCH_PHYS_ADDR_T_64BIT=y # CONFIG_NUMA is not set CONFIG_ARCH_SPARSEMEM_DEFAULT=y CONFIG_ARCH_SPARSEMEM_ENABLE=y @@ -256,7 +270,6 @@ CONFIG_SELECT_MEMORY_MODEL=y CONFIG_SPARSEMEM_MANUAL=y CONFIG_SPARSEMEM=y CONFIG_HAVE_MEMORY_PRESENT=y -# CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPARSEMEM_EXTREME=y CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y CONFIG_SPARSEMEM_VMEMMAP=y @@ -267,13 +280,19 @@ CONFIG_SPARSEMEM_VMEMMAP=y CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_RESOURCES_64BIT=y +CONFIG_PHYS_ADDR_T_64BIT=y CONFIG_ZONE_DMA_FLAG=1 CONFIG_BOUNCE=y CONFIG_VIRT_TO_BUS=y +CONFIG_UNEVICTABLE_LRU=y CONFIG_MMU_NOTIFIER=y +CONFIG_X86_CHECK_BIOS_CORRUPTION=y +CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y CONFIG_X86_RESERVE_LOW_64K=y CONFIG_MTRR=y -# CONFIG_MTRR_SANITIZER is not set +CONFIG_MTRR_SANITIZER=y +CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0 +CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 CONFIG_X86_PAT=y # CONFIG_EFI is not set CONFIG_SECCOMP=y @@ -290,10 +309,11 @@ CONFIG_PHYSICAL_START=0x200000 CONFIG_PHYSICAL_ALIGN=0x200000 CONFIG_HOTPLUG_CPU=y # CONFIG_COMPAT_VDSO is not set +# CONFIG_CMDLINE_BOOL is not set CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y # -# Power management options +# Power management and ACPI options # CONFIG_ARCH_HIBERNATION_HEADER=y CONFIG_PM=y @@ -316,7 +336,6 @@ CONFIG_ACPI_BUTTON=m CONFIG_ACPI_VIDEO=m CONFIG_ACPI_FAN=m CONFIG_ACPI_DOCK=y -CONFIG_ACPI_BAY=m CONFIG_ACPI_PROCESSOR=m CONFIG_ACPI_HOTPLUG_CPU=y CONFIG_ACPI_THERMAL=m @@ -326,9 +345,7 @@ CONFIG_ACPI_TOSHIBA=m # CONFIG_ACPI_CUSTOM_DSDT is not set CONFIG_ACPI_BLACKLIST_YEAR=0 # CONFIG_ACPI_DEBUG is not set -CONFIG_ACPI_EC=y -# CONFIG_ACPI_PCI_SLOT is not set -CONFIG_ACPI_POWER=y +CONFIG_ACPI_PCI_SLOT=m CONFIG_ACPI_SYSTEM=y CONFIG_X86_PM_TIMER=y CONFIG_ACPI_CONTAINER=m @@ -341,7 +358,7 @@ CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_TABLE=m # CONFIG_CPU_FREQ_DEBUG is not set CONFIG_CPU_FREQ_STAT=m -# CONFIG_CPU_FREQ_STAT_DETAILS is not set +CONFIG_CPU_FREQ_STAT_DETAILS=y # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y @@ -372,6 +389,12 @@ CONFIG_CPU_IDLE_GOV_LADDER=y CONFIG_CPU_IDLE_GOV_MENU=y # +# Memory power savings +# +CONFIG_I7300_IDLE_IOAT_CHANNEL=y +CONFIG_I7300_IDLE=m + +# # Bus options (PCI etc.) # CONFIG_PCI=y @@ -379,10 +402,12 @@ CONFIG_PCI_DIRECT=y CONFIG_PCI_MMCONFIG=y CONFIG_PCI_DOMAINS=y # CONFIG_DMAR is not set +CONFIG_INTR_REMAP=y CONFIG_PCIEPORTBUS=y CONFIG_HOTPLUG_PCI_PCIE=m CONFIG_PCIEAER=y -# CONFIG_PCIEASPM is not set +CONFIG_PCIEASPM=y +# CONFIG_PCIEASPM_DEBUG is not set CONFIG_ARCH_SUPPORTS_MSI=y CONFIG_PCI_MSI=y CONFIG_PCI_LEGACY=y @@ -423,6 +448,8 @@ CONFIG_HOTPLUG_PCI_SHPC=m # CONFIG_BINFMT_ELF=y CONFIG_COMPAT_BINFMT_ELF=y +# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set +# CONFIG_HAVE_AOUT is not set CONFIG_BINFMT_MISC=m CONFIG_IA32_EMULATION=y CONFIG_IA32_AOUT=m @@ -464,7 +491,7 @@ CONFIG_NET_IPGRE_BROADCAST=y CONFIG_IP_MROUTE=y CONFIG_IP_PIMSM_V1=y CONFIG_IP_PIMSM_V2=y -# CONFIG_ARPD is not set +CONFIG_ARPD=y CONFIG_SYN_COOKIES=y CONFIG_INET_AH=m CONFIG_INET_ESP=m @@ -498,7 +525,6 @@ CONFIG_DEFAULT_BIC=y # CONFIG_DEFAULT_RENO is not set CONFIG_DEFAULT_TCP_CONG="bic" # CONFIG_TCP_MD5SIG is not set -# CONFIG_IP_VS is not set CONFIG_IPV6=m CONFIG_IPV6_PRIVACY=y CONFIG_IPV6_ROUTER_PREF=y @@ -518,7 +544,7 @@ CONFIG_IPV6_SIT=m CONFIG_IPV6_NDISC_NODETYPE=y CONFIG_IPV6_TUNNEL=m CONFIG_IPV6_MULTIPLE_TABLES=y -# CONFIG_IPV6_SUBTREES is not set +CONFIG_IPV6_SUBTREES=y CONFIG_IPV6_MROUTE=y CONFIG_IPV6_PIMSM_V2=y CONFIG_NETLABEL=y @@ -553,15 +579,17 @@ CONFIG_NF_CONNTRACK_SANE=m CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_TFTP=m CONFIG_NF_CT_NETLINK=m +CONFIG_NETFILTER_TPROXY=m CONFIG_NETFILTER_XTABLES=m CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m CONFIG_NETFILTER_XT_TARGET_CONNMARK=m CONFIG_NETFILTER_XT_TARGET_DSCP=m CONFIG_NETFILTER_XT_TARGET_MARK=m -CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m CONFIG_NETFILTER_XT_TARGET_NFLOG=m +CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m CONFIG_NETFILTER_XT_TARGET_NOTRACK=m CONFIG_NETFILTER_XT_TARGET_RATEEST=m +CONFIG_NETFILTER_XT_TARGET_TPROXY=m CONFIG_NETFILTER_XT_TARGET_TRACE=m CONFIG_NETFILTER_XT_TARGET_SECMARK=m CONFIG_NETFILTER_XT_TARGET_TCPMSS=m @@ -574,41 +602,45 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m CONFIG_NETFILTER_XT_MATCH_DCCP=m CONFIG_NETFILTER_XT_MATCH_DSCP=m CONFIG_NETFILTER_XT_MATCH_ESP=m +CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m CONFIG_NETFILTER_XT_MATCH_HELPER=m CONFIG_NETFILTER_XT_MATCH_IPRANGE=m CONFIG_NETFILTER_XT_MATCH_LENGTH=m CONFIG_NETFILTER_XT_MATCH_LIMIT=m CONFIG_NETFILTER_XT_MATCH_MAC=m CONFIG_NETFILTER_XT_MATCH_MARK=m +CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m CONFIG_NETFILTER_XT_MATCH_OWNER=m CONFIG_NETFILTER_XT_MATCH_POLICY=m -CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m CONFIG_NETFILTER_XT_MATCH_QUOTA=m CONFIG_NETFILTER_XT_MATCH_RATEEST=m CONFIG_NETFILTER_XT_MATCH_REALM=m +CONFIG_NETFILTER_XT_MATCH_RECENT=m +CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT=y CONFIG_NETFILTER_XT_MATCH_SCTP=m +CONFIG_NETFILTER_XT_MATCH_SOCKET=m CONFIG_NETFILTER_XT_MATCH_STATE=m CONFIG_NETFILTER_XT_MATCH_STATISTIC=m CONFIG_NETFILTER_XT_MATCH_STRING=m CONFIG_NETFILTER_XT_MATCH_TCPMSS=m CONFIG_NETFILTER_XT_MATCH_TIME=m CONFIG_NETFILTER_XT_MATCH_U32=m -CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m +# CONFIG_IP_VS is not set # # IP: Netfilter Configuration # +CONFIG_NF_DEFRAG_IPV4=m CONFIG_NF_CONNTRACK_IPV4=m CONFIG_NF_CONNTRACK_PROC_COMPAT=y CONFIG_IP_NF_QUEUE=m CONFIG_IP_NF_IPTABLES=m -CONFIG_IP_NF_MATCH_RECENT=m -CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_ADDRTYPE=m CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_ECN=m CONFIG_IP_NF_MATCH_TTL=m -CONFIG_IP_NF_MATCH_ADDRTYPE=m CONFIG_IP_NF_FILTER=m CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_TARGET_LOG=m @@ -616,8 +648,8 @@ CONFIG_IP_NF_TARGET_ULOG=m CONFIG_NF_NAT=m CONFIG_NF_NAT_NEEDED=y CONFIG_IP_NF_TARGET_MASQUERADE=m -CONFIG_IP_NF_TARGET_REDIRECT=m CONFIG_IP_NF_TARGET_NETMAP=m +CONFIG_IP_NF_TARGET_REDIRECT=m CONFIG_NF_NAT_SNMP_BASIC=m CONFIG_NF_NAT_PROTO_DCCP=m CONFIG_NF_NAT_PROTO_GRE=m @@ -631,9 +663,9 @@ CONFIG_NF_NAT_PPTP=m CONFIG_NF_NAT_H323=m CONFIG_NF_NAT_SIP=m CONFIG_IP_NF_MANGLE=m +CONFIG_IP_NF_TARGET_CLUSTERIP=m CONFIG_IP_NF_TARGET_ECN=m CONFIG_IP_NF_TARGET_TTL=m -CONFIG_IP_NF_TARGET_CLUSTERIP=m CONFIG_IP_NF_RAW=m CONFIG_IP_NF_SECURITY=m CONFIG_IP_NF_ARPTABLES=m @@ -646,16 +678,16 @@ CONFIG_IP_NF_ARP_MANGLE=m CONFIG_NF_CONNTRACK_IPV6=m CONFIG_IP6_NF_QUEUE=m CONFIG_IP6_NF_IPTABLES=m -CONFIG_IP6_NF_MATCH_RT=m -CONFIG_IP6_NF_MATCH_OPTS=m +CONFIG_IP6_NF_MATCH_AH=m +CONFIG_IP6_NF_MATCH_EUI64=m CONFIG_IP6_NF_MATCH_FRAG=m +CONFIG_IP6_NF_MATCH_OPTS=m CONFIG_IP6_NF_MATCH_HL=m CONFIG_IP6_NF_MATCH_IPV6HEADER=m -CONFIG_IP6_NF_MATCH_AH=m CONFIG_IP6_NF_MATCH_MH=m -CONFIG_IP6_NF_MATCH_EUI64=m -CONFIG_IP6_NF_FILTER=m +CONFIG_IP6_NF_MATCH_RT=m CONFIG_IP6_NF_TARGET_LOG=m +CONFIG_IP6_NF_FILTER=m CONFIG_IP6_NF_TARGET_REJECT=m CONFIG_IP6_NF_MANGLE=m CONFIG_IP6_NF_TARGET_HL=m @@ -666,10 +698,6 @@ CONFIG_IP6_NF_SECURITY=m # DECnet: Netfilter Configuration # CONFIG_DECNET_NF_GRABULATOR=m - -# -# Bridge: Netfilter Configuration -# CONFIG_BRIDGE_NF_EBTABLES=m CONFIG_BRIDGE_EBT_BROUTE=m CONFIG_BRIDGE_EBT_T_FILTER=m @@ -692,14 +720,33 @@ CONFIG_BRIDGE_EBT_SNAT=m CONFIG_BRIDGE_EBT_LOG=m # CONFIG_BRIDGE_EBT_ULOG is not set CONFIG_BRIDGE_EBT_NFLOG=m -# CONFIG_IP_DCCP is not set +CONFIG_IP_DCCP=m +CONFIG_INET_DCCP_DIAG=m +CONFIG_IP_DCCP_ACKVEC=y + +# +# DCCP CCIDs Configuration (EXPERIMENTAL) +# +CONFIG_IP_DCCP_CCID2=m +# CONFIG_IP_DCCP_CCID2_DEBUG is not set +CONFIG_IP_DCCP_CCID3=m +# CONFIG_IP_DCCP_CCID3_DEBUG is not set +CONFIG_IP_DCCP_CCID3_RTO=100 +CONFIG_IP_DCCP_TFRC_LIB=m + +# +# DCCP Kernel Hacking +# +# CONFIG_IP_DCCP_DEBUG is not set CONFIG_IP_SCTP=m # CONFIG_SCTP_DBG_MSG is not set # CONFIG_SCTP_DBG_OBJCNT is not set # CONFIG_SCTP_HMAC_NONE is not set # CONFIG_SCTP_HMAC_SHA1 is not set CONFIG_SCTP_HMAC_MD5=y -# CONFIG_TIPC is not set +CONFIG_TIPC=m +# CONFIG_TIPC_ADVANCED is not set +# CONFIG_TIPC_DEBUG is not set CONFIG_ATM=m CONFIG_ATM_CLIP=m # CONFIG_ATM_CLIP_NO_ICMP is not set @@ -709,6 +756,7 @@ CONFIG_ATM_BR2684=m # CONFIG_ATM_BR2684_IPFILTER is not set CONFIG_STP=m CONFIG_BRIDGE=m +# CONFIG_NET_DSA is not set CONFIG_VLAN_8021Q=m # CONFIG_VLAN_8021Q_GVRP is not set CONFIG_DECNET=m @@ -716,7 +764,7 @@ CONFIG_DECNET=m CONFIG_LLC=y CONFIG_LLC2=m CONFIG_IPX=m -# CONFIG_IPX_INTERN is not set +CONFIG_IPX_INTERN=y CONFIG_ATALK=m CONFIG_DEV_APPLETALK=m CONFIG_IPDDP=m @@ -738,6 +786,7 @@ CONFIG_NET_SCH_HTB=m CONFIG_NET_SCH_HFSC=m CONFIG_NET_SCH_ATM=m CONFIG_NET_SCH_PRIO=m +CONFIG_NET_SCH_MULTIQ=m CONFIG_NET_SCH_RED=m CONFIG_NET_SCH_SFQ=m CONFIG_NET_SCH_TEQL=m @@ -761,7 +810,7 @@ CONFIG_NET_CLS_U32=m CONFIG_CLS_U32_MARK=y CONFIG_NET_CLS_RSVP=m CONFIG_NET_CLS_RSVP6=m -# CONFIG_NET_CLS_FLOW is not set +CONFIG_NET_CLS_FLOW=m CONFIG_NET_EMATCH=y CONFIG_NET_EMATCH_STACK=32 CONFIG_NET_EMATCH_CMP=m @@ -778,6 +827,7 @@ CONFIG_NET_ACT_IPT=m CONFIG_NET_ACT_NAT=m CONFIG_NET_ACT_PEDIT=m # CONFIG_NET_ACT_SIMP is not set +CONFIG_NET_ACT_SKBEDIT=m CONFIG_NET_CLS_IND=y CONFIG_NET_SCH_FIFO=y @@ -878,14 +928,13 @@ CONFIG_BT_RFCOMM_TTY=y CONFIG_BT_BNEP=m CONFIG_BT_BNEP_MC_FILTER=y CONFIG_BT_BNEP_PROTO_FILTER=y +# CONFIG_BT_CMTP is not set CONFIG_BT_HIDP=m # # Bluetooth device drivers # -CONFIG_BT_HCIUSB=m -CONFIG_BT_HCIUSB_SCO=y -# CONFIG_BT_HCIBTUSB is not set +CONFIG_BT_HCIBTUSB=m CONFIG_BT_HCIBTSDIO=m CONFIG_BT_HCIUART=m CONFIG_BT_HCIUART_H4=y @@ -902,13 +951,12 @@ CONFIG_BT_HCIVHCI=m CONFIG_AF_RXRPC=m # CONFIG_AF_RXRPC_DEBUG is not set CONFIG_RXKAD=m +CONFIG_PHONET=m CONFIG_FIB_RULES=y - -# -# Wireless -# +CONFIG_WIRELESS=y CONFIG_CFG80211=m CONFIG_NL80211=y +CONFIG_WIRELESS_OLD_REGULATORY=y CONFIG_WIRELESS_EXT=y CONFIG_WIRELESS_EXT_SYSFS=y CONFIG_MAC80211=m @@ -917,7 +965,9 @@ CONFIG_MAC80211=m # Rate control algorithm selection # CONFIG_MAC80211_RC_PID=y +CONFIG_MAC80211_RC_MINSTREL=y CONFIG_MAC80211_RC_DEFAULT_PID=y +# CONFIG_MAC80211_RC_DEFAULT_MINSTREL is not set CONFIG_MAC80211_RC_DEFAULT="pid" CONFIG_MAC80211_MESH=y CONFIG_MAC80211_LEDS=y @@ -932,7 +982,8 @@ CONFIG_RFKILL=m CONFIG_RFKILL_INPUT=m CONFIG_RFKILL_LEDS=y CONFIG_NET_9P=m -# CONFIG_NET_9P_VIRTIO is not set +CONFIG_NET_9P_VIRTIO=m +CONFIG_NET_9P_RDMA=m # CONFIG_NET_9P_DEBUG is not set # @@ -958,7 +1009,7 @@ CONFIG_MTD_CONCAT=m CONFIG_MTD_PARTITIONS=y CONFIG_MTD_REDBOOT_PARTS=m CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 -# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set +CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y # CONFIG_MTD_REDBOOT_PARTS_READONLY is not set CONFIG_MTD_AR7_PARTS=m @@ -966,6 +1017,7 @@ CONFIG_MTD_AR7_PARTS=m # User Modules And Translation Layers # CONFIG_MTD_CHAR=m +CONFIG_HAVE_MTD_OTP=y CONFIG_MTD_BLKDEVS=m CONFIG_MTD_BLOCK=m CONFIG_MTD_BLOCK_RO=m @@ -1034,6 +1086,8 @@ CONFIG_MTD_PMC551=m CONFIG_MTD_PMC551_BUGFIX=y # CONFIG_MTD_PMC551_DEBUG is not set CONFIG_MTD_DATAFLASH=m +CONFIG_MTD_DATAFLASH_WRITE_VERIFY=y +# CONFIG_MTD_DATAFLASH_OTP is not set CONFIG_MTD_M25P80=m CONFIG_M25PXX_USE_FAST_READ=y CONFIG_MTD_SLRAM=m @@ -1051,14 +1105,20 @@ CONFIG_MTD_BLOCK2MTD=m CONFIG_MTD_DOC2001PLUS=m CONFIG_MTD_DOCPROBE=m CONFIG_MTD_DOCECC=m -# CONFIG_MTD_DOCPROBE_ADVANCED is not set -CONFIG_MTD_DOCPROBE_ADDRESS=0 +CONFIG_MTD_DOCPROBE_ADVANCED=y +CONFIG_MTD_DOCPROBE_ADDRESS=0x0000 +CONFIG_MTD_DOCPROBE_HIGH=y +CONFIG_MTD_DOCPROBE_55AA=y CONFIG_MTD_NAND=m CONFIG_MTD_NAND_VERIFY_WRITE=y -# CONFIG_MTD_NAND_ECC_SMC is not set -# CONFIG_MTD_NAND_MUSEUM_IDS is not set +CONFIG_MTD_NAND_ECC_SMC=y +CONFIG_MTD_NAND_MUSEUM_IDS=y CONFIG_MTD_NAND_IDS=m -# CONFIG_MTD_NAND_DISKONCHIP is not set +CONFIG_MTD_NAND_DISKONCHIP=m +CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED=y +CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0 +CONFIG_MTD_NAND_DISKONCHIP_PROBE_HIGH=y +CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE=y CONFIG_MTD_NAND_CAFE=m CONFIG_MTD_NAND_NANDSIM=m CONFIG_MTD_NAND_PLATFORM=m @@ -1066,7 +1126,7 @@ CONFIG_MTD_ALAUDA=m CONFIG_MTD_ONENAND=m CONFIG_MTD_ONENAND_VERIFY_WRITE=y CONFIG_MTD_ONENAND_OTP=y -# CONFIG_MTD_ONENAND_2X_PROGRAM is not set +CONFIG_MTD_ONENAND_2X_PROGRAM=y CONFIG_MTD_ONENAND_SIM=m # @@ -1092,7 +1152,7 @@ CONFIG_PARPORT_AX88796=m CONFIG_PARPORT_1284=y CONFIG_PARPORT_NOT_PC=y CONFIG_PNP=y -# CONFIG_PNP_DEBUG is not set +# CONFIG_PNP_DEBUG_MESSAGES is not set # # Protocols @@ -1148,7 +1208,7 @@ CONFIG_CDROM_PKTCDVD=m CONFIG_CDROM_PKTCDVD_BUFFERS=8 CONFIG_CDROM_PKTCDVD_WCACHE=y CONFIG_ATA_OVER_ETH=m -# CONFIG_VIRTIO_BLK is not set +CONFIG_VIRTIO_BLK=m # CONFIG_BLK_DEV_HD is not set CONFIG_MISC_DEVICES=y CONFIG_IBM_ASM=m @@ -1161,9 +1221,11 @@ CONFIG_ACER_WMI=m CONFIG_ASUS_LAPTOP=m CONFIG_FUJITSU_LAPTOP=m # CONFIG_FUJITSU_LAPTOP_DEBUG is not set -# CONFIG_HP_WMI is not set +CONFIG_HP_WMI=m +CONFIG_ICS932S401=m CONFIG_MSI_LAPTOP=m -# CONFIG_COMPAL_LAPTOP is not set +CONFIG_PANASONIC_LAPTOP=m +CONFIG_COMPAL_LAPTOP=m CONFIG_SONY_LAPTOP=m CONFIG_SONYPI_COMPAT=y CONFIG_THINKPAD_ACPI=m @@ -1171,15 +1233,17 @@ CONFIG_THINKPAD_ACPI=m CONFIG_THINKPAD_ACPI_BAY=y CONFIG_THINKPAD_ACPI_VIDEO=y CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y -# CONFIG_INTEL_MENLOW is not set +CONFIG_INTEL_MENLOW=m CONFIG_EEEPC_LAPTOP=m CONFIG_ENCLOSURE_SERVICES=m -# CONFIG_SGI_XP is not set -# CONFIG_HP_ILO is not set -# CONFIG_SGI_GRU is not set +CONFIG_SGI_XP=m +CONFIG_HP_ILO=m +CONFIG_SGI_GRU=m +# CONFIG_SGI_GRU_DEBUG is not set +CONFIG_C2PORT=m +CONFIG_C2PORT_DURAMAR_2150=m CONFIG_HAVE_IDE=y CONFIG_IDE=y -CONFIG_BLK_DEV_IDE=y # # Please see Documentation/ide/ide.txt for help/info on IDE drives @@ -1187,17 +1251,17 @@ CONFIG_BLK_DEV_IDE=y CONFIG_IDE_TIMINGS=y CONFIG_IDE_ATAPI=y # CONFIG_BLK_DEV_IDE_SATA is not set -CONFIG_BLK_DEV_IDEDISK=y -CONFIG_IDEDISK_MULTI_MODE=y +CONFIG_IDE_GD=y +CONFIG_IDE_GD_ATA=y +CONFIG_IDE_GD_ATAPI=y CONFIG_BLK_DEV_IDECS=m CONFIG_BLK_DEV_DELKIN=m CONFIG_BLK_DEV_IDECD=y CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y CONFIG_BLK_DEV_IDETAPE=m -CONFIG_BLK_DEV_IDEFLOPPY=m # CONFIG_BLK_DEV_IDESCSI is not set -# CONFIG_BLK_DEV_IDEACPI is not set -# CONFIG_IDE_TASK_IOCTL is not set +CONFIG_BLK_DEV_IDEACPI=y +CONFIG_IDE_TASK_IOCTL=y CONFIG_IDE_PROC_FS=y # @@ -1207,7 +1271,7 @@ CONFIG_IDE_GENERIC=m # CONFIG_BLK_DEV_PLATFORM is not set CONFIG_BLK_DEV_CMD640=y CONFIG_BLK_DEV_CMD640_ENHANCED=y -# CONFIG_BLK_DEV_IDEPNP is not set +CONFIG_BLK_DEV_IDEPNP=m CONFIG_BLK_DEV_IDEDMA_SFF=y # @@ -1425,6 +1489,7 @@ CONFIG_PATA_WINBOND=m # CONFIG_PATA_SCH is not set CONFIG_MD=y CONFIG_BLK_DEV_MD=y +CONFIG_MD_AUTODETECT=y CONFIG_MD_LINEAR=y CONFIG_MD_RAID0=y CONFIG_MD_RAID1=y @@ -1544,6 +1609,9 @@ CONFIG_HP100=m # CONFIG_IBM_NEW_EMAC_RGMII is not set # CONFIG_IBM_NEW_EMAC_TAH is not set # CONFIG_IBM_NEW_EMAC_EMAC4 is not set +# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set +# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set +# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set CONFIG_NET_PCI=y CONFIG_PCNET32=m CONFIG_AMD8111_ETH=m @@ -1578,12 +1646,12 @@ CONFIG_NET_POCKET=y CONFIG_ATP=m CONFIG_DE600=m CONFIG_DE620=m +CONFIG_ATL2=m CONFIG_NETDEV_1000=y CONFIG_ACENIC=m # CONFIG_ACENIC_OMIT_TIGON_I is not set CONFIG_DL2K=m CONFIG_E1000=m -# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set CONFIG_E1000E=m CONFIG_IP1000=m # CONFIG_IGB is not set @@ -1603,20 +1671,26 @@ CONFIG_BNX2=m CONFIG_QLA3XXX=m CONFIG_ATL1=m CONFIG_ATL1E=m +CONFIG_JME=m CONFIG_NETDEV_10000=y CONFIG_CHELSIO_T1=m CONFIG_CHELSIO_T1_1G=y CONFIG_CHELSIO_T3=m +CONFIG_ENIC=m CONFIG_IXGBE=m +CONFIG_IXGBE_DCA=y CONFIG_IXGB=m CONFIG_S2IO=m CONFIG_MYRI10GE=m +CONFIG_MYRI10GE_DCA=y CONFIG_NETXEN_NIC=m CONFIG_NIU=m +CONFIG_MLX4_EN=m CONFIG_MLX4_CORE=m CONFIG_MLX4_DEBUG=y CONFIG_TEHUTI=m # CONFIG_BNX2X is not set +CONFIG_QLGE=m CONFIG_SFC=m CONFIG_TR=y CONFIG_IBMOL=m @@ -1648,6 +1722,8 @@ CONFIG_LIBERTAS_USB=m CONFIG_LIBERTAS_CS=m CONFIG_LIBERTAS_SDIO=m # CONFIG_LIBERTAS_DEBUG is not set +CONFIG_LIBERTAS_THINFIRM=m +CONFIG_LIBERTAS_THINFIRM_USB=m CONFIG_AIRO=m CONFIG_HERMES=m CONFIG_PLX_HERMES=m @@ -1712,25 +1788,18 @@ CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y CONFIG_ZD1211RW=m # CONFIG_ZD1211RW_DEBUG is not set CONFIG_RT2X00=m -CONFIG_RT2X00_LIB=m -CONFIG_RT2X00_LIB_PCI=m -CONFIG_RT2X00_LIB_USB=m -CONFIG_RT2X00_LIB_FIRMWARE=y -CONFIG_RT2X00_LIB_RFKILL=y -CONFIG_RT2X00_LIB_LEDS=y CONFIG_RT2400PCI=m -CONFIG_RT2400PCI_RFKILL=y -CONFIG_RT2400PCI_LEDS=y CONFIG_RT2500PCI=m -CONFIG_RT2500PCI_RFKILL=y -CONFIG_RT2500PCI_LEDS=y CONFIG_RT61PCI=m -CONFIG_RT61PCI_RFKILL=y -CONFIG_RT61PCI_LEDS=y CONFIG_RT2500USB=m -CONFIG_RT2500USB_LEDS=y CONFIG_RT73USB=m -CONFIG_RT73USB_LEDS=y +CONFIG_RT2X00_LIB_PCI=m +CONFIG_RT2X00_LIB_USB=m +CONFIG_RT2X00_LIB=m +CONFIG_RT2X00_LIB_FIRMWARE=y +CONFIG_RT2X00_LIB_CRYPTO=y +CONFIG_RT2X00_LIB_RFKILL=y +CONFIG_RT2X00_LIB_LEDS=y # CONFIG_RT2X00_DEBUG is not set # @@ -1744,6 +1813,7 @@ CONFIG_USB_USBNET=m CONFIG_USB_NET_AX8817X=m CONFIG_USB_NET_CDCETHER=m CONFIG_USB_NET_DM9601=m +CONFIG_USB_NET_SMSC95XX=m CONFIG_USB_NET_GL620A=m CONFIG_USB_NET_NET1080=m CONFIG_USB_NET_PLUSB=m @@ -1768,6 +1838,7 @@ CONFIG_PCMCIA_SMC91C92=m CONFIG_PCMCIA_XIRC2PS=m CONFIG_PCMCIA_AXNET=m CONFIG_ARCNET_COM20020_CS=m +CONFIG_PCMCIA_IBMTR=m CONFIG_WAN=y CONFIG_LANMEDIA=m CONFIG_HDLC=m @@ -1779,16 +1850,6 @@ CONFIG_HDLC_PPP=m CONFIG_HDLC_X25=m CONFIG_PCI200SYN=m CONFIG_WANXL=m -CONFIG_PC300=m -# CONFIG_PC300_MLPPP is not set - -# -# Cyclades-PC300 MLPPP support is disabled. -# - -# -# Refer to the file README.mlppp, provided by PC300 package. -# CONFIG_PC300TOO=m CONFIG_FARSYNC=m CONFIG_DSCC4=m @@ -1856,7 +1917,42 @@ CONFIG_NETPOLL=y CONFIG_NETPOLL_TRAP=y CONFIG_NET_POLL_CONTROLLER=y CONFIG_VIRTIO_NET=m -# CONFIG_ISDN is not set +CONFIG_ISDN=y +CONFIG_MISDN=m +CONFIG_MISDN_DSP=m +CONFIG_MISDN_L1OIP=m + +# +# mISDN hardware drivers +# +CONFIG_MISDN_HFCPCI=m +CONFIG_MISDN_HFCMULTI=m +# CONFIG_ISDN_I4L is not set +CONFIG_ISDN_CAPI=m +CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y +CONFIG_CAPI_TRACE=y +CONFIG_ISDN_CAPI_MIDDLEWARE=y +CONFIG_ISDN_CAPI_CAPI20=m +CONFIG_ISDN_CAPI_CAPIFS_BOOL=y +CONFIG_ISDN_CAPI_CAPIFS=m + +# +# CAPI hardware drivers +# +CONFIG_CAPI_AVM=y +CONFIG_ISDN_DRV_AVMB1_B1PCI=m +CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y +CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m +CONFIG_ISDN_DRV_AVMB1_AVM_CS=m +CONFIG_ISDN_DRV_AVMB1_T1PCI=m +CONFIG_ISDN_DRV_AVMB1_C4=m +CONFIG_CAPI_EICON=y +CONFIG_ISDN_DIVAS=m +CONFIG_ISDN_DIVAS_BRIPCI=y +CONFIG_ISDN_DIVAS_PRIPCI=y +CONFIG_ISDN_DIVAS_DIVACAPI=m +CONFIG_ISDN_DIVAS_USERIDI=m +CONFIG_ISDN_DIVAS_MAINT=m CONFIG_PHONE=m CONFIG_PHONE_IXJ=m CONFIG_PHONE_IXJ_PCMCIA=m @@ -1889,6 +1985,7 @@ CONFIG_KEYBOARD_LKKBD=m CONFIG_KEYBOARD_XTKBD=m CONFIG_KEYBOARD_NEWTON=m CONFIG_KEYBOARD_STOWAWAY=m +# CONFIG_KEYBOARD_GPIO is not set CONFIG_INPUT_MOUSE=y CONFIG_MOUSE_PS2=y CONFIG_MOUSE_PS2_ALPS=y @@ -1896,11 +1993,13 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y CONFIG_MOUSE_PS2_SYNAPTICS=y CONFIG_MOUSE_PS2_LIFEBOOK=y CONFIG_MOUSE_PS2_TRACKPOINT=y +# CONFIG_MOUSE_PS2_ELANTECH is not set # CONFIG_MOUSE_PS2_TOUCHKIT is not set CONFIG_MOUSE_SERIAL=m CONFIG_MOUSE_APPLETOUCH=m # CONFIG_MOUSE_BCM5974 is not set CONFIG_MOUSE_VSXXXAA=m +# CONFIG_MOUSE_GPIO is not set CONFIG_INPUT_JOYSTICK=y CONFIG_JOYSTICK_ANALOG=m CONFIG_JOYSTICK_A3D=m @@ -1947,7 +2046,7 @@ CONFIG_TOUCHSCREEN_MK712=m CONFIG_TOUCHSCREEN_PENMOUNT=m CONFIG_TOUCHSCREEN_TOUCHRIGHT=m CONFIG_TOUCHSCREEN_TOUCHWIN=m -CONFIG_TOUCHSCREEN_UCB1400=m +# CONFIG_TOUCHSCREEN_UCB1400 is not set CONFIG_TOUCHSCREEN_WM97XX=m CONFIG_TOUCHSCREEN_WM9705=y CONFIG_TOUCHSCREEN_WM9712=y @@ -1974,6 +2073,7 @@ CONFIG_INPUT_ATI_REMOTE2=m CONFIG_INPUT_KEYSPAN_REMOTE=m CONFIG_INPUT_POWERMATE=m CONFIG_INPUT_YEALINK=m +CONFIG_INPUT_CM109=m CONFIG_INPUT_UINPUT=m # @@ -2000,7 +2100,7 @@ CONFIG_VT=y CONFIG_CONSOLE_TRANSLATIONS=y CONFIG_VT_CONSOLE=y CONFIG_HW_CONSOLE=y -# CONFIG_VT_HW_CONSOLE_BINDING is not set +CONFIG_VT_HW_CONSOLE_BINDING=y CONFIG_DEVKMEM=y CONFIG_SERIAL_NONSTANDARD=y CONFIG_COMPUTONE=m @@ -2015,12 +2115,14 @@ CONFIG_SYNCLINK=m CONFIG_SYNCLINKMP=m CONFIG_SYNCLINK_GT=m CONFIG_N_HDLC=m -# CONFIG_RISCOM8 is not set +CONFIG_RISCOM8=m CONFIG_SPECIALIX=m CONFIG_SX=m CONFIG_RIO=m -# CONFIG_RIO_OLDPCI is not set +CONFIG_RIO_OLDPCI=y CONFIG_STALDRV=y +CONFIG_STALLION=m +CONFIG_ISTALLION=m CONFIG_NOZOMI=m # @@ -2052,7 +2154,8 @@ CONFIG_LEGACY_PTY_COUNT=256 CONFIG_PRINTER=m CONFIG_LP_CONSOLE=y CONFIG_PPDEV=m -# CONFIG_VIRTIO_CONSOLE is not set +CONFIG_HVC_DRIVER=y +CONFIG_VIRTIO_CONSOLE=m CONFIG_IPMI_HANDLER=m # CONFIG_IPMI_PANIC_EVENT is not set CONFIG_IPMI_DEVICE_INTERFACE=m @@ -2062,7 +2165,7 @@ CONFIG_IPMI_POWEROFF=m CONFIG_HW_RANDOM=y CONFIG_HW_RANDOM_INTEL=m CONFIG_HW_RANDOM_AMD=m -# CONFIG_HW_RANDOM_VIRTIO is not set +CONFIG_HW_RANDOM_VIRTIO=m CONFIG_NVRAM=m CONFIG_R3964=m CONFIG_APPLICOM=m @@ -2073,7 +2176,7 @@ CONFIG_APPLICOM=m CONFIG_SYNCLINK_CS=m CONFIG_CARDMAN_4000=m CONFIG_CARDMAN_4040=m -# CONFIG_IPWIRELESS is not set +CONFIG_IPWIRELESS=m CONFIG_MWAVE=m CONFIG_PC8736x_GPIO=m CONFIG_NSC_GPIO=m @@ -2110,10 +2213,10 @@ CONFIG_I2C_AMD756=m CONFIG_I2C_AMD756_S4882=m CONFIG_I2C_AMD8111=m CONFIG_I2C_I801=m -# CONFIG_I2C_ISCH is not set +CONFIG_I2C_ISCH=m CONFIG_I2C_PIIX4=m CONFIG_I2C_NFORCE2=m -# CONFIG_I2C_NFORCE2_S4985 is not set +CONFIG_I2C_NFORCE2_S4985=m CONFIG_I2C_SIS5595=m CONFIG_I2C_SIS630=m CONFIG_I2C_SIS96X=m @@ -2123,6 +2226,7 @@ CONFIG_I2C_VIAPRO=m # # I2C system bus drivers (mostly embedded / system-on-chip) # +# CONFIG_I2C_GPIO is not set CONFIG_I2C_OCORES=m CONFIG_I2C_SIMTEC=m @@ -2149,12 +2253,10 @@ CONFIG_I2C_PCA_PLATFORM=m # Miscellaneous I2C Chip support # CONFIG_DS1682=m -# CONFIG_AT24 is not set +CONFIG_AT24=m CONFIG_SENSORS_EEPROM=m -CONFIG_SENSORS_PCF8574=m -CONFIG_PCF8575=m -# CONFIG_SENSORS_PCA9539 is not set CONFIG_SENSORS_PCF8591=m +# CONFIG_TPS65010 is not set CONFIG_SENSORS_MAX6875=m CONFIG_SENSORS_TSL2550=m # CONFIG_I2C_DEBUG_CORE is not set @@ -2179,7 +2281,30 @@ CONFIG_SPI_AT25=m CONFIG_SPI_SPIDEV=m CONFIG_SPI_TLE62X0=m CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y -# CONFIG_GPIOLIB is not set +CONFIG_GPIOLIB=y +# CONFIG_DEBUG_GPIO is not set +CONFIG_GPIO_SYSFS=y + +# +# Memory mapped GPIO expanders: +# + +# +# I2C GPIO expanders: +# +CONFIG_GPIO_MAX732X=m +CONFIG_GPIO_PCA953X=m +CONFIG_GPIO_PCF857X=m + +# +# PCI GPIO expanders: +# + +# +# SPI GPIO expanders: +# +CONFIG_GPIO_MAX7301=m +CONFIG_GPIO_MCP23S08=m CONFIG_W1=m CONFIG_W1_CON=y @@ -2189,6 +2314,7 @@ CONFIG_W1_CON=y CONFIG_W1_MASTER_MATROX=m CONFIG_W1_MASTER_DS2490=m CONFIG_W1_MASTER_DS2482=m +# CONFIG_W1_MASTER_GPIO is not set # # 1-wire Slaves @@ -2198,23 +2324,26 @@ CONFIG_W1_SLAVE_SMEM=m CONFIG_W1_SLAVE_DS2433=m CONFIG_W1_SLAVE_DS2433_CRC=y CONFIG_W1_SLAVE_DS2760=m +CONFIG_W1_SLAVE_BQ27000=m CONFIG_POWER_SUPPLY=y # CONFIG_POWER_SUPPLY_DEBUG is not set CONFIG_PDA_POWER=m CONFIG_BATTERY_DS2760=m +CONFIG_BATTERY_BQ27x00=m CONFIG_HWMON=y CONFIG_HWMON_VID=m CONFIG_SENSORS_ABITUGURU=m CONFIG_SENSORS_ABITUGURU3=m -# CONFIG_SENSORS_AD7414 is not set +CONFIG_SENSORS_AD7414=m CONFIG_SENSORS_AD7418=m -# CONFIG_SENSORS_ADCXX is not set +CONFIG_SENSORS_ADCXX=m CONFIG_SENSORS_ADM1021=m CONFIG_SENSORS_ADM1025=m CONFIG_SENSORS_ADM1026=m CONFIG_SENSORS_ADM1029=m CONFIG_SENSORS_ADM1031=m CONFIG_SENSORS_ADM9240=m +CONFIG_SENSORS_ADT7462=m CONFIG_SENSORS_ADT7470=m CONFIG_SENSORS_ADT7473=m CONFIG_SENSORS_K8TEMP=m @@ -2246,6 +2375,7 @@ CONFIG_SENSORS_LM87=m CONFIG_SENSORS_LM90=m CONFIG_SENSORS_LM92=m CONFIG_SENSORS_LM93=m +CONFIG_SENSORS_MAX1111=m CONFIG_SENSORS_MAX1619=m CONFIG_SENSORS_MAX6650=m CONFIG_SENSORS_PC87360=m @@ -2269,6 +2399,7 @@ CONFIG_SENSORS_W83L786NG=m CONFIG_SENSORS_W83627HF=m CONFIG_SENSORS_W83627EHF=m CONFIG_SENSORS_HDAPS=m +CONFIG_SENSORS_LIS3LV02D=m CONFIG_SENSORS_APPLESMC=m # CONFIG_HWMON_DEBUG_CHIP is not set CONFIG_THERMAL=y @@ -2293,6 +2424,7 @@ CONFIG_I6300ESB_WDT=m CONFIG_ITCO_WDT=m CONFIG_ITCO_VENDOR_SUPPORT=y CONFIG_IT8712F_WDT=m +CONFIG_IT87_WDT=m CONFIG_HP_WATCHDOG=m CONFIG_SC1200_WDT=m CONFIG_PC87413_WDT=m @@ -2302,6 +2434,7 @@ CONFIG_CPU5_WDT=m CONFIG_SMSC37B787_WDT=m CONFIG_W83627HF_WDT=m CONFIG_W83697HF_WDT=m +CONFIG_W83697UG_WDT=m CONFIG_W83877F_WDT=m CONFIG_W83977F_WDT=m CONFIG_MACHZ_WDT=m @@ -2318,11 +2451,11 @@ CONFIG_WDT_501_PCI=y # USB-based Watchdog Cards # CONFIG_USBPCWATCHDOG=m +CONFIG_SSB_POSSIBLE=y # # Sonics Silicon Backplane # -CONFIG_SSB_POSSIBLE=y CONFIG_SSB=m CONFIG_SSB_SPROM=y CONFIG_SSB_BLOCKIO=y @@ -2340,8 +2473,20 @@ CONFIG_SSB_DRIVER_PCICORE=y # # CONFIG_MFD_CORE is not set CONFIG_MFD_SM501=m +CONFIG_MFD_SM501_GPIO=y CONFIG_HTC_PASIC3=m +CONFIG_UCB1400_CORE=m # CONFIG_MFD_TMIO is not set +CONFIG_MFD_WM8400=m +CONFIG_MFD_WM8350=m +CONFIG_MFD_WM8350_I2C=m +CONFIG_REGULATOR=y +# CONFIG_REGULATOR_DEBUG is not set +# CONFIG_REGULATOR_FIXED_VOLTAGE is not set +CONFIG_REGULATOR_VIRTUAL_CONSUMER=m +CONFIG_REGULATOR_BQ24022=m +CONFIG_REGULATOR_WM8350=m +CONFIG_REGULATOR_WM8400=m # # Multimedia devices @@ -2386,6 +2531,7 @@ CONFIG_VIDEO_V4L1=m CONFIG_VIDEOBUF_GEN=m CONFIG_VIDEOBUF_DMA_SG=m CONFIG_VIDEOBUF_VMALLOC=m +CONFIG_VIDEOBUF_DMA_CONTIG=m CONFIG_VIDEOBUF_DVB=m CONFIG_VIDEO_BTCX=m CONFIG_VIDEO_IR=m @@ -2393,6 +2539,7 @@ CONFIG_VIDEO_TVEEPROM=m CONFIG_VIDEO_TUNER=m CONFIG_VIDEO_CAPTURE_DRIVERS=y # CONFIG_VIDEO_ADV_DEBUG is not set +# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set CONFIG_VIDEO_HELPER_CHIPS_AUTO=y CONFIG_VIDEO_IR_I2C=m CONFIG_VIDEO_TVAUDIO=m @@ -2440,7 +2587,6 @@ CONFIG_VIDEO_CPIA_USB=m CONFIG_VIDEO_CPIA2=m CONFIG_VIDEO_SAA5246A=m CONFIG_VIDEO_SAA5249=m -CONFIG_TUNER_3036=m CONFIG_VIDEO_STRADIS=m CONFIG_VIDEO_ZORAN=m CONFIG_VIDEO_ZORAN_DC30=m @@ -2455,7 +2601,6 @@ CONFIG_VIDEO_SAA7134=m CONFIG_VIDEO_SAA7134_ALSA=m CONFIG_VIDEO_SAA7134_DVB=m CONFIG_VIDEO_MXB=m -CONFIG_VIDEO_DPC=m CONFIG_VIDEO_HEXIUM_ORION=m CONFIG_VIDEO_HEXIUM_GEMINI=m CONFIG_VIDEO_CX88=m @@ -2469,15 +2614,46 @@ CONFIG_VIDEO_IVTV=m CONFIG_VIDEO_FB_IVTV=m CONFIG_VIDEO_CX18=m CONFIG_VIDEO_CAFE_CCIC=m +CONFIG_SOC_CAMERA=m +CONFIG_SOC_CAMERA_MT9M001=m +CONFIG_MT9M001_PCA9536_SWITCH=y +CONFIG_SOC_CAMERA_MT9M111=m +CONFIG_SOC_CAMERA_MT9V022=m +CONFIG_MT9V022_PCA9536_SWITCH=y +CONFIG_SOC_CAMERA_PLATFORM=m +CONFIG_VIDEO_SH_MOBILE_CEU=m CONFIG_V4L_USB_DRIVERS=y CONFIG_USB_VIDEO_CLASS=m CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y CONFIG_USB_GSPCA=m +CONFIG_USB_M5602=m +CONFIG_USB_GSPCA_CONEX=m +CONFIG_USB_GSPCA_ETOMS=m +CONFIG_USB_GSPCA_FINEPIX=m +CONFIG_USB_GSPCA_MARS=m +CONFIG_USB_GSPCA_OV519=m +CONFIG_USB_GSPCA_PAC207=m +CONFIG_USB_GSPCA_PAC7311=m +CONFIG_USB_GSPCA_SONIXB=m +CONFIG_USB_GSPCA_SONIXJ=m +CONFIG_USB_GSPCA_SPCA500=m +CONFIG_USB_GSPCA_SPCA501=m +CONFIG_USB_GSPCA_SPCA505=m +CONFIG_USB_GSPCA_SPCA506=m +CONFIG_USB_GSPCA_SPCA508=m +CONFIG_USB_GSPCA_SPCA561=m +CONFIG_USB_GSPCA_STK014=m +CONFIG_USB_GSPCA_SUNPLUS=m +CONFIG_USB_GSPCA_T613=m +CONFIG_USB_GSPCA_TV8532=m +CONFIG_USB_GSPCA_VC032X=m +CONFIG_USB_GSPCA_ZC3XX=m CONFIG_VIDEO_PVRUSB2=m -# CONFIG_VIDEO_PVRUSB2_SYSFS is not set -# CONFIG_VIDEO_PVRUSB2_DVB is not set +CONFIG_VIDEO_PVRUSB2_SYSFS=y +CONFIG_VIDEO_PVRUSB2_DVB=y +# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set CONFIG_VIDEO_EM28XX=m -# CONFIG_VIDEO_EM28XX_ALSA is not set +CONFIG_VIDEO_EM28XX_ALSA=m CONFIG_VIDEO_EM28XX_DVB=m CONFIG_VIDEO_USBVISION=m CONFIG_VIDEO_USBVIDEO=m @@ -2496,19 +2672,15 @@ CONFIG_USB_ZC0301=m CONFIG_USB_PWC=m # CONFIG_USB_PWC_DEBUG is not set CONFIG_USB_ZR364XX=m -# CONFIG_USB_STKWEBCAM is not set -# CONFIG_USB_S2255 is not set -CONFIG_SOC_CAMERA=m -CONFIG_SOC_CAMERA_MT9M001=m -CONFIG_SOC_CAMERA_MT9V022=m -# CONFIG_SOC_CAMERA_PLATFORM is not set -# CONFIG_VIDEO_SH_MOBILE_CEU is not set +CONFIG_USB_STKWEBCAM=m +CONFIG_USB_S2255=m CONFIG_RADIO_ADAPTERS=y CONFIG_RADIO_GEMTEK_PCI=m CONFIG_RADIO_MAXIRADIO=m CONFIG_RADIO_MAESTRO=m CONFIG_USB_DSBR=m CONFIG_USB_SI470X=m +CONFIG_USB_MR800=m CONFIG_DVB_CAPTURE_DRIVERS=y # @@ -2517,7 +2689,11 @@ CONFIG_DVB_CAPTURE_DRIVERS=y CONFIG_TTPCI_EEPROM=m CONFIG_DVB_AV7110=m CONFIG_DVB_AV7110_OSD=y -# CONFIG_DVB_BUDGET_CORE is not set +CONFIG_DVB_BUDGET_CORE=m +CONFIG_DVB_BUDGET=m +CONFIG_DVB_BUDGET_CI=m +CONFIG_DVB_BUDGET_AV=m +CONFIG_DVB_BUDGET_PATCH=m # # Supported USB Adapters @@ -2544,18 +2720,15 @@ CONFIG_DVB_USB_DTT200U=m CONFIG_DVB_USB_OPERA1=m CONFIG_DVB_USB_AF9005=m CONFIG_DVB_USB_AF9005_REMOTE=m -# CONFIG_DVB_USB_DW2102 is not set -# CONFIG_DVB_USB_ANYSEE is not set +CONFIG_DVB_USB_DW2102=m +CONFIG_DVB_USB_CINERGY_T2=m +CONFIG_DVB_USB_ANYSEE=m +CONFIG_DVB_USB_DTV5100=m +CONFIG_DVB_USB_AF9015=m CONFIG_DVB_TTUSB_BUDGET=m CONFIG_DVB_TTUSB_DEC=m -CONFIG_DVB_CINERGYT2=m -CONFIG_DVB_CINERGYT2_TUNING=y -CONFIG_DVB_CINERGYT2_STREAM_URB_COUNT=32 -CONFIG_DVB_CINERGYT2_STREAM_BUF_SIZE=512 -CONFIG_DVB_CINERGYT2_QUERY_INTERVAL=250 -CONFIG_DVB_CINERGYT2_ENABLE_RC_INPUT_DEVICE=y -CONFIG_DVB_CINERGYT2_RC_QUERY_INTERVAL=50 -# CONFIG_DVB_SIANO_SMS1XXX is not set +CONFIG_DVB_SIANO_SMS1XXX=m +CONFIG_DVB_SIANO_SMS1XXX_SMS_IDS=y # # Supported FlexCopII (B2C2) Adapters @@ -2576,6 +2749,11 @@ CONFIG_DVB_BT8XX=m CONFIG_DVB_PLUTO2=m # +# Supported SDMC DM1105 Adapters +# +CONFIG_DVB_DM1105=m + +# # Supported DVB Frontends # @@ -2591,6 +2769,8 @@ CONFIG_DVB_CX24110=m CONFIG_DVB_CX24123=m CONFIG_DVB_MT312=m CONFIG_DVB_S5H1420=m +CONFIG_DVB_STV0288=m +CONFIG_DVB_STB6000=m CONFIG_DVB_STV0299=m CONFIG_DVB_TDA8083=m CONFIG_DVB_TDA10086=m @@ -2598,6 +2778,8 @@ CONFIG_DVB_VES1X93=m CONFIG_DVB_TUNER_ITD1000=m CONFIG_DVB_TDA826X=m CONFIG_DVB_TUA6100=m +CONFIG_DVB_CX24116=m +CONFIG_DVB_SI21XX=m # # DVB-T (terrestrial) frontends @@ -2606,7 +2788,7 @@ CONFIG_DVB_SP8870=m CONFIG_DVB_SP887X=m CONFIG_DVB_CX22700=m CONFIG_DVB_CX22702=m -# CONFIG_DVB_DRX397XD is not set +CONFIG_DVB_DRX397XD=m CONFIG_DVB_L64781=m CONFIG_DVB_TDA1004X=m CONFIG_DVB_NXT6000=m @@ -2650,6 +2832,13 @@ CONFIG_DVB_TUNER_DIB0070=m CONFIG_DVB_LNBP21=m CONFIG_DVB_ISL6405=m CONFIG_DVB_ISL6421=m +CONFIG_DVB_LGS8GL5=m + +# +# Tools to develop new frontends +# +CONFIG_DVB_DUMMY_FE=m +CONFIG_DVB_AF9013=m CONFIG_DAB=y CONFIG_USB_DABUSB=m @@ -2677,6 +2866,7 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y CONFIG_FB=y CONFIG_FIRMWARE_EDID=y CONFIG_FB_DDC=m +CONFIG_FB_BOOT_VESA_SUPPORT=y CONFIG_FB_CFB_FILLRECT=y CONFIG_FB_CFB_COPYAREA=y CONFIG_FB_CFB_IMAGEBLIT=y @@ -2704,7 +2894,6 @@ CONFIG_FB_TILEBLITTING=y CONFIG_FB_VGA16=y CONFIG_FB_UVESA=m CONFIG_FB_VESA=y -# CONFIG_FB_EFI is not set # CONFIG_FB_N411 is not set # CONFIG_FB_HGA is not set # CONFIG_FB_S1D13XXX is not set @@ -2737,6 +2926,7 @@ CONFIG_FB_S3=m CONFIG_FB_SIS=m CONFIG_FB_SIS_300=y CONFIG_FB_SIS_315=y +CONFIG_FB_VIA=m # CONFIG_FB_NEOMAGIC is not set # CONFIG_FB_KYRO is not set # CONFIG_FB_3DFX is not set @@ -2749,10 +2939,13 @@ CONFIG_FB_SIS_315=y # CONFIG_FB_GEODE is not set # CONFIG_FB_SM501 is not set # CONFIG_FB_VIRTUAL is not set +# CONFIG_FB_METRONOME is not set +# CONFIG_FB_MB862XX is not set CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_LCD_CLASS_DEVICE=m CONFIG_LCD_LTV350QV=m CONFIG_LCD_ILI9320=m +CONFIG_LCD_TDO24M=m CONFIG_LCD_VGG2432A4=m CONFIG_LCD_PLATFORM=m CONFIG_BACKLIGHT_CLASS_DEVICE=y @@ -2760,6 +2953,7 @@ CONFIG_BACKLIGHT_CORGI=m CONFIG_BACKLIGHT_PROGEAR=m CONFIG_BACKLIGHT_CARILLO_RANCH=m CONFIG_BACKLIGHT_MBP_NVIDIA=m +CONFIG_BACKLIGHT_SAHARA=m # # Display device support @@ -2776,7 +2970,6 @@ CONFIG_DISPLAY_SUPPORT=m CONFIG_VGA_CONSOLE=y CONFIG_VGACON_SOFT_SCROLLBACK=y CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64 -CONFIG_VIDEO_SELECT=y CONFIG_DUMMY_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE=y # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set @@ -2794,6 +2987,7 @@ CONFIG_FONT_8x16=y # CONFIG_FONT_10x18 is not set # CONFIG_LOGO is not set CONFIG_SOUND=m +CONFIG_SOUND_OSS_CORE=y CONFIG_SND=m CONFIG_SND_TIMER=m CONFIG_SND_PCM=m @@ -2874,16 +3068,19 @@ CONFIG_SND_FM801_TEA575X_BOOL=y CONFIG_SND_FM801_TEA575X=m CONFIG_SND_HDA_INTEL=m CONFIG_SND_HDA_HWDEP=y +# CONFIG_SND_HDA_INPUT_BEEP is not set CONFIG_SND_HDA_CODEC_REALTEK=y CONFIG_SND_HDA_CODEC_ANALOG=y CONFIG_SND_HDA_CODEC_SIGMATEL=y CONFIG_SND_HDA_CODEC_VIA=y CONFIG_SND_HDA_CODEC_ATIHDMI=y +CONFIG_SND_HDA_CODEC_NVHDMI=y CONFIG_SND_HDA_CODEC_CONEXANT=y CONFIG_SND_HDA_CODEC_CMEDIA=y CONFIG_SND_HDA_CODEC_SI3054=y CONFIG_SND_HDA_GENERIC=y -# CONFIG_SND_HDA_POWER_SAVE is not set +CONFIG_SND_HDA_POWER_SAVE=y +CONFIG_SND_HDA_POWER_SAVE_DEFAULT=30 CONFIG_SND_HDSP=m CONFIG_SND_HDSPM=m CONFIG_SND_HIFIER=m @@ -2913,6 +3110,7 @@ CONFIG_SND_USB_AUDIO=m CONFIG_SND_USB_USX2Y=m CONFIG_SND_USB_CAIAQ=m CONFIG_SND_USB_CAIAQ_INPUT=y +CONFIG_SND_USB_US122L=m CONFIG_SND_PCMCIA=y CONFIG_SND_VXPOCKET=m CONFIG_SND_PDAUDIOCF=m @@ -2928,15 +3126,36 @@ CONFIG_HIDRAW=y # USB Input Devices # CONFIG_USB_HID=y -CONFIG_USB_HIDINPUT_POWERBOOK=y -CONFIG_HID_FF=y CONFIG_HID_PID=y +CONFIG_USB_HIDDEV=y + +# +# Special HID drivers +# +CONFIG_HID_COMPAT=y +CONFIG_HID_A4TECH=y +CONFIG_HID_APPLE=y +CONFIG_HID_BELKIN=y +CONFIG_HID_BRIGHT=y +CONFIG_HID_CHERRY=y +CONFIG_HID_CHICONY=y +CONFIG_HID_CYPRESS=y +CONFIG_HID_DELL=y +CONFIG_HID_EZKEY=y +CONFIG_HID_GYRATION=y +CONFIG_HID_LOGITECH=y CONFIG_LOGITECH_FF=y CONFIG_LOGIRUMBLEPAD2_FF=y +CONFIG_HID_MICROSOFT=y +CONFIG_HID_MONTEREY=y +CONFIG_HID_PANTHERLORD=y CONFIG_PANTHERLORD_FF=y +CONFIG_HID_PETALYNX=y +CONFIG_HID_SAMSUNG=y +CONFIG_HID_SONY=y +CONFIG_HID_SUNPLUS=y CONFIG_THRUSTMASTER_FF=y CONFIG_ZEROPLUS_FF=y -CONFIG_USB_HIDDEV=y CONFIG_USB_SUPPORT=y CONFIG_USB_ARCH_HAS_HCD=y CONFIG_USB_ARCH_HAS_OHCI=y @@ -2954,6 +3173,9 @@ CONFIG_USB_DYNAMIC_MINORS=y CONFIG_USB_SUSPEND=y # CONFIG_USB_OTG is not set # CONFIG_USB_MON is not set +CONFIG_USB_WUSB=m +CONFIG_USB_WUSB_CBAF=m +# CONFIG_USB_WUSB_CBAF_DEBUG is not set # # USB Host Controller Drivers @@ -2961,11 +3183,11 @@ CONFIG_USB_SUSPEND=y CONFIG_USB_C67X00_HCD=m CONFIG_USB_EHCI_HCD=m CONFIG_USB_EHCI_ROOT_HUB_TT=y -# CONFIG_USB_EHCI_TT_NEWSCHED is not set +CONFIG_USB_EHCI_TT_NEWSCHED=y CONFIG_USB_ISP116X_HCD=m CONFIG_USB_ISP1760_HCD=m CONFIG_USB_OHCI_HCD=m -# CONFIG_USB_OHCI_HCD_SSB is not set +CONFIG_USB_OHCI_HCD_SSB=y # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set CONFIG_USB_OHCI_LITTLE_ENDIAN=y @@ -2974,6 +3196,8 @@ CONFIG_USB_U132_HCD=m CONFIG_USB_SL811_HCD=m CONFIG_USB_SL811_CS=m CONFIG_USB_R8A66597_HCD=m +CONFIG_USB_WHCI_HCD=m +CONFIG_USB_HWA_HCD=m # CONFIG_USB_GADGET_MUSB_HDRC is not set # @@ -2982,13 +3206,14 @@ CONFIG_USB_R8A66597_HCD=m CONFIG_USB_ACM=m CONFIG_USB_PRINTER=m CONFIG_USB_WDM=m +CONFIG_USB_TMC=m # -# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' +# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; # # -# may also be needed; see USB_STORAGE Help for more information +# see USB_STORAGE Help for more information # CONFIG_USB_STORAGE=y # CONFIG_USB_STORAGE_DEBUG is not set @@ -3001,7 +3226,7 @@ CONFIG_USB_STORAGE_SDDR09=y CONFIG_USB_STORAGE_SDDR55=y CONFIG_USB_STORAGE_JUMPSHOT=y CONFIG_USB_STORAGE_ALAUDA=y -# CONFIG_USB_STORAGE_ONETOUCH is not set +CONFIG_USB_STORAGE_ONETOUCH=y CONFIG_USB_STORAGE_KARMA=y CONFIG_USB_STORAGE_CYPRESS_ATACB=y # CONFIG_USB_LIBUSUAL is not set @@ -3079,6 +3304,7 @@ CONFIG_USB_SERIAL_OMNINET=m CONFIG_USB_EMI62=m CONFIG_USB_EMI26=m CONFIG_USB_ADUTUX=m +CONFIG_USB_SEVSEG=m CONFIG_USB_RIO500=m CONFIG_USB_LEGOTOWER=m CONFIG_USB_LCD=m @@ -3100,6 +3326,7 @@ CONFIG_USB_TRANCEVIBRATOR=m CONFIG_USB_IOWARRIOR=m CONFIG_USB_TEST=m CONFIG_USB_ISIGHTFW=m +CONFIG_USB_VST=m CONFIG_USB_ATM=m CONFIG_USB_SPEEDTOUCH=m CONFIG_USB_CXACRU=m @@ -3109,20 +3336,22 @@ CONFIG_USB_GADGET=m # CONFIG_USB_GADGET_DEBUG is not set # CONFIG_USB_GADGET_DEBUG_FILES is not set # CONFIG_USB_GADGET_DEBUG_FS is not set +CONFIG_USB_GADGET_VBUS_DRAW=2 CONFIG_USB_GADGET_SELECTED=y -# CONFIG_USB_GADGET_AMD5536UDC is not set +# CONFIG_USB_GADGET_AT91 is not set # CONFIG_USB_GADGET_ATMEL_USBA is not set # CONFIG_USB_GADGET_FSL_USB2 is not set -CONFIG_USB_GADGET_NET2280=y -CONFIG_USB_NET2280=m -# CONFIG_USB_GADGET_PXA25X is not set -# CONFIG_USB_GADGET_M66592 is not set -# CONFIG_USB_GADGET_PXA27X is not set -# CONFIG_USB_GADGET_GOKU is not set # CONFIG_USB_GADGET_LH7A40X is not set # CONFIG_USB_GADGET_OMAP is not set +# CONFIG_USB_GADGET_PXA25X is not set +# CONFIG_USB_GADGET_PXA27X is not set # CONFIG_USB_GADGET_S3C2410 is not set -# CONFIG_USB_GADGET_AT91 is not set +# CONFIG_USB_GADGET_M66592 is not set +# CONFIG_USB_GADGET_AMD5536UDC is not set +# CONFIG_USB_GADGET_FSL_QE is not set +CONFIG_USB_GADGET_NET2280=y +CONFIG_USB_NET2280=m +# CONFIG_USB_GADGET_GOKU is not set # CONFIG_USB_GADGET_DUMMY_HCD is not set CONFIG_USB_GADGET_DUALSPEED=y CONFIG_USB_ZERO=m @@ -3134,13 +3363,19 @@ CONFIG_USB_FILE_STORAGE=m CONFIG_USB_G_SERIAL=m CONFIG_USB_MIDI_GADGET=m CONFIG_USB_G_PRINTER=m -# CONFIG_USB_CDC_COMPOSITE is not set +CONFIG_USB_CDC_COMPOSITE=m +CONFIG_UWB=m +CONFIG_UWB_HWA=m +CONFIG_UWB_WHCI=m +CONFIG_UWB_WLP=m +CONFIG_UWB_I1480U=m +CONFIG_UWB_I1480U_WLP=m CONFIG_MMC=m # CONFIG_MMC_DEBUG is not set # CONFIG_MMC_UNSAFE_RESUME is not set # -# MMC/SD Card Drivers +# MMC/SD/SDIO Card Drivers # CONFIG_MMC_BLOCK=m CONFIG_MMC_BLOCK_BOUNCE=y @@ -3148,15 +3383,29 @@ CONFIG_SDIO_UART=m # CONFIG_MMC_TEST is not set # -# MMC/SD Host Controller Drivers +# MMC/SD/SDIO Host Controller Drivers # CONFIG_MMC_SDHCI=m -# CONFIG_MMC_SDHCI_PCI is not set +CONFIG_MMC_SDHCI_PCI=m +CONFIG_MMC_RICOH_MMC=m CONFIG_MMC_WBSD=m CONFIG_MMC_TIFM_SD=m CONFIG_MMC_SPI=m CONFIG_MMC_SDRICOH_CS=m -# CONFIG_MEMSTICK is not set +CONFIG_MEMSTICK=m +# CONFIG_MEMSTICK_DEBUG is not set + +# +# MemoryStick drivers +# +# CONFIG_MEMSTICK_UNSAFE_RESUME is not set +CONFIG_MSPRO_BLOCK=m + +# +# MemoryStick Host Controller Drivers +# +CONFIG_MEMSTICK_TIFM_MS=m +CONFIG_MEMSTICK_JMICRON_38X=m CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=m @@ -3164,6 +3413,8 @@ CONFIG_LEDS_CLASS=m # LED drivers # # CONFIG_LEDS_PCA9532 is not set +# CONFIG_LEDS_GPIO is not set +CONFIG_LEDS_HP_DISK=m # CONFIG_LEDS_CLEVO_MAIL is not set # CONFIG_LEDS_PCA955X is not set @@ -3174,6 +3425,7 @@ CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_IDE_DISK=y CONFIG_LEDS_TRIGGER_HEARTBEAT=m +CONFIG_LEDS_TRIGGER_BACKLIGHT=m CONFIG_LEDS_TRIGGER_DEFAULT_ON=m # CONFIG_ACCESSIBILITY is not set CONFIG_INFINIBAND=m @@ -3228,27 +3480,34 @@ CONFIG_RTC_DRV_M41T80=m CONFIG_RTC_DRV_M41T80_WDT=y CONFIG_RTC_DRV_S35390A=m CONFIG_RTC_DRV_FM3130=m +CONFIG_RTC_DRV_RX8581=m # # SPI RTC drivers # # CONFIG_RTC_DRV_M41T94 is not set # CONFIG_RTC_DRV_DS1305 is not set +CONFIG_RTC_DRV_DS1390=m CONFIG_RTC_DRV_MAX6902=m CONFIG_RTC_DRV_R9701=m CONFIG_RTC_DRV_RS5C348=m +CONFIG_RTC_DRV_DS3234=m # # Platform RTC drivers # CONFIG_RTC_DRV_CMOS=m +CONFIG_RTC_DRV_DS1286=m CONFIG_RTC_DRV_DS1511=m CONFIG_RTC_DRV_DS1553=m CONFIG_RTC_DRV_DS1742=m CONFIG_RTC_DRV_STK17TA8=m CONFIG_RTC_DRV_M48T86=m +CONFIG_RTC_DRV_M48T35=m CONFIG_RTC_DRV_M48T59=m +CONFIG_RTC_DRV_BQ4802=m CONFIG_RTC_DRV_V3020=m +CONFIG_RTC_DRV_WM8350=m # # on-CPU RTC drivers @@ -3278,6 +3537,8 @@ CONFIG_UIO_CIF=m # CONFIG_UIO_PDRV is not set # CONFIG_UIO_PDRV_GENIRQ is not set # CONFIG_UIO_SMX is not set +CONFIG_UIO_SERCOS3=m +# CONFIG_STAGING is not set # # Firmware Drivers @@ -3288,7 +3549,8 @@ CONFIG_FIRMWARE_MEMMAP=y CONFIG_DELL_RBU=m CONFIG_DCDBAS=m CONFIG_DMIID=y -# CONFIG_ISCSI_IBFT_FIND is not set +CONFIG_ISCSI_IBFT_FIND=y +CONFIG_ISCSI_IBFT=m # # File systems @@ -3302,10 +3564,11 @@ CONFIG_EXT3_FS=y CONFIG_EXT3_FS_XATTR=y CONFIG_EXT3_FS_POSIX_ACL=y CONFIG_EXT3_FS_SECURITY=y -CONFIG_EXT4DEV_FS=m -CONFIG_EXT4DEV_FS_XATTR=y -CONFIG_EXT4DEV_FS_POSIX_ACL=y -CONFIG_EXT4DEV_FS_SECURITY=y +CONFIG_EXT4_FS=m +CONFIG_EXT4DEV_COMPAT=y +CONFIG_EXT4_FS_XATTR=y +CONFIG_EXT4_FS_POSIX_ACL=y +CONFIG_EXT4_FS_SECURITY=y CONFIG_JBD=y CONFIG_JBD_DEBUG=y CONFIG_JBD2=m @@ -3323,6 +3586,7 @@ CONFIG_JFS_SECURITY=y # CONFIG_JFS_DEBUG is not set CONFIG_JFS_STATISTICS=y CONFIG_FS_POSIX_ACL=y +CONFIG_FILE_LOCKING=y CONFIG_XFS_FS=y CONFIG_XFS_QUOTA=y CONFIG_XFS_POSIX_ACL=y @@ -3336,11 +3600,12 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m CONFIG_OCFS2_FS_STATS=y CONFIG_OCFS2_DEBUG_MASKLOG=y CONFIG_OCFS2_DEBUG_FS=y +CONFIG_OCFS2_COMPAT_JBD=y CONFIG_DNOTIFY=y CONFIG_INOTIFY=y CONFIG_INOTIFY_USER=y CONFIG_QUOTA=y -# CONFIG_QUOTA_NETLINK_INTERFACE is not set +CONFIG_QUOTA_NETLINK_INTERFACE=y # CONFIG_PRINT_QUOTA_WARNING is not set CONFIG_QFMT_V1=m CONFIG_QFMT_V2=m @@ -3377,6 +3642,7 @@ CONFIG_NTFS_RW=y CONFIG_PROC_FS=y CONFIG_PROC_KCORE=y CONFIG_PROC_SYSCTL=y +CONFIG_PROC_PAGE_MONITOR=y CONFIG_SYSFS=y CONFIG_TMPFS=y CONFIG_TMPFS_POSIX_ACL=y @@ -3440,6 +3706,7 @@ CONFIG_NFS_COMMON=y CONFIG_SUNRPC=m CONFIG_SUNRPC_GSS=m CONFIG_SUNRPC_XPRT_RDMA=m +# CONFIG_SUNRPC_REGISTER_V4 is not set CONFIG_RPCSEC_GSS_KRB5=m # CONFIG_RPCSEC_GSS_SPKM3 is not set CONFIG_SMB_FS=m @@ -3565,6 +3832,7 @@ CONFIG_SLUB_STATS=y CONFIG_DEBUG_BUGVERBOSE=y # CONFIG_DEBUG_INFO is not set # CONFIG_DEBUG_VM is not set +# CONFIG_DEBUG_VIRTUAL is not set # CONFIG_DEBUG_WRITECOUNT is not set CONFIG_DEBUG_MEMORY_INIT=y # CONFIG_DEBUG_LIST is not set @@ -3573,25 +3841,35 @@ CONFIG_DEBUG_MEMORY_INIT=y # CONFIG_BOOT_PRINTK_DELAY is not set # CONFIG_RCU_TORTURE_TEST is not set # CONFIG_BACKTRACE_SELF_TEST is not set +# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set # CONFIG_FAULT_INJECTION is not set # CONFIG_LATENCYTOP is not set CONFIG_SYSCTL_SYSCALL_CHECK=y -CONFIG_HAVE_FTRACE=y +CONFIG_HAVE_FUNCTION_TRACER=y CONFIG_HAVE_DYNAMIC_FTRACE=y -# CONFIG_FTRACE is not set +CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y + +# +# Tracers +# +# CONFIG_FUNCTION_TRACER is not set # CONFIG_IRQSOFF_TRACER is not set # CONFIG_PREEMPT_TRACER is not set # CONFIG_SYSPROF_TRACER is not set # CONFIG_SCHED_TRACER is not set # CONFIG_CONTEXT_SWITCH_TRACER is not set +# CONFIG_BOOT_TRACER is not set +# CONFIG_STACK_TRACER is not set # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set # CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set +# CONFIG_DYNAMIC_PRINTK_DEBUG is not set # CONFIG_SAMPLES is not set CONFIG_HAVE_ARCH_KGDB=y # CONFIG_KGDB is not set # CONFIG_STRICT_DEVMEM is not set CONFIG_X86_VERBOSE_BOOTUP=y CONFIG_EARLY_PRINTK=y +# CONFIG_EARLY_PRINTK_DBGP is not set # CONFIG_DEBUG_STACKOVERFLOW is not set # CONFIG_DEBUG_STACK_USAGE is not set # CONFIG_DEBUG_PAGEALLOC is not set @@ -3621,6 +3899,7 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0 CONFIG_KEYS=y CONFIG_KEYS_DEBUG_PROC_KEYS=y CONFIG_SECURITY=y +CONFIG_SECURITYFS=y CONFIG_SECURITY_NETWORK=y # CONFIG_SECURITY_NETWORK_XFRM is not set # CONFIG_SECURITY_FILE_CAPABILITIES is not set @@ -3637,11 +3916,19 @@ CONFIG_CRYPTO=y # # Crypto core or helper # +CONFIG_CRYPTO_FIPS=y CONFIG_CRYPTO_ALGAPI=y +CONFIG_CRYPTO_ALGAPI2=y CONFIG_CRYPTO_AEAD=m +CONFIG_CRYPTO_AEAD2=y CONFIG_CRYPTO_BLKCIPHER=m +CONFIG_CRYPTO_BLKCIPHER2=y CONFIG_CRYPTO_HASH=y +CONFIG_CRYPTO_HASH2=y +CONFIG_CRYPTO_RNG=m +CONFIG_CRYPTO_RNG2=y CONFIG_CRYPTO_MANAGER=y +CONFIG_CRYPTO_MANAGER2=y CONFIG_CRYPTO_GF128MUL=m CONFIG_CRYPTO_NULL=m CONFIG_CRYPTO_CRYPTD=m @@ -3676,6 +3963,7 @@ CONFIG_CRYPTO_XCBC=m # Digest # CONFIG_CRYPTO_CRC32C=m +CONFIG_CRYPTO_CRC32C_INTEL=m CONFIG_CRYPTO_MD4=m CONFIG_CRYPTO_MD5=y CONFIG_CRYPTO_MICHAEL_MIC=m @@ -3717,6 +4005,11 @@ CONFIG_CRYPTO_TWOFISH_X86_64=m # CONFIG_CRYPTO_DEFLATE=m CONFIG_CRYPTO_LZO=m + +# +# Random Number Generation +# +CONFIG_CRYPTO_ANSI_CPRNG=m CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_DEV_HIFN_795X=m CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y @@ -3738,7 +4031,7 @@ CONFIG_GENERIC_FIND_FIRST_BIT=y CONFIG_GENERIC_FIND_NEXT_BIT=y CONFIG_CRC_CCITT=m CONFIG_CRC16=m -# CONFIG_CRC_T10DIF is not set +CONFIG_CRC_T10DIF=y CONFIG_CRC_ITU_T=m CONFIG_CRC32=y CONFIG_CRC7=m diff --git a/source/base/kernel/resources-skip-sanity-check-of-busy-resources.patch b/source/base/kernel/resources-skip-sanity-check-of-busy-resources.patch new file mode 100644 index 0000000..faf38b9 --- /dev/null +++ b/source/base/kernel/resources-skip-sanity-check-of-busy-resources.patch @@ -0,0 +1,42 @@ +commit 3ac52669c7a24b93663acfcab606d1065ed1accd +Author: Arjan van de Ven +Date: Sat Dec 13 09:15:27 2008 -0800 + + resources: skip sanity check of busy resources + + Impact: reduce false positives in iomem_map_sanity_check() + + Some drivers (vesafb) only map/reserve a portion of a resource. + If then some other driver comes in and maps the whole resource, + the current code WARN_ON's. This is not the intent of the checks + in iomem_map_sanity_check(); rather these checks want to + warn when crossing *hardware* resources only. + + This patch skips BUSY resources as suggested by Linus. + + Note: having two drivers talk to the same hardware at the same + time is obviously not optimal behavior, but that's a separate story. + + Signed-off-by: Arjan van de Ven + Signed-off-by: Ingo Molnar + +diff --git a/kernel/resource.c b/kernel/resource.c +index 4337063..e633106 100644 +--- a/kernel/resource.c ++++ b/kernel/resource.c +@@ -853,6 +853,15 @@ int iomem_map_sanity_check(resource_size_t addr, unsigned long size) + if (PFN_DOWN(p->start) <= PFN_DOWN(addr) && + PFN_DOWN(p->end) >= PFN_DOWN(addr + size - 1)) + continue; ++ /* ++ * if a resource is "BUSY", it's not a hardware resource ++ * but a driver mapping of such a resource; we don't want ++ * to warn for those; some drivers legitimately map only ++ * partial hardware resources. (example: vesafb) ++ */ ++ if (p->flags & IORESOURCE_BUSY) ++ continue; ++ + printk(KERN_WARNING "resource map sanity check conflict: " + "0x%llx 0x%llx 0x%llx 0x%llx %s\n", + (unsigned long long)addr, diff --git a/source/include/kernel-version.sh b/source/include/kernel-version.sh index bb2d79f..04cc667 100644 --- a/source/include/kernel-version.sh +++ b/source/include/kernel-version.sh @@ -15,6 +15,6 @@ # * _F_kernelver_rel: the kernel release # * _F_kernelver_stable: the number of the -stable patch to use (if any) ### -_F_kernelver_ver=2.6.27 -_F_kernelver_rel=4 -_F_kernelver_stable=10 +_F_kernelver_ver=2.6.28 +_F_kernelver_rel=1 +_F_kernelver_stable=1 diff --git a/source/include/kernel.sh b/source/include/kernel.sh index 64e87e9..35e19c1 100644 --- a/source/include/kernel.sh +++ b/source/include/kernel.sh @@ -172,7 +172,7 @@ if [ "`vercmp 2.6.24 $_F_kernel_ver`" -le 0 ]; then source=(ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_F_kernel_ver.tar.bz2 \ config.i686 config.x86_64 config.ppc) # this can be removed after Frualware 1.0 is out - replaces=('gspcav1') + replaces=('gspcav1' 'atl2') else source=(ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_F_kernel_ver.tar.bz2 config) fi From priyank at frugalware.org Mon Jan 19 10:46:04 2009 From: priyank at frugalware.org (Priyank) Date: Mon Jan 19 10:46:05 2009 Subject: [Frugalware-git] frugalware-current: pyyaml-3.08-1-i686 Message-ID: <20090119094604.1684511B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e670cac9bd03be32f94efbdf3cabc3ce9de95ca1 commit e670cac9bd03be32f94efbdf3cabc3ce9de95ca1 Author: Priyank Date: Mon Jan 19 15:15:06 2009 +0530 pyyaml-3.08-1-i686 * Version bump diff --git a/source/devel-extra/pyyaml/FrugalBuild b/source/devel-extra/pyyaml/FrugalBuild index cf8e98b..3669abe 100644 --- a/source/devel-extra/pyyaml/FrugalBuild +++ b/source/devel-extra/pyyaml/FrugalBuild @@ -3,8 +3,8 @@ # Contributor: free-zombie pkgname=pyyaml -pkgver=3.06 -pkgrel=2 +pkgver=3.08 +pkgrel=1 pkgdesc="a complete python YAML 1.1 parser" url="http://pyyaml.org/wiki/PyYAML" depends=('python') @@ -13,6 +13,6 @@ archs=('i686' 'x86_64') up2date="lynx -dump $url | grep -m1 'current stable' | sed 's/.*: \(.*\)./\1/'" source=(http://pyyaml.org/download/pyyaml/PyYAML-$pkgver.tar.gz) _F_cd_path="PyYAML-$pkgver" -sha1sums=('c31ee801ce220a9416ac822524e785b2a2b3038c') +sha1sums=('5f9738b74afabcf516ce536b462cb4d18403211d') # optimization OK From priyank at frugalware.org Mon Jan 19 10:51:57 2009 From: priyank at frugalware.org (Priyank) Date: Mon Jan 19 10:51:58 2009 Subject: [Frugalware-git] frugalware-current: perl-anyevent-4.331-1-i686 Message-ID: <20090119095157.41AAC11B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=048304177e8c7cdb6bdc109ccb24c4d5bc5b45c9 commit 048304177e8c7cdb6bdc109ccb24c4d5bc5b45c9 Author: Priyank Date: Mon Jan 19 15:20:56 2009 +0530 perl-anyevent-4.331-1-i686 * Version bump diff --git a/source/devel-extra/perl-anyevent/FrugalBuild b/source/devel-extra/perl-anyevent/FrugalBuild index f661549..5e876a6 100644 --- a/source/devel-extra/perl-anyevent/FrugalBuild +++ b/source/devel-extra/perl-anyevent/FrugalBuild @@ -4,10 +4,10 @@ _F_perl_name=AnyEvent _F_perl_author=M/ML/MLEHMANN -pkgver=4.33 +pkgver=4.331 pkgdesc="Perl framework for multiple event loops." depends=('perl-event>=1.10') Finclude perl archs=('i686' 'x86_64') -sha1sums=('998134a8dc1e5daaa6d4f8d092e25784c5dba3ee') +sha1sums=('bf0bd5b436260898c12076e46aee35e93b0220a2') From vmiklos at frugalware.org Mon Jan 19 10:53:30 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jan 19 10:53:32 2009 Subject: [Frugalware-git] kernel2628: acerhk-0.5.35-24-i686 Message-ID: <20090119095330.B36C011B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kernel2628.git;a=commitdiff;h=b77ea044f43cf1e063569c7246a9b0420ce0fa8e commit b77ea044f43cf1e063569c7246a9b0420ce0fa8e Author: Miklos Vajna Date: Mon Jan 19 10:53:11 2009 +0100 acerhk-0.5.35-24-i686 - kernel-2.6.28 diff --git a/source/apps-extra/acerhk/FrugalBuild b/source/apps-extra/acerhk/FrugalBuild index 141846c..96d5bfd 100644 --- a/source/apps-extra/acerhk/FrugalBuild +++ b/source/apps-extra/acerhk/FrugalBuild @@ -4,7 +4,7 @@ pkgname=acerhk pkgver=0.5.35 -pkgrel=23 +pkgrel=24 pkgdesc="Acer Hotkey driver for Linux" url="http://www.cakey.de/acerhk/" Finclude kernel-module From vmiklos at frugalware.org Mon Jan 19 10:58:45 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jan 19 10:58:46 2009 Subject: [Frugalware-git] kernel2628: r8169-6.009.00-2-i686 Message-ID: <20090119095845.8CB7211B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kernel2628.git;a=commitdiff;h=e8e7dc850368d23e1c5fc48097a8bdf527daf5b7 commit e8e7dc850368d23e1c5fc48097a8bdf527daf5b7 Author: Miklos Vajna Date: Mon Jan 19 10:58:35 2009 +0100 r8169-6.009.00-2-i686 - kernel-2.6.28 diff --git a/source/network-extra/r8169/FrugalBuild b/source/network-extra/r8169/FrugalBuild index 16f80c2..b75c185 100644 --- a/source/network-extra/r8169/FrugalBuild +++ b/source/network-extra/r8169/FrugalBuild @@ -3,7 +3,7 @@ pkgname=r8169 pkgver=6.009.00 -pkgrel=1 +pkgrel=2 Finclude sourceforge kernel-module pkgdesc="Realtek driver for RTL8169/8110 cards." url="http://www.realtek.com.tw" From priyank at frugalware.org Mon Jan 19 11:00:20 2009 From: priyank at frugalware.org (Priyank) Date: Mon Jan 19 11:00:22 2009 Subject: [Frugalware-git] xfce46: xfce4-clipman-plugin-0.9.0-1-i686 Message-ID: <20090119100020.2302611B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfce46.git;a=commitdiff;h=c6afe64fd85d320c5ea8e0329b567c1dfffb5044 commit c6afe64fd85d320c5ea8e0329b567c1dfffb5044 Author: Priyank Date: Mon Jan 19 15:29:17 2009 +0530 xfce4-clipman-plugin-0.9.0-1-i686 * Version bump * updated dependencies diff --git a/source/xfce4/xfce4-clipman-plugin/FrugalBuild b/source/xfce4/xfce4-clipman-plugin/FrugalBuild index 98caf67..3766d05 100644 --- a/source/xfce4/xfce4-clipman-plugin/FrugalBuild +++ b/source/xfce4/xfce4-clipman-plugin/FrugalBuild @@ -2,14 +2,14 @@ # Maintainer: Priyank Gosalia pkgname=xfce4-clipman-plugin -pkgver=0.8.1 +pkgver=0.9.0 pkgrel=1 pkgdesc="Clipboard manager plugin for the Xfce panel." makedepends=('intltool') -depends=('libxfcegui4>=4.4.2' 'xfce4-panel>=4.4.2') +depends=('libxfcegui4>=4.5.93' 'xfce4-panel>=4.5.93') groups=('xfce4' 'xfce4-goodies') archs=('i686' 'x86_64') Finclude xfce4 -sha1sums=('ab8434116dc6cb5ded09bdb5021e03d3a17a5dc9') +sha1sums=('c0c6c80e68b600f758436ee5e134a4a23721dad1') # optimization OK From vmiklos at frugalware.org Mon Jan 19 11:26:20 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jan 19 11:26:22 2009 Subject: [Frugalware-git] kernel2628: acx100-20080806-6-i686 Message-ID: <20090119102620.65F1D11B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kernel2628.git;a=commitdiff;h=ca4e1d6b57824b74b812222b2e9d3665b8ea94ed commit ca4e1d6b57824b74b812222b2e9d3665b8ea94ed Author: Miklos Vajna Date: Mon Jan 19 11:26:06 2009 +0100 acx100-20080806-6-i686 - kernel-2.6.28 diff --git a/source/network-extra/acx100/FrugalBuild b/source/network-extra/acx100/FrugalBuild index 64b0a48..f5c2944 100644 --- a/source/network-extra/acx100/FrugalBuild +++ b/source/network-extra/acx100/FrugalBuild @@ -4,7 +4,7 @@ pkgname=acx100 origname=acx-mac80211 pkgver=20080806 -pkgrel=5 +pkgrel=6 pkgdesc="The ACX100/ACX111 wireless network driver." _F_sourceforge_ext=".tar.bz2" _F_sourceforge_dirname=${pkgname} diff --git a/source/network-extra/acx100/acx100.key b/source/network-extra/acx100/acx100.key new file mode 100644 index 0000000..1a290d4 --- /dev/null +++ b/source/network-extra/acx100/acx100.key @@ -0,0 +1,33 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.9 (GNU/Linux) + +mQGiBERmdGoRBACBy3BuNIj+KDXJR2hR/zAe6T5A6f3EKenC0mXfNa/rJTaEU0kh +c7LJGCnjtxRwKp0CF3PzQPU+P7zFfMTxYUjr1ZtD3VoANkbDbZb5dHIFFb3GDK28 +cvD25EXOyrKgNAkxE9T++8mh8k7jX9THGFNjHD7w3yllw3g1S2ehvXVdIwCgqNAC +gj9sqGmNoBAM5wlK6sldq1MD/2UxZIzq8wkvfFm+t6fxhLoGN+3lHvMkNbjE+lgs +IAkiLvTNpOL303k5AATkh5ljHaxmto+G7aYetA9E6CDRSyzA2izcW2g1H6ZMhi48 +e99oLisPuWG0eiWBJq4D5gwb+hYtg+aEcax7PkwcJLkhqjLd59xfz1WXCsrCEw8m +STBdA/4ua+ux+DxOzd3axskuhtX7m0L3x9RgLzUH/NsOyrvAQHiY7RYjlKyP5jGb +FOxn6J/y3SZfq2wYmwGUrYrre6Cd3a6QBP8cyMmB5Su6pbMBlTrgqfiAMXtroou5 +VavFNCWoUl/197bJuPOEci6dZmNwBg3YOm6OD8bm7xduBceHkLRMRnJ1Z2Fsd2Fy +ZSBMaW51eCBBcmNoaXZlcyBWZXJpZmljYXRpb24gS2V5IDxmcnVnYWx3YXJlLWRl +dmVsQGZydWdhbHdhcmUub3JnPohGBBARAgAGBQJFgocOAAoJEHvNbQIDkVCWigoA +oKqW9DDKI86EsRZuiz88PrAOgtxKAJ9kTZc1Wh8bDioF8JpMytPMuEArw4hGBBAR +AgAGBQJFgu5GAAoJEEFKKfUA6A6GIVcAoJD+Hrojb/+cGVYkQdJpuDcH6BzmAJ92 +q4MzXd6azItLylyAz4OSTPv0MohgBBMRAgAgBQJEZnRqAhsDBgsJCAcDAgQVAggD +BBYCAwECHgECF4AACgkQZ7NElSD1VhlPVwCfRdpRLJc9LCJZNIO5Gn3QaU1xMB0A +n3HWMgzdn8mxkJhyj9J4K37I8aXtuQINBERmdNwQCACrd7e4YTDQSeKhcV3gYgL4 +jKXZKrRhyX3+n3Ycwo7eLNvMSc5gbVYVeAaaovolW7O5ZdhXXUmR6Zc8QMzlQ0L1 +EH/DpFjUnV561kw4WBuE5o5oMiqUjWd3woSUsxFXpoffznzFlwIPqEtAAkooSW5F +JshsRLSu4/Gj2SDqzgjNdDXDnBR/YV51IgYyHFOQSE+vN4yXUjhGI0cZcDPcoafe +jZty0MixVXP4deb3gBpnsK3VgRgM8n0DZL9m2qAHOaXaLxvCrIKacIYlN9SDv4Pn +uNu7F595Xf9qY8x0KLmYEZaSvVC5ZR35YyOxKYexu7g7M1Hyp6UtT81Ctxi9YPL3 +AAMFB/9FQnl6l3FcBvO38lD7q0pkzEnYyqHqlh5N7SQXI4oWmE9SGLXWj5MgUSKy +/05fYTiU6+tX/U5AXQy/+EN9GGEr/kTbfU6NIVOkc2wrXaBkWomlAav5HL18NTF1 +uvjOywyjn3JevJcZ2Bm5l5gaAnWrfcK12udZJyv6b19UpUR195lhU5kT7y4w1hMM +XVjx+R7wamKl533HyEJfaUjZHuejOpA/VX233OFjnUr2iYw5w/s5ey5Z8lrtA5P6 +aXm3QRr23MjztedCovk5yJmzsUd/Fkw0FHGgWPakLMjgBGhyUT2+1yH5XS0rQA2f +Jn0Z7pfdZ2SlrJBVgr/UvLnO+770iEkEGBECAAkFAkRmdNwCGwwACgkQZ7NElSD1 +VhlbxQCfQnid7EXE2DAhyrbmocGa5CzzNzkAoIgE96QvLqESutC/tuk6j2q5msud +=kCh9 +-----END PGP PUBLIC KEY BLOCK----- From priyank at frugalware.org Mon Jan 19 11:38:05 2009 From: priyank at frugalware.org (Priyank) Date: Mon Jan 19 11:38:07 2009 Subject: [Frugalware-git] gservice: changed location of icon mapping file to /etc/gservice/icons.conf Message-ID: <20090119103805.B757511B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gservice.git;a=commitdiff;h=29ac2825f489f927baff80b969c8ae2658435e2c commit 29ac2825f489f927baff80b969c8ae2658435e2c Author: Priyank Date: Mon Jan 19 16:07:20 2009 +0530 changed location of icon mapping file to /etc/gservice/icons.conf added another file main.conf for maintaining general settings service edit dialog should hide on delete-event diff --git a/Makefile.am b/Makefile.am index 36e2e40..847b331 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,8 +3,8 @@ SUBDIRS = src data po icondir = $(datadir)/pixmaps icon_DATA = data/gservice.png -confdir = $(sysconfdir)/ -conf_DATA = gservice-icons.conf +confdir = $(sysconfdir)/gservice +conf_DATA = main.conf icons.conf EXTRA_DIST = $(icon_DATA) $(conf_DATA) diff --git a/gservice-icons.conf b/gservice-icons.conf deleted file mode 100644 index 9867572..0000000 --- a/gservice-icons.conf +++ /dev/null @@ -1,34 +0,0 @@ -# Icon mapping configuration for gService -# syntax: service_name = icon_name | path_to_icon_file -# where icon_name is a valid icon name recognized by your current icon theme. -# If you're unsure about the icon name, you might also specify an icon path. - -alsa = multimedia -cups = printer -gpm = mouse -keymap = keyboard -fun = system-software-update -syslog = logviewer -interfaces = gtk-network -samba = server -mount = gtk-harddisk -rmount = folder-remote -time = gservice-clock -bluetooth = gservice-bluetooth -apmd = gservice-power -acpid = gservice-power -splash = gservice-splash -hostname = computer -firewall = gservice-firewall -local = gservice-local -sshd = gservice-remote -wine = wine -xconsolekit = terminal - -# some servers -mysqld = server -proftpd = server -lighttpd = server -httpd = server -vsftpd = server - diff --git a/icons.conf b/icons.conf new file mode 100644 index 0000000..9867572 --- /dev/null +++ b/icons.conf @@ -0,0 +1,34 @@ +# Icon mapping configuration for gService +# syntax: service_name = icon_name | path_to_icon_file +# where icon_name is a valid icon name recognized by your current icon theme. +# If you're unsure about the icon name, you might also specify an icon path. + +alsa = multimedia +cups = printer +gpm = mouse +keymap = keyboard +fun = system-software-update +syslog = logviewer +interfaces = gtk-network +samba = server +mount = gtk-harddisk +rmount = folder-remote +time = gservice-clock +bluetooth = gservice-bluetooth +apmd = gservice-power +acpid = gservice-power +splash = gservice-splash +hostname = computer +firewall = gservice-firewall +local = gservice-local +sshd = gservice-remote +wine = wine +xconsolekit = terminal + +# some servers +mysqld = server +proftpd = server +lighttpd = server +httpd = server +vsftpd = server + diff --git a/main.conf b/main.conf new file mode 100644 index 0000000..73093fd --- /dev/null +++ b/main.conf @@ -0,0 +1,6 @@ +# gService configuration file + +show_warning = true +show_icons = true +show_status = true + diff --git a/src/gservice-icon-mapping.c b/src/gservice-icon-mapping.c index c02abe7..ae939ed 100644 --- a/src/gservice-icon-mapping.c +++ b/src/gservice-icon-mapping.c @@ -25,7 +25,7 @@ #include #include "gservice-icon-mapping.h" -#define ICON_MAP_FILE "/etc/gservice-icons.conf" +#define ICON_MAP_FILE "/etc/gservice/icons.conf" #define FALLBACK_ICON "/share/gservice/gservice.png" /* get icon map value for a specified service key */ diff --git a/src/gservice-interface.c b/src/gservice-interface.c index f11b143..3aad5ed 100644 --- a/src/gservice-interface.c +++ b/src/gservice-interface.c @@ -367,6 +367,10 @@ gservice_interface_init (void) "delete-event", G_CALLBACK(gtk_main_quit), NULL); + g_signal_connect (G_OBJECT(gsvc_service_edit_dlg), + "delete-event", + G_CALLBACK(gtk_widget_hide), + (gpointer)gsvc_service_edit_dlg); g_signal_connect (G_OBJECT(gsvc_button_quit), "clicked", G_CALLBACK(gtk_main_quit), From vmiklos at frugalware.org Mon Jan 19 11:45:48 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jan 19 11:45:50 2009 Subject: [Frugalware-git] kernel2628: qc-usb-0.6.6-46-i686 Message-ID: <20090119104548.DDDF911B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kernel2628.git;a=commitdiff;h=28938b699853fc4824328f301bf57d3354541fd8 commit 28938b699853fc4824328f301bf57d3354541fd8 Author: Miklos Vajna Date: Mon Jan 19 11:45:37 2009 +0100 qc-usb-0.6.6-46-i686 - kernel-2.6.28 diff --git a/source/multimedia-extra/qc-usb/FrugalBuild b/source/multimedia-extra/qc-usb/FrugalBuild index 10cd26d..7a2fe6b 100644 --- a/source/multimedia-extra/qc-usb/FrugalBuild +++ b/source/multimedia-extra/qc-usb/FrugalBuild @@ -3,7 +3,7 @@ pkgname=qc-usb pkgver=0.6.6 -pkgrel=45 +pkgrel=46 pkgdesc="Quickcam kernel driver." groups=('multimedia-extra') archs=('i686' 'x86_64') @@ -11,11 +11,12 @@ _F_sourceforge_dirname="qce-ga" Finclude sourceforge kernel-module url="http://qce-ga.sourceforge.net/" up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=12924|grep qc-usb |sed 's/[^]]*][^]]*]\([^ ]*\) .*/\1/;q'" -source=($source kernel-2.6.2{4,6,7}.patch) +source=($source kernel-2.6.2{4,6,7,8}.patch) sha1sums=('947a9f1233586af71d82e413f455ef01ee388b43' \ 'f77487fc75fe1a79d93813141448c04cc538a890' \ 'b549293fe695aa346b26a7d52c65ac142c4ae4bc' \ - '5f7ccc2df2a017d8d6bdca2469aa65646e58685a') + '5f7ccc2df2a017d8d6bdca2469aa65646e58685a' \ + '1f8dd39d711f0160a6ce962989db6ad3550fccf4') build() { Fpatchall diff --git a/source/multimedia-extra/qc-usb/kernel-2.6.28.patch b/source/multimedia-extra/qc-usb/kernel-2.6.28.patch new file mode 100644 index 0000000..371d844 --- /dev/null +++ b/source/multimedia-extra/qc-usb/kernel-2.6.28.patch @@ -0,0 +1,112 @@ +The following upstream commit renders qc-usb FTBS: + +Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=601e9444f249d219009ec05674268d90f6f1cdcb +Commit: 601e9444f249d219009ec05674268d90f6f1cdcb +Parent: e138c592b50370621653fd962b2bc3f4e25dfe78 +Author: Hans Verkuil +AuthorDate: Sat Aug 23 07:24:07 2008 -0300 +Committer: Mauro Carvalho Chehab +CommitDate: Sun Oct 12 09:36:54 2008 -0200 + + V4L/DVB (8786): v4l2: remove the priv field, use dev_get_drvdata instead + + Remove the priv field and let video_get/set_drvdata use dev_get_drvdata + and dev_set_drvdata instead. + + Convert all drivers that still used priv directly. + + Signed-off-by: Hans Verkuil + Signed-off-by: Mauro Carvalho Chehab + +Copyright (C) 2008 Stefan Lippers-Hollmann + +Cleaned up for Frugalware by Miklos Vajna. + +diff --git a/qc-driver.c b/qc-driver.c +index 5e13fbb..09f2461 100644 +--- a/qc-driver.c ++++ b/qc-driver.c +@@ -2255,7 +2255,11 @@ static unsigned int qc_v4l_poll(struct video_device *dev, struct file *file, pol + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) + struct video_device *dev = video_devdata(file); + #endif ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28) ++ struct quickcam *qc = (struct quickcam *)video_get_drvdata(dev); ++#else + struct quickcam *qc = (struct quickcam *)dev->priv; ++#endif + struct qc_frame_data *fd = &qc->frame_data; + int mask; + +@@ -2307,7 +2311,11 @@ static int qc_v4l_open(struct video_device *dev, int flags) + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) + struct video_device *dev = video_devdata(file); + #endif ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28) ++ struct quickcam *qc = video_get_drvdata(dev); ++#else + struct quickcam *qc = dev->priv; ++#endif + int r; + + if (qcdebug&QC_DEBUGLOGIC || qcdebug&QC_DEBUGUSER) PDEBUG("qc_v4l_open(qc=%p)", qc); +@@ -2375,7 +2383,11 @@ static void qc_v4l_close(struct video_device *dev) + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) + struct video_device *dev = video_devdata(file); + #endif ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28) ++ struct quickcam *qc = (struct quickcam *)video_get_drvdata(dev); ++#else + struct quickcam *qc = (struct quickcam *)dev->priv; ++#endif + if (qcdebug&QC_DEBUGLOGIC || qcdebug&QC_DEBUGUSER) PDEBUG("qc_v4l_close(dev=%p,qc=%p)",dev,qc); + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) + TEST_BUGR_MSG(qc==NULL, "qc==NULL"); +@@ -2423,7 +2435,11 @@ static long qc_v4l_read(struct video_device *dev, char *buf, unsigned long count + struct video_device *dev = video_devdata(file); + int noblock = file->f_flags & O_NONBLOCK; + #endif ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28) ++ struct quickcam *qc = (struct quickcam *)video_get_drvdata(dev); ++#else + struct quickcam *qc = (struct quickcam *)dev->priv; ++#endif + int frame_len; + unsigned char *frame; + long r = 0; +@@ -2478,7 +2494,11 @@ static int qc_v4l_mmap( + const void *start = (void *)vma->vm_start; + unsigned long size = vma->vm_end - vma->vm_start; + #endif ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28) ++ struct quickcam *qc = (struct quickcam *)video_get_drvdata(dev); ++#else + struct quickcam *qc = (struct quickcam *)dev->priv; ++#endif + unsigned char *frame; + int ret = 0, frame_size; + #if !HAVE_VMA && LINUX_VERSION_CODE= KERNEL_VERSION(2,6,28) ++ struct quickcam *qc = (struct quickcam *)video_get_drvdata(dev); ++#else + struct quickcam *qc = (struct quickcam *)dev->priv; ++#endif + int i, retval = 0; + + if (qcdebug&QC_DEBUGLOGIC || qcdebug&QC_DEBUGUSER) PDEBUG("qc_v4l_ioctl(dev=%p,cmd=%u,arg=%p,qc=%p)",dev,cmd,argp,qc); +@@ -3158,7 +3182,11 @@ PDEBUG("poisoning qc in qc_usb_init"); + + /* Register V4L video device */ + memcpy(&qc->vdev, &qc_v4l_template, sizeof(qc_v4l_template)); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28) ++ video_set_drvdata(&qc->vdev, qc); ++#else + qc->vdev.priv = qc; ++#endif + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27) + qc->vdev.parent = &(qc->dev->dev); + #else From vmiklos at frugalware.org Mon Jan 19 11:48:35 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jan 19 11:48:36 2009 Subject: [Frugalware-git] kernel2628: wlan-ng-0.2.9-9-i686 Message-ID: <20090119104835.2AA9A11B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kernel2628.git;a=commitdiff;h=e069b35d2e5a6196959dc00a91ced4063616d139 commit e069b35d2e5a6196959dc00a91ced4063616d139 Author: Miklos Vajna Date: Mon Jan 19 11:48:25 2009 +0100 wlan-ng-0.2.9-9-i686 - kernel-2.6.28 diff --git a/source/network-extra/wlan-ng/FrugalBuild b/source/network-extra/wlan-ng/FrugalBuild index f4d80cc..025cfb0 100644 --- a/source/network-extra/wlan-ng/FrugalBuild +++ b/source/network-extra/wlan-ng/FrugalBuild @@ -3,7 +3,7 @@ pkgname=wlan-ng pkgver=0.2.9 -pkgrel=8 +pkgrel=9 pkgdesc="Wireless Lan modules" url="http://www.linux-wlan.org/" Finclude kernel-module From vmiklos at frugalware.org Mon Jan 19 11:53:52 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jan 19 11:53:53 2009 Subject: [Frugalware-git] kernel2628: ndiswrapper-1.53-11-i686 Message-ID: <20090119105352.31EF511B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kernel2628.git;a=commitdiff;h=80aa367b5850bc7724f4389c7775ca890da1c0ca commit 80aa367b5850bc7724f4389c7775ca890da1c0ca Author: Miklos Vajna Date: Mon Jan 19 11:53:32 2009 +0100 ndiswrapper-1.53-11-i686 - kernel-2.6.28 diff --git a/source/network/ndiswrapper/FrugalBuild b/source/network/ndiswrapper/FrugalBuild index 91df3fc..2974839 100644 --- a/source/network/ndiswrapper/FrugalBuild +++ b/source/network/ndiswrapper/FrugalBuild @@ -4,7 +4,7 @@ pkgname=ndiswrapper pkgver=1.53 -pkgrel=10 +pkgrel=11 pkgdesc="Wrapper for using Windows drivers for some wireless cards" _F_kernelmod_scriptlet=$pkgname.install Finclude kernel-module sourceforge From vmiklos at frugalware.org Mon Jan 19 11:55:40 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jan 19 11:55:42 2009 Subject: [Frugalware-git] kernel2628: redirfs-0.3-5-i686 Message-ID: <20090119105540.63A5F11B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kernel2628.git;a=commitdiff;h=3181bf80b571557b700bcdb7fd5cb02d81ce9b93 commit 3181bf80b571557b700bcdb7fd5cb02d81ce9b93 Author: Miklos Vajna Date: Mon Jan 19 11:55:29 2009 +0100 redirfs-0.3-5-i686 - kernel-2.6.28 diff --git a/source/apps-extra/redirfs/FrugalBuild b/source/apps-extra/redirfs/FrugalBuild index 34fe3d4..4c9be6a 100644 --- a/source/apps-extra/redirfs/FrugalBuild +++ b/source/apps-extra/redirfs/FrugalBuild @@ -4,7 +4,7 @@ pkgname=redirfs pkgver=0.3 realver=${pkgver/pre/-pre} -pkgrel=4 +pkgrel=5 pkgdesc="Redirecting FileSystem" url="http://www.redirfs.org/tiki-index.php" _F_kernelmod_scriptlet=$pkgname.install From vmiklos at frugalware.org Mon Jan 19 11:57:16 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jan 19 11:57:17 2009 Subject: [Frugalware-git] kernel2628: madwifi-0.9.4-17-i686 Message-ID: <20090119105716.7C86C11B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kernel2628.git;a=commitdiff;h=089ebfe2081e2c74a83c251644cf35fd7d9e04d8 commit 089ebfe2081e2c74a83c251644cf35fd7d9e04d8 Author: Miklos Vajna Date: Mon Jan 19 11:57:05 2009 +0100 madwifi-0.9.4-17-i686 - kernel-2.6.28 diff --git a/source/network/madwifi/FrugalBuild b/source/network/madwifi/FrugalBuild index 4f48f04..acf18e8 100644 --- a/source/network/madwifi/FrugalBuild +++ b/source/network/madwifi/FrugalBuild @@ -3,7 +3,7 @@ pkgname=madwifi pkgver=0.9.4 -pkgrel=16 +pkgrel=17 pkgdesc="Madwifi drivers for Atheros wireless chipsets" Finclude kernel-module depends=(${depends[@]} 'wireless_tools') From vmiklos at frugalware.org Mon Jan 19 12:01:53 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jan 19 12:01:55 2009 Subject: [Frugalware-git] kernel2628: fglrx-8.561-3-i686 Message-ID: <20090119110153.C640F11B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kernel2628.git;a=commitdiff;h=52820d333baf7e23fddc94af7c56f9f49a3fffc7 commit 52820d333baf7e23fddc94af7c56f9f49a3fffc7 Author: Miklos Vajna Date: Mon Jan 19 12:01:24 2009 +0100 fglrx-8.561-3-i686 - kernel-2.6.28 diff --git a/source/x11-extra/fglrx/FrugalBuild b/source/x11-extra/fglrx/FrugalBuild index fe37006..99713bc 100644 --- a/source/x11-extra/fglrx/FrugalBuild +++ b/source/x11-extra/fglrx/FrugalBuild @@ -5,7 +5,7 @@ pkgname=fglrx pkgver=8.561 _shortver=8-12 -pkgrel=2 +pkgrel=3 pkgdesc="Hardware Accelerated ATi driver for xorg" url="http://www.ati.com/" # libstdc++5: no hardware acceleration without it From vmiklos at frugalware.org Mon Jan 19 12:04:53 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jan 19 12:04:54 2009 Subject: [Frugalware-git] kernel2628: nvidia-180.22-2-i686 Message-ID: <20090119110453.6098911B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kernel2628.git;a=commitdiff;h=02af14584a51414156a4dc3c11dcaeb16662f73b commit 02af14584a51414156a4dc3c11dcaeb16662f73b Author: Miklos Vajna Date: Mon Jan 19 12:04:33 2009 +0100 nvidia-180.22-2-i686 - kernel-2.6.28 diff --git a/source/x11-extra/nvidia/FrugalBuild b/source/x11-extra/nvidia/FrugalBuild index 875b6d0..3b221b4 100644 --- a/source/x11-extra/nvidia/FrugalBuild +++ b/source/x11-extra/nvidia/FrugalBuild @@ -3,7 +3,7 @@ pkgname=nvidia pkgver=180.22 -pkgrel=1 +pkgrel=2 archs=('i686' 'x86_64' '!ppc') Finclude nvidia case "$_F_nvidia_arch" in From vmiklos at frugalware.org Mon Jan 19 12:08:16 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jan 19 12:08:17 2009 Subject: [Frugalware-git] kernel2628: kqemu-1.3.0pre11-39-i686 Message-ID: <20090119110816.41B5911B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kernel2628.git;a=commitdiff;h=6786cfda8d7db7f73ba9a2054b3e46cce1bbe35d commit 6786cfda8d7db7f73ba9a2054b3e46cce1bbe35d Author: Miklos Vajna Date: Mon Jan 19 12:06:23 2009 +0100 kqemu-1.3.0pre11-39-i686 - kernel-2.6.28 diff --git a/source/xapps-extra/kqemu/FrugalBuild b/source/xapps-extra/kqemu/FrugalBuild index ed3860e..7c5588e 100644 --- a/source/xapps-extra/kqemu/FrugalBuild +++ b/source/xapps-extra/kqemu/FrugalBuild @@ -3,7 +3,7 @@ pkgname=kqemu pkgver=1.3.0pre11 -pkgrel=38 +pkgrel=39 pkgdesc="QEMU Accelerator Module" url="http://bellard.org/qemu/" depends=('qemu') From vmiklos at frugalware.org Mon Jan 19 12:08:16 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jan 19 12:08:18 2009 Subject: [Frugalware-git] kernel2628: dazuko-2.3.6pre1-7-i686 Message-ID: <20090119110816.5E30811B87A9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kernel2628.git;a=commitdiff;h=4c384812ab9525400ce2df9d2ace0ffd0bae4ab3 commit 4c384812ab9525400ce2df9d2ace0ffd0bae4ab3 Author: Miklos Vajna Date: Mon Jan 19 12:08:01 2009 +0100 dazuko-2.3.6pre1-7-i686 - kernel-2.6.28 diff --git a/source/apps-extra/dazuko/FrugalBuild b/source/apps-extra/dazuko/FrugalBuild index ac6ef95..4e504bf 100644 --- a/source/apps-extra/dazuko/FrugalBuild +++ b/source/apps-extra/dazuko/FrugalBuild @@ -5,7 +5,7 @@ pkgname=dazuko pkgver=2.3.6pre1 realver=${pkgver/pre/-pre} redirver=0.3 -pkgrel=6 +pkgrel=7 pkgdesc="On-access virus scanning kernel interface" url="http://www.dazuko.org" license="GPL-2 BSD" From vmiklos at frugalware.org Mon Jan 19 12:09:02 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jan 19 12:09:04 2009 Subject: [Frugalware-git] kernel2628: atl2-2.0.5-5-i686 Message-ID: <20090119110902.80D0811B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kernel2628.git;a=commitdiff;h=38c0b1e34533a68f6654e10576da08b448988d13 commit 38c0b1e34533a68f6654e10576da08b448988d13 Author: Miklos Vajna Date: Mon Jan 19 12:08:43 2009 +0100 atl2-2.0.5-5-i686 - bin, now in kernel-2.6.28 diff --git a/source/network-extra/atl2/FrugalBuild b/source/network-extra/atl2/FrugalBuild deleted file mode 100644 index e84da41..0000000 --- a/source/network-extra/atl2/FrugalBuild +++ /dev/null @@ -1,22 +0,0 @@ -# Compiling time: 0.01 SBU -# Maintainer: Janos Kovacs - -pkgname=atl2 -pkgver=2.0.5 -pkgrel=5 -pkgdesc="Driver for the Attansic/Atheros L2 Fast Ethernet Adapter" -url="http://people.redhat.com/csnook/${pkgname}" -license="GPL" -Finclude kernel-module -archs=('i686' 'x86_64') -groups=('network-extra') -up2date="Flasttar $url" -source=(${url}/$pkgname-$pkgver.tar.bz2) -sha1sums=('b0267912e088b85adf3893d2697ce1a286856013') - -build() { - Fcd - make KSRC=/usr/src/linux || Fdie - Ffilerel $_F_kernelmod_dir/net/${pkgname}/${pkgname}.ko - Fbuild_kernelmod_scriptlet -} From priyank at frugalware.org Mon Jan 19 13:34:44 2009 From: priyank at frugalware.org (Priyank) Date: Mon Jan 19 13:34:47 2009 Subject: [Frugalware-git] gservice: gservice-config: initial import Message-ID: <20090119123444.E2C6B11B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gservice.git;a=commitdiff;h=d05833cb1986270436ed29bf0bb2e891b7ebf6f8 commit d05833cb1986270436ed29bf0bb2e891b7ebf6f8 Author: Priyank Date: Mon Jan 19 18:04:14 2009 +0530 gservice-config: initial import * Added a configuration file parser diff --git a/src/Makefile.am b/src/Makefile.am index 0a5fe69..606ff70 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -7,6 +7,7 @@ bin_PROGRAMS=gservice gservice_SOURCES= \ gservice.c \ gservice-backend.c \ + gservice-config.c \ gservice-icon-mapping.c \ gservice-interface.c \ gservice-messages.c \ diff --git a/src/gservice-config.c b/src/gservice-config.c new file mode 100644 index 0000000..8adb735 --- /dev/null +++ b/src/gservice-config.c @@ -0,0 +1,189 @@ +/* + * gservice-config.c for gService + * + * Copyright (C) 2008-2009 by Priyank Gosalia + * + * 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 General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include +#include "gservice-config.h" + +#define CONFIG_FILE "/etc/gservice/main.conf" + +struct _gsvc_config_t { + gboolean show_warning; + gboolean show_icons; + gboolean show_status; +}; + +static gboolean _gsvc_write_config (gsvc_config_t *cfg); + +gsvc_config_t * +gsvc_config_new (void) +{ + gsvc_config_t *ret = NULL; + + ret = (gsvc_config_t*) malloc (sizeof(gsvc_config_t)); + if (ret) + { + memset (ret, 0, sizeof(gsvc_config_t)); + } + + return ret; +} + +guint +gsvc_config_init (gsvc_config_t *cfg) +{ + FILE *fp = NULL; + char line[PATH_MAX+1] = ""; + char *tmp = NULL; + + if (cfg == NULL) + { + return 1; + } + fp = fopen (CONFIG_FILE, "r"); + if (fp) + { + while (fgets(line,PATH_MAX,fp)) + { + g_strstrip (line); + if (line[0] == '#' || strlen(line) == 0) + continue; + tmp = strtok (line, "="); + if (tmp != NULL) + { + char *var = g_strdup (tmp); + char *val = strtok (NULL, "="); + char *tval = NULL; + if (!val) continue; + tval = g_strdup (val); + g_strstrip (tval); + g_strstrip (var); + if (!strcmp(var,"show_warning")) + { + if (!strcmp("true",tval)) + cfg->show_warning = TRUE; + else + cfg->show_warning = FALSE; + } + else + if (!strcmp(var,"show_icons")) + { + if (!strcmp("true",tval)) + cfg->show_icons = TRUE; + else + cfg->show_warning = FALSE; + } + else + if (!strcmp(var,"show_status")) + { + if (!strcmp("true",tval)) + cfg->show_status = TRUE; + else + cfg->show_warning = FALSE; + } + else + { + g_free (var); + g_free (tval); + continue; + } + g_free (var); + g_free (tval); + } + } + fclose (fp); + return 0; + } + + return 1; +} + +gboolean +gsvc_config_get_bool (gsvc_config_t *cfg, const char *key) +{ + gsvc_config_t *c = cfg; + + if (!c) + { + return FALSE; + } + if (!strcmp(key,"show_warning")) + return c->show_warning; + else + if (!strcmp(key,"show_icons")) + return c->show_icons; + else + if (!strcmp(key,"show_status")) + return c->show_status; + + return FALSE; +} + +gboolean +gsvc_config_set_bool (gsvc_config_t *cfg, const char *key, gboolean val) +{ + gsvc_config_t *c = cfg; + + if (!c || !key) + { + return FALSE; + } + if (!strcmp(key,"show_warning")) + c->show_warning = val; + else + if (!strcmp(key,"show_icons")) + c->show_warning = val; + else + if (!strcmp(key,"show_status")) + c->show_warning = val; + + /* write the config to file */ + return (_gsvc_write_config(c)); +} + +/* private functions */ + +/* stores config values to a file */ +static gboolean +_gsvc_write_config (gsvc_config_t *cfg) +{ + FILE *fp = NULL; + + if (!cfg) return FALSE; + fp = fopen (CONFIG_FILE,"w"); + if (!fp) return FALSE; + + fprintf (fp, "# gService configuration file\n\n"); + fprintf (fp, "# show a warning at startup"); + fprintf (fp, "show_warning = %s", (cfg->show_warning)?"true":"false"); + fprintf (fp, "# show service icons"); + fprintf (fp, "show_icons = %s", (cfg->show_icons)?"true":"false"); + fprintf (fp, "# show status window"); + fprintf (fp, "show_status = %s", (cfg->show_status)?"true":"false"); + fclose (fp); + + return TRUE; +} + + + diff --git a/src/gservice-config.h b/src/gservice-config.h new file mode 100644 index 0000000..0f5295e --- /dev/null +++ b/src/gservice-config.h @@ -0,0 +1,22 @@ +#ifndef __GSERVICE_CONFIG_H__ +#define __GSERVICE_CONFIG_H__ + +#include "gservice.h" + +typedef struct _gsvc_config_t gsvc_config_t; + +/* parses the config file and populates the config structure */ +/* returns 0 on success, 1 on failure */ +guint gsvc_config_init (gsvc_config_t *cfg); + +/* returns a newly allocated conf structure */ +gsvc_config_t *gsvc_config_new (void); + +/* set a boolean value for a configuration key + * returns TRUE on success, FALSE on error */ +gboolean gsvc_config_set_bool (gsvc_config_t *cfg, const char *key, gboolean val); + +/* get the boolean value for a specified key */ +gboolean gsvc_config_get_bool (gsvc_config_t *cfg, const char *key); + +#endif diff --git a/src/gservice-interface.c b/src/gservice-interface.c index 3aad5ed..1d7aaae 100644 --- a/src/gservice-interface.c +++ b/src/gservice-interface.c @@ -20,6 +20,7 @@ #include "gservice-interface.h" #include "gservice-backend.h" +#include "gservice-config.h" #include "gservice-icon-mapping.h" #include "gservice-about.h" @@ -50,6 +51,8 @@ extern GladeXML *xml; static GList *gsvc_service_list = NULL; +static gsvc_config_t *conf = NULL; + /* callbacks */ static void cb_gsvc_r0_toggled (GtkCellRendererToggle *toggle, gchar *path_str, gpointer data); static void cb_gsvc_r1_toggled (GtkCellRendererToggle *toggle, gchar *path_str, gpointer data); @@ -303,6 +306,14 @@ gservice_push_status (const char *status) void gservice_interface_init (void) { + /* initialize configuration */ + conf = gsvc_config_new (); + if (gsvc_config_init(conf)) + { + gsvc_error (_("Error"), _("Failed to initialize configuration. Please check that a valid configuration file exists in /etc/gservice/main.conf")); + gtk_main_quit (); + } + gsvc_main_window = gservice_get_widget ("gsvc_main_window"); gsvc_splash_screen = gservice_get_widget ("gsvc_splash_screen"); gsvc_treeview_services = gservice_get_widget ("gsvc_treeview_services"); From priyank at frugalware.org Mon Jan 19 14:09:36 2009 From: priyank at frugalware.org (Priyank) Date: Mon Jan 19 14:09:38 2009 Subject: [Frugalware-git] gservice: Fix bugs while saving config file Message-ID: <20090119130936.BE45611B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gservice.git;a=commitdiff;h=9cb0fe2fce51fc587eb673d8fdeed3e2d0116791 commit 9cb0fe2fce51fc587eb673d8fdeed3e2d0116791 Author: Priyank Date: Mon Jan 19 18:38:51 2009 +0530 Fix bugs while saving config file * Also, status console can now be shown/hidden by user * service icons can also be hidden/shown by user diff --git a/data/gservice.glade b/data/gservice.glade index dd959a3..fe2df9d 100644 --- a/data/gservice.glade +++ b/data/gservice.glade @@ -1,6 +1,6 @@ - + 570 @@ -51,9 +51,16 @@ True - + True - Hide service icons + Show service icons + True + + + + + True + Show status console True @@ -227,7 +234,7 @@ - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK diff --git a/src/gservice-config.c b/src/gservice-config.c index 8adb735..7bc07ce 100644 --- a/src/gservice-config.c +++ b/src/gservice-config.c @@ -123,7 +123,7 @@ gsvc_config_get_bool (gsvc_config_t *cfg, const char *key) { gsvc_config_t *c = cfg; - if (!c) + if (!c || !key) { return FALSE; } @@ -174,12 +174,12 @@ _gsvc_write_config (gsvc_config_t *cfg) if (!fp) return FALSE; fprintf (fp, "# gService configuration file\n\n"); - fprintf (fp, "# show a warning at startup"); - fprintf (fp, "show_warning = %s", (cfg->show_warning)?"true":"false"); - fprintf (fp, "# show service icons"); - fprintf (fp, "show_icons = %s", (cfg->show_icons)?"true":"false"); - fprintf (fp, "# show status window"); - fprintf (fp, "show_status = %s", (cfg->show_status)?"true":"false"); + fprintf (fp, "# show a warning at startup\n"); + fprintf (fp, "show_warning = %s\n\n", (cfg->show_warning)?"true":"false"); + fprintf (fp, "# show service icons\n"); + fprintf (fp, "show_icons = %s\n\n", (cfg->show_icons)?"true":"false"); + fprintf (fp, "# show status window\n"); + fprintf (fp, "show_status = %s\n\n", (cfg->show_status)?"true":"false"); fclose (fp); return TRUE; diff --git a/src/gservice-interface.c b/src/gservice-interface.c index 1d7aaae..040096b 100644 --- a/src/gservice-interface.c +++ b/src/gservice-interface.c @@ -61,6 +61,8 @@ static void cb_gsvc_r3_toggled (GtkCellRendererToggle *toggle, gchar *path_str, static void cb_gsvc_r4_toggled (GtkCellRendererToggle *toggle, gchar *path_str, gpointer data); static void cb_gsvc_r5_toggled (GtkCellRendererToggle *toggle, gchar *path_str, gpointer data); static void cb_gsvc_r6_toggled (GtkCellRendererToggle *toggle, gchar *path_str, gpointer data); +static void cb_gsvc_mnu_show_icons_toggled (GtkCheckMenuItem *item, gpointer data); +static void cb_gsvc_mnu_show_status_toggled (GtkCheckMenuItem *item, gpointer data); static void cb_gsvc_button_start_clicked (GtkButton *button, gpointer data); static void cb_gsvc_button_stop_clicked (GtkButton *button, gpointer data); static void cb_gsvc_button_activate_clicked (GtkButton *button, gpointer data); @@ -144,6 +146,12 @@ gservice_setup_treeview (void) gtk_tree_view_column_set_resizable (column, FALSE); gtk_tree_view_column_set_min_width (column, 48); gtk_tree_view_append_column (GTK_TREE_VIEW(gsvc_treeview_services), column); + gtk_tree_view_column_set_visible (column, gsvc_config_get_bool(conf,"show_icons")); + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(gservice_get_widget("gsvc_show_icons")), gsvc_config_get_bool(conf,"show_icons")); + g_signal_connect (G_OBJECT(gservice_get_widget("gsvc_show_icons")), + "toggled", + G_CALLBACK(cb_gsvc_mnu_show_icons_toggled), + (gpointer)column); renderer = gtk_cell_renderer_text_new (); g_object_set (G_OBJECT(renderer), "wrap-mode", PANGO_WRAP_CHAR, NULL); @@ -386,6 +394,12 @@ gservice_interface_init (void) "clicked", G_CALLBACK(gtk_main_quit), NULL); + g_signal_connect (G_OBJECT(gservice_get_widget("gsvc_show_status")), + "toggled", + G_CALLBACK(cb_gsvc_mnu_show_status_toggled), + (gpointer)gservice_get_widget("gsvc_status_box")); + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(gservice_get_widget("gsvc_show_status")), gsvc_config_get_bool(conf,"show_status")); + /* alrite, lets display the main window */ while (gtk_events_pending()) gtk_main_iteration (); gtk_widget_hide (gsvc_splash_screen); @@ -398,6 +412,31 @@ gservice_interface_init (void) /* callback definitions */ static void +cb_gsvc_mnu_show_icons_toggled (GtkCheckMenuItem *item, gpointer data) +{ + GtkTreeViewColumn *col = (GtkTreeViewColumn*) data; + gboolean val = gtk_check_menu_item_get_active (item); + gsvc_config_set_bool (conf, "show_icons", val); + gtk_tree_view_column_set_visible (col, val); + + return; +} + +static void +cb_gsvc_mnu_show_status_toggled (GtkCheckMenuItem *item, gpointer data) +{ + GtkWidget *box = (GtkWidget*) data; + gboolean val = gtk_check_menu_item_get_active (item); + gsvc_config_set_bool (conf, "show_status", val); + if (!val) + gtk_widget_hide (box); + else + gtk_widget_show (box); + + return; +} + +static void cb_gsvc_button_start_clicked (GtkButton *button, gpointer data) { GtkTreeSelection *selection = NULL; From crazy at frugalware.org Mon Jan 19 14:14:02 2009 From: crazy at frugalware.org (crazy) Date: Mon Jan 19 14:14:03 2009 Subject: [Frugalware-git] frugalware-current: microcode_ctl-1.17-2-x86_64 Message-ID: <20090119131402.9D28811B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8ff30412aae37eed02746db97cfb1e44ec824a90 commit 8ff30412aae37eed02746db97cfb1e44ec824a90 Author: crazy Date: Mon Jan 19 14:10:51 2009 +0100 microcode_ctl-1.17-2-x86_64 * release bump * change back the MICROCODE_DEVICE_DEFAULT * to /dev/cpu/.. since this is what newer udev create * fixed program location and device location in * init script since it was broken too diff --git a/source/apps-extra/microcode_ctl/FrugalBuild b/source/apps-extra/microcode_ctl/FrugalBuild index d7d7d9f..427ce6f 100644 --- a/source/apps-extra/microcode_ctl/FrugalBuild +++ b/source/apps-extra/microcode_ctl/FrugalBuild @@ -3,7 +3,7 @@ pkgname=microcode_ctl pkgver=1.17 -pkgrel=1 +pkgrel=2 pkgdesc="Intel IA32 CPU Microcode Utility" url="http://www.urbanmyth.org/microcode/" depends=('glibc') @@ -24,9 +24,9 @@ build() { Frcd2 } -sha1sums=('3c32cf0b3658018a4d0de203aebdb96dce6f68d6'\ - 'e04e5a211633fd141bdefd3a219f9c6f9ef4f881'\ - '48968bb41a53eef5d8468dacd0fdcd0ad944ac61'\ +sha1sums=('3c32cf0b3658018a4d0de203aebdb96dce6f68d6' \ + '6cd4812ea3f7bc7a44c4271379fe0d26102a88af' \ + 'b2def62528a5799970fbed5b9c2bab52f3dcb382' \ 'f3c664501e2ea8f5a20f0074da2718d3ce5c39eb') # optimization OK diff --git a/source/apps-extra/microcode_ctl/microcode_ctl.patch b/source/apps-extra/microcode_ctl/microcode_ctl.patch index 0386a8b..5d99dd7 100644 --- a/source/apps-extra/microcode_ctl/microcode_ctl.patch +++ b/source/apps-extra/microcode_ctl/microcode_ctl.patch @@ -66,7 +66,7 @@ diff -Naur microcode_ctl-1.16.orig/microcode_ctl.c microcode_ctl-1.16/microcode_ -#define MICROCODE_DEVICE_DEFAULT "/dev/cpu/microcode" -#define MICROCODE_FILE_DEFAULT "/etc/microcode.dat" -+#define MICROCODE_DEVICE_DEFAULT "/dev/microcode" ++#define MICROCODE_DEVICE_DEFAULT "/dev/cpu/microcode" +#define MICROCODE_FILE_DEFAULT "/usr/share/misc/microcode.dat" static void usage(void) diff --git a/source/apps-extra/microcode_ctl/rc.microcode_ctl b/source/apps-extra/microcode_ctl/rc.microcode_ctl index d9109ff..263a977 100644 --- a/source/apps-extra/microcode_ctl/rc.microcode_ctl +++ b/source/apps-extra/microcode_ctl/rc.microcode_ctl @@ -10,9 +10,9 @@ # Only root can do this :P [ `id -u` = 0 ] || exit 0 -DEVICE=/dev/microcode +DEVICE=/dev/cpu/microcode ARGS=-Qu -PROGRAM=/sbin/microcode +PROGRAM=/usr/sbin/microcode DATAFILE=/usr/share/misc/microcode.dat source /lib/initscripts/functions From vmiklos at frugalware.org Mon Jan 19 14:14:10 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jan 19 14:14:11 2009 Subject: [Frugalware-git] kernel2628: lirc-0.8.4-5-i686 Message-ID: <20090119131410.B6B8D11B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kernel2628.git;a=commitdiff;h=3ddce7ae08da0e7d78964ff954b8b18900d75dfd commit 3ddce7ae08da0e7d78964ff954b8b18900d75dfd Author: Miklos Vajna Date: Mon Jan 19 14:13:52 2009 +0100 lirc-0.8.4-5-i686 - kernel-2.6.28 diff --git a/source/apps-extra/lirc/FrugalBuild b/source/apps-extra/lirc/FrugalBuild index 991bf30..5ea8495 100644 --- a/source/apps-extra/lirc/FrugalBuild +++ b/source/apps-extra/lirc/FrugalBuild @@ -3,7 +3,7 @@ pkgname=lirc pkgver=0.8.4 -pkgrel=4 +pkgrel=5 pkgdesc="LIRC is a package that allows you to decode and send infra-red signals of many commonly used remote controls." url="http://www.lirc.org/" Finclude kernel-module sourceforge From vmiklos at frugalware.org Mon Jan 19 14:20:16 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Mon Jan 19 14:20:17 2009 Subject: [Frugalware-git] kernel2628: virtualbox-modules-2.1.0-2-i686 Message-ID: <20090119132016.AB52311B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kernel2628.git;a=commitdiff;h=abfbb5f9abc2cd2166e0321f2fa9e7ca07a30b8a commit abfbb5f9abc2cd2166e0321f2fa9e7ca07a30b8a Author: Miklos Vajna Date: Mon Jan 19 14:20:00 2009 +0100 virtualbox-modules-2.1.0-2-i686 - kernel-2.6.28 diff --git a/source/apps-extra/virtualbox-modules/FrugalBuild b/source/apps-extra/virtualbox-modules/FrugalBuild index af830a9..463c475 100644 --- a/source/apps-extra/virtualbox-modules/FrugalBuild +++ b/source/apps-extra/virtualbox-modules/FrugalBuild @@ -3,7 +3,7 @@ pkgname=virtualbox-modules pkgver=2.1.0 -pkgrel=1 +pkgrel=2 pkgdesc="Kernel modules for VirtualBox" url="http://www.virtualbox.org" Finclude kernel-module From crazy at frugalware.org Mon Jan 19 14:41:55 2009 From: crazy at frugalware.org (crazy) Date: Mon Jan 19 14:41:57 2009 Subject: [Frugalware-git] frugalware-current: microcode_ctl-1.17-3-x86_64 Message-ID: <20090119134155.B43A211B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b79f8df1b742c0ff67b6b11bdc19e2ec3dc52481 commit b79f8df1b742c0ff67b6b11bdc19e2ec3dc52481 Author: crazy Date: Mon Jan 19 14:39:51 2009 +0100 microcode_ctl-1.17-3-x86_64 * next bug :) * moved rmmod in rc_stop() where it belongs :) diff --git a/source/apps-extra/microcode_ctl/FrugalBuild b/source/apps-extra/microcode_ctl/FrugalBuild index 427ce6f..458e25a 100644 --- a/source/apps-extra/microcode_ctl/FrugalBuild +++ b/source/apps-extra/microcode_ctl/FrugalBuild @@ -3,7 +3,7 @@ pkgname=microcode_ctl pkgver=1.17 -pkgrel=2 +pkgrel=3 pkgdesc="Intel IA32 CPU Microcode Utility" url="http://www.urbanmyth.org/microcode/" depends=('glibc') @@ -25,7 +25,7 @@ build() { } sha1sums=('3c32cf0b3658018a4d0de203aebdb96dce6f68d6' \ - '6cd4812ea3f7bc7a44c4271379fe0d26102a88af' \ + '3678e3f020bdc3a3566fd45cdc948b460ccdcf10' \ 'b2def62528a5799970fbed5b9c2bab52f3dcb382' \ 'f3c664501e2ea8f5a20f0074da2718d3ce5c39eb') diff --git a/source/apps-extra/microcode_ctl/rc.microcode_ctl b/source/apps-extra/microcode_ctl/rc.microcode_ctl index 263a977..6083cbf 100644 --- a/source/apps-extra/microcode_ctl/rc.microcode_ctl +++ b/source/apps-extra/microcode_ctl/rc.microcode_ctl @@ -77,7 +77,6 @@ rc_start() exit 1 fi - /sbin/rmmod microcode [ $RETVAL -eq 0 ] && /var/lock/subsys/microcode_ctl ok 0 @@ -85,7 +84,8 @@ rc_start() rc_stop() { - msg $"Removing microcode_ctl lock." + msg $"Removing microcode_ctl.." + /sbin/rmmod microcode rm -f /var/lock/subsys/microcode_ctl hint $"You need to reboot to clear uploaded microcode." ok 0 @@ -93,4 +93,3 @@ rc_stop() rc_exec $1 -# vim: ft=sh From priyank at frugalware.org Mon Jan 19 14:55:59 2009 From: priyank at frugalware.org (Priyank) Date: Mon Jan 19 14:56:01 2009 Subject: [Frugalware-git] frugalware-current: btnx-0.4.11-2-i686 Message-ID: <20090119135559.B598F11B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=fdee83d7fac8d1cb0ff3acb459b8d29245d07d40 commit fdee83d7fac8d1cb0ff3acb459b8d29245d07d40 Author: Priyank Date: Mon Jan 19 19:24:57 2009 +0530 btnx-0.4.11-2-i686 * Fixed rc.btnx to support status diff --git a/source/apps-extra/btnx/FrugalBuild b/source/apps-extra/btnx/FrugalBuild index 90cb7fc..33b1aa4 100644 --- a/source/apps-extra/btnx/FrugalBuild +++ b/source/apps-extra/btnx/FrugalBuild @@ -3,7 +3,7 @@ pkgname=btnx pkgver=0.4.11 -pkgrel=1 +pkgrel=2 pkgdesc="btnx is a daemon that enables rerouting of mouse button events through uinput as keyboard and other mouse button combinations." url="http://www.ollisalonen.com/btnx/" depends=('libdaemon') @@ -14,13 +14,12 @@ backup=('etc/btnx/events') up2date="lynx -dump ${url} |Flasttar" source=(http://www.ollisalonen.com/btnx/btnx-${pkgver}.tar.gz rc.btnx) sha1sums=('7c7af20e3da10d6537c9ccb38c10b26a84eb4f48' \ - '266301bc58153356dce696d8318f7b87d6fb7643') + '53c4d81d157cf17dc452dd4a54ee1d9a2b776190') build() { export init_tool=no Fbuild Frm /etc/init.d - Frcd2 } # optimization OK diff --git a/source/apps-extra/btnx/rc.btnx b/source/apps-extra/btnx/rc.btnx index d4a7d75..a413877 100644 --- a/source/apps-extra/btnx/rc.btnx +++ b/source/apps-extra/btnx/rc.btnx @@ -14,12 +14,12 @@ TEXTDOMAINDIR=/lib/initscripts/messages actions=(restart start status stop) daemon=$"BTNX services" -pid="$(pidof btnx 2> /dev/null)" +pid="pidof btnx 2> /dev/null" rc_start() { start_msg - if [ -z ${pid} ] ; then + if [ -z "$(eval $pid)" ] ; then /usr/sbin/btnx -b -l ok $? else @@ -30,8 +30,8 @@ rc_start() rc_stop() { stop_msg - if [ ! -z ${pid} ] ; then - kill ${pid} + if [ ! -z "$(eval $pid)" ] ; then + killall btnx ok $? else ok 999 From priyank at frugalware.org Mon Jan 19 15:42:07 2009 From: priyank at frugalware.org (Priyank) Date: Mon Jan 19 15:42:09 2009 Subject: [Frugalware-git] gservice: Fixed some bugs and added cleanup functions Message-ID: <20090119144207.C4A9911B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gservice.git;a=commitdiff;h=81da1d7ac02019bd5e84ae8137f5367941cdee4c commit 81da1d7ac02019bd5e84ae8137f5367941cdee4c Author: Priyank Date: Mon Jan 19 20:10:33 2009 +0530 Fixed some bugs and added cleanup functions * move config detection code to gservice.c * display a warning for the first time gservice is started * fix a bug in gsvc_config_set_bool() where all values were set to TRUE diff --git a/src/gservice-config.c b/src/gservice-config.c index 7bc07ce..53b5aab 100644 --- a/src/gservice-config.c +++ b/src/gservice-config.c @@ -49,6 +49,17 @@ gsvc_config_new (void) return ret; } +void +gsvc_config_free (gsvc_config_t *cfg) +{ + if (cfg) + { + g_free (cfg); + } + + return; +} + guint gsvc_config_init (gsvc_config_t *cfg) { @@ -152,10 +163,10 @@ gsvc_config_set_bool (gsvc_config_t *cfg, const char *key, gboolean val) c->show_warning = val; else if (!strcmp(key,"show_icons")) - c->show_warning = val; + c->show_icons = val; else if (!strcmp(key,"show_status")) - c->show_warning = val; + c->show_status = val; /* write the config to file */ return (_gsvc_write_config(c)); diff --git a/src/gservice-config.h b/src/gservice-config.h index 0f5295e..b0b0237 100644 --- a/src/gservice-config.h +++ b/src/gservice-config.h @@ -12,6 +12,9 @@ guint gsvc_config_init (gsvc_config_t *cfg); /* returns a newly allocated conf structure */ gsvc_config_t *gsvc_config_new (void); +/* free an allocated conf structure */ +void gsvc_config_free (gsvc_config_t *cfg); + /* set a boolean value for a configuration key * returns TRUE on success, FALSE on error */ gboolean gsvc_config_set_bool (gsvc_config_t *cfg, const char *key, gboolean val); @@ -19,4 +22,5 @@ gboolean gsvc_config_set_bool (gsvc_config_t *cfg, const char *key, gboolean val /* get the boolean value for a specified key */ gboolean gsvc_config_get_bool (gsvc_config_t *cfg, const char *key); + #endif diff --git a/src/gservice-interface.c b/src/gservice-interface.c index 040096b..a2e3d4b 100644 --- a/src/gservice-interface.c +++ b/src/gservice-interface.c @@ -48,11 +48,10 @@ static GtkWidget *gsvc_service_edit_dlg_r4 = NULL; static GtkWidget *gsvc_service_edit_dlg_r5 = NULL; static GtkWidget *gsvc_service_edit_dlg_r6 = NULL; extern GladeXML *xml; +extern gsvc_config_t *conf; static GList *gsvc_service_list = NULL; -static gsvc_config_t *conf = NULL; - /* callbacks */ static void cb_gsvc_r0_toggled (GtkCellRendererToggle *toggle, gchar *path_str, gpointer data); static void cb_gsvc_r1_toggled (GtkCellRendererToggle *toggle, gchar *path_str, gpointer data); @@ -314,14 +313,6 @@ gservice_push_status (const char *status) void gservice_interface_init (void) { - /* initialize configuration */ - conf = gsvc_config_new (); - if (gsvc_config_init(conf)) - { - gsvc_error (_("Error"), _("Failed to initialize configuration. Please check that a valid configuration file exists in /etc/gservice/main.conf")); - gtk_main_quit (); - } - gsvc_main_window = gservice_get_widget ("gsvc_main_window"); gsvc_splash_screen = gservice_get_widget ("gsvc_splash_screen"); gsvc_treeview_services = gservice_get_widget ("gsvc_treeview_services"); @@ -358,6 +349,10 @@ gservice_interface_init (void) gservice_populate_services (); /* connect some signals */ + g_signal_connect (G_OBJECT(gsvc_treeview_services), + "row-activated", + G_CALLBACK(cb_gsvc_button_edit_clicked), + NULL); g_signal_connect (G_OBJECT(gservice_get_widget("menu_about")), "activate", G_CALLBACK(gservice_about), @@ -399,11 +394,30 @@ gservice_interface_init (void) G_CALLBACK(cb_gsvc_mnu_show_status_toggled), (gpointer)gservice_get_widget("gsvc_status_box")); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(gservice_get_widget("gsvc_show_status")), gsvc_config_get_bool(conf,"show_status")); + if (!gsvc_config_get_bool(conf,"show_status")) + { + gtk_widget_hide (gservice_get_widget("gsvc_status_box")); + } /* alrite, lets display the main window */ while (gtk_events_pending()) gtk_main_iteration (); gtk_widget_hide (gsvc_splash_screen); gtk_widget_show (gsvc_main_window); + if (gsvc_config_get_bool(conf,"show_warning")) + { + if (gsvc_warning_special("You are about to change system settings. Please note that gService is not responsible for any damage to your computer system or loss of data that results from the use of gService.")) + { + gsvc_config_set_bool (conf, "show_warning", FALSE); + } + } + + return; +} + +void +gservice_interface_cleanup (void) +{ + g_object_unref (xml); return; } diff --git a/src/gservice-interface.h b/src/gservice-interface.h index 52390b1..d3be37b 100644 --- a/src/gservice-interface.h +++ b/src/gservice-interface.h @@ -4,6 +4,9 @@ #include "gservice.h" /* initialize widgets and interface signals */ -void gfpm_interface_init (void); +void gservice_interface_init (void); + +/* free memory used by gservice */ +void gservice_interface_cleanup (void); #endif diff --git a/src/gservice-messages.c b/src/gservice-messages.c index f219167..62d2b93 100644 --- a/src/gservice-messages.c +++ b/src/gservice-messages.c @@ -116,3 +116,31 @@ gsvc_input (const char *title, const char *message, int *res) return ret; } +gboolean +gsvc_warning_special (const char *message) +{ + GtkWidget *dialog; + GtkCheckButton *button; + int res; + gboolean ret = FALSE; + + dialog = gtk_message_dialog_new (GTK_WINDOW(gsvc_main_window), + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_WARNING, + GTK_BUTTONS_OK, + message); + gtk_window_set_resizable (GTK_WINDOW(dialog), FALSE); + button = gtk_check_button_new_with_label (_("Do not show this warning again.")); + gtk_container_add (GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), button); + gtk_widget_show_all (GTK_WIDGET(dialog)); + res = gtk_dialog_run (GTK_DIALOG(dialog)); + if (res == GTK_RESPONSE_ACCEPT || res == GTK_RESPONSE_OK) + { + ret = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(button)); + } + gtk_widget_destroy (dialog); + + return ret; +} + + diff --git a/src/gservice.c b/src/gservice.c index 2cb305b..2f5d574 100644 --- a/src/gservice.c +++ b/src/gservice.c @@ -26,12 +26,14 @@ #endif #include "gservice.h" +#include "gservice-config.h" #include "gservice-messages.h" #include "gservice-interface.h" #define UI_FILE "/share/gservice/gservice.glade" -GladeXML *xml = NULL; +GladeXML *xml = NULL; +gsvc_config_t *conf = NULL; int main (int argc, char *argv[]) @@ -54,10 +56,26 @@ main (int argc, char *argv[]) } g_free (path); glade_xml_signal_autoconnect (xml); + + /* initialize configuration */ + conf = gsvc_config_new (); + if (gsvc_config_init(conf)) + { + gsvc_error (_("Error"), _("Failed to initialize configuration. Please check that a valid configuration file exists in /etc/gservice/main.conf")); + exit (1); + } + + /* initialize gservice */ gservice_interface_init (); + /* run the main loop */ gtk_main (); + + /* cleanup */ + gsvc_config_free (conf); + gservice_interface_cleanup (); + /* say goodbye! */ return 0; } From devil505linux at gmail.com Mon Jan 19 15:54:25 2009 From: devil505linux at gmail.com (Devil505) Date: Mon Jan 19 15:54:26 2009 Subject: [Frugalware-git] frugalware-current: btnx-config-0.4.9-2-i686 Message-ID: <20090119145425.9EEBF11B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1d109ee2924953697bb51738030f16042f1a2026 commit 1d109ee2924953697bb51738030f16042f1a2026 Author: Devil505 Date: Mon Jan 19 15:52:49 2009 +0100 btnx-config-0.4.9-2-i686 * remove btnx from rodepends to avoid circular dependency, thx priyank * to notice it diff --git a/source/xapps-extra/btnx-config/FrugalBuild b/source/xapps-extra/btnx-config/FrugalBuild index 855aed0..c2d48e3 100644 --- a/source/xapps-extra/btnx-config/FrugalBuild +++ b/source/xapps-extra/btnx-config/FrugalBuild @@ -3,10 +3,9 @@ pkgname=btnx-config pkgver=0.4.9 -pkgrel=1 +pkgrel=2 pkgdesc="Button Extension- a GNU/GPL mouse tool for GNU/Linux" url="http://www.ollisalonen.com/btnx/" -rodepends=('btnx') depends=('libglade' 'glibc' 'freetype2' 'libxau' 'libxdmcp' 'libxdamage' 'libxext') options=('scriptlet') groups=('xapps-extra') From devil505linux at gmail.com Mon Jan 19 17:01:39 2009 From: devil505linux at gmail.com (Devil505) Date: Mon Jan 19 17:01:40 2009 Subject: [Frugalware-git] frugalware-current: zenshot-0.6-1-x86_64 Message-ID: <20090119160139.79B9111B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b7fa7de0d7ead68359a54fa36e48fcdaf078059e commit b7fa7de0d7ead68359a54fa36e48fcdaf078059e Author: Devil505 Date: Mon Jan 19 16:59:58 2009 +0100 zenshot-0.6-1-x86_64 * added x86_64 to archs diff --git a/source/xapps-extra/zenshot/FrugalBuild b/source/xapps-extra/zenshot/FrugalBuild index fd04dab..61e758a 100644 --- a/source/xapps-extra/zenshot/FrugalBuild +++ b/source/xapps-extra/zenshot/FrugalBuild @@ -9,7 +9,7 @@ url="http://xrado.hopto.org/post/simple-screenshot-tool" depends=('pygtk') options=('scriptlet') groups=('xapps-extra') -archs=('i686') +archs=('i686' 'x86_64') up2date="lynx -dump http://xrado.hopto.org/tag/python | grep tar.gz | Flasttar" source=(http://xrado.hopto.org/file/open/6_3936c5fdf61bb8/$pkgname-$pkgver.tar.gz) sha1sums=('293ff09e407a3afc37938e4e283af2fb1114159c') From devil505linux at gmail.com Mon Jan 19 17:12:27 2009 From: devil505linux at gmail.com (Devil505) Date: Mon Jan 19 17:12:29 2009 Subject: [Frugalware-git] frugalware-current: mupen64plus-1_5-1-x86_64 Message-ID: <20090119161227.8D8E811B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=59d9e3d2cc9d9bef545a184e10bba2aabfc90752 commit 59d9e3d2cc9d9bef545a184e10bba2aabfc90752 Author: Devil505 Date: Mon Jan 19 17:12:03 2009 +0100 mupen64plus-1_5-1-x86_64 * added x86_64 to archs diff --git a/source/games-extra/mupen64plus/FrugalBuild b/source/games-extra/mupen64plus/FrugalBuild index 2757954..8e612fa 100644 --- a/source/games-extra/mupen64plus/FrugalBuild +++ b/source/games-extra/mupen64plus/FrugalBuild @@ -12,7 +12,7 @@ _F_googlecode_name="Mupen64Plus" Finclude googlecode options=('scriptlet') groups=('games-extra') -archs=('i686') +archs=('i686' 'x86_64') sha1sums=('ef200d6ea2eb3faa969ba9c82d2a771236c3145d') build() { From priyank at frugalware.org Mon Jan 19 17:56:14 2009 From: priyank at frugalware.org (Priyank) Date: Mon Jan 19 17:56:18 2009 Subject: [Frugalware-git] gservice: gservice-interface: Added an option to show/hide inactive services Message-ID: <20090119165614.B07D411B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gservice.git;a=commitdiff;h=dae2124c86411769e78256f55619a3820d9c3fca commit dae2124c86411769e78256f55619a3820d9c3fca Author: Priyank Date: Mon Jan 19 22:26:00 2009 +0530 gservice-interface: Added an option to show/hide inactive services diff --git a/data/gservice.glade b/data/gservice.glade index fe2df9d..e3c5c66 100644 --- a/data/gservice.glade +++ b/data/gservice.glade @@ -1,6 +1,6 @@ - + 570 @@ -64,6 +64,13 @@ True + + + True + Show inactive services + True + + diff --git a/main.conf b/main.conf index 73093fd..fed2994 100644 --- a/main.conf +++ b/main.conf @@ -1,6 +1,14 @@ # gService configuration file -show_warning = true +# show a warning at startup +show_warning = false + +# show service icons show_icons = true + +# show inactive services +show_inactive = false + +# show status window show_status = true diff --git a/src/gservice-config.c b/src/gservice-config.c index 53b5aab..44adfff 100644 --- a/src/gservice-config.c +++ b/src/gservice-config.c @@ -30,6 +30,7 @@ struct _gsvc_config_t { gboolean show_warning; gboolean show_icons; + gboolean show_inactive; gboolean show_status; }; @@ -102,7 +103,15 @@ gsvc_config_init (gsvc_config_t *cfg) if (!strcmp("true",tval)) cfg->show_icons = TRUE; else - cfg->show_warning = FALSE; + cfg->show_icons = FALSE; + } + else + if (!strcmp(var,"show_inactive")) + { + if (!strcmp("true",tval)) + cfg->show_inactive = TRUE; + else + cfg->show_inactive = FALSE; } else if (!strcmp(var,"show_status")) @@ -110,7 +119,7 @@ gsvc_config_init (gsvc_config_t *cfg) if (!strcmp("true",tval)) cfg->show_status = TRUE; else - cfg->show_warning = FALSE; + cfg->show_status = FALSE; } else { @@ -144,6 +153,9 @@ gsvc_config_get_bool (gsvc_config_t *cfg, const char *key) if (!strcmp(key,"show_icons")) return c->show_icons; else + if (!strcmp(key,"show_inactive")) + return c->show_inactive; + else if (!strcmp(key,"show_status")) return c->show_status; @@ -165,6 +177,9 @@ gsvc_config_set_bool (gsvc_config_t *cfg, const char *key, gboolean val) if (!strcmp(key,"show_icons")) c->show_icons = val; else + if (!strcmp(key,"show_inactive")) + c->show_inactive = val; + else if (!strcmp(key,"show_status")) c->show_status = val; @@ -189,6 +204,8 @@ _gsvc_write_config (gsvc_config_t *cfg) fprintf (fp, "show_warning = %s\n\n", (cfg->show_warning)?"true":"false"); fprintf (fp, "# show service icons\n"); fprintf (fp, "show_icons = %s\n\n", (cfg->show_icons)?"true":"false"); + fprintf (fp, "# show inactive services\n"); + fprintf (fp, "show_inactive = %s\n\n", (cfg->show_inactive)?"true":"false"); fprintf (fp, "# show status window\n"); fprintf (fp, "show_status = %s\n\n", (cfg->show_status)?"true":"false"); fclose (fp); diff --git a/src/gservice-icon-mapping.c b/src/gservice-icon-mapping.c index ae939ed..9e1b0b1 100644 --- a/src/gservice-icon-mapping.c +++ b/src/gservice-icon-mapping.c @@ -59,7 +59,6 @@ gsvc_icon_mapping_get_value (const char *svc) tok = strtok (NULL, "="); if (tok) { - printf ("FOUND:%s\n", tok); ret = strdup (g_strstrip(tok)); free (var); break; diff --git a/src/gservice-interface.c b/src/gservice-interface.c index a2e3d4b..9433d86 100644 --- a/src/gservice-interface.c +++ b/src/gservice-interface.c @@ -62,6 +62,7 @@ static void cb_gsvc_r5_toggled (GtkCellRendererToggle *toggle, gchar *path_str, static void cb_gsvc_r6_toggled (GtkCellRendererToggle *toggle, gchar *path_str, gpointer data); static void cb_gsvc_mnu_show_icons_toggled (GtkCheckMenuItem *item, gpointer data); static void cb_gsvc_mnu_show_status_toggled (GtkCheckMenuItem *item, gpointer data); +static void cb_gsvc_mnu_show_inactive_toggled (GtkCheckMenuItem *item, gpointer data); static void cb_gsvc_button_start_clicked (GtkButton *button, gpointer data); static void cb_gsvc_button_stop_clicked (GtkButton *button, gpointer data); static void cb_gsvc_button_activate_clicked (GtkButton *button, gpointer data); @@ -193,10 +194,13 @@ gservice_populate_services (void) { GList *temp = NULL; GtkListStore *store = NULL; - GtkTreeIter iter; GdkPixbuf *pixbuf_on = NULL; GdkPixbuf *pixbuf_off = NULL; GdkPixbuf *pixbuf_inactive = NULL; + gboolean show_inactive = TRUE; + gboolean hide = FALSE; + GtkTreeIter iter; + gservice_entry_t *e = NULL; /* if a list already exists, free it */ if (gsvc_service_list != NULL) @@ -220,43 +224,50 @@ gservice_populate_services (void) /* get the treeview store */ store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(gsvc_treeview_services))); gtk_list_store_clear (store); - /* populate a fresh service list */ - gsvc_service_list = gsvc_service_get_list (); + /* populate a fresh service list if required */ + if (gsvc_service_list == NULL) + { + gsvc_service_list = gsvc_service_get_list (); + } + show_inactive = gsvc_config_get_bool (conf, "show_inactive"); temp = gsvc_service_list; while (temp != NULL) { gservice_entry_t *e = temp->data; - char *desc = NULL; - char *namedesc = NULL; - GdkPixbuf *icon = NULL; - desc = gsvc_glist_to_string (e->description); - namedesc = g_markup_printf_escaped ("%s\n%s", e->name, desc); - icon = gsvc_icon_mapping_get_icon_for_service ((char*)e->name, 48); - gtk_list_store_append (GTK_LIST_STORE(store), &iter); - gtk_list_store_set (store, &iter, - 1, icon, - 2, (char*)namedesc, - 3, e->status, - 4, (char*)e->name, - 5, (e->enabled)?TRUE:FALSE, - -1); - g_object_unref (icon); - switch (e->status) + if ((show_inactive == FALSE && e->enabled == TRUE) || show_inactive) { - case GSVC_ON: - gtk_list_store_set (store, &iter, 0, pixbuf_on); - break; + char *desc = NULL; + char *namedesc = NULL; + GdkPixbuf *icon = NULL; + desc = gsvc_glist_to_string (e->description); + namedesc = g_markup_printf_escaped ("%s\n%s", e->name, desc); + icon = gsvc_icon_mapping_get_icon_for_service ((char*)e->name, 48); + gtk_list_store_append (GTK_LIST_STORE(store), &iter); + gtk_list_store_set (store, &iter, + 1, icon, + 2, (char*)namedesc, + 3, e->status, + 4, (char*)e->name, + 5, (e->enabled)?TRUE:FALSE, + -1); + g_object_unref (icon); + switch (e->status) + { + case GSVC_ON: + gtk_list_store_set (store, &iter, 0, pixbuf_on); + break; - case GSVC_OFF: - case GSVC_ERR: - gtk_list_store_set (store, &iter, 0, pixbuf_off); - break; + case GSVC_OFF: + case GSVC_ERR: + gtk_list_store_set (store, &iter, 0, pixbuf_off); + break; - default: - break; + default: + break; + } + g_free (desc); + g_free (namedesc); } - g_free (desc); - g_free (namedesc); temp = g_list_next (temp); while (gtk_events_pending()) gtk_main_iteration (); } @@ -389,6 +400,11 @@ gservice_interface_init (void) "clicked", G_CALLBACK(gtk_main_quit), NULL); + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(gservice_get_widget("gsvc_show_inactive")), gsvc_config_get_bool(conf,"show_inactive")); + g_signal_connect (G_OBJECT(gservice_get_widget("gsvc_show_inactive")), + "toggled", + G_CALLBACK(cb_gsvc_mnu_show_inactive_toggled), + NULL); g_signal_connect (G_OBJECT(gservice_get_widget("gsvc_show_status")), "toggled", G_CALLBACK(cb_gsvc_mnu_show_status_toggled), @@ -451,6 +467,16 @@ cb_gsvc_mnu_show_status_toggled (GtkCheckMenuItem *item, gpointer data) } static void +cb_gsvc_mnu_show_inactive_toggled (GtkCheckMenuItem *item, gpointer data) +{ + gboolean val = gtk_check_menu_item_get_active (item); + gsvc_config_set_bool (conf, "show_inactive", val); + gservice_populate_services (); + + return; +} + +static void cb_gsvc_button_start_clicked (GtkButton *button, gpointer data) { GtkTreeSelection *selection = NULL; From priyank at frugalware.org Mon Jan 19 19:27:04 2009 From: priyank at frugalware.org (Priyank) Date: Mon Jan 19 19:27:06 2009 Subject: [Frugalware-git] gservice: gservice_populate_services(): do not free the service list Message-ID: <20090119182704.EC00E11B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gservice.git;a=commitdiff;h=3fda8ac3eb5129d81580a6afb6ddb4cf86e78dd5 commit 3fda8ac3eb5129d81580a6afb6ddb4cf86e78dd5 Author: Priyank Date: Mon Jan 19 23:56:49 2009 +0530 gservice_populate_services(): do not free the service list diff --git a/src/gservice-interface.c b/src/gservice-interface.c index 9433d86..49d7a37 100644 --- a/src/gservice-interface.c +++ b/src/gservice-interface.c @@ -203,6 +203,7 @@ gservice_populate_services (void) gservice_entry_t *e = NULL; /* if a list already exists, free it */ + /* if (gsvc_service_list != NULL) { temp = gsvc_service_list; @@ -216,7 +217,7 @@ gservice_populate_services (void) g_list_free (gsvc_service_list); gsvc_service_list = NULL; } - + */ /* get the status icons */ pixbuf_on = gservice_get_icon ("gservice-running", 16); pixbuf_off = gservice_get_icon ("gservice-stopped", 16); From bouleetbil at frogdev.info Mon Jan 19 19:29:21 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Mon Jan 19 19:29:22 2009 Subject: [Frugalware-git] mono: mono-2.2-1-i686 Message-ID: <20090119182921.2791911B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=mono.git;a=commitdiff;h=637339578f1b4647adb6cf848919b684552dbb4f commit 637339578f1b4647adb6cf848919b684552dbb4f Author: bouleetbil Date: Mon Jan 19 19:15:07 2009 +0100 mono-2.2-1-i686 *added subpkg monodoc *moved monodoc to devel-extra (gtk2-sharp is not required) diff --git a/source/devel/mono/FrugalBuild b/source/devel/mono/FrugalBuild index 1c8a271..77286cf 100644 --- a/source/devel/mono/FrugalBuild +++ b/source/devel/mono/FrugalBuild @@ -16,23 +16,41 @@ up2date="lynx -dump http://www.go-mono.com/sources-stable/|grep -m1 'mono-'|sed source=(http://www.go-mono.com/sources/$pkgname/$pkgname-$pkgver.tar.bz2 rc.mono rc.mono-hu.po) Fconfopts="$Fconfopts --with-tls=__thread --with-libgdiplus=installed --with-moonlight=yes \ --with-preview=yes --with-glib=system --with-gc=included" + #Don't enable --enable-big-arrays we should have >3Go of ram +#we can add --with-ikvm-native=yes for replace ikvm package and use native ikvm + sha1sums=('028c061ba4f4631c4ff10a15b832211a67ec5858' \ '70d030d677bc38c90ccd208f5cfea4a7b244e085' \ '6c19f98462d7bb1ecba79a3ad284ea02a1eac2ec') +subpkgs=("monodoc") +subdescs=("Documentation for mono's .Net class library") +subdepends=('mono>=2.2') +subgroups=('devel-extra') +subarchs=('i686 x86_64 ppc') + build() { unset MAKEFLAGS - export EXTERNAL_MCS=false - export EXTERNAL_MONO=false Fcd Fpatchall Fmonoexport -# libtoolize -c -f || Fdie -# Fautoreconf Fmake Fmakeinstall Fmonocleanup + Fsplit monodoc /usr/lib/monodoc + Fsplit monodoc /usr/lib/mono/monodoc + Fsplit monodoc /usr/lib/mono/gac/monodoc + Fsplit monodoc /usr/bin/monodoc* + Fsplit monodoc /usr/bin/mdvalidater + Fsplit monodoc /usr/bin/mdoc* + Fsplit monodoc /usr/bin/mdassembler + Fsplit monodoc /usr/share/man/man5/mdoc.5 + Fsplit monodoc /usr/share/man/man1/monodocs2html.1 + Fsplit monodoc /usr/share/man/man1/mdvalidater.1 + Fsplit monodoc /usr/share/man/man1/mdoc* + Fsplit monodoc /usr/share/man/man1/mdassembler.1 + Fsplit monodoc /usr/lib/pkgconfig/monodoc.pc } # optimization OK From bouleetbil at frogdev.info Mon Jan 19 19:31:59 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Mon Jan 19 19:32:00 2009 Subject: [Frugalware-git] mono: mono-basic-2.2-1-i686 Message-ID: <20090119183159.22D2411B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=mono.git;a=commitdiff;h=9b13926fdbbac7f76a726c374895b7ed9a895833 commit 9b13926fdbbac7f76a726c374895b7ed9a895833 Author: bouleetbil Date: Mon Jan 19 19:25:56 2009 +0100 mono-basic-2.2-1-i686 *new package diff --git a/source/devel-extra/mono-basic/FrugalBuild b/source/devel-extra/mono-basic/FrugalBuild new file mode 100644 index 0000000..80029df --- /dev/null +++ b/source/devel-extra/mono-basic/FrugalBuild @@ -0,0 +1,15 @@ +# Compiling time: 0.23 SBU +# Maintainer: bouleetbil + +pkgname=mono-basic +pkgver=2.2 +pkgrel=1 +pkgdesc="Visual Basic .NET Runtime and Class Libraries" +url="http://www.mono-project.com/" +depends=('glib2' 'mono>=2.2') +groups=('devel-extra') +archs=('i686') +Finclude mono +up2date="lynx -dump http://ftp.novell.com/pub/mono/sources-stable/|grep -m1 'mono-basic'|sed 's/.*-\(.*\).t.*/\1/'" +source=(http://ftp.novell.com/pub/mono/sources/$pkgname/$pkgname-$pkgver.tar.bz2) +sha1sums=('36e5992ff59f1ca9c6208f0294bf25d7616ca9f3') From priyank at frugalware.org Mon Jan 19 20:06:54 2009 From: priyank at frugalware.org (Priyank) Date: Mon Jan 19 20:06:56 2009 Subject: [Frugalware-git] gservice: Runlevels can now be edited Message-ID: <20090119190654.E39C111B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gservice.git;a=commitdiff;h=8b466ddec53825809ba484cdfacedbe006e043d7 commit 8b466ddec53825809ba484cdfacedbe006e043d7 Author: Priyank Date: Tue Jan 20 00:36:41 2009 +0530 Runlevels can now be edited diff --git a/main.conf b/main.conf index fed2994..a5d8a00 100644 --- a/main.conf +++ b/main.conf @@ -7,7 +7,7 @@ show_warning = false show_icons = true # show inactive services -show_inactive = false +show_inactive = true # show status window show_status = true diff --git a/src/gservice-backend.c b/src/gservice-backend.c index a9ba9ac..c659d7f 100644 --- a/src/gservice-backend.c +++ b/src/gservice-backend.c @@ -504,6 +504,7 @@ gsvc_service_activate (const char *service) g_free (svc); if (!system(cmd)) ret = TRUE; + g_free (cmd); return ret; } @@ -520,7 +521,37 @@ gsvc_service_deactivate (const char *service) g_free (svc); if (!system(cmd)) ret = TRUE; + g_free (cmd); return ret; } +gboolean +gsvc_service_set_runlevel (const char *service, guint runlevel, gboolean val) +{ + char *cmd = NULL; + char *svc = NULL; + char *opr = NULL; + gboolean ret = FALSE; + + if (val) + { + opr = "on"; + } + else + { + opr = "off"; + } + svc = g_strdup_printf ("rc.%s", service); + cmd = g_strdup_printf ("chkconfig --level %d %s %s", runlevel, svc, opr); + if (!system(cmd)) + { + ret = TRUE; + } + g_free (svc); + g_free (cmd); + + return ret; +} + + diff --git a/src/gservice-backend.h b/src/gservice-backend.h index 3a2a91d..66b9016 100644 --- a/src/gservice-backend.h +++ b/src/gservice-backend.h @@ -44,5 +44,9 @@ gboolean gsvc_service_activate (const char *service); /* returns TRUE on success, FALSE on failure */ gboolean gsvc_service_deactivate (const char *service); +/* set runlevel of a service */ +/* returns TRUE on success, FALSE on failure */ +gboolean gsvc_service_set_runlevel (const char *service, guint runlevel, gboolean val); + #endif diff --git a/src/gservice-interface.c b/src/gservice-interface.c index 49d7a37..e5616a2 100644 --- a/src/gservice-interface.c +++ b/src/gservice-interface.c @@ -53,13 +53,13 @@ extern gsvc_config_t *conf; static GList *gsvc_service_list = NULL; /* callbacks */ -static void cb_gsvc_r0_toggled (GtkCellRendererToggle *toggle, gchar *path_str, gpointer data); -static void cb_gsvc_r1_toggled (GtkCellRendererToggle *toggle, gchar *path_str, gpointer data); -static void cb_gsvc_r2_toggled (GtkCellRendererToggle *toggle, gchar *path_str, gpointer data); -static void cb_gsvc_r3_toggled (GtkCellRendererToggle *toggle, gchar *path_str, gpointer data); -static void cb_gsvc_r4_toggled (GtkCellRendererToggle *toggle, gchar *path_str, gpointer data); -static void cb_gsvc_r5_toggled (GtkCellRendererToggle *toggle, gchar *path_str, gpointer data); -static void cb_gsvc_r6_toggled (GtkCellRendererToggle *toggle, gchar *path_str, gpointer data); +static void cb_gsvc_r0_toggled (GtkToggleButton *toggle, gpointer data); +static void cb_gsvc_r1_toggled (GtkToggleButton *toggle, gpointer data); +static void cb_gsvc_r2_toggled (GtkToggleButton *toggle, gpointer data); +static void cb_gsvc_r3_toggled (GtkToggleButton *toggle, gpointer data); +static void cb_gsvc_r4_toggled (GtkToggleButton *toggle, gpointer data); +static void cb_gsvc_r5_toggled (GtkToggleButton *toggle, gpointer data); +static void cb_gsvc_r6_toggled (GtkToggleButton *toggle, gpointer data); static void cb_gsvc_mnu_show_icons_toggled (GtkCheckMenuItem *item, gpointer data); static void cb_gsvc_mnu_show_status_toggled (GtkCheckMenuItem *item, gpointer data); static void cb_gsvc_mnu_show_inactive_toggled (GtkCheckMenuItem *item, gpointer data); @@ -352,7 +352,7 @@ gservice_interface_init (void) gtk_widget_show (gsvc_splash_screen); while (gtk_events_pending()) gtk_main_iteration (); /* a li'l manual delay */ - sleep (2); + //sleep (2); while (gtk_events_pending()) gtk_main_iteration (); /* setup service treeview */ @@ -684,44 +684,108 @@ cb_gsvc_button_deactivate_clicked (GtkButton *button, gpointer data) } static void -cb_gsvc_r0_toggled (GtkCellRendererToggle *toggle, gchar *path_str, gpointer data) +cb_gsvc_r0_toggled (GtkToggleButton *toggle, gpointer data) { + gboolean val = gtk_toggle_button_get_active (toggle); + if (!gsvc_service_set_runlevel (((gservice_entry_t*)data)->name,0,val)) + { + gsvc_error (_("Error"), _("There was an error while changing runlevel information.")); + } + else + { + ((gservice_entry_t*)data)->runlevel[0] = val; + } + return; } static void -cb_gsvc_r1_toggled (GtkCellRendererToggle *toggle, gchar *path_str, gpointer data) +cb_gsvc_r1_toggled (GtkToggleButton *toggle, gpointer data) { + gboolean val = gtk_toggle_button_get_active (toggle); + if (!gsvc_service_set_runlevel (((gservice_entry_t*)data)->name,1,val)) + { + gsvc_error (_("Error"), _("There was an error while changing runlevel information.")); + } + else + { + ((gservice_entry_t*)data)->runlevel[1] = val; + } return; } static void -cb_gsvc_r2_toggled (GtkCellRendererToggle *toggle, gchar *path_str, gpointer data) +cb_gsvc_r2_toggled (GtkToggleButton *toggle, gpointer data) { + gboolean val = gtk_toggle_button_get_active (toggle); + if (!gsvc_service_set_runlevel (((gservice_entry_t*)data)->name,2,val)) + { + gsvc_error (_("Error"), _("There was an error while changing runlevel information.")); + } + else + { + ((gservice_entry_t*)data)->runlevel[2] = val; + } return; } static void -cb_gsvc_r3_toggled (GtkCellRendererToggle *toggle, gchar *path_str, gpointer data) +cb_gsvc_r3_toggled (GtkToggleButton *toggle, gpointer data) { + gboolean val = gtk_toggle_button_get_active (toggle); + if (!gsvc_service_set_runlevel (((gservice_entry_t*)data)->name,3,val)) + { + gsvc_error (_("Error"), _("There was an error while changing runlevel information.")); + } + else + { + ((gservice_entry_t*)data)->runlevel[3] = val; + } return; } static void -cb_gsvc_r4_toggled (GtkCellRendererToggle *toggle, gchar *path_str, gpointer data) +cb_gsvc_r4_toggled (GtkToggleButton *toggle, gpointer data) { + gboolean val = gtk_toggle_button_get_active (toggle); + if (!gsvc_service_set_runlevel (((gservice_entry_t*)data)->name,4,val)) + { + gsvc_error (_("Error"), _("There was an error while changing runlevel information.")); + } + else + { + ((gservice_entry_t*)data)->runlevel[4] = val; + } return; } static void -cb_gsvc_r5_toggled (GtkCellRendererToggle *toggle, gchar *path_str, gpointer data) +cb_gsvc_r5_toggled (GtkToggleButton *toggle, gpointer data) { + gboolean val = gtk_toggle_button_get_active (toggle); + if (!gsvc_service_set_runlevel (((gservice_entry_t*)data)->name,5,val)) + { + gsvc_error (_("Error"), _("There was an error while changing runlevel information.")); + } + else + { + ((gservice_entry_t*)data)->runlevel[5] = val; + } return; } static void -cb_gsvc_r6_toggled (GtkCellRendererToggle *toggle, gchar *path_str, gpointer data) +cb_gsvc_r6_toggled (GtkToggleButton *toggle, gpointer data) { + gboolean val = gtk_toggle_button_get_active (toggle); + if (!gsvc_service_set_runlevel (((gservice_entry_t*)data)->name,6,val)) + { + gsvc_error (_("Error"), _("There was an error while changing runlevel information.")); + } + else + { + ((gservice_entry_t*)data)->runlevel[6] = val; + } return; } @@ -809,6 +873,14 @@ cb_gsvc_button_edit_clicked (GtkButton *button, gpointer data) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(gsvc_service_edit_dlg_r4), entry->runlevel[4]); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(gsvc_service_edit_dlg_r5), entry->runlevel[5]); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(gsvc_service_edit_dlg_r6), entry->runlevel[6]); + /* connect signals so that the user will be able to edit the runlevels */ + g_signal_connect (G_OBJECT(gsvc_service_edit_dlg_r0), "toggled", G_CALLBACK(cb_gsvc_r0_toggled), (gpointer)entry); + g_signal_connect (G_OBJECT(gsvc_service_edit_dlg_r1), "toggled", G_CALLBACK(cb_gsvc_r1_toggled), (gpointer)entry); + g_signal_connect (G_OBJECT(gsvc_service_edit_dlg_r2), "toggled", G_CALLBACK(cb_gsvc_r2_toggled), (gpointer)entry); + g_signal_connect (G_OBJECT(gsvc_service_edit_dlg_r3), "toggled", G_CALLBACK(cb_gsvc_r3_toggled), (gpointer)entry); + g_signal_connect (G_OBJECT(gsvc_service_edit_dlg_r4), "toggled", G_CALLBACK(cb_gsvc_r4_toggled), (gpointer)entry); + g_signal_connect (G_OBJECT(gsvc_service_edit_dlg_r5), "toggled", G_CALLBACK(cb_gsvc_r5_toggled), (gpointer)entry); + g_signal_connect (G_OBJECT(gsvc_service_edit_dlg_r6), "toggled", G_CALLBACK(cb_gsvc_r6_toggled), (gpointer)entry); /* and the service icon */ GdkPixbuf *pixbuf = gsvc_icon_mapping_get_icon_for_service (entry->name, 48); gtk_image_set_from_pixbuf (GTK_IMAGE(gsvc_service_edit_dlg_svcicon), pixbuf); From bouleetbil at frogdev.info Mon Jan 19 20:27:38 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Mon Jan 19 20:27:40 2009 Subject: [Frugalware-git] bouleetbiltesting: abiword-2.6.6-1-i686 Message-ID: <20090119192738.1AA4B11B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbiltesting.git;a=commitdiff;h=7744ac6fa76c981fac4ac91902cc63397310ffe0 commit 7744ac6fa76c981fac4ac91902cc63397310ffe0 Author: bouleetbil Date: Mon Jan 19 20:19:11 2009 +0100 abiword-2.6.6-1-i686 *version bump diff --git a/source/xapps-extra/abiword/FrugalBuild b/source/xapps-extra/abiword/FrugalBuild index c7961be..2a44b31 100644 --- a/source/xapps-extra/abiword/FrugalBuild +++ b/source/xapps-extra/abiword/FrugalBuild @@ -2,9 +2,9 @@ # Maintainer: Christian Hamar alias krix pkgname=abiword -pkgver=2.6.5 +pkgver=2.6.6 #for now same version -pkgverplugin=2.6.5 +pkgverplugin=2.6.6 abivers=2.6 pkgrel=1 pkgdesc="AbiWord is a free word processing program similar to Microsoft(R) Word." @@ -24,8 +24,8 @@ Finclude gnome-scriptlet up2date="lynx -dump http://www.abisource.com/|grep -m1 'stable release is'|tr -d '[:alpha:] [:blank:]' |sed 's/\(.*\)./\1/;s/.//6'" source=($url/downloads/$pkgname/$pkgver/source/$pkgname-$pkgver.tar.gz \ $url/downloads/abiword/$pkgver/source/abiword-plugins-$pkgverplugin.tar.gz ) -sha1sums=('f848e82bcda6b0ece5ce206b516a475af9aa5fa7' \ - '2572bdfe0d19390ff839310102cef75802ba7fa8') +sha1sums=('9751b7f01beee9f048ab20e52a600a757085363b' \ + 'e7282802f5d3fcb804542e7092bad6576943a623') license="GPL2" conflicts=('abiword-gnome') From bouleetbil at frogdev.info Mon Jan 19 20:30:07 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Mon Jan 19 20:30:08 2009 Subject: [Frugalware-git] mono: mono-tools-2.2-1-i686 Message-ID: <20090119193007.4E19711B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=mono.git;a=commitdiff;h=f3a9bbccd82f748aacc46991caf526a7725199ce commit f3a9bbccd82f748aacc46991caf526a7725199ce Author: bouleetbil Date: Mon Jan 19 20:23:58 2009 +0100 mono-tools-2.2-1-i686 *version bump diff --git a/source/gnome-extra/mono-tools/FrugalBuild b/source/gnome-extra/mono-tools/FrugalBuild index f15dd3b..92b499b 100644 --- a/source/gnome-extra/mono-tools/FrugalBuild +++ b/source/gnome-extra/mono-tools/FrugalBuild @@ -2,19 +2,19 @@ # Maintainer: Christian Hamar alias krix pkgname=mono-tools -pkgver=2.0 +pkgver=2.2 pkgrel=1 pkgdesc="Mono Tools is a collection of development and testing programs and utilities for use with Mono." url="http://www.mono-project.com/" -depends=('gnome-desktop-sharp>=2.20.1' 'desktop-file-utils' 'gecko-sharp>=0.13' 'monodoc>=2.0' 'xulrunner') -makedepends=('pkgconfig' 'libgdiplus>=2.0') +depends=('gnome-desktop-sharp>=2.20.1' 'desktop-file-utils' 'gecko-sharp>=0.13' 'monodoc>=2.2' 'xulrunner') +makedepends=('pkgconfig' 'libgdiplus>=2.2') groups=('gnome-extra') archs=('i686' 'x86_64') up2date="lynx -dump 'http://www.go-mono.com/sources-stable/'|grep -m1 'mono-tools-'|sed 's/.*ls-\(.*\).t.*/\1/'" source=(http://www.go-mono.com/sources/$pkgname/$pkgname-$pkgver.tar.bz2) options=('scriptlet') Finclude mono -sha1sums=('25afde95409b20a395644102c33b3172d64e393d') +sha1sums=('68dad19fc8ac35821ce122169fd9d4611f078e1b') build() { From bouleetbil at frogdev.info Mon Jan 19 20:32:16 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Mon Jan 19 20:32:19 2009 Subject: [Frugalware-git] frugalware-current: balsa-2.3.27-1-i686 Message-ID: <20090119193216.5141011B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b7348eddc62f90eeac81cc4395a69275a4fb60fb commit b7348eddc62f90eeac81cc4395a69275a4fb60fb Author: bouleetbil Date: Mon Jan 19 20:26:02 2009 +0100 balsa-2.3.27-1-i686 *version bump *added patch for gmime-2.4 diff --git a/source/gnome-extra/balsa/FrugalBuild b/source/gnome-extra/balsa/FrugalBuild index 007a16e..2bb53e1 100644 --- a/source/gnome-extra/balsa/FrugalBuild +++ b/source/gnome-extra/balsa/FrugalBuild @@ -2,26 +2,36 @@ # Maintainer: bouleetbil pkgname=balsa -pkgver=2.3.26 +pkgver=2.3.27 pkgrel=1 pkgdesc="Balsa is an e-mail client for GNOME" url="http://balsa.gnome.org" up2date="lynx -dump $url/download.html | Flasttar" -source=($url/$pkgname-$pkgver.tar.bz2) +source=($url/$pkgname-$pkgver.tar.bz2 gmime-2.4-with-2.2.patch) options=('scriptlet') depends=('libesmtp' 'gmime' 'aspell' 'libgnomeprint' 'libgnomeprintui' 'libbonobo' \ 'libgnome' 'libgnomeui' 'gnome-vfs' 'gtkhtml' 'gpgme' 'sqlite3' 'openssl' 'gtkspell' \ 'libsm' 'gnome-keyring' 'popt' 'esd' 'pango' 'libart_lgpl' 'atk' 'freetype2' \ 'libxau' 'libxdmcp' 'libnotify' 'libglade' 'libjpeg' 'libxdamage' 'gtkspell' \ 'libxinerama' 'libxi' 'libxrandr' 'libxcursor' 'libgcc' 'gtksourceview') -makedepends=('perl-xml-parser' 'rarian') +makedepends=('perl-xml-parser' 'rarian' 'intltool') _F_gnome_iconcache="y" _F_gnome_desktop="y" Finclude gnome-scriptlet groups=('gnome-extra') archs=('i686' 'x86_64') -sha1sums=('08fd06a3e93b155a0bca727f8a2bff3589bc36df') +sha1sums=('79b2e9fcf015403b097f025ac8e0902672aa9bbd' \ + '8513e0636adb5f2f3c793f0322f3860930c26baa') Fconfopts="${Fconfopts[@]} --with-ssl --with-gtkprint --with-gpgme=gpgme-config \ --with-sqlite=sqlite3 --with-gtkspell --with-gtksourceview=yes" +build() { + Fcd + Fpatchall + Fautoreconf + Fmake + Fmakeinstall + Fbuild_gnome_scriptlet +} + # optimization OK diff --git a/source/gnome-extra/balsa/gmime-2.4-with-2.2.patch b/source/gnome-extra/balsa/gmime-2.4-with-2.2.patch new file mode 100644 index 0000000..d8e897f --- /dev/null +++ b/source/gnome-extra/balsa/gmime-2.4-with-2.2.patch @@ -0,0 +1,4676 @@ +see http://bugzilla.gnome.org/show_bug.cgi?id=537507 + +Index: balsa/balsa/src/balsa-mime-widget-message.c +=================================================================== +--- balsa/src/balsa-mime-widget-message.c (revision 8017) ++++ balsa/src/balsa-mime-widget-message.c (working copy) +@@ -315,9 +315,15 @@ + + /* create a message */ + message = libbalsa_message_new(); ++#ifndef HAVE_GMIME_2_4 + data = internet_address_to_string(balsa_app.current_ident->ia, FALSE); + message->headers->from = internet_address_parse_string(data); + g_free(data); ++#else /* HAVE_GMIME_2_4 */ ++ message->headers->from = internet_address_list_new(); ++ internet_address_list_add(message->headers->from, ++ balsa_app.current_ident->ia); ++#endif /* HAVE_GMIME_2_4 */ + + data = libbalsa_message_body_get_parameter(mime_body, "subject"); + if (data) { +@@ -326,7 +332,11 @@ + } + + data = libbalsa_message_body_get_parameter(mime_body, "server"); ++#ifndef HAVE_GMIME_2_4 + message->headers->to_list = internet_address_parse_string(data); ++#else /* HAVE_GMIME_2_4 */ ++ message->headers->to_list = internet_address_list_parse_string(data); ++#endif /* HAVE_GMIME_2_4 */ + g_free(data); + + /* the original body my have some data to be returned as commands... */ +@@ -624,7 +634,11 @@ + { + gchar *value; + ++#ifndef HAVE_GMIME_2_4 + if (list == NULL) ++#else /* HAVE_GMIME_2_4 */ ++ if (list == NULL || internet_address_list_length(list) == 0) ++#endif /* HAVE_GMIME_2_4 */ + return; + + if (!(bm->shown_headers == HEADERS_ALL || +Index: balsa/src/store-address.c +=================================================================== +--- balsa/src/store-address.c (revision 8017) ++++ balsa/src/store-address.c (working copy) +@@ -59,13 +59,22 @@ + StoreAddressInfo * info); + static void store_address_add_address(StoreAddressInfo * info, + const gchar * label, ++#ifndef HAVE_GMIME_2_4 + const InternetAddress * address, + const InternetAddress * group); ++#else /* HAVE_GMIME_2_4 */ ++ InternetAddress * address, ++ InternetAddress * group); ++#endif /* HAVE_GMIME_2_4 */ + static void store_address_add_lbaddress(StoreAddressInfo * info, + const LibBalsaAddress *address); + static void store_address_add_list(StoreAddressInfo * info, + const gchar * label, ++#ifndef HAVE_GMIME_2_4 + const InternetAddressList * list); ++#else /* HAVE_GMIME_2_4 */ ++ InternetAddressList * list); ++#endif /* HAVE_GMIME_2_4 */ + + /* + * public interface: balsa_store_address +@@ -348,8 +357,13 @@ + * make a new page in the notebook */ + static void + store_address_add_address(StoreAddressInfo * info, ++#ifndef HAVE_GMIME_2_4 + const gchar * lab, const InternetAddress * ia, + const InternetAddress * group) ++#else /* HAVE_GMIME_2_4 */ ++ const gchar * lab, InternetAddress * ia, ++ InternetAddress * group) ++#endif /* HAVE_GMIME_2_4 */ + { + gchar *text; + LibBalsaAddress *address; +@@ -366,7 +380,11 @@ + address = libbalsa_address_new(); + address->full_name = + g_strdup(ia->name ? ia->name : group ? group->name : NULL); ++#ifndef HAVE_GMIME_2_4 + address->address_list = g_list_prepend(NULL, g_strdup(ia->value.addr)); ++#else /* HAVE_GMIME_2_4 */ ++ address->address_list = g_list_prepend(NULL, g_strdup(INTERNET_ADDRESS_MAILBOX (ia)->addr)); ++#endif /* HAVE_GMIME_2_4 */ + ew = libbalsa_address_get_edit_widget(address, entries, NULL, NULL); + g_object_unref(address); + +@@ -409,20 +427,47 @@ + static void + store_address_add_list(StoreAddressInfo * info, + const gchar * label, ++#ifndef HAVE_GMIME_2_4 + const InternetAddressList * list) ++#else /* HAVE_GMIME_2_4 */ ++ InternetAddressList * list) ++#endif /* HAVE_GMIME_2_4 */ + { ++#ifndef HAVE_GMIME_2_4 + for (; list; list = list->next) { + InternetAddress *ia = list->address; + + if (ia->type == INTERNET_ADDRESS_NAME) ++#else /* HAVE_GMIME_2_4 */ ++ int i, j; ++ ++ for (i = 0; i < internet_address_list_length (list); i++) { ++ InternetAddress *ia = internet_address_list_get_address (list, i); ++ ++ if (INTERNET_ADDRESS_IS_MAILBOX (ia)) ++#endif /* HAVE_GMIME_2_4 */ + store_address_add_address(info, label, ia, NULL); ++#ifndef HAVE_GMIME_2_4 + else if (ia->type == INTERNET_ADDRESS_GROUP) { + InternetAddressList *member; ++#else /* HAVE_GMIME_2_4 */ ++ else { ++ InternetAddressList *members = INTERNET_ADDRESS_GROUP (ia)->members; ++#endif /* HAVE_GMIME_2_4 */ + ++#ifndef HAVE_GMIME_2_4 + for (member = ia->value.members; member; member = member->next) { + InternetAddress *member_address = member->address; ++#else /* HAVE_GMIME_2_4 */ ++ for (j = 0; j < internet_address_list_length (members); j++) { ++ InternetAddress *member_address = internet_address_list_get_address (members, j); ++#endif /* HAVE_GMIME_2_4 */ + ++#ifndef HAVE_GMIME_2_4 + if (member_address->type == INTERNET_ADDRESS_NAME) ++#else /* HAVE_GMIME_2_4 */ ++ if (INTERNET_ADDRESS_IS_MAILBOX (member_address)) ++#endif /* HAVE_GMIME_2_4 */ + store_address_add_address(info, label, member_address, + ia); + } +Index: balsa/src/sendmsg-window.c +=================================================================== +--- balsa/src/sendmsg-window.c (revision 8017) ++++ balsa/src/sendmsg-window.c (working copy) +@@ -890,26 +890,46 @@ + static gint + delete_handler(BalsaSendmsg * bsmsg) + { ++#ifndef HAVE_GMIME_2_4 + InternetAddressList *l = + libbalsa_address_view_get_list(bsmsg->recipient_view, "To:"); + const gchar *tmp = l && l->address && l->address->name ? + l->address->name : _("(No name)"); ++#else /* HAVE_GMIME_2_4 */ ++ InternetAddressList *list; ++ const InternetAddress *ia; ++ const gchar *tmp; ++#endif /* HAVE_GMIME_2_4 */ + gint reply; + GtkWidget *d; + + if (balsa_app.debug) ++#ifndef HAVE_GMIME_2_4 + printf("delete_event_cb\n"); ++#else /* HAVE_GMIME_2_4 */ ++ printf("%s\n", __func__); ++#endif /* HAVE_GMIME_2_4 */ + + if (bsmsg->state == SENDMSG_STATE_CLEAN) + return FALSE; + ++#ifdef HAVE_GMIME_2_4 ++ list = libbalsa_address_view_get_list(bsmsg->recipient_view, "To:"); ++ ia = internet_address_list_get_address(list, 0); ++ tmp = ia && ia->name ? ia->name : _("(No name)"); ++ ++#endif /* HAVE_GMIME_2_4 */ + d = gtk_message_dialog_new(GTK_WINDOW(bsmsg->window), + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_QUESTION, + GTK_BUTTONS_YES_NO, + _("The message to '%s' is modified.\n" + "Save message to Draftbox?"), tmp); ++#ifndef HAVE_GMIME_2_4 + internet_address_list_destroy(l); ++#else /* HAVE_GMIME_2_4 */ ++ g_object_unref(list); ++#endif /* HAVE_GMIME_2_4 */ + gtk_dialog_set_default_response(GTK_DIALOG(d), GTK_RESPONSE_YES); + gtk_dialog_add_button(GTK_DIALOG(d), + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); +@@ -1243,7 +1263,11 @@ + libbalsa_address_view_get_list(bsmsg->recipient_view, + address_types[type]); + gchar *p = internet_address_list_to_string(list, FALSE); ++#ifndef HAVE_GMIME_2_4 + internet_address_list_destroy(list); ++#else /* HAVE_GMIME_2_4 */ ++ g_object_unref(list); ++#endif /* HAVE_GMIME_2_4 */ + fprintf(tmp, "%s %s\n", _(address_types[type]), p); + g_free(p); + } +@@ -1455,6 +1479,7 @@ + #endif + + if (bsmsg->ident->bcc) { ++#ifndef HAVE_GMIME_2_4 + InternetAddressList *l, + *old_ident_list, *new_ident_list, + *old_list, *new_list = NULL; +@@ -1474,20 +1499,68 @@ + break; + if (!m) /* We didn't find this address. */ + new_list = internet_address_list_append(new_list, ia); ++#else /* HAVE_GMIME_2_4 */ ++ InternetAddressList *bcc_list, *ident_list; ++ int i, j; ++ ++ bcc_list = ++ libbalsa_address_view_get_list(bsmsg->recipient_view, "Bcc:"); ++ ++ ident_list = internet_address_list_parse_string(bsmsg->ident->bcc); ++ if (ident_list) { ++ /* Remove any Bcc addresses that came from the old identity ++ * from the list. */ ++ gint ident_list_len = internet_address_list_length(ident_list); ++ ++ for (i = 0; i < internet_address_list_length(bcc_list); i++) { ++ InternetAddress *ia = ++ internet_address_list_get_address (bcc_list, i); ++ ++ for (j = 0; j < ident_list_len; j++) { ++ InternetAddress *ia2 = ++ internet_address_list_get_address(ident_list, j); ++ if (libbalsa_ia_rfc2821_equal(ia, ia2)) ++ break; ++ } ++ ++ if (j < ident_list_len) { ++ /* This address was found in the identity. */ ++ internet_address_list_remove_at(bcc_list, i); ++ --i; ++ } ++ } ++ g_object_unref(ident_list); ++#endif /* HAVE_GMIME_2_4 */ + } ++#ifndef HAVE_GMIME_2_4 + internet_address_list_destroy(old_list); + internet_address_list_destroy(old_ident_list); ++#endif /* ! HAVE_GMIME_2_4 */ + + /* Add the new Bcc addresses, if any: */ ++#ifndef HAVE_GMIME_2_4 + new_ident_list = internet_address_parse_string(ident->bcc); + new_list = internet_address_list_concat(new_list, new_ident_list); + internet_address_list_destroy(new_ident_list); ++#else /* HAVE_GMIME_2_4 */ ++ ident_list = internet_address_list_parse_string(ident->bcc); ++ if (ident_list) { ++ internet_address_list_append(bcc_list, ident_list); ++ g_object_unref(ident_list); ++ } ++#endif /* HAVE_GMIME_2_4 */ + + /* Set the resulting list: */ ++#ifndef HAVE_GMIME_2_4 + libbalsa_address_view_set_from_list(bsmsg->recipient_view, + "Bcc:", + new_list); + internet_address_list_destroy(new_list); ++#else /* HAVE_GMIME_2_4 */ ++ libbalsa_address_view_set_from_list(bsmsg->recipient_view, "Bcc:", ++ bcc_list); ++ g_object_unref(bcc_list); ++#endif /* HAVE_GMIME_2_4 */ + } + + /* change the subject to use the reply/forward strings */ +@@ -1980,12 +2053,16 @@ + if (!subject) + headers->subject = g_strdup(_("(no subject)")); + else ++#ifndef HAVE_GMIME_2_4 + #if HAVE_GMIME_2_2_5 + headers->subject = g_mime_utils_header_decode_text(subject); + #else /* HAVE_GMIME_2_2_5 */ + headers->subject = + g_mime_utils_header_decode_text((guchar *) subject); + #endif /* HAVE_GMIME_2_2_5 */ ++#else /* ! HAVE_GMIME_2_4 */ ++ headers->subject = g_mime_utils_header_decode_text(subject); ++#endif /* ! HAVE_GMIME_2_4 */ + } + libbalsa_utf8_sanitize(&headers->subject, + balsa_app.convert_unknown_8bit, +@@ -3372,7 +3449,11 @@ + + gtk_tree_store_append(store, &iter, parent); + if (body->mime_part) ++#ifndef HAVE_GMIME_2_4 + disp_type = g_mime_part_get_content_disposition(GMIME_PART(body->mime_part)); ++#else /* HAVE_GMIME_2_4 */ ++ disp_type = g_mime_object_get_disposition(body->mime_part); ++#endif /* HAVE_GMIME_2_4 */ + else + disp_type = NULL; + preselect = !disp_type || *disp_type == '\0' || +@@ -3794,7 +3875,11 @@ + g_free(from); + } + ++#ifndef HAVE_GMIME_2_4 + if (headers->to_list) { ++#else /* HAVE_GMIME_2_4 */ ++ if (internet_address_list_length(headers->to_list) > 0) { ++#endif /* HAVE_GMIME_2_4 */ + gchar *to_list = + internet_address_list_to_string(headers->to_list, + FALSE); +@@ -3802,7 +3887,11 @@ + g_free(to_list); + } + ++#ifndef HAVE_GMIME_2_4 + if (headers->cc_list) { ++#else /* HAVE_GMIME_2_4 */ ++ if (internet_address_list_length(headers->cc_list) > 0) { ++#endif /* HAVE_GMIME_2_4 */ + gchar *cc_list = + internet_address_list_to_string(headers->cc_list, + FALSE); +@@ -4221,18 +4310,63 @@ + * particular identity, other than the default. The to_list of the + * original message needs to be set in order for it to work. + **/ ++#ifdef HAVE_GMIME_2_4 ++/* First a helper; groups cannot be nested, and are not allowed in the ++ * From: list. */ ++#endif /* HAVE_GMIME_2_4 */ + static gboolean ++#ifndef HAVE_GMIME_2_4 + guess_identity(BalsaSendmsg* bsmsg, LibBalsaMessage * message) ++#else /* HAVE_GMIME_2_4 */ ++guess_identity_from_list(BalsaSendmsg * bsmsg, InternetAddressList * list, ++ gboolean allow_group) ++#endif /* HAVE_GMIME_2_4 */ + { ++#ifndef HAVE_GMIME_2_4 + const gchar *address_string; + GList *ilist; + LibBalsaIdentity *ident; + const gchar *tmp; ++#else /* HAVE_GMIME_2_4 */ ++ gint i; ++#endif /* HAVE_GMIME_2_4 */ + ++#ifdef HAVE_GMIME_2_4 ++ for (i = 0; i < internet_address_list_length(list); i++) { ++ InternetAddress *ia = internet_address_list_get_address(list, i); + ++ if (INTERNET_ADDRESS_IS_GROUP(ia)) { ++ InternetAddressList *members = ++ INTERNET_ADDRESS_GROUP(ia)->members; ++ if (allow_group ++ && guess_identity_from_list(bsmsg, members, FALSE)) ++ return TRUE; ++ } else { ++ GList *l; ++#endif /* HAVE_GMIME_2_4 */ ++ ++#ifdef HAVE_GMIME_2_4 ++ for (l = balsa_app.identities; l; l = l->next) { ++ LibBalsaIdentity *ident = LIBBALSA_IDENTITY(l->data); ++ if (libbalsa_ia_rfc2821_equal(ia, ident->ia)) { ++ bsmsg->ident = ident; ++ return TRUE; ++ } ++ } ++ } ++ } ++ ++ return FALSE; ++} ++ ++static gboolean ++guess_identity(BalsaSendmsg* bsmsg, LibBalsaMessage * message) ++{ ++#endif /* HAVE_GMIME_2_4 */ + if (!message || !message->headers || !balsa_app.identities) + return FALSE; /* use default */ + ++#ifndef HAVE_GMIME_2_4 + if (bsmsg->type == SEND_CONTINUE) { + if (message->headers->from) { + /* +@@ -4292,6 +4426,21 @@ + } + } + } ++#else /* HAVE_GMIME_2_4 */ ++ if (bsmsg->type == SEND_CONTINUE) ++ return guess_identity_from_list(bsmsg, message->headers->from, ++ FALSE); ++ ++ if (bsmsg->type != SEND_NORMAL) ++ /* bsmsg->type == SEND_REPLY || bsmsg->type == SEND_REPLY_ALL || ++ * bsmsg->type == SEND_REPLY_GROUP || bsmsg->type == SEND_FORWARD_ATTACH || ++ * bsmsg->type == SEND_FORWARD_INLINE */ ++ return guess_identity_from_list(bsmsg, message->headers->to_list, ++ TRUE) ++ || guess_identity_from_list(bsmsg, message->headers->cc_list, ++ TRUE); ++ ++#endif /* HAVE_GMIME_2_4 */ + return FALSE; + } + +@@ -4483,6 +4632,7 @@ + static void + sw_cc_add_list(InternetAddressList **new_cc, InternetAddressList * list) + { ++#ifndef HAVE_GMIME_2_4 + for (; list; list = list->next) { + InternetAddress *ia; + +@@ -4496,6 +4646,23 @@ + break; + if (!ident) + *new_cc = internet_address_list_append(*new_cc, ia); ++#else /* HAVE_GMIME_2_4 */ ++ int i; ++ ++ for (i = 0; i < internet_address_list_length(list); i++) { ++ InternetAddress *ia = internet_address_list_get_address (list, i); ++ GList *ident; ++ ++ /* do not insert any of my identities into the cc: list */ ++ for (ident = balsa_app.identities; ident; ident = ident->next) ++ if (libbalsa_ia_rfc2821_equal ++ (ia, LIBBALSA_IDENTITY(ident->data)->ia)) ++ break; ++ if (!ident) { ++ if (*new_cc == NULL) ++ *new_cc = internet_address_list_new(); ++ internet_address_list_add(*new_cc, ia); ++#endif /* HAVE_GMIME_2_4 */ + } + } + } +@@ -4755,7 +4922,12 @@ + libbalsa_address_view_set_from_list(bsmsg->recipient_view, + "Cc:", + new_cc); ++#ifndef HAVE_GMIME_2_4 + internet_address_list_destroy(new_cc); ++#else /* HAVE_GMIME_2_4 */ ++ if (new_cc) ++ g_object_unref(new_cc); ++#endif /* HAVE_GMIME_2_4 */ + } + + static void +@@ -5493,7 +5665,12 @@ + + message = libbalsa_message_new(); + ++#ifndef HAVE_GMIME_2_4 + message->headers->from = internet_address_list_prepend(NULL, ident->ia); ++#else /* HAVE_GMIME_2_4 */ ++ message->headers->from = internet_address_list_new (); ++ internet_address_list_add(message->headers->from, ident->ia); ++#endif /* HAVE_GMIME_2_4 */ + + tmp = gtk_editable_get_chars(GTK_EDITABLE(bsmsg->subject[1]), 0, -1); + strip_chars(tmp, "\r\n"); +@@ -5713,9 +5890,14 @@ + { + InternetAddressList * ia_list; + gboolean can_encrypt; ++#ifndef HAVE_GMIME_2_4 + InternetAddressList * from_list; + InternetAddressList * cc_list; ++#endif /* ! HAVE_GMIME_2_4 */ + gpgme_protocol_t protocol; ++#ifdef HAVE_GMIME_2_4 ++ gint len; ++#endif /* HAVE_GMIME_2_4 */ + + /* check if the user wants to see the message */ + if (!bsmsg->ident->warn_send_plain) +@@ -5726,24 +5908,52 @@ + return TRUE; + + /* we can not encrypt if we have bcc recipients */ ++#ifndef HAVE_GMIME_2_4 + if ((ia_list = libbalsa_address_view_get_list(bsmsg->recipient_view, "Bcc:"))) { + internet_address_list_destroy(ia_list); + return TRUE; + } ++#else /* HAVE_GMIME_2_4 */ ++ ia_list = libbalsa_address_view_get_list(bsmsg->recipient_view, "Bcc:"); ++ len = internet_address_list_length(ia_list); ++ g_object_unref(ia_list); ++ if (len > 0) ++ return TRUE; ++#endif /* HAVE_GMIME_2_4 */ + + /* collect all to and cc recipients */ ++#ifndef HAVE_GMIME_2_4 + ia_list = libbalsa_address_view_get_list(bsmsg->recipient_view, "To:"); + cc_list = libbalsa_address_view_get_list(bsmsg->recipient_view, "Cc:"); + from_list = internet_address_list_prepend(NULL, bsmsg->ident->ia); ++#endif /* ! HAVE_GMIME_2_4 */ + protocol = bsmsg->gpg_mode & LIBBALSA_PROTECT_SMIMEV3 ? + GPGME_PROTOCOL_CMS : GPGME_PROTOCOL_OpenPGP; ++#ifndef HAVE_GMIME_2_4 + can_encrypt = libbalsa_can_encrypt_for_all(from_list, protocol) & + libbalsa_can_encrypt_for_all(ia_list, protocol) & + libbalsa_can_encrypt_for_all(cc_list, protocol); + internet_address_list_destroy(from_list); + internet_address_list_destroy(ia_list); + internet_address_list_destroy(cc_list); ++#else /* HAVE_GMIME_2_4 */ + ++ ia_list = libbalsa_address_view_get_list(bsmsg->recipient_view, "To:"); ++ can_encrypt = libbalsa_can_encrypt_for_all(ia_list, protocol); ++ g_object_unref(ia_list); ++ if (can_encrypt) { ++ ia_list = libbalsa_address_view_get_list(bsmsg->recipient_view, "Cc:"); ++ can_encrypt = libbalsa_can_encrypt_for_all(ia_list, protocol); ++ g_object_unref(ia_list); ++ } ++ if (can_encrypt) { ++ ia_list = internet_address_list_new(); ++ internet_address_list_add(ia_list, bsmsg->ident->ia); ++ can_encrypt = libbalsa_can_encrypt_for_all(ia_list, protocol); ++ g_object_unref(ia_list); ++ } ++#endif /* HAVE_GMIME_2_4 */ ++ + /* ask the user if we could encrypt this message */ + if (can_encrypt) { + GtkWidget *dialog; +@@ -6757,7 +6967,11 @@ + if (mailing_list_address) { + libbalsa_address_view_set_from_list(bsmsg->recipient_view, "To:", + mailing_list_address); ++#ifndef HAVE_GMIME_2_4 + internet_address_list_destroy(mailing_list_address); ++#else /* HAVE_GMIME_2_4 */ ++ g_object_unref(mailing_list_address); ++#endif /* HAVE_GMIME_2_4 */ + return; + } + +@@ -6891,6 +7105,9 @@ + + list = libbalsa_address_view_get_list(bsmsg->recipient_view, "To:"); + to_string = internet_address_list_to_string(list, FALSE); ++#ifdef HAVE_GMIME_2_4 ++ g_object_unref(list); ++#endif /* HAVE_GMIME_2_4 */ + title = g_strdup_printf(title_format, to_string, + gtk_entry_get_text(GTK_ENTRY(bsmsg->subject[1]))); + g_free(to_string); +Index: balsa/src/save-restore.c +=================================================================== +--- balsa/src/save-restore.c (revision 8017) ++++ balsa/src/save-restore.c (working copy) +@@ -1766,7 +1766,11 @@ + libbalsa_conf_get_string_with_default("MailingListAddress", + &def); + view->mailing_list_address = ++#ifndef HAVE_GMIME_2_4 + def ? NULL : internet_address_parse_string(address); ++#else /* HAVE_GMIME_2_4 */ ++ def ? NULL : internet_address_list_parse_string(address); ++#endif /* HAVE_GMIME_2_4 */ + g_free(address); + + view->identity_name = libbalsa_conf_get_string("Identity"); +Index: balsa/src/balsa-message.c +=================================================================== +--- balsa/src/balsa-message.c (revision 8017) ++++ balsa/src/balsa-message.c (working copy) +@@ -1022,14 +1022,26 @@ + balsa_message_sender_to_gchar(InternetAddressList * list, gint which) + { + if (!list) ++#ifndef HAVE_GMIME_2_4 + return g_strdup(_("(No sender)")); + if (which < 0) + return internet_address_list_to_string(list, FALSE); + while (which > 0 && list->next) { + list = list->next; + --which; ++#else /* HAVE_GMIME_2_4 */ ++ return g_strdup(_("(No sender)")); ++ else if (which < 0) ++ return internet_address_list_to_string(list, FALSE); ++ else { ++ InternetAddress *ia = ++ internet_address_list_get_address(list, which); ++ return internet_address_to_string(ia, FALSE); ++#endif /* HAVE_GMIME_2_4 */ + } ++#ifndef HAVE_GMIME_2_4 + return internet_address_to_string(list->address, FALSE); ++#endif /* ! HAVE_GMIME_2_4 */ + } + + static void +@@ -2041,7 +2053,11 @@ + (g_mime_content_type_is_type(type, "application", "pkcs7-signature") || + g_mime_content_type_is_type(type, "application", "x-pkcs7-signature")))) + add_body(bm, body); ++#ifndef HAVE_GMIME_2_4 + g_mime_content_type_destroy(type); ++#else /* HAVE_GMIME_2_4 */ ++ g_object_unref(type); ++#endif /* HAVE_GMIME_2_4 */ + #else + if (libbalsa_message_body_is_inline(body) || + bm->force_inline || +@@ -2078,7 +2094,11 @@ + } else { /* default to multipart/mixed */ + body = add_multipart_mixed(bm, body->parts); + } ++#ifndef HAVE_GMIME_2_4 + g_mime_content_type_destroy(type); ++#else /* HAVE_GMIME_2_4 */ ++ g_object_unref(type); ++#endif /* HAVE_GMIME_2_4 */ + + return body; + } +@@ -2269,21 +2289,39 @@ + } + + static const InternetAddress * ++#ifndef HAVE_GMIME_2_4 + bm_get_mailbox(const InternetAddressList * list) ++#else /* HAVE_GMIME_2_4 */ ++bm_get_mailbox(InternetAddressList * list) ++#endif /* HAVE_GMIME_2_4 */ + { + InternetAddress *ia; + + if (!list) ++#ifndef HAVE_GMIME_2_4 + return NULL; ++#else /* HAVE_GMIME_2_4 */ ++ return NULL; ++#endif /* HAVE_GMIME_2_4 */ + ++#ifndef HAVE_GMIME_2_4 + ia = list->address; + if (!ia || ia->type == INTERNET_ADDRESS_NONE) + return NULL; ++#else /* HAVE_GMIME_2_4 */ ++ ia = internet_address_list_get_address(list, 0); ++#endif /* HAVE_GMIME_2_4 */ + ++#ifndef HAVE_GMIME_2_4 + while (ia->type == INTERNET_ADDRESS_GROUP && ia->value.members) + ia = ia->value.members->address; + if (!ia || ia->type == INTERNET_ADDRESS_NONE) + return NULL; ++#else /* HAVE_GMIME_2_4 */ ++ while (ia && INTERNET_ADDRESS_IS_GROUP(ia)) ++ ia = internet_address_list_get_address(INTERNET_ADDRESS_GROUP(ia)-> ++ members, 0); ++#endif /* HAVE_GMIME_2_4 */ + + return ia; + } +@@ -2292,10 +2330,19 @@ + handle_mdn_request(GtkWindow *parent, LibBalsaMessage *message) + { + gboolean suspicious, found; ++#ifndef HAVE_GMIME_2_4 + const InternetAddressList *use_from; + const InternetAddressList *list; ++#else /* HAVE_GMIME_2_4 */ ++ InternetAddressList *use_from; ++ InternetAddressList *list; ++ InternetAddress *from, *dn; ++#endif /* HAVE_GMIME_2_4 */ + BalsaMDNReply action; + LibBalsaMessage *mdn; ++#ifdef HAVE_GMIME_2_4 ++ gint i, len; ++#endif /* HAVE_GMIME_2_4 */ + + /* Check if the dispnotify_to address is equal to the (in this order, + if present) reply_to, from or sender address. */ +@@ -2307,28 +2354,58 @@ + use_from = message->sender; + else + use_from = NULL; ++#ifdef HAVE_GMIME_2_4 ++ ++#endif /* HAVE_GMIME_2_4 */ + /* note: neither Disposition-Notification-To: nor Reply-To:, From: or + Sender: may be address groups */ ++#ifndef HAVE_GMIME_2_4 + suspicious = + !libbalsa_ia_rfc2821_equal(message->headers->dispnotify_to->address, + use_from->address); ++#else /* HAVE_GMIME_2_4 */ ++ from = ++ use_from ? internet_address_list_get_address(use_from, 0) : NULL; ++ dn = internet_address_list_get_address(message->headers->dispnotify_to, ++ 0); ++ suspicious = !libbalsa_ia_rfc2821_equal(dn, from); ++#endif /* HAVE_GMIME_2_4 */ + + if (!suspicious) { + /* Try to find "my" address first in the to, then in the cc list */ ++#ifndef HAVE_GMIME_2_4 + list = message->headers->to_list; ++#endif /* ! HAVE_GMIME_2_4 */ + found = FALSE; ++#ifndef HAVE_GMIME_2_4 + while (list && !found) { ++#else /* HAVE_GMIME_2_4 */ ++ ++ list = message->headers->to_list; ++ len = list ? internet_address_list_length(list) : 0; ++ for (i = 0; i < len && !found; i++) ++#endif /* HAVE_GMIME_2_4 */ + found = libbalsa_ia_rfc2821_equal(balsa_app.current_ident->ia, + bm_get_mailbox(list)); ++#ifndef HAVE_GMIME_2_4 + list = list->next; + } ++#endif /* ! HAVE_GMIME_2_4 */ + if (!found) { + list = message->headers->cc_list; ++#ifndef HAVE_GMIME_2_4 + while (list && !found) { + found = libbalsa_ia_rfc2821_equal(balsa_app.current_ident->ia, + bm_get_mailbox(list)); + list = list->next; + } ++#else /* HAVE_GMIME_2_4 */ ++ len = list ? internet_address_list_length(list) : 0; ++ for (i = 0; i < len && !found; i++) ++ found = ++ libbalsa_ia_rfc2821_equal(balsa_app.current_ident->ia, ++ bm_get_mailbox(list)); ++#endif /* HAVE_GMIME_2_4 */ + } + suspicious = !found; + } +@@ -2350,7 +2427,11 @@ + if (action == BALSA_MDN_REPLY_ASKME) { + gchar *sender; + gchar *reply_to; ++#ifndef HAVE_GMIME_2_4 + sender = internet_address_to_string (use_from->address, FALSE); ++#else /* HAVE_GMIME_2_4 */ ++ sender = from ? internet_address_to_string (from, FALSE) : NULL; ++#endif /* HAVE_GMIME_2_4 */ + reply_to = + internet_address_list_to_string (message->headers->dispnotify_to, + FALSE); +@@ -2393,14 +2474,26 @@ + + /* create a message with the header set from the incoming message */ + message = libbalsa_message_new(); ++#ifndef HAVE_GMIME_2_4 + dummy = internet_address_to_string(balsa_app.current_ident->ia, FALSE); + message->headers->from = internet_address_parse_string(dummy); + g_free (dummy); ++#else /* HAVE_GMIME_2_4 */ ++ message->headers->from = internet_address_list_new(); ++ internet_address_list_add(message->headers->from, ++ balsa_app.current_ident->ia); ++#endif /* HAVE_GMIME_2_4 */ + message->headers->date = time(NULL); + libbalsa_message_set_subject(message, "Message Disposition Notification"); ++#ifndef HAVE_GMIME_2_4 + message->headers->to_list = + internet_address_list_prepend(NULL, for_msg->headers-> + dispnotify_to->address); ++#else /* HAVE_GMIME_2_4 */ ++ message->headers->to_list = internet_address_list_new(); ++ internet_address_list_append(message->headers->to_list, ++ for_msg->headers->dispnotify_to); ++#endif /* HAVE_GMIME_2_4 */ + + /* RFC 2298 requests this mime type... */ + message->subtype = g_strdup("report"); +@@ -2440,7 +2533,13 @@ + g_string_append_printf(report, "Original-Recipient: %s\n", + original_rcpt); + g_string_append_printf(report, "Final-Recipient: rfc822; %s\n", ++#ifndef HAVE_GMIME_2_4 + balsa_app.current_ident->ia->value.addr); ++#else /* HAVE_GMIME_2_4 */ ++ INTERNET_ADDRESS_MAILBOX(balsa_app. ++ current_ident->ia)-> ++ addr); ++#endif /* HAVE_GMIME_2_4 */ + if (for_msg->message_id) + g_string_append_printf(report, "Original-Message-ID: <%s>\n", + for_msg->message_id); +Index: balsa/libinit_balsa/assistant_page_user.c +=================================================================== +--- balsa/libinit_balsa/assistant_page_user.c (revision 8017) ++++ balsa/libinit_balsa/assistant_page_user.c (working copy) +@@ -246,6 +246,9 @@ + const gchar *host, *mailbox; + gchar *uhoh; + LibBalsaIdentity *ident; ++#ifdef HAVE_GMIME_2_4 ++ InternetAddress *ia; ++#endif /* HAVE_GMIME_2_4 */ + #if ENABLE_ESMTP + LibBalsaSmtpServer *smtp_server; + #endif /* ENABLE_ESMTP */ +@@ -292,9 +295,16 @@ + } else { + ident = balsa_app.current_ident; + } ++#ifndef HAVE_GMIME_2_4 + internet_address_set_name(ident->ia, mailbox); + internet_address_set_addr(ident->ia, + gtk_entry_get_text(GTK_ENTRY(user->email))); ++#else /* HAVE_GMIME_2_4 */ ++ ia = internet_address_mailbox_new(mailbox, ++ gtk_entry_get_text(GTK_ENTRY ++ (user->email))); ++ libbalsa_identity_set_address(ident, ia); ++#endif /* HAVE_GMIME_2_4 */ + + /* outgoing mail */ + #if ENABLE_ESMTP +Index: configure.in +=================================================================== +--- balsa/configure.in (revision 8017) ++++ balsa/configure.in (working copy) +@@ -51,6 +51,13 @@ + with_gnome=yes + ]) + ++AC_ARG_WITH([gmime], ++ AC_HELP_STRING([--with-gmime=VERSION], ++ [version of GMime to link against]), ++ [ with_gmime=$withval ], ++ [ with_gmime=2.4 ] ++) ++ + dnl ########################################################################### + dnl Configure locking + dnl ########################################################################### +@@ -350,7 +357,6 @@ + PKG_CHECK_MODULES(BALSA, [ + glib-2.0 + gtk+-2.0 >= 2.4 +-gmime-2.0 >= 2.1.9 + $gnome_extras + $gnome_print_extras + ]) +@@ -359,7 +365,6 @@ + libgnome-2.0 libgnomeui-2.0 + glib-2.0 + gtk+-2.0 >= 2.4 +- gmime-2.0 >= 2.1.9 + ]) + + dnl ########################################################################## +@@ -780,6 +785,45 @@ + fi + AM_CONDITIONAL([BUILD_WITH_GTKSOURCEVIEW2], [test x$with_gtksourceview = x2 ]) + ++# GMime configuration ++# ++if test $with_gmime == 2.4 ; then ++ if $PKG_CONFIG --exists gmime-2.4 ; then ++ if $PKG_CONFIG --atleast-version=2.3.8 gmime-2.4 ; then ++ PKG_CHECK_MODULES(GMIME, [ gmime-2.4 ]) ++ AC_DEFINE(HAVE_GMIME_2_4, 1, ++ [Defined when GMime-2.4 is available.]) ++ AC_MSG_NOTICE([Note: using GMime Version 2.4]) ++ else ++ AC_MSG_ERROR([*** Your GMime-2.4 installation is too old]) ++ fi ++ else ++ AC_MSG_ERROR([*** You requested GMime-2.4 but it was not found.]) ++ fi ++else ++ if test $with_gmime == 2.0 ; then ++ if $PKG_CONFIG --atleast-version=2.1.9 gmime-2.0 ; then ++ PKG_CHECK_MODULES(GMIME, [ gmime-2.0 ]) ++ if $PKG_CONFIG --atleast-version=2.2.5 gmime-2.0 ; then ++ AC_DEFINE(HAVE_GMIME_2_2_5,1, ++ [Defined when GMime is at least version 2.2.5.]) ++ fi ++ if $PKG_CONFIG --atleast-version=2.2.7 gmime-2.0 ; then ++ AC_DEFINE(HAVE_GMIME_2_2_7,1, ++ [Defined when GMime is at least version 2.2.7.]) ++ fi ++ AC_MSG_NOTICE([Note: using GMime Version 2.0]) ++ else ++ AC_MSG_ERROR([*** Your GMime installation is too old]) ++ fi ++ else ++ AC_MSG_ERROR([*** Unrecognized GMime version]) ++ fi ++fi ++BALSA_CFLAGS="$BALSA_CFLAGS $GMIME_CFLAGS" ++BALSA_LIBS="$BALSA_LIBS $GMIME_LIBS" ++BALSA_AB_LIBS="$BALSA_AB_LIBS $GMIME_LIBS" ++ + dnl ##################################################################### + dnl 5. Headers. + dnl ##################################################################### +@@ -935,16 +979,6 @@ + dnl things that it fixes, for eg. user installs, package builds etc. + dnl AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache) + +-dnl check GMime version +-if $PKG_CONFIG --atleast-version=2.2.5 gmime-2.0 ; then +- AC_DEFINE(HAVE_GMIME_2_2_5,1,[Defined when GMime is at least version +- 2.2.5.]) +-fi +-if $PKG_CONFIG --atleast-version=2.2.7 gmime-2.0 ; then +- AC_DEFINE(HAVE_GMIME_2_2_7,1,[Defined when GMime is at least version +- 2.2.7.]) +-fi +- + dnl ##################################################################### + dnl 8. Output + dnl ##################################################################### +@@ -975,6 +1009,7 @@ + echo " Installing into prefix: $prefix" + echo " Using multithreading: $use_threads" + echo " Enable compile warnings: $set_more_warnings" ++echo " Use GMime: $with_gmime" + echo " Use ESMTP : $with_esmtp" + echo " Use WebKit (experimental): $use_webkit" + echo " Use GtkHTML: $use_gtkhtml" +Index: libbalsa/abook-completion.c +=================================================================== +--- balsa/libbalsa/abook-completion.c (revision 8017) ++++ balsa/libbalsa/abook-completion.c (working copy) +@@ -46,7 +46,11 @@ + + ret = g_new0(CompletionData, 1); + ++#ifndef HAVE_GMIME_2_4 + internet_address_ref(ia); ++#else /* HAVE_GMIME_2_4 */ ++ g_object_ref(ia); ++#endif /* HAVE_GMIME_2_4 */ + ret->ia = ia; + + string = g_string_new(nick_name); +@@ -78,7 +82,11 @@ + void + completion_data_free(CompletionData * data) + { ++#ifndef HAVE_GMIME_2_4 + internet_address_unref(data->ia); ++#else /* HAVE_GMIME_2_4 */ ++ g_object_unref(data->ia); ++#endif /* HAVE_GMIME_2_4 */ + g_free(data->string); + g_free(data); + } +Index: balsa/libbalsa/address-book-rubrica.c +=================================================================== +--- balsa/libbalsa/address-book-rubrica.c (revision 8017) ++++ balsa/libbalsa/address-book-rubrica.c (working copy) +@@ -236,8 +236,12 @@ + g_completion_complete(ab_text->name_complete, (gchar *) prefix, + new_prefix); list; list = list->next) { + InternetAddress *ia = ((CompletionData *) list->data)->ia; ++#ifndef HAVE_GMIME_2_4 + internet_address_ref(ia); + res = g_list_prepend(res, ia); ++#else /* HAVE_GMIME_2_4 */ ++ res = g_list_prepend(res, g_object_ref(ia)); ++#endif /* HAVE_GMIME_2_4 */ + } + + return g_list_reverse(res); +@@ -469,28 +473,51 @@ + && LIBBALSA_ADDRESS_BOOK(ab_rubrica)->dist_list_mode) { + /* Create a group address. */ + InternetAddress *ia = ++#ifndef HAVE_GMIME_2_4 + internet_address_new_group(address->full_name); ++#else /* HAVE_GMIME_2_4 */ ++ internet_address_group_new(address->full_name); ++ InternetAddressGroup *group = (InternetAddressGroup *) ia; ++#endif /* HAVE_GMIME_2_4 */ + + for (l = address->address_list; l; l = l->next) { + InternetAddress *member = ++#ifndef HAVE_GMIME_2_4 + internet_address_new_name(NULL, l->data); + internet_address_add_member(ia, member); + internet_address_unref(member); ++#else /* HAVE_GMIME_2_4 */ ++ internet_address_mailbox_new(NULL, l->data); ++ internet_address_group_add_member(group, member); ++ g_object_unref(member); ++#endif /* HAVE_GMIME_2_4 */ + } + cmp_data = completion_data_new(ia, address->nick_name); + completion_list = g_list_prepend(completion_list, cmp_data); ++#ifndef HAVE_GMIME_2_4 + internet_address_unref(ia); ++#else /* HAVE_GMIME_2_4 */ ++ g_object_unref(ia); ++#endif /* HAVE_GMIME_2_4 */ + } else { + /* Create name addresses. */ + GList *l; + + for (l = address->address_list; l; l = l->next) { + InternetAddress *ia = ++#ifndef HAVE_GMIME_2_4 + internet_address_new_name(address->full_name, l->data); ++#else /* HAVE_GMIME_2_4 */ ++ internet_address_mailbox_new(address->full_name, l->data); ++#endif /* HAVE_GMIME_2_4 */ + cmp_data = completion_data_new(ia, address->nick_name); + completion_list = + g_list_prepend(completion_list, cmp_data); ++#ifndef HAVE_GMIME_2_4 + internet_address_unref(ia); ++#else /* HAVE_GMIME_2_4 */ ++ g_object_unref(ia); ++#endif /* HAVE_GMIME_2_4 */ + } + } + } +Index: balsa/libbalsa/gmime-gpgme-context.c +=================================================================== +--- balsa/libbalsa/gmime-gpgme-context.c (revision 8017) ++++ balsa/libbalsa/gmime-gpgme-context.c (working copy) +@@ -62,9 +62,17 @@ + GMimeStream * istream, + GMimeStream * ostream, GError ** err); + ++#ifndef HAVE_GMIME_2_4 + static int g_mime_gpgme_decrypt(GMimeCipherContext * ctx, + GMimeStream * istream, + GMimeStream * ostream, GError ** err); ++#else /* HAVE_GMIME_2_4 */ ++static GMimeSignatureValidity *g_mime_gpgme_decrypt(GMimeCipherContext * ++ ctx, ++ GMimeStream * istream, ++ GMimeStream * ostream, ++ GError ** err); ++#endif /* HAVE_GMIME_2_4 */ + + + /* internal passphrase callback */ +@@ -634,7 +642,11 @@ + * Decrypt istream to ostream. In RFC 2440 mode, also try to check an included + * signature (if any). + */ ++#ifndef HAVE_GMIME_2_4 + static int ++#else /* HAVE_GMIME_2_4 */ ++static GMimeSignatureValidity * ++#endif /* HAVE_GMIME_2_4 */ + g_mime_gpgme_decrypt(GMimeCipherContext * context, GMimeStream * istream, + GMimeStream * ostream, GError ** error) + { +@@ -649,10 +661,18 @@ + NULL, /* seek method */ + cb_data_release /* release method */ + }; ++#ifdef HAVE_GMIME_2_4 ++ GMimeSignatureValidity *validity; ++#endif /* HAVE_GMIME_2_4 */ + + /* some paranoia checks */ ++#ifndef HAVE_GMIME_2_4 + g_return_val_if_fail(ctx, -1); + g_return_val_if_fail(ctx->gpgme_ctx, -1); ++#else /* HAVE_GMIME_2_4 */ ++ g_return_val_if_fail(ctx, NULL); ++ g_return_val_if_fail(ctx->gpgme_ctx, NULL); ++#endif /* HAVE_GMIME_2_4 */ + gpgme_ctx = ctx->gpgme_ctx; + protocol = gpgme_get_protocol(gpgme_ctx); + +@@ -672,13 +692,21 @@ + gpgme_data_new_from_cbs(&crypt, &cbs, + istream)) != GPG_ERR_NO_ERROR) { + g_set_error_from_gpgme(error, err, _("could not get data from stream")); ++#ifndef HAVE_GMIME_2_4 + return -1; ++#else /* HAVE_GMIME_2_4 */ ++ return NULL; ++#endif /* HAVE_GMIME_2_4 */ + } + if ((err = gpgme_data_new_from_cbs(&plain, &cbs, ostream)) != + GPG_ERR_NO_ERROR) { + g_set_error_from_gpgme(error, err, _("could not create new data object")); + gpgme_data_release(crypt); ++#ifndef HAVE_GMIME_2_4 + return -1; ++#else /* HAVE_GMIME_2_4 */ ++ return NULL; ++#endif /* HAVE_GMIME_2_4 */ + } + + /* try to decrypt */ +@@ -688,7 +716,11 @@ + g_set_error_from_gpgme(error, err, _("decryption failed")); + gpgme_data_release(plain); + gpgme_data_release(crypt); ++#ifndef HAVE_GMIME_2_4 + return -1; ++#else /* HAVE_GMIME_2_4 */ ++ return NULL; ++#endif /* HAVE_GMIME_2_4 */ + } + gpgme_data_release(plain); + gpgme_data_release(crypt); +@@ -696,7 +728,27 @@ + /* try to get information about the signature (if any) */ + ctx->sig_state = g_mime_gpgme_sigstat_new_from_gpgme_ctx(gpgme_ctx); + ++#ifndef HAVE_GMIME_2_4 + return 0; ++#else /* HAVE_GMIME_2_4 */ ++ validity = g_mime_signature_validity_new(); ++ if (ctx->sig_state) { ++ switch (ctx->sig_state->status) ++ { ++ case GPG_ERR_NO_ERROR: ++ g_mime_signature_validity_set_status(validity, GMIME_SIGNATURE_STATUS_GOOD); ++ break; ++ case GPG_ERR_NOT_SIGNED: ++ g_mime_signature_validity_set_status(validity, GMIME_SIGNATURE_STATUS_UNKNOWN); ++ break; ++ default: ++ g_mime_signature_validity_set_status(validity, GMIME_SIGNATURE_STATUS_BAD); ++ } ++ } else ++ g_mime_signature_validity_set_status(validity, GMIME_SIGNATURE_STATUS_UNKNOWN); ++ ++ return validity; ++#endif /* HAVE_GMIME_2_4 */ + } + + +Index: balsa/libbalsa/mailbox_mh.c +=================================================================== +--- balsa/libbalsa/mailbox_mh.c (revision 8017) ++++ balsa/libbalsa/mailbox_mh.c (working copy) +@@ -1094,9 +1094,15 @@ + } + out_stream = g_mime_stream_fs_new(fd); + ++#ifndef HAVE_GMIME_2_4 + crlffilter = g_mime_filter_crlf_new(GMIME_FILTER_CRLF_DECODE, + GMIME_FILTER_CRLF_MODE_CRLF_ONLY); + in_stream = g_mime_stream_filter_new_with_stream(stream); ++#else /* HAVE_GMIME_2_4 */ ++ crlffilter = g_mime_filter_crlf_new(FALSE, ++ FALSE); ++ in_stream = g_mime_stream_filter_new(stream); ++#endif /* HAVE_GMIME_2_4 */ + g_mime_stream_filter_add(GMIME_STREAM_FILTER(in_stream), crlffilter); + g_object_unref(crlffilter); + +Index: balsa/libbalsa/mailbox_mbox.c +=================================================================== +--- balsa/libbalsa/mailbox_mbox.c (revision 8017) ++++ balsa/libbalsa/mailbox_mbox.c (working copy) +@@ -353,7 +353,11 @@ + */ + static void + lbm_mbox_header_cb(GMimeParser * parser, const char *header, ++#ifndef HAVE_GMIME_2_4 + const char *value, off_t offset, ++#else /* HAVE_GMIME_2_4 */ ++ const char *value, gint64 offset, ++#endif /* HAVE_GMIME_2_4 */ + gpointer user_data) + { + struct message_info *msg_info = *(struct message_info **) user_data; +@@ -1787,7 +1791,11 @@ + + message = libbalsa_message_new(); + ++#ifndef HAVE_GMIME_2_4 + header = g_mime_message_get_header (mime_message, "Status"); ++#else /* HAVE_GMIME_2_4 */ ++ header = g_mime_object_get_header (GMIME_OBJECT(mime_message), "Status"); ++#endif /* HAVE_GMIME_2_4 */ + if (header) { + if (strchr(header, 'R') == NULL) /* not found == not READ */ + flags |= LIBBALSA_MESSAGE_FLAG_NEW; +@@ -1797,7 +1805,11 @@ + flags |= LIBBALSA_MESSAGE_FLAG_RECENT; + } else + flags |= LIBBALSA_MESSAGE_FLAG_NEW | LIBBALSA_MESSAGE_FLAG_RECENT; ++#ifndef HAVE_GMIME_2_4 + header = g_mime_message_get_header (mime_message, "X-Status"); ++#else /* HAVE_GMIME_2_4 */ ++ header = g_mime_object_get_header (GMIME_OBJECT(mime_message), "X-Status"); ++#endif /* HAVE_GMIME_2_4 */ + if (header) { + if (strchr(header, 'D') != NULL) /* found == DELETED */ + flags |= LIBBALSA_MESSAGE_FLAG_DELETED; +@@ -1821,10 +1833,18 @@ + /* Create headers with spaces in place of flags, if necessary, so we + * can later update them in place. */ + lbm_mbox_status_hdr(flags, 2, new_header); ++#ifndef HAVE_GMIME_2_4 + g_mime_message_set_header(message, "Status", new_header->str); ++#else /* HAVE_GMIME_2_4 */ ++ g_mime_object_set_header(GMIME_OBJECT(message), "Status", new_header->str); ++#endif /* HAVE_GMIME_2_4 */ + g_string_truncate(new_header, 0); + lbm_mbox_x_status_hdr(flags, 3, new_header); ++#ifndef HAVE_GMIME_2_4 + g_mime_message_set_header(message, "X-Status", new_header->str); ++#else /* HAVE_GMIME_2_4 */ ++ g_mime_object_set_header(GMIME_OBJECT(message), "X-Status", new_header->str); ++#endif /* HAVE_GMIME_2_4 */ + g_string_free(new_header, TRUE); + } + +@@ -1832,7 +1852,12 @@ + * Encode text parts as quoted-printable. + */ + static void ++#ifndef HAVE_GMIME_2_4 + lbm_mbox_prepare_object(GMimeObject * mime_part) ++#else /* HAVE_GMIME_2_4 */ ++lbm_mbox_prepare_object(GMimeObject * parent, GMimeObject * mime_part, ++ gpointer data) ++#endif /* HAVE_GMIME_2_4 */ + { + g_mime_object_remove_header(mime_part, "Content-Length"); + +@@ -1842,21 +1867,58 @@ + /* Do not break crypto. */ + return; + ++#ifdef HAVE_GMIME_2_4 ++ if (parent) ++ /* We have been called by g_mime_multipart_foreach, which ++ * recursively descends the multipart tree, so we must not ++ * start another descent. */ ++ return; ++ ++#endif /* HAVE_GMIME_2_4 */ ++#ifndef HAVE_GMIME_2_4 + g_mime_multipart_foreach((GMimeMultipart *) mime_part, + (GMimePartFunc) lbm_mbox_prepare_object, + NULL); ++#else /* HAVE_GMIME_2_4 */ ++ g_mime_multipart_foreach((GMimeMultipart *) mime_part, ++ lbm_mbox_prepare_object, ++ NULL); ++#endif /* HAVE_GMIME_2_4 */ + } else if (GMIME_IS_MESSAGE_PART(mime_part)) ++#ifndef HAVE_GMIME_2_4 + lbm_mbox_prepare_object(GMIME_OBJECT + (((GMimeMessagePart *) mime_part)-> + message)); ++#else /* HAVE_GMIME_2_4 */ ++ lbm_mbox_prepare_object(NULL, ++ GMIME_OBJECT ++ (((GMimeMessagePart *) mime_part)-> ++ message), NULL); ++#endif /* HAVE_GMIME_2_4 */ + else if (GMIME_IS_MESSAGE(mime_part)) ++#ifndef HAVE_GMIME_2_4 + lbm_mbox_prepare_object(((GMimeMessage *) mime_part)->mime_part); ++#else /* HAVE_GMIME_2_4 */ ++ lbm_mbox_prepare_object(NULL, ++ ((GMimeMessage *) mime_part)->mime_part, ++ NULL); ++#endif /* HAVE_GMIME_2_4 */ + else if (!GMIME_IS_MESSAGE_PARTIAL(mime_part)) { ++#ifndef HAVE_GMIME_2_4 + GMimePartEncodingType encoding; + const GMimeContentType *mime_type; ++#else /* HAVE_GMIME_2_4 */ ++ GMimeContentEncoding encoding; ++ GMimeContentType *mime_type; ++#endif /* HAVE_GMIME_2_4 */ + ++#ifndef HAVE_GMIME_2_4 + encoding = g_mime_part_get_encoding(GMIME_PART(mime_part)); + if (encoding == GMIME_PART_ENCODING_BASE64) ++#else /* HAVE_GMIME_2_4 */ ++ encoding = g_mime_part_get_content_encoding(GMIME_PART(mime_part)); ++ if (encoding == GMIME_CONTENT_ENCODING_BASE64) ++#endif /* HAVE_GMIME_2_4 */ + return; + + mime_type = g_mime_object_get_content_type(mime_part); +@@ -1868,8 +1930,13 @@ + return; + } + ++#ifndef HAVE_GMIME_2_4 + g_mime_part_set_encoding(GMIME_PART(mime_part), + GMIME_PART_ENCODING_QUOTEDPRINTABLE); ++#else /* HAVE_GMIME_2_4 */ ++ g_mime_part_set_content_encoding(GMIME_PART(mime_part), ++ GMIME_CONTENT_ENCODING_QUOTEDPRINTABLE); ++#endif /* HAVE_GMIME_2_4 */ + } + } + +@@ -1882,7 +1949,11 @@ + parser = g_mime_parser_new_with_stream(stream); + object = GMIME_OBJECT(g_mime_parser_construct_message(parser)); + g_object_unref(parser); ++#ifndef HAVE_GMIME_2_4 + lbm_mbox_prepare_object(object); ++#else /* HAVE_GMIME_2_4 */ ++ lbm_mbox_prepare_object(NULL, object, NULL); ++#endif /* HAVE_GMIME_2_4 */ + + return object; + } +@@ -1893,10 +1964,19 @@ + GMimeStream *fstream; + GMimeFilter *filter; + ++#ifndef HAVE_GMIME_2_4 + fstream = g_mime_stream_filter_new_with_stream(stream); ++#else /* HAVE_GMIME_2_4 */ ++ fstream = g_mime_stream_filter_new(stream); ++#endif /* HAVE_GMIME_2_4 */ + ++#ifndef HAVE_GMIME_2_4 + filter = g_mime_filter_crlf_new(GMIME_FILTER_CRLF_DECODE, + GMIME_FILTER_CRLF_MODE_CRLF_ONLY); ++#else /* HAVE_GMIME_2_4 */ ++ filter = g_mime_filter_crlf_new(FALSE, ++ FALSE); ++#endif /* HAVE_GMIME_2_4 */ + g_mime_stream_filter_add(GMIME_STREAM_FILTER(fstream), filter); + g_object_unref(filter); + +Index: balsa/libbalsa/message.c +=================================================================== +--- balsa/libbalsa/message.c (revision 8017) ++++ balsa/libbalsa/message.c (working copy) +@@ -144,7 +144,11 @@ + message->headers = NULL; + + if (message->sender) { ++#ifndef HAVE_GMIME_2_4 + internet_address_list_destroy(message->sender); ++#else /* HAVE_GMIME_2_4 */ ++ g_object_unref(message->sender); ++#endif /* HAVE_GMIME_2_4 */ + message->sender = NULL; + } + +@@ -209,37 +213,65 @@ + headers->subject = NULL; + + if (headers->from) { ++#ifndef HAVE_GMIME_2_4 + internet_address_list_destroy(headers->from); ++#else /* HAVE_GMIME_2_4 */ ++ g_object_unref(headers->from); ++#endif /* HAVE_GMIME_2_4 */ + headers->from = NULL; + } + + if (headers->to_list) { ++#ifndef HAVE_GMIME_2_4 + internet_address_list_destroy(headers->to_list); ++#else /* HAVE_GMIME_2_4 */ ++ g_object_unref(headers->to_list); ++#endif /* HAVE_GMIME_2_4 */ + headers->to_list = NULL; + } + + if (headers->content_type) { ++#ifndef HAVE_GMIME_2_4 + g_mime_content_type_destroy(headers->content_type); ++#else /* HAVE_GMIME_2_4 */ ++ g_object_unref(headers->content_type); ++#endif /* HAVE_GMIME_2_4 */ + headers->content_type = NULL; + } + + if (headers->cc_list) { ++#ifndef HAVE_GMIME_2_4 + internet_address_list_destroy(headers->cc_list); ++#else /* HAVE_GMIME_2_4 */ ++ g_object_unref(headers->cc_list); ++#endif /* HAVE_GMIME_2_4 */ + headers->cc_list = NULL; + } + + if (headers->bcc_list) { ++#ifndef HAVE_GMIME_2_4 + internet_address_list_destroy(headers->bcc_list); ++#else /* HAVE_GMIME_2_4 */ ++ g_object_unref(headers->bcc_list); ++#endif /* HAVE_GMIME_2_4 */ + headers->bcc_list = NULL; + } + + if (headers->reply_to) { ++#ifndef HAVE_GMIME_2_4 + internet_address_list_destroy(headers->reply_to); ++#else /* HAVE_GMIME_2_4 */ ++ g_object_unref(headers->reply_to); ++#endif /* HAVE_GMIME_2_4 */ + headers->reply_to = NULL; + } + + if(headers->dispnotify_to) { ++#ifndef HAVE_GMIME_2_4 + internet_address_list_destroy(headers->dispnotify_to); ++#else /* HAVE_GMIME_2_4 */ ++ g_object_unref(headers->dispnotify_to); ++#endif /* HAVE_GMIME_2_4 */ + headers->dispnotify_to = NULL; + } + +@@ -261,7 +293,11 @@ + return body->charset; + + if (GMIME_IS_PART(body->mime_part)) { ++#ifndef HAVE_GMIME_2_4 + const GMimeContentType *type; ++#else /* HAVE_GMIME_2_4 */ ++ GMimeContentType *type; ++#endif /* HAVE_GMIME_2_4 */ + + type = g_mime_object_get_content_type(body->mime_part); + return g_mime_content_type_get_parameter(type, "charset"); +@@ -465,6 +501,10 @@ + GList * + libbalsa_message_user_hdrs_from_gmime(GMimeMessage * message) + { ++#ifdef HAVE_GMIME_2_4 ++ GMimeHeaderList *hdrlist; ++ GMimeHeaderIter iter; ++#endif /* HAVE_GMIME_2_4 */ + GList *res = NULL; + const char *value; + +@@ -479,7 +519,11 @@ + already present in LibBalsaMessage::references field. FWIW, + mailbox driver does not copy references to user_headers. + */ ++#ifndef HAVE_GMIME_2_4 + value = g_mime_message_get_header(message, "References"); ++#else /* HAVE_GMIME_2_4 */ ++ value = g_mime_object_get_header(GMIME_OBJECT(message), "References"); ++#endif /* HAVE_GMIME_2_4 */ + if (value) { + #if BALSA_NEEDS_SEPARATE_USER_HEADERS + GMimeReferences *references, *reference; +@@ -502,26 +546,51 @@ + #endif + } + ++#ifndef HAVE_GMIME_2_4 + value = g_mime_message_get_header(message, "In-Reply-To"); ++#else /* HAVE_GMIME_2_4 */ ++ value = g_mime_object_get_header(GMIME_OBJECT(message), "In-Reply-To"); ++#endif /* HAVE_GMIME_2_4 */ + if (value) { ++#ifndef HAVE_GMIME_2_4 ++#if HAVE_GMIME_2_2_5 + res = +-#if HAVE_GMIME_2_2_5 + g_list_prepend(res, + libbalsa_create_hdr_pair + ("In-Reply-To", + g_mime_utils_header_decode_text(value))); + #else /* HAVE_GMIME_2_2_5 */ ++ res = + g_list_prepend(res, + libbalsa_create_hdr_pair + ("In-Reply-To", + g_mime_utils_header_decode_text + ((unsigned char *) value))); + #endif /* HAVE_GMIME_2_2_5 */ ++#else /* ! HAVE_GMIME_2_4 */ ++ res = ++ g_list_prepend(res, ++ libbalsa_create_hdr_pair ++ ("In-Reply-To", ++ g_mime_utils_header_decode_text(value))); ++#endif /* ! HAVE_GMIME_2_4 */ + } + ++#ifndef HAVE_GMIME_2_4 + g_mime_header_foreach(GMIME_OBJECT(message)->headers, + prepend_header_misc, &res); + ++#else /* HAVE_GMIME_2_4 */ ++ hdrlist = g_mime_object_get_header_list (GMIME_OBJECT(message)); ++ if (g_mime_header_list_get_iter (hdrlist, &iter)) { ++ do { ++ prepend_header_misc (g_mime_header_iter_get_name (&iter), ++ g_mime_header_iter_get_value (&iter), ++ &res); ++ } while (g_mime_header_iter_next (&iter)); ++ } ++ ++#endif /* HAVE_GMIME_2_4 */ + return g_list_reverse(res); + } + +@@ -696,7 +765,11 @@ + gboolean + libbalsa_message_is_partial(LibBalsaMessage * message, gchar ** id) + { ++#ifndef HAVE_GMIME_2_4 + const GMimeContentType *content_type; ++#else /* HAVE_GMIME_2_4 */ ++ GMimeContentType *content_type; ++#endif /* HAVE_GMIME_2_4 */ + + g_return_val_if_fail(LIBBALSA_IS_MESSAGE(message), FALSE); + +@@ -807,9 +880,19 @@ + { + g_return_if_fail(message); + ++#ifndef HAVE_GMIME_2_4 + internet_address_list_destroy(message->headers->dispnotify_to); + message->headers->dispnotify_to = + ia ? internet_address_list_prepend(NULL, ia) : NULL; ++#else /* HAVE_GMIME_2_4 */ ++ g_object_unref(message->headers->dispnotify_to); ++ if (ia) { ++ message->headers->dispnotify_to = internet_address_list_new (); ++ internet_address_list_add (message->headers->dispnotify_to, ia); ++ } else { ++ message->headers->dispnotify_to = NULL; ++ } ++#endif /* HAVE_GMIME_2_4 */ + } + + #ifndef MESSAGE_COPY_CONTENT +@@ -839,7 +922,11 @@ + const char *value; + if (!msg->mime_msg) + return 0; ++#ifndef HAVE_GMIME_2_4 + value = g_mime_message_get_header(msg->mime_msg, "Lines"); ++#else /* HAVE_GMIME_2_4 */ ++ value = g_mime_object_get_header(msg->mime_msg, "Lines"); ++#endif /* HAVE_GMIME_2_4 */ + if (!value) + return 0; + return atoi(value); +@@ -851,7 +938,11 @@ + const char *value; + if (!msg->mime_msg) + return 0; ++#ifndef HAVE_GMIME_2_4 + value = g_mime_message_get_header(msg->mime_msg, "Content-Length"); ++#else /* HAVE_GMIME_2_4 */ ++ value = g_mime_object_get_header(msg->mime_msg, "Content-Length"); ++#endif /* HAVE_GMIME_2_4 */ + if (!value) + return 0; + return atoi(value); +@@ -869,8 +960,13 @@ + /* Populate headers from mime_msg, but only the members that are needed + * all the time. */ + static InternetAddressList * ++#ifndef HAVE_GMIME_2_4 + lb_message_recipients(GMimeMessage * message, const gchar * type) ++#else /* HAVE_GMIME_2_4 */ ++lb_message_recipients(GMimeMessage * message, GMimeRecipientType type) ++#endif /* HAVE_GMIME_2_4 */ + { ++#ifndef HAVE_GMIME_2_4 + const InternetAddressList *list; + InternetAddressList *copy = NULL; + +@@ -879,6 +975,9 @@ + copy = internet_address_list_append(copy, list->address); + + return copy; ++#else /* HAVE_GMIME_2_4 */ ++ return g_object_ref(g_mime_message_get_recipients(message, type)); ++#endif /* HAVE_GMIME_2_4 */ + } + + static void +@@ -889,7 +988,11 @@ + g_return_if_fail(mime_msg != NULL); + + if (!headers->from) ++#ifndef HAVE_GMIME_2_4 + headers->from = internet_address_parse_string(mime_msg->from); ++#else /* HAVE_GMIME_2_4 */ ++ headers->from = internet_address_list_parse_string(mime_msg->from); ++#endif /* HAVE_GMIME_2_4 */ + + if (!headers->date) + g_mime_message_get_date(mime_msg, &headers->date, NULL); +@@ -904,7 +1007,11 @@ + * g_mime_content_type_copy + * (g_mime_object_get_content_type(mime_msg->mime_part)); + */ ++#ifndef HAVE_GMIME_2_4 + const GMimeContentType *content_type; ++#else /* HAVE_GMIME_2_4 */ ++ GMimeContentType *content_type; ++#endif /* HAVE_GMIME_2_4 */ + gchar *str; + g_return_if_fail(headers->content_type == NULL); + content_type = g_mime_object_get_content_type(mime_msg->mime_part); +@@ -925,12 +1032,21 @@ + + if (!headers->reply_to) + headers->reply_to = ++#ifndef HAVE_GMIME_2_4 + internet_address_parse_string(mime_msg->reply_to); ++#else /* HAVE_GMIME_2_4 */ ++ internet_address_list_parse_string(mime_msg->reply_to); ++#endif /* HAVE_GMIME_2_4 */ + + if (!headers->dispnotify_to) + headers->dispnotify_to = ++#ifndef HAVE_GMIME_2_4 + internet_address_parse_string(g_mime_message_get_header + (mime_msg, ++#else /* HAVE_GMIME_2_4 */ ++ internet_address_list_parse_string(g_mime_object_get_header ++ (GMIME_OBJECT(mime_msg), ++#endif /* HAVE_GMIME_2_4 */ + "Disposition-Notification-To")); + + if (!headers->cc_list) +@@ -944,7 +1060,11 @@ + /* Get fcc from message */ + if (!headers->fcc_url) + headers->fcc_url = ++#ifndef HAVE_GMIME_2_4 + g_strdup(g_mime_message_get_header(mime_msg, "X-Balsa-Fcc")); ++#else /* HAVE_GMIME_2_4 */ ++ g_strdup(g_mime_object_get_header(GMIME_OBJECT(mime_msg), "X-Balsa-Fcc")); ++#endif /* HAVE_GMIME_2_4 */ + } + + /* Populate headers from the info in mime_msg. */ +@@ -971,7 +1091,11 @@ + header = g_mime_message_get_subject(mime_msg); + libbalsa_message_set_subject_from_header(message, header); + ++#ifndef HAVE_GMIME_2_4 + header = g_mime_message_get_header(mime_msg, "Content-Length"); ++#else /* HAVE_GMIME_2_4 */ ++ header = g_mime_object_get_header(GMIME_OBJECT(mime_msg), "Content-Length"); ++#endif /* HAVE_GMIME_2_4 */ + if (header) + message->length = atoi(header); + #endif +@@ -979,11 +1103,19 @@ + if (header) + message->message_id = g_strdup(header); + ++#ifndef HAVE_GMIME_2_4 + header = g_mime_message_get_header(mime_msg, "References"); ++#else /* HAVE_GMIME_2_4 */ ++ header = g_mime_object_get_header(GMIME_OBJECT(mime_msg), "References"); ++#endif /* HAVE_GMIME_2_4 */ + if (header) + libbalsa_message_set_references_from_string(message, header); + ++#ifndef HAVE_GMIME_2_4 + header = g_mime_message_get_header(mime_msg, "In-Reply-To"); ++#else /* HAVE_GMIME_2_4 */ ++ header = g_mime_object_get_header(GMIME_OBJECT(mime_msg), "In-Reply-To"); ++#endif /* HAVE_GMIME_2_4 */ + if (header) + libbalsa_message_set_in_reply_to_from_string(message, header); + +@@ -1092,11 +1224,15 @@ + * appropriate GMime decoder. */ + gchar *tmp = g_strdup(value); + libbalsa_utf8_sanitize(&tmp, TRUE, NULL); ++#ifndef HAVE_GMIME_2_4 + #if HAVE_GMIME_2_2_5 ++#endif /* ! HAVE_GMIME_2_4 */ + val = g_mime_utils_header_encode_text(tmp); ++#ifndef HAVE_GMIME_2_4 + #else /* HAVE_GMIME_2_2_5 */ + val = g_mime_utils_header_encode_text((unsigned char *) tmp); + #endif /* HAVE_GMIME_2_2_5 */ ++#endif /* ! HAVE_GMIME_2_4 */ + g_free(tmp); + #ifdef DEBUG + g_print("%s: non-ascii \"%s\" header \"%s\" encoded as \"%s\"\n", +@@ -1120,11 +1256,19 @@ + } else + if (message->headers->from == NULL && + g_ascii_strcasecmp(name, "From") == 0) { ++#ifndef HAVE_GMIME_2_4 + message->headers->from = internet_address_parse_string(value); ++#else /* HAVE_GMIME_2_4 */ ++ message->headers->from = internet_address_list_parse_string(value); ++#endif /* HAVE_GMIME_2_4 */ + } else + if (message->headers->to_list == NULL && + g_ascii_strcasecmp(name, "To") == 0) { ++#ifndef HAVE_GMIME_2_4 + message->headers->to_list = internet_address_parse_string(value); ++#else /* HAVE_GMIME_2_4 */ ++ message->headers->to_list = internet_address_list_parse_string(value); ++#endif /* HAVE_GMIME_2_4 */ + } else + if (g_ascii_strcasecmp(name, "In-Reply-To") == 0) { + libbalsa_message_set_in_reply_to_from_string(message, value); +@@ -1144,7 +1288,11 @@ + if (message->headers->dispnotify_to == NULL && + g_ascii_strcasecmp(name, "Disposition-Notification-To") == 0) { + message->headers->dispnotify_to = ++#ifndef HAVE_GMIME_2_4 + internet_address_parse_string(value); ++#else /* HAVE_GMIME_2_4 */ ++ internet_address_list_parse_string(value); ++#endif /* HAVE_GMIME_2_4 */ + } else + #ifdef MESSAGE_COPY_CONTENT + if (g_ascii_strcasecmp(name, "Content-Length") == 0) { +@@ -1212,11 +1360,20 @@ + * fields, and finding the empty line that separates the body from + * the header is simpler if it has no '\r' in it. */ + gmime_stream_filter = ++#ifndef HAVE_GMIME_2_4 + g_mime_stream_filter_new_with_stream(gmime_stream); ++#else /* HAVE_GMIME_2_4 */ ++ g_mime_stream_filter_new(gmime_stream); ++#endif /* HAVE_GMIME_2_4 */ + + gmime_filter_crlf = ++#ifndef HAVE_GMIME_2_4 + g_mime_filter_crlf_new(GMIME_FILTER_CRLF_DECODE, + GMIME_FILTER_CRLF_MODE_CRLF_ONLY); ++#else /* HAVE_GMIME_2_4 */ ++ g_mime_filter_crlf_new(FALSE, ++ FALSE); ++#endif /* HAVE_GMIME_2_4 */ + g_mime_stream_filter_add(GMIME_STREAM_FILTER(gmime_stream_filter), + gmime_filter_crlf); + g_object_unref(gmime_filter_crlf); +@@ -1345,13 +1502,19 @@ + const gchar * header) + { + if (header) { ++#ifndef HAVE_GMIME_2_4 ++#if HAVE_GMIME_2_2_5 + gchar *subject = +-#if HAVE_GMIME_2_2_5 + g_mime_utils_header_decode_text(header); + #else /* HAVE_GMIME_2_2_5 */ ++ gchar *subject = + g_mime_utils_header_decode_text((const unsigned char *) + header); + #endif /* HAVE_GMIME_2_2_5 */ ++#else /* ! HAVE_GMIME_2_4 */ ++ gchar *subject = ++ g_mime_utils_header_decode_text(header); ++#endif /* ! HAVE_GMIME_2_4 */ + libbalsa_message_set_subject(message, subject); + g_free(subject); + } +Index: balsa/libbalsa/mime-stream-shared.c +=================================================================== +--- balsa/libbalsa/mime-stream-shared.c (revision 8017) ++++ balsa/libbalsa/mime-stream-shared.c (working copy) +@@ -60,10 +60,18 @@ + static ssize_t lbmss_stream_write(GMimeStream * stream, const char *buf, + size_t len); + static int lbmss_stream_reset(GMimeStream * stream); ++#ifndef HAVE_GMIME_2_4 + static off_t lbmss_stream_seek(GMimeStream * stream, off_t offset, ++#else /* HAVE_GMIME_2_4 */ ++static gint64 lbmss_stream_seek(GMimeStream * stream, gint64 offset, ++#endif /* HAVE_GMIME_2_4 */ + GMimeSeekWhence whence); + static GMimeStream *lbmss_stream_substream(GMimeStream * stream, ++#ifndef HAVE_GMIME_2_4 + off_t start, off_t end); ++#else /* HAVE_GMIME_2_4 */ ++ gint64 start, gint64 end); ++#endif /* HAVE_GMIME_2_4 */ + + static GMimeStreamFsClass *parent_class = NULL; + static GMutex *lbmss_mutex; +@@ -192,8 +200,13 @@ + return GMIME_STREAM_CLASS(parent_class)->reset(stream); + } + ++#ifndef HAVE_GMIME_2_4 + static off_t + lbmss_stream_seek(GMimeStream * stream, off_t offset, ++#else /* HAVE_GMIME_2_4 */ ++static gint64 ++lbmss_stream_seek(GMimeStream * stream, gint64 offset, ++#endif /* HAVE_GMIME_2_4 */ + GMimeSeekWhence whence) + { + g_return_val_if_fail(lbmss_thread_has_lock(stream), -1); +@@ -201,7 +214,11 @@ + } + + static GMimeStream * ++#ifndef HAVE_GMIME_2_4 + lbmss_stream_substream(GMimeStream * stream, off_t start, off_t end) ++#else /* HAVE_GMIME_2_4 */ ++lbmss_stream_substream(GMimeStream * stream, gint64 start, gint64 end) ++#endif /* HAVE_GMIME_2_4 */ + { + LibBalsaMimeStreamShared *stream_shared; + GMimeStreamFs *fstream; +@@ -235,7 +252,11 @@ + { + LibBalsaMimeStreamShared *stream_shared; + GMimeStreamFs *fstream; ++#ifndef HAVE_GMIME_2_4 + off_t start; ++#else /* HAVE_GMIME_2_4 */ ++ gint64 start; ++#endif /* HAVE_GMIME_2_4 */ + + stream_shared = + g_object_new(LIBBALSA_TYPE_MIME_STREAM_SHARED, NULL, NULL); +Index: balsa/libbalsa/gmime-stream-gnome-vfs.c +=================================================================== +--- balsa/libbalsa/gmime-stream-gnome-vfs.c (revision 8017) ++++ balsa/libbalsa/gmime-stream-gnome-vfs.c (working copy) +@@ -56,12 +56,25 @@ + static int stream_close(GMimeStream * stream); + static gboolean stream_eos(GMimeStream * stream); + static int stream_reset(GMimeStream * stream); ++#ifndef HAVE_GMIME_2_4 + static off_t stream_seek(GMimeStream * stream, off_t offset, ++#else /* HAVE_GMIME_2_4 */ ++static gint64 stream_seek(GMimeStream * stream, gint64 offset, ++#endif /* HAVE_GMIME_2_4 */ + GMimeSeekWhence whence); ++#ifndef HAVE_GMIME_2_4 + static off_t stream_tell(GMimeStream * stream); ++#else /* HAVE_GMIME_2_4 */ ++static gint64 stream_tell(GMimeStream * stream); ++#endif /* HAVE_GMIME_2_4 */ + static ssize_t stream_length(GMimeStream * stream); ++#ifndef HAVE_GMIME_2_4 + static GMimeStream *stream_substream(GMimeStream * stream, off_t start, + off_t end); ++#else /* HAVE_GMIME_2_4 */ ++static GMimeStream *stream_substream(GMimeStream * stream, gint64 start, ++ gint64 end); ++#endif /* HAVE_GMIME_2_4 */ + + + static GMimeStreamClass *parent_class = NULL; +@@ -147,7 +160,11 @@ + return -1; + + if (stream->bound_end != -1) ++#ifndef HAVE_GMIME_2_4 + len = MIN(stream->bound_end - stream->position, (off_t) len); ++#else /* HAVE_GMIME_2_4 */ ++ len = MIN(stream->bound_end - stream->position, (gint64) len); ++#endif /* HAVE_GMIME_2_4 */ + + /* make sure we are at the right position */ + gnome_vfs_seek(gvfs->handle, GNOME_VFS_SEEK_START, stream->position); +@@ -178,7 +195,11 @@ + return -1; + + if (stream->bound_end != -1) ++#ifndef HAVE_GMIME_2_4 + len = MIN(stream->bound_end - stream->position, (off_t) len); ++#else /* HAVE_GMIME_2_4 */ ++ len = MIN(stream->bound_end - stream->position, (gint64) len); ++#endif /* HAVE_GMIME_2_4 */ + + /* make sure we are at the right position */ + gnome_vfs_seek(gvfs->handle, GNOME_VFS_SEEK_START, stream->position); +@@ -267,11 +288,20 @@ + return 0; + } + ++#ifndef HAVE_GMIME_2_4 + static off_t + stream_seek(GMimeStream * stream, off_t offset, GMimeSeekWhence whence) ++#else /* HAVE_GMIME_2_4 */ ++static gint64 ++stream_seek(GMimeStream * stream, gint64 offset, GMimeSeekWhence whence) ++#endif /* HAVE_GMIME_2_4 */ + { + GMimeStreamGvfs *gvfs = (GMimeStreamGvfs *) stream; ++#ifndef HAVE_GMIME_2_4 + off_t real; ++#else /* HAVE_GMIME_2_4 */ ++ gint64 real; ++#endif /* HAVE_GMIME_2_4 */ + GnomeVFSFileSize gvfs_real; + + g_return_val_if_fail(gvfs->handle != NULL, -1); +@@ -323,7 +353,11 @@ + gnome_vfs_tell(gvfs->handle, &gvfs_real) != GNOME_VFS_OK) + return -1; + else ++#ifndef HAVE_GMIME_2_4 + real = (off_t) gvfs_real; ++#else /* HAVE_GMIME_2_4 */ ++ real = (gint64) gvfs_real; ++#endif /* HAVE_GMIME_2_4 */ + + /* reset eos if appropriate */ + if ((stream->bound_end != -1 && real < stream->bound_end) || +@@ -335,7 +369,11 @@ + return real; + } + ++#ifndef HAVE_GMIME_2_4 + static off_t ++#else /* HAVE_GMIME_2_4 */ ++static gint64 ++#endif /* HAVE_GMIME_2_4 */ + stream_tell(GMimeStream * stream) + { + return stream->position; +@@ -353,14 +391,26 @@ + if (gnome_vfs_seek(gvfs->handle, GNOME_VFS_SEEK_END, 0) != GNOME_VFS_OK || + gnome_vfs_tell(gvfs->handle, &bound_end) != GNOME_VFS_OK || + gnome_vfs_seek(gvfs->handle, GNOME_VFS_SEEK_START, stream->position) != GNOME_VFS_OK || ++#ifndef HAVE_GMIME_2_4 + (off_t) bound_end < stream->bound_start) ++#else /* HAVE_GMIME_2_4 */ ++ (gint64) bound_end < stream->bound_start) ++#endif /* HAVE_GMIME_2_4 */ + return -1; + ++#ifndef HAVE_GMIME_2_4 + return (off_t) bound_end - stream->bound_start; ++#else /* HAVE_GMIME_2_4 */ ++ return (ssize_t) bound_end - stream->bound_start; ++#endif /* HAVE_GMIME_2_4 */ + } + + static GMimeStream * ++#ifndef HAVE_GMIME_2_4 + stream_substream(GMimeStream * stream, off_t start, off_t end) ++#else /* HAVE_GMIME_2_4 */ ++stream_substream(GMimeStream * stream, gint64 start, gint64 end) ++#endif /* HAVE_GMIME_2_4 */ + { + GMimeStreamGvfs *gvfs; + +@@ -392,7 +442,11 @@ + start = 0; + + gvfs = g_object_new(GMIME_TYPE_STREAM_GVFS, NULL); ++#ifndef HAVE_GMIME_2_4 + g_mime_stream_construct(GMIME_STREAM(gvfs), (off_t) start, -1); ++#else /* HAVE_GMIME_2_4 */ ++ g_mime_stream_construct(GMIME_STREAM(gvfs), (gint64) start, -1); ++#endif /* HAVE_GMIME_2_4 */ + gvfs->owner = TRUE; + gvfs->eos = FALSE; + gvfs->handle = handle; +@@ -413,7 +467,11 @@ + * Returns a stream using @handle with bounds @start and @end. + **/ + GMimeStream * ++#ifndef HAVE_GMIME_2_4 + g_mime_stream_gvfs_new_with_bounds(GnomeVFSHandle * handle, off_t start, off_t end) ++#else /* HAVE_GMIME_2_4 */ ++g_mime_stream_gvfs_new_with_bounds(GnomeVFSHandle * handle, gint64 start, gint64 end) ++#endif /* HAVE_GMIME_2_4 */ + { + GMimeStreamGvfs *gvfs; + +Index: balsa/libbalsa/rfc3156.c +=================================================================== +--- balsa/libbalsa/rfc3156.c (revision 8017) ++++ balsa/libbalsa/rfc3156.c (working copy) +@@ -129,14 +129,22 @@ + gboolean retval; + + if (body->mime_part) { ++#ifndef HAVE_GMIME_2_4 + const GMimeContentType *content_type = ++#else /* HAVE_GMIME_2_4 */ ++ GMimeContentType *content_type = ++#endif /* HAVE_GMIME_2_4 */ + g_mime_object_get_content_type(body->mime_part); + retval = g_mime_content_type_is_type(content_type, type, sub_type); + } else { + GMimeContentType *content_type = + g_mime_content_type_new_from_string(body->content_type); + retval = g_mime_content_type_is_type(content_type, type, sub_type); ++#ifndef HAVE_GMIME_2_4 + g_mime_content_type_destroy(content_type); ++#else /* HAVE_GMIME_2_4 */ ++ g_object_unref(content_type); ++#endif /* HAVE_GMIME_2_4 */ + } + + return retval; +@@ -390,6 +398,9 @@ + result = + g_mime_multipart_encrypted_encrypt(mpe, *content, + GMIME_CIPHER_CONTEXT(ctx), ++#ifdef HAVE_GMIME_2_4 ++ FALSE, NULL, ++#endif /* HAVE_GMIME_2_4 */ + recipients, error); + } + #ifdef HAVE_SMIME +@@ -506,7 +517,11 @@ + + /* check if the body is really a multipart/signed */ + if (!GMIME_IS_MULTIPART_SIGNED(body->mime_part) ++#ifndef HAVE_GMIME_2_4 + || (g_mime_multipart_get_number ++#else /* HAVE_GMIME_2_4 */ ++ || (g_mime_multipart_get_count ++#endif /* HAVE_GMIME_2_4 */ + (((GMimeMultipart *) body->mime_part))) < 2) + return FALSE; + if (body->parts->next->sig_info) +@@ -701,7 +716,9 @@ + #endif + + libbalsa_message_body_set_mime_body(body, mime_obj); ++#ifndef HAVE_GMIME_2_4 + g_object_unref(G_OBJECT(mime_obj)); ++#endif /* ! HAVE_GMIME_2_4 */ + if (ctx->sig_state && ctx->sig_state->status != GPG_ERR_NOT_SIGNED) { + g_object_ref(ctx->sig_state); + body->sig_info = ctx->sig_state; +@@ -918,7 +935,11 @@ + } + + /* decrypt */ ++#ifndef HAVE_GMIME_2_4 + if (g_mime_part_rfc2440_decrypt(part, ctx, &error) == -1) { ++#else /* HAVE_GMIME_2_4 */ ++ if (g_mime_part_rfc2440_decrypt(part, ctx, &error) == NULL) { ++#endif /* HAVE_GMIME_2_4 */ + if (error) { + if (error->code != GPG_ERR_CANCELED) + libbalsa_information(LIBBALSA_INFORMATION_ERROR, "%s: %s", +@@ -1751,16 +1772,37 @@ + gpgme_key_t key; + gboolean result = TRUE; + time_t now = time(NULL); ++#ifdef HAVE_GMIME_2_4 ++ gint i; ++#endif /* HAVE_GMIME_2_4 */ + ++#ifndef HAVE_GMIME_2_4 + for (; result && recipients; recipients = recipients->next) { + InternetAddress *ia = recipients->address; ++#else /* HAVE_GMIME_2_4 */ ++ for (i = 0; result && i < internet_address_list_length(recipients); ++ i++) { ++ InternetAddress *ia = ++ internet_address_list_get_address(recipients, i); ++#endif /* HAVE_GMIME_2_4 */ + + /* check all entries in the list, handle groups recursively */ ++#ifndef HAVE_GMIME_2_4 + if (ia->type == INTERNET_ADDRESS_GROUP) + result = have_pub_key_for(gpgme_ctx, ia->value.members); + else if (recipients->address->type == INTERNET_ADDRESS_NAME) { + if (gpgme_op_keylist_start(gpgme_ctx, ia->value.addr, FALSE) != + GPG_ERR_NO_ERROR) ++#else /* HAVE_GMIME_2_4 */ ++ if (INTERNET_ADDRESS_IS_GROUP(ia)) ++ result = ++ have_pub_key_for(gpgme_ctx, ++ INTERNET_ADDRESS_GROUP(ia)->members); ++ else { ++ if (gpgme_op_keylist_start(gpgme_ctx, ++ INTERNET_ADDRESS_MAILBOX(ia)->addr, ++ FALSE) != GPG_ERR_NO_ERROR) ++#endif /* HAVE_GMIME_2_4 */ + return FALSE; + + result = FALSE; +Index: balsa/libbalsa/send.c +=================================================================== +--- balsa/libbalsa/send.c (revision 8017) ++++ balsa/libbalsa/send.c (working copy) +@@ -294,7 +294,11 @@ + + wrapper = + g_mime_data_wrapper_new_with_stream(stream, ++#ifndef HAVE_GMIME_2_4 + GMIME_PART_ENCODING_DEFAULT); ++#else /* HAVE_GMIME_2_4 */ ++ GMIME_CONTENT_ENCODING_DEFAULT); ++#endif /* HAVE_GMIME_2_4 */ + g_object_unref(stream); + + g_mime_part_set_content_object(mime_part, wrapper); +@@ -339,8 +343,13 @@ + mime_part = g_mime_part_new_with_type("text", "plain"); + } + ++#ifndef HAVE_GMIME_2_4 + g_mime_part_set_content_disposition(mime_part, GMIME_DISPOSITION_INLINE); + g_mime_part_set_encoding(mime_part, GMIME_PART_ENCODING_QUOTEDPRINTABLE); ++#else /* HAVE_GMIME_2_4 */ ++ g_mime_object_set_disposition(GMIME_OBJECT(mime_part), GMIME_DISPOSITION_INLINE); ++ g_mime_part_set_content_encoding(mime_part, GMIME_CONTENT_ENCODING_QUOTEDPRINTABLE); ++#endif /* HAVE_GMIME_2_4 */ + g_mime_object_set_content_type_parameter(GMIME_OBJECT(mime_part), + "charset", + charset ? charset : +@@ -361,7 +370,11 @@ + GMimeDataWrapper *wrapper; + + stream = g_mime_stream_mem_new(); ++#ifndef HAVE_GMIME_2_4 + filter_stream = g_mime_stream_filter_new_with_stream(stream); ++#else /* HAVE_GMIME_2_4 */ ++ filter_stream = g_mime_stream_filter_new(stream); ++#endif /* HAVE_GMIME_2_4 */ + filter = g_mime_filter_charset_new("UTF-8", charset); + g_mime_stream_filter_add(GMIME_STREAM_FILTER(filter_stream), filter); + g_object_unref(G_OBJECT(filter)); +@@ -371,7 +384,11 @@ + + wrapper = + g_mime_data_wrapper_new_with_stream(stream, ++#ifndef HAVE_GMIME_2_4 + GMIME_PART_ENCODING_DEFAULT); ++#else /* HAVE_GMIME_2_4 */ ++ GMIME_CONTENT_ENCODING_DEFAULT); ++#endif /* HAVE_GMIME_2_4 */ + g_object_unref(stream); + + g_mime_part_set_content_object(mime_part, wrapper); +@@ -398,14 +415,27 @@ + if (body->html_buffer && !postpone) { + GMimeMultipart *mpa = g_mime_multipart_new_with_subtype("alternative"); + ++#ifndef HAVE_GMIME_2_4 + g_mime_multipart_add_part(mpa, GMIME_OBJECT(mime_part)); ++#else /* HAVE_GMIME_2_4 */ ++ g_mime_multipart_add(mpa, GMIME_OBJECT(mime_part)); ++#endif /* HAVE_GMIME_2_4 */ + g_object_unref(G_OBJECT(mime_part)); + + mime_part = g_mime_part_new_with_type("text", "html"); ++#ifndef HAVE_GMIME_2_4 + g_mime_multipart_add_part(mpa, GMIME_OBJECT(mime_part)); ++#else /* HAVE_GMIME_2_4 */ ++ g_mime_multipart_add(mpa, GMIME_OBJECT(mime_part)); ++#endif /* HAVE_GMIME_2_4 */ + g_object_unref(G_OBJECT(mime_part)); ++#ifndef HAVE_GMIME_2_4 + g_mime_part_set_content_disposition(mime_part, GMIME_DISPOSITION_INLINE); + g_mime_part_set_encoding(mime_part, GMIME_PART_ENCODING_QUOTEDPRINTABLE); ++#else /* HAVE_GMIME_2_4 */ ++ g_mime_object_set_disposition(GMIME_OBJECT(mime_part), GMIME_DISPOSITION_INLINE); ++ g_mime_part_set_content_encoding(mime_part, GMIME_CONTENT_ENCODING_QUOTEDPRINTABLE); ++#endif /* HAVE_GMIME_2_4 */ + g_mime_object_set_content_type_parameter(GMIME_OBJECT(mime_part), + "charset", "UTF-8"); + lbs_set_content(mime_part, body->html_buffer); +@@ -469,10 +499,18 @@ + return result; + + if (fccbox) ++#ifndef HAVE_GMIME_2_4 + g_mime_message_set_header(message->mime_msg, "X-Balsa-Fcc", ++#else /* HAVE_GMIME_2_4 */ ++ g_mime_object_set_header(GMIME_OBJECT(message->mime_msg), "X-Balsa-Fcc", ++#endif /* HAVE_GMIME_2_4 */ + fccbox->url); + #if ENABLE_ESMTP ++#ifndef HAVE_GMIME_2_4 + g_mime_message_set_header(message->mime_msg, "X-Balsa-SmtpServer", ++#else /* HAVE_GMIME_2_4 */ ++ g_mime_object_set_header(GMIME_OBJECT(message->mime_msg), "X-Balsa-SmtpServer", ++#endif /* HAVE_GMIME_2_4 */ + libbalsa_smtp_server_get_name(smtp_server)); + + big_message = libbalsa_smtp_server_get_big_message(smtp_server); +@@ -492,9 +530,15 @@ + /* RFC 2046, 5.2.2: "...it is specified that entities of + * type "message/partial" must always have a content- + * transfer-encoding of 7bit (the default)" */ ++#ifndef HAVE_GMIME_2_4 + g_mime_part_set_encoding(GMIME_PART + (mime_msgs[i]->mime_part), + GMIME_PART_ENCODING_7BIT); ++#else /* HAVE_GMIME_2_4 */ ++ g_mime_part_set_content_encoding(GMIME_PART ++ (mime_msgs[i]->mime_part), ++ GMIME_CONTENT_ENCODING_7BIT); ++#endif /* HAVE_GMIME_2_4 */ + libbalsa_set_message_id(mime_msgs[i]); + } + if (rc) { +@@ -597,13 +641,31 @@ + add_recipients(smtp_message_t message, + InternetAddressList * recipient_list) + { ++#ifndef HAVE_GMIME_2_4 + for (; recipient_list; recipient_list = recipient_list->next) { + InternetAddress *ia = recipient_list->address; ++#else /* HAVE_GMIME_2_4 */ ++ const InternetAddress *ia; ++ int i; ++ ++ if (recipient_list == NULL) ++ return; ++ ++ for (i = 0; i < internet_address_list_length (recipient_list); i++) { ++ ia = internet_address_list_get_address (recipient_list, i); ++#endif /* HAVE_GMIME_2_4 */ + ++#ifndef HAVE_GMIME_2_4 + if (ia->type == INTERNET_ADDRESS_NAME) + smtp_add_recipient (message, ia->value.addr); + else if (ia->type == INTERNET_ADDRESS_GROUP) + add_recipients(message, ia->value.members); ++#else /* HAVE_GMIME_2_4 */ ++ if (INTERNET_ADDRESS_IS_MAILBOX (ia)) ++ smtp_add_recipient (message, INTERNET_ADDRESS_MAILBOX (ia)->addr); ++ else ++ add_recipients(message, INTERNET_ADDRESS_GROUP (ia)->members); ++#endif /* HAVE_GMIME_2_4 */ + + /* XXX - this is where to add DSN requests. It would be + cool if LibBalsaAddress could contain DSN options +@@ -611,6 +673,7 @@ + } + } + ++#ifndef HAVE_GMIME_2_4 + static guint + lbs_list_n_addresses(InternetAddressList * recipient_list) + { +@@ -631,6 +694,7 @@ + return n_addresses; + } + ++#endif /* ! HAVE_GMIME_2_4 */ + /* libbalsa_process_queue: + treats given mailbox as a set of messages to send. Loads them up and + launches sending thread/routine. +@@ -726,7 +790,11 @@ + } else { + gboolean has_open_recipients; + guint n_bcc_recipients; ++#ifndef HAVE_GMIME_2_4 + InternetAddress *ia; ++#else /* HAVE_GMIME_2_4 */ ++ const InternetAddress *ia; ++#endif /* HAVE_GMIME_2_4 */ + + libbalsa_message_change_flags(msg, + LIBBALSA_MESSAGE_FLAG_FLAGGED, 0); +@@ -751,10 +819,19 @@ + + mem_stream = new_message->stream; + filter_stream = ++#ifndef HAVE_GMIME_2_4 + g_mime_stream_filter_new_with_stream(mem_stream); ++#else /* HAVE_GMIME_2_4 */ ++ g_mime_stream_filter_new(mem_stream); ++#endif /* HAVE_GMIME_2_4 */ + filter = ++#ifndef HAVE_GMIME_2_4 + g_mime_filter_crlf_new( GMIME_FILTER_CRLF_ENCODE, + GMIME_FILTER_CRLF_MODE_CRLF_ONLY); ++#else /* HAVE_GMIME_2_4 */ ++ g_mime_filter_crlf_new( TRUE, ++ FALSE); ++#endif /* HAVE_GMIME_2_4 */ + g_mime_stream_filter_add(GMIME_STREAM_FILTER(filter_stream), + filter); + g_object_unref(G_OBJECT(filter)); +@@ -772,10 +849,22 @@ + * session for that one recipient, in which the Bcc: header + * is preserved. */ + has_open_recipients = ++#ifndef HAVE_GMIME_2_4 + lbs_list_n_addresses(msg->headers->to_list) > 0 || + lbs_list_n_addresses(msg->headers->cc_list) > 0; ++#else /* HAVE_GMIME_2_4 */ ++ libbalsa_address_n_mailboxes_in_list(msg->headers-> ++ to_list) > 0 ++ || libbalsa_address_n_mailboxes_in_list(msg->headers-> ++ cc_list) > 0; ++#endif /* HAVE_GMIME_2_4 */ + n_bcc_recipients = ++#ifndef HAVE_GMIME_2_4 + lbs_list_n_addresses(msg->headers->bcc_list); ++#else /* HAVE_GMIME_2_4 */ ++ libbalsa_address_n_mailboxes_in_list(msg->headers-> ++ bcc_list); ++#endif /* HAVE_GMIME_2_4 */ + if (has_open_recipients && n_bcc_recipients == 1) + bcc_message = smtp_add_message (session); + else +@@ -821,12 +910,22 @@ + + /* Add the sender info */ + if (msg->headers->from ++#ifndef HAVE_GMIME_2_4 + && (ia = msg->headers->from->address) + && ia->type != INTERNET_ADDRESS_NONE) { ++#else /* HAVE_GMIME_2_4 */ ++ && (ia = internet_address_list_get_address (msg->headers->from, 0))) { ++#endif /* HAVE_GMIME_2_4 */ + phrase = ia->name; ++#ifndef HAVE_GMIME_2_4 + while (ia->type == INTERNET_ADDRESS_GROUP) + ia = ia->value.members->address; + mailbox = ia->value.addr; ++#else /* HAVE_GMIME_2_4 */ ++ while (ia && INTERNET_ADDRESS_IS_GROUP (ia)) ++ ia = internet_address_list_get_address (INTERNET_ADDRESS_GROUP (ia)->members, 0); ++ mailbox = ia ? INTERNET_ADDRESS_MAILBOX (ia)->addr : ""; ++#endif /* HAVE_GMIME_2_4 */ + } else + phrase = mailbox = ""; + smtp_set_reverse_path (message, mailbox); +@@ -837,24 +936,44 @@ + } + + if (msg->headers->reply_to ++#ifndef HAVE_GMIME_2_4 + && (ia = msg->headers->reply_to->address) + && ia->type != INTERNET_ADDRESS_NONE) { ++#else /* HAVE_GMIME_2_4 */ ++ && (ia = internet_address_list_get_address (msg->headers->reply_to, 0))) { ++#endif /* HAVE_GMIME_2_4 */ + phrase = ia->name; ++#ifndef HAVE_GMIME_2_4 + while (ia->type == INTERNET_ADDRESS_GROUP) + ia = ia->value.members->address; + mailbox = ia->value.addr; ++#else /* HAVE_GMIME_2_4 */ ++ while (ia && INTERNET_ADDRESS_IS_GROUP (ia)) ++ ia = internet_address_list_get_address (INTERNET_ADDRESS_GROUP (ia)->members, 0); ++ mailbox = ia ? INTERNET_ADDRESS_MAILBOX (ia)->addr : ""; ++#endif /* HAVE_GMIME_2_4 */ + smtp_set_header (message, "Reply-To", phrase, mailbox); + if (bcc_message) + smtp_set_header (bcc_message, "Reply-To", phrase, mailbox); + } + + if (msg->headers->dispnotify_to ++#ifndef HAVE_GMIME_2_4 + && (ia = msg->headers->dispnotify_to->address) + && ia->type != INTERNET_ADDRESS_NONE) { ++#else /* HAVE_GMIME_2_4 */ ++ && (ia = internet_address_list_get_address (msg->headers->dispnotify_to, 0))) { ++#endif /* HAVE_GMIME_2_4 */ + phrase = ia->name; ++#ifndef HAVE_GMIME_2_4 + while (ia->type == INTERNET_ADDRESS_GROUP) + ia = ia->value.members->address; + mailbox = ia->value.addr; ++#else /* HAVE_GMIME_2_4 */ ++ while (ia && INTERNET_ADDRESS_IS_GROUP (ia)) ++ ia = internet_address_list_get_address (INTERNET_ADDRESS_GROUP (ia)->members, 0); ++ mailbox = ia ? INTERNET_ADDRESS_MAILBOX (ia)->addr : ""; ++#endif /* HAVE_GMIME_2_4 */ + smtp_set_header (message, "Disposition-Notification-To", + phrase, mailbox); + if (bcc_message) +@@ -1599,27 +1718,54 @@ + g_string_append_c(str, ' '); + g_string_append_printf(str, "<%s>", (gchar *) list->data); + } while ((list = list->next) != NULL); ++#ifndef HAVE_GMIME_2_4 + g_mime_message_set_header(msg, "References", str->str); ++#else /* HAVE_GMIME_2_4 */ ++ g_mime_object_set_header(GMIME_OBJECT(msg), "References", str->str); ++#endif /* HAVE_GMIME_2_4 */ + g_string_free(str, TRUE); + } + + if (message->in_reply_to) + /* There's no specific header function for In-Reply-To */ ++#ifndef HAVE_GMIME_2_4 + g_mime_message_set_header(msg, "In-Reply-To", ++#else /* HAVE_GMIME_2_4 */ ++ g_mime_object_set_header(GMIME_OBJECT(msg), "In-Reply-To", ++#endif /* HAVE_GMIME_2_4 */ + message->in_reply_to->data); + } + + #ifdef HAVE_GPGME + static GList * ++#ifndef HAVE_GMIME_2_4 + get_mailbox_names(GList *list, const InternetAddressList *address_list) ++#else /* HAVE_GMIME_2_4 */ ++get_mailbox_names(GList *list, InternetAddressList *address_list) ++#endif /* HAVE_GMIME_2_4 */ + { ++#ifndef HAVE_GMIME_2_4 + for (; address_list; address_list = address_list->next) { + InternetAddress *ia = address_list->address; ++#else /* HAVE_GMIME_2_4 */ ++ gint i; ++#endif /* HAVE_GMIME_2_4 */ + ++#ifndef HAVE_GMIME_2_4 + if (ia->type == INTERNET_ADDRESS_NAME) + list = g_list_append(list, g_strdup(ia->value.addr)); + else if (ia->type == INTERNET_ADDRESS_GROUP) + list = get_mailbox_names(list, ia->value.members); ++#else /* HAVE_GMIME_2_4 */ ++ for (i = 0; i < internet_address_list_length(address_list); i++) { ++ InternetAddress *ia = ++ internet_address_list_get_address(address_list, i); ++ ++ if (INTERNET_ADDRESS_IS_MAILBOX(ia)) ++ list = g_list_append(list, g_strdup(((InternetAddressMailbox *) ia)->addr)); ++ else ++ list = get_mailbox_names(list, ((InternetAddressGroup *) ia)->members); ++#endif /* HAVE_GMIME_2_4 */ + } + + return list; +@@ -1680,6 +1826,9 @@ + GMimeObject *mime_root = NULL; + GMimeMessage *mime_message; + LibBalsaMessageBody *body; ++#ifdef HAVE_GMIME_2_4 ++ InternetAddressList *recipients; ++#endif /* HAVE_GMIME_2_4 */ + gchar *tmp; + GList *list; + GtkWindow * parent; +@@ -1707,8 +1856,13 @@ + g_mime_content_type_new("message", "external-body"); + mime_part=g_mime_object_new_type("message", "external-body"); + g_mime_object_set_content_type(mime_part, content_type); ++#ifndef HAVE_GMIME_2_4 + g_mime_part_set_encoding(GMIME_PART(mime_part), + GMIME_PART_ENCODING_7BIT); ++#else /* HAVE_GMIME_2_4 */ ++ g_mime_part_set_content_encoding(GMIME_PART(mime_part), ++ GMIME_CONTENT_ENCODING_7BIT); ++#endif /* HAVE_GMIME_2_4 */ + if (body->filename && !strncmp(body->filename, "URL", 3)) { + g_mime_object_set_content_type_parameter(mime_part, + "access-type", "URL"); +@@ -1781,13 +1935,22 @@ + mime_part = + GMIME_OBJECT(g_mime_part_new_with_type(mime_type[0], + mime_type[1])); ++#ifndef HAVE_GMIME_2_4 + g_mime_part_set_content_disposition(GMIME_PART(mime_part), ++#else /* HAVE_GMIME_2_4 */ ++ g_mime_object_set_disposition(mime_part, ++#endif /* HAVE_GMIME_2_4 */ + body->attach_mode == LIBBALSA_ATTACH_AS_INLINE ? + GMIME_DISPOSITION_INLINE : GMIME_DISPOSITION_ATTACHMENT); + if(strcasecmp(mime_type[0],"text") != 0) + { ++#ifndef HAVE_GMIME_2_4 + g_mime_part_set_encoding(GMIME_PART(mime_part), + GMIME_PART_ENCODING_BASE64); ++#else /* HAVE_GMIME_2_4 */ ++ g_mime_part_set_content_encoding(GMIME_PART(mime_part), ++ GMIME_CONTENT_ENCODING_BASE64); ++#endif /* HAVE_GMIME_2_4 */ + } else { + /* is text */ + g_mime_object_set_content_type_parameter(mime_part, +@@ -1815,7 +1978,11 @@ + return LIBBALSA_MESSAGE_CREATE_ERROR; + } + content = g_mime_data_wrapper_new_with_stream(stream, ++#ifndef HAVE_GMIME_2_4 + GMIME_PART_ENCODING_DEFAULT); ++#else /* HAVE_GMIME_2_4 */ ++ GMIME_CONTENT_ENCODING_DEFAULT); ++#endif /* HAVE_GMIME_2_4 */ + g_object_unref(stream); + g_mime_part_set_content_object(GMIME_PART(mime_part), + content); +@@ -1847,8 +2014,13 @@ + } + + if (mime_root) { ++#ifndef HAVE_GMIME_2_4 + g_mime_multipart_add_part(GMIME_MULTIPART(mime_root), + GMIME_OBJECT(mime_part)); ++#else /* HAVE_GMIME_2_4 */ ++ g_mime_multipart_add(GMIME_MULTIPART(mime_root), ++ GMIME_OBJECT(mime_part)); ++#endif /* HAVE_GMIME_2_4 */ + g_object_unref(G_OBJECT(mime_part)); + } else { + mime_root = mime_part; +@@ -1906,6 +2078,7 @@ + g_mime_message_set_date(mime_message, message->headers->date, + get_tz_offset(&message->headers->date)); + ++#ifndef HAVE_GMIME_2_4 + tmp = internet_address_list_to_string(message->headers->to_list, TRUE); + g_mime_message_add_recipients_from_string(mime_message, + GMIME_RECIPIENT_TYPE_TO, tmp); +@@ -1921,11 +2094,33 @@ + GMIME_RECIPIENT_TYPE_BCC, tmp); + g_free(tmp); + ++#else /* HAVE_GMIME_2_4 */ ++ recipients = g_mime_message_get_recipients(mime_message, ++ GMIME_RECIPIENT_TYPE_TO); ++ internet_address_list_append(recipients, message->headers->to_list); ++ ++ recipients = g_mime_message_get_recipients(mime_message, ++ GMIME_RECIPIENT_TYPE_CC); ++ internet_address_list_append(recipients, message->headers->cc_list); ++ ++ recipients = g_mime_message_get_recipients(mime_message, ++ GMIME_RECIPIENT_TYPE_BCC); ++ internet_address_list_append(recipients, message->headers->bcc_list); ++ ++#endif /* HAVE_GMIME_2_4 */ + if (message->headers->dispnotify_to) { ++#ifndef HAVE_GMIME_2_4 + tmp = internet_address_to_string(message->headers->dispnotify_to-> + address, TRUE); ++#else /* HAVE_GMIME_2_4 */ ++ tmp = internet_address_list_to_string(message->headers->dispnotify_to, TRUE); ++#endif /* HAVE_GMIME_2_4 */ + if (tmp) { ++#ifndef HAVE_GMIME_2_4 + g_mime_message_add_header(mime_message, ++#else /* HAVE_GMIME_2_4 */ ++ g_mime_object_append_header(GMIME_OBJECT(mime_message), ++#endif /* HAVE_GMIME_2_4 */ + "Disposition-Notification-To", tmp); + g_free(tmp); + } +@@ -1934,14 +2129,22 @@ + for (list = message->headers->user_hdrs; list; list = list->next) { + gchar **pair = list->data; + g_strchug(pair[1]); ++#ifndef HAVE_GMIME_2_4 + g_mime_message_add_header(mime_message, pair[0], pair[1]); ++#else /* HAVE_GMIME_2_4 */ ++ g_mime_object_append_header(GMIME_OBJECT(mime_message), pair[0], pair[1]); ++#endif /* HAVE_GMIME_2_4 */ + #if DEBUG_USER_HEADERS + printf("adding header '%s:%s'\n", pair[0], pair[1]); + #endif + } + + tmp = g_strdup_printf("Balsa %s", VERSION); ++#ifndef HAVE_GMIME_2_4 + g_mime_message_add_header(mime_message, "X-Mailer", tmp); ++#else /* HAVE_GMIME_2_4 */ ++ g_mime_object_append_header(GMIME_OBJECT(mime_message), "X-Mailer", tmp); ++#endif /* HAVE_GMIME_2_4 */ + g_free(tmp); + + message->mime_msg = mime_message; +@@ -1972,7 +2175,11 @@ + gint i; + + for (i = 0; extra_headers[i] && extra_headers[i + 1]; i += 2) ++#ifndef HAVE_GMIME_2_4 + g_mime_message_set_header(message->mime_msg, extra_headers[i], ++#else /* HAVE_GMIME_2_4 */ ++ g_mime_object_set_header(GMIME_OBJECT(message->mime_msg), extra_headers[i], ++#endif /* HAVE_GMIME_2_4 */ + extra_headers[i + 1]); + } + +@@ -2066,11 +2273,17 @@ + static const gchar * + lb_send_from(LibBalsaMessage *message) + { ++#ifndef HAVE_GMIME_2_4 + InternetAddress *ia = message->headers->from->address; ++#else /* HAVE_GMIME_2_4 */ ++ InternetAddress *ia = ++ internet_address_list_get_address(message->headers->from, 0); ++#endif /* HAVE_GMIME_2_4 */ + + if (message->force_key_id) + return message->force_key_id; + ++#ifndef HAVE_GMIME_2_4 + if (ia->type == INTERNET_ADDRESS_NONE) + return NULL; + +@@ -2079,8 +2292,17 @@ + + if (ia->type == INTERNET_ADDRESS_NONE) + return NULL; ++#else /* HAVE_GMIME_2_4 */ ++ while (INTERNET_ADDRESS_IS_GROUP(ia)) ++ ia = internet_address_list_get_address(((InternetAddressGroup *) ++ ia)->members, 0); ++#endif /* HAVE_GMIME_2_4 */ + ++#ifndef HAVE_GMIME_2_4 + return ia->value.addr; ++#else /* HAVE_GMIME_2_4 */ ++ return ((InternetAddressMailbox *) ia)->addr; ++#endif /* HAVE_GMIME_2_4 */ + } + + static LibBalsaMsgCreateResult +@@ -2114,7 +2336,11 @@ + message->headers->cc_list); + encrypt_for = get_mailbox_names(encrypt_for, + message->headers->from); ++#ifndef HAVE_GMIME_2_4 + if (message->headers->bcc_list) ++#else /* HAVE_GMIME_2_4 */ ++ if (internet_address_list_length(message->headers->bcc_list) > 0) ++#endif /* HAVE_GMIME_2_4 */ + libbalsa_information(LIBBALSA_INFORMATION_WARNING, + _("This message will not be encrypted for the BCC: recipient(s).")); + +@@ -2195,7 +2421,11 @@ + message->headers->cc_list); + encrypt_for = g_list_append(encrypt_for, + g_strdup(lb_send_from(message))); ++#ifndef HAVE_GMIME_2_4 + if (message->headers->bcc_list) ++#else /* HAVE_GMIME_2_4 */ ++ if (internet_address_list_length(message->headers->bcc_list) > 0) ++#endif /* HAVE_GMIME_2_4 */ + libbalsa_information(LIBBALSA_INFORMATION_WARNING, + _("This message will not be encrypted for the BCC: recipient(s).")); + +Index: balsa/libbalsa/gmime-stream-gnome-vfs.h +=================================================================== +--- balsa/libbalsa/gmime-stream-gnome-vfs.h (revision 8017) ++++ balsa/libbalsa/gmime-stream-gnome-vfs.h (working copy) +@@ -61,8 +61,13 @@ + + GMimeStream *g_mime_stream_gvfs_new(GnomeVFSHandle * handle); + GMimeStream *g_mime_stream_gvfs_new_with_bounds(GnomeVFSHandle * handle, ++#ifndef HAVE_GMIME_2_4 + off_t start, + off_t end); ++#else /* HAVE_GMIME_2_4 */ ++ gint64 start, ++ gint64 end); ++#endif /* HAVE_GMIME_2_4 */ + + gboolean g_mime_stream_gvfs_get_owner(GMimeStreamGvfs * stream); + void g_mime_stream_gvfs_set_owner(GMimeStreamGvfs * stream, +@@ -136,8 +141,13 @@ + + GMimeStream *g_mime_stream_gvfs_new(GnomeVFSHandle * handle); + GMimeStream *g_mime_stream_gvfs_new_with_bounds(GnomeVFSHandle * handle, ++#ifndef HAVE_GMIME_2_4 + off_t start, + off_t end); ++#else /* HAVE_GMIME_2_4 */ ++ gint64 start, ++ gint64 end); ++#endif /* HAVE_GMIME_2_4 */ + + gboolean g_mime_stream_gvfs_get_owner(GMimeStreamGvfs * stream); + void g_mime_stream_gvfs_set_owner(GMimeStreamGvfs * stream, +@@ -211,8 +221,13 @@ + + GMimeStream *g_mime_stream_gvfs_new(GnomeVFSHandle * handle); + GMimeStream *g_mime_stream_gvfs_new_with_bounds(GnomeVFSHandle * handle, ++#ifndef HAVE_GMIME_2_4 + off_t start, + off_t end); ++#else /* HAVE_GMIME_2_4 */ ++ gint64 start, ++ gint64 end); ++#endif /* HAVE_GMIME_2_4 */ + + gboolean g_mime_stream_gvfs_get_owner(GMimeStreamGvfs * stream); + void g_mime_stream_gvfs_set_owner(GMimeStreamGvfs * stream, +Index: balsa/libbalsa/mailbox_maildir.c +=================================================================== +--- balsa/libbalsa/mailbox_maildir.c (revision 8017) ++++ balsa/libbalsa/mailbox_maildir.c (working copy) +@@ -911,10 +911,19 @@ + return FALSE; + out_stream = g_mime_stream_fs_new(fd); + ++#ifndef HAVE_GMIME_2_4 + in_stream = g_mime_stream_filter_new_with_stream(stream); ++#else /* HAVE_GMIME_2_4 */ ++ in_stream = g_mime_stream_filter_new(stream); ++#endif /* HAVE_GMIME_2_4 */ + crlffilter = ++#ifndef HAVE_GMIME_2_4 + g_mime_filter_crlf_new(GMIME_FILTER_CRLF_DECODE, + GMIME_FILTER_CRLF_MODE_CRLF_ONLY); ++#else /* HAVE_GMIME_2_4 */ ++ g_mime_filter_crlf_new(FALSE, ++ FALSE); ++#endif /* HAVE_GMIME_2_4 */ + g_mime_stream_filter_add(GMIME_STREAM_FILTER(in_stream), crlffilter); + g_object_unref(crlffilter); + +Index: balsa/libbalsa/address-view.c +=================================================================== +--- balsa/libbalsa/address-view.c (revision 8017) ++++ balsa/libbalsa/address-view.c (working copy) +@@ -227,7 +227,11 @@ + if (*prefix) + match = lbav_get_matching_addresses(address_view, prefix, type); + lbav_append_addresses(address_view, completion, match, prefix); ++#ifndef HAVE_GMIME_2_4 + g_list_foreach(match, (GFunc) internet_address_unref, NULL); ++#else /* HAVE_GMIME_2_4 */ ++ g_list_foreach(match, (GFunc) g_object_unref, NULL); ++#endif /* HAVE_GMIME_2_4 */ + g_list_free(match); + } + +@@ -369,10 +373,20 @@ + GtkTreeModel *model = + gtk_tree_view_get_model(GTK_TREE_VIEW(address_view)); + GtkListStore *address_store = GTK_LIST_STORE(model); ++#ifdef HAVE_GMIME_2_4 ++ InternetAddress *ia; ++ gchar *name; ++#endif /* HAVE_GMIME_2_4 */ + guint type; ++#ifndef HAVE_GMIME_2_4 + ++#else /* HAVE_GMIME_2_4 */ ++ int i; ++ ++#endif /* HAVE_GMIME_2_4 */ + gtk_tree_model_get(model, iter, ADDRESS_TYPE_COL, &type, -1); + ++#ifndef HAVE_GMIME_2_4 + while (list) { + InternetAddress *ia = list->address; + +@@ -393,6 +407,25 @@ + } + + if ((list = list->next)) ++#else /* HAVE_GMIME_2_4 */ ++ for (i = 0; i < internet_address_list_length (list); i++) { ++ ia = internet_address_list_get_address (list, i);; ++ name = internet_address_to_string (ia, FALSE); ++ ++ libbalsa_utf8_sanitize(&name, address_view->fallback, NULL); ++ lbav_clean_text(name); ++ ++ gtk_list_store_set(address_store, iter, ++ ADDRESS_TYPE_COL, type, ++ ADDRESS_TYPESTRING_COL, ++ _(lbav_type_string(address_view, type)), ++ ADDRESS_NAME_COL, name, ++ ADDRESS_ICON_COL, lbav_close_icon, ++ -1); ++ g_free(name); ++ ++ if (i + 1 < internet_address_list_length (list)) ++#endif /* HAVE_GMIME_2_4 */ + gtk_list_store_insert_after(address_store, iter, iter); + } + } +@@ -407,12 +440,25 @@ + lbav_add_from_string(LibBalsaAddressView * address_view, + GtkTreeIter * iter, const gchar * string) + { ++#ifndef HAVE_GMIME_2_4 + InternetAddressList *list = internet_address_parse_string(string); ++#else /* HAVE_GMIME_2_4 */ ++ InternetAddressList *list = internet_address_list_parse_string(string); ++ gboolean retval = internet_address_list_length(list) > 0; ++#endif /* HAVE_GMIME_2_4 */ + + lbav_add_from_list(address_view, iter, list); ++#ifndef HAVE_GMIME_2_4 + internet_address_list_destroy(list); ++#else /* HAVE_GMIME_2_4 */ ++ g_object_unref(list); ++#endif /* HAVE_GMIME_2_4 */ + ++#ifndef HAVE_GMIME_2_4 + return list != NULL; ++#else /* HAVE_GMIME_2_4 */ ++ return retval; ++#endif /* HAVE_GMIME_2_4 */ + } + + /* +@@ -533,6 +579,7 @@ + } + } + ++#ifndef HAVE_GMIME_2_4 + /* + * Count addresses in an InternetAddressList + */ +@@ -551,6 +598,7 @@ + } + } + ++#endif /* ! HAVE_GMIME_2_4 */ + /* + * Find an address_type + */ +@@ -765,7 +813,11 @@ + gtk_cell_editable_editing_done(GTK_CELL_EDITABLE(entry)); + g_free(the_addr); + } ++#ifndef HAVE_GMIME_2_4 + g_list_foreach(match, (GFunc) internet_address_unref, NULL); ++#else /* HAVE_GMIME_2_4 */ ++ g_list_foreach(match, (GFunc) g_object_unref, NULL); ++#endif /* HAVE_GMIME_2_4 */ + g_list_free(match); + } + } +@@ -1190,7 +1242,11 @@ + + lbav_remove(address_view, type); + ++#ifndef HAVE_GMIME_2_4 + if (list) { ++#else /* HAVE_GMIME_2_4 */ ++ if (list && internet_address_list_length(list) > 0) { ++#endif /* HAVE_GMIME_2_4 */ + GtkTreeModel *model = + gtk_tree_view_get_model(GTK_TREE_VIEW(address_view)); + GtkListStore *address_store = GTK_LIST_STORE(model); +@@ -1213,28 +1269,47 @@ + gint + libbalsa_address_view_n_addresses(LibBalsaAddressView * address_view) + { ++#ifndef HAVE_GMIME_2_4 + gint addresses; ++#else /* HAVE_GMIME_2_4 */ ++ gint addresses = 0; ++#endif /* HAVE_GMIME_2_4 */ + guint type; + + g_return_val_if_fail(LIBBALSA_IS_ADDRESS_VIEW(address_view), -1); + ++#ifndef HAVE_GMIME_2_4 + addresses = 0; ++#endif /* ! HAVE_GMIME_2_4 */ + for (type = 0; type < address_view->n_types; type++) { + InternetAddressList *list = + libbalsa_address_view_get_list(address_view, + lbav_type_string(address_view, + type)); ++#ifndef HAVE_GMIME_2_4 + lbav_count_addresses_in_list(list, &addresses); + internet_address_list_destroy(list); ++#else /* HAVE_GMIME_2_4 */ ++ addresses += libbalsa_address_n_mailboxes_in_list(list); ++ g_object_unref(list); ++#endif /* HAVE_GMIME_2_4 */ + } + + return addresses; + } + ++#ifndef HAVE_GMIME_2_4 + /* + * Create InternetAddressList corresponding to the view content. + * The list must be destroyed using internet_address_list_destroy(). + */ ++#else /* HAVE_GMIME_2_4 */ ++/* ++ * Create InternetAddressList corresponding to the view content. ++ * The list, which is NULL only on error, must be destroyed using ++ * g_object_unref(). ++ */ ++#endif /* HAVE_GMIME_2_4 */ + InternetAddressList * + libbalsa_address_view_get_list(LibBalsaAddressView * address_view, + const gchar * address_type) +@@ -1252,7 +1327,11 @@ + || type < address_view->n_types, NULL); + + model = gtk_tree_view_get_model(GTK_TREE_VIEW(address_view)); ++#ifndef HAVE_GMIME_2_4 + address_list = NULL; ++#else /* HAVE_GMIME_2_4 */ ++ address_list = internet_address_list_new(); ++#endif /* HAVE_GMIME_2_4 */ + for (valid = gtk_tree_model_get_iter_first(model, &iter); + valid; valid = gtk_tree_model_iter_next(model, &iter)) { + guint this_type; +@@ -1263,6 +1342,7 @@ + ADDRESS_NAME_COL, &name, -1); + + if (this_type == type && name && *name) { ++#ifndef HAVE_GMIME_2_4 + InternetAddressList *l, *tmp_list = + internet_address_parse_string(name); + for (l = tmp_list; l; l = l->next) { +@@ -1272,6 +1352,12 @@ + internet_address_list_append(address_list, ia); + } + internet_address_list_destroy(tmp_list); ++#else /* HAVE_GMIME_2_4 */ ++ InternetAddressList *tmp_list = ++ internet_address_list_parse_string(name); ++ internet_address_list_append(address_list, tmp_list); ++ g_object_unref(tmp_list); ++#endif /* HAVE_GMIME_2_4 */ + } + g_free(name); + } +Index: balsa/libbalsa/gmime-part-rfc2440.c +=================================================================== +--- balsa/libbalsa/gmime-part-rfc2440.c (revision 8017) ++++ balsa/libbalsa/gmime-part-rfc2440.c (working copy) +@@ -40,14 +40,25 @@ + /* try to get the content stream */ + wrapper = g_mime_part_get_content_object(part); + g_return_val_if_fail(wrapper, GMIME_PART_RFC2440_NONE); ++#ifdef HAVE_GMIME_2_4 ++ ++#endif /* HAVE_GMIME_2_4 */ + stream = g_mime_data_wrapper_get_stream(wrapper); ++#ifndef HAVE_GMIME_2_4 + g_object_unref(wrapper); + if (!stream) + return retval; + if ((slen = g_mime_stream_length(stream)) == -1) { + g_object_unref(stream); ++#else /* HAVE_GMIME_2_4 */ ++ if (!stream || (slen = g_mime_stream_length(stream)) < 0) ++#endif /* HAVE_GMIME_2_4 */ + return retval; ++#ifndef HAVE_GMIME_2_4 + } ++#else /* HAVE_GMIME_2_4 */ ++ ++#endif /* HAVE_GMIME_2_4 */ + g_mime_stream_reset(stream); + + /* check if the complete stream fits in the buffer */ +@@ -87,7 +98,9 @@ + } + } + ++#ifndef HAVE_GMIME_2_4 + g_object_unref(stream); ++#endif /* ! HAVE_GMIME_2_4 */ + return retval; + } + +@@ -122,7 +135,9 @@ + wrapper = g_mime_part_get_content_object(part); + g_return_val_if_fail(wrapper, -1); /* Incomplete part. */ + stream = g_mime_data_wrapper_get_stream(wrapper); ++#ifndef HAVE_GMIME_2_4 + g_object_unref(wrapper); ++#endif /* ! HAVE_GMIME_2_4 */ + g_mime_stream_reset(stream); + + /* construct the stream for the crypto output */ +@@ -134,15 +149,25 @@ + ctx->singlepart_mode = TRUE; + if (recipients == NULL) + result = ++#ifndef HAVE_GMIME_2_4 + g_mime_cipher_sign(GMIME_CIPHER_CONTEXT(ctx), sign_userid, ++#else /* HAVE_GMIME_2_4 */ ++ g_mime_cipher_context_sign(GMIME_CIPHER_CONTEXT(ctx), sign_userid, ++#endif /* HAVE_GMIME_2_4 */ + GMIME_CIPHER_HASH_DEFAULT, stream, + cipherstream, err); + else + result = ++#ifndef HAVE_GMIME_2_4 + g_mime_cipher_encrypt(GMIME_CIPHER_CONTEXT(ctx), ++#else /* HAVE_GMIME_2_4 */ ++ g_mime_cipher_context_encrypt(GMIME_CIPHER_CONTEXT(ctx), ++#endif /* HAVE_GMIME_2_4 */ + sign_userid != NULL, sign_userid, + recipients, stream, cipherstream, err); ++#ifndef HAVE_GMIME_2_4 + g_object_unref(stream); ++#endif /* ! HAVE_GMIME_2_4 */ + if (result == -1) { + g_object_unref(cipherstream); + return -1; +@@ -178,15 +203,33 @@ + * and set the charset to us-ascii instead, as gpg added it's own armor. + */ + if (recipients == NULL) { ++#ifndef HAVE_GMIME_2_4 + if (g_mime_part_get_encoding(part) != GMIME_PART_ENCODING_BASE64) + g_mime_part_set_encoding(part, + GMIME_PART_ENCODING_QUOTEDPRINTABLE); ++#else /* HAVE_GMIME_2_4 */ ++ if (g_mime_part_get_content_encoding(part) != GMIME_CONTENT_ENCODING_BASE64) ++ g_mime_part_set_content_encoding(part, ++ GMIME_CONTENT_ENCODING_QUOTEDPRINTABLE); ++#endif /* HAVE_GMIME_2_4 */ + g_mime_data_wrapper_set_encoding(wrapper, ++#ifndef HAVE_GMIME_2_4 + GMIME_PART_ENCODING_DEFAULT); ++#else /* HAVE_GMIME_2_4 */ ++ GMIME_CONTENT_ENCODING_DEFAULT); ++#endif /* HAVE_GMIME_2_4 */ + } else { ++#ifndef HAVE_GMIME_2_4 + g_mime_part_set_encoding(part, GMIME_PART_ENCODING_7BIT); ++#else /* HAVE_GMIME_2_4 */ ++ g_mime_part_set_content_encoding(part, GMIME_CONTENT_ENCODING_7BIT); ++#endif /* HAVE_GMIME_2_4 */ + g_mime_data_wrapper_set_encoding(wrapper, ++#ifndef HAVE_GMIME_2_4 + GMIME_PART_ENCODING_7BIT); ++#else /* HAVE_GMIME_2_4 */ ++ GMIME_CONTENT_ENCODING_7BIT); ++#endif /* HAVE_GMIME_2_4 */ + g_mime_object_set_content_type_parameter(GMIME_OBJECT(part), + "charset", "US-ASCII"); + } +@@ -210,7 +253,11 @@ + g_mime_part_rfc2440_verify(GMimePart * part, + GMimeGpgmeContext * ctx, GError ** err) + { ++#ifndef HAVE_GMIME_2_4 + GMimeStream *stream, *plainstream, *wrapper_stream; ++#else /* HAVE_GMIME_2_4 */ ++ GMimeStream *stream, *plainstream; ++#endif /* HAVE_GMIME_2_4 */ + GMimeDataWrapper * wrapper; + GMimeSignatureValidity *valid; + +@@ -222,12 +269,18 @@ + /* get the raw content */ + wrapper = g_mime_part_get_content_object(GMIME_PART(part)); + g_return_val_if_fail(wrapper, NULL); /* Incomplete part. */ ++#ifndef HAVE_GMIME_2_4 + wrapper_stream = g_mime_data_wrapper_get_stream(wrapper); ++#endif /* ! HAVE_GMIME_2_4 */ + stream = g_mime_stream_mem_new(); + g_mime_data_wrapper_write_to_stream(wrapper, stream); ++#ifndef HAVE_GMIME_2_4 + g_object_unref(wrapper_stream); ++#endif /* ! HAVE_GMIME_2_4 */ + g_mime_stream_reset(stream); ++#ifndef HAVE_GMIME_2_4 + g_object_unref(wrapper); ++#endif /* ! HAVE_GMIME_2_4 */ + + /* construct the stream for the checked output */ + plainstream = g_mime_stream_mem_new(); +@@ -235,10 +288,16 @@ + /* verify the signature */ + ctx->singlepart_mode = TRUE; + valid = ++#ifndef HAVE_GMIME_2_4 + g_mime_cipher_verify(GMIME_CIPHER_CONTEXT(ctx), ++#else /* HAVE_GMIME_2_4 */ ++ g_mime_cipher_context_verify(GMIME_CIPHER_CONTEXT(ctx), ++#endif /* HAVE_GMIME_2_4 */ + GMIME_CIPHER_HASH_DEFAULT, stream, + plainstream, err); ++#ifndef HAVE_GMIME_2_4 + g_object_unref(stream); ++#endif /* ! HAVE_GMIME_2_4 */ + + /* upon success, replace the signed content by the checked one */ + if (valid) { +@@ -263,26 +322,49 @@ + * verified and the result is placed in ctx by the underlying gpgme + * context. + */ ++#ifndef HAVE_GMIME_2_4 + int ++#else /* HAVE_GMIME_2_4 */ ++GMimeSignatureValidity * ++#endif /* HAVE_GMIME_2_4 */ + g_mime_part_rfc2440_decrypt(GMimePart * part, + GMimeGpgmeContext * ctx, GError ** err) + { + GMimeStream *stream, *plainstream; + GMimeDataWrapper * wrapper; ++#ifndef HAVE_GMIME_2_4 + gint result; ++#else /* HAVE_GMIME_2_4 */ ++ GMimeSignatureValidity *result; ++#endif /* HAVE_GMIME_2_4 */ + gchar *headbuf = g_malloc0(1024); + ++#ifndef HAVE_GMIME_2_4 + g_return_val_if_fail(GMIME_IS_PART(part), -1); + g_return_val_if_fail(GMIME_IS_GPGME_CONTEXT(ctx), -1); ++#else /* HAVE_GMIME_2_4 */ ++ g_return_val_if_fail(GMIME_IS_PART(part), NULL); ++ g_return_val_if_fail(GMIME_IS_GPGME_CONTEXT(ctx), NULL); ++#endif /* HAVE_GMIME_2_4 */ + g_return_val_if_fail(GMIME_CIPHER_CONTEXT(ctx)->encrypt_protocol != ++#ifndef HAVE_GMIME_2_4 + NULL, -1); ++#else /* HAVE_GMIME_2_4 */ ++ NULL, NULL); ++#endif /* HAVE_GMIME_2_4 */ + + /* get the raw content */ + wrapper = g_mime_part_get_content_object(part); ++#ifndef HAVE_GMIME_2_4 + g_return_val_if_fail(wrapper, -1); /* Incomplete part. */ ++#else /* HAVE_GMIME_2_4 */ ++ g_return_val_if_fail(wrapper, NULL); /* Incomplete part. */ ++#endif /* HAVE_GMIME_2_4 */ + stream = g_mime_stream_mem_new(); + g_mime_data_wrapper_write_to_stream(wrapper, stream); ++#ifndef HAVE_GMIME_2_4 + g_object_unref(wrapper); ++#endif /* ! HAVE_GMIME_2_4 */ + + g_mime_stream_reset(stream); + g_mime_stream_read(stream, headbuf, 1023); +@@ -293,19 +375,32 @@ + + /* decrypt and (if possible) verify the input */ + result = ++#ifndef HAVE_GMIME_2_4 + g_mime_cipher_decrypt(GMIME_CIPHER_CONTEXT(ctx), stream, ++#else /* HAVE_GMIME_2_4 */ ++ g_mime_cipher_context_decrypt(GMIME_CIPHER_CONTEXT(ctx), stream, ++#endif /* HAVE_GMIME_2_4 */ + plainstream, err); + ++#ifndef HAVE_GMIME_2_4 + if (result == 0) { ++#else /* HAVE_GMIME_2_4 */ ++ if (result != NULL) { ++#endif /* HAVE_GMIME_2_4 */ + GMimeStream *filter_stream; + GMimeStream *out_stream; + GMimeFilter *filter; + GMimeDataWrapper *wrapper = g_mime_data_wrapper_new(); + + /* strip crlf off encrypted stuff coming from Winbloze crap */ ++#ifndef HAVE_GMIME_2_4 + filter_stream = g_mime_stream_filter_new_with_stream(plainstream); + filter = g_mime_filter_crlf_new(GMIME_FILTER_CRLF_DECODE, + GMIME_FILTER_CRLF_MODE_CRLF_ONLY); ++#else /* HAVE_GMIME_2_4 */ ++ filter_stream = g_mime_stream_filter_new(plainstream); ++ filter = g_mime_filter_crlf_new(FALSE, FALSE); ++#endif /* HAVE_GMIME_2_4 */ + g_mime_stream_filter_add(GMIME_STREAM_FILTER(filter_stream), filter); + g_object_unref(filter); + +@@ -313,12 +408,18 @@ + out_stream = g_mime_stream_mem_new(); + g_mime_data_wrapper_set_stream(wrapper, out_stream); + g_mime_part_set_content_object(part, wrapper); ++#ifndef HAVE_GMIME_2_4 + g_object_unref(wrapper); ++#endif /* ! HAVE_GMIME_2_4 */ + g_mime_stream_reset(filter_stream); + g_mime_stream_write_to_stream(filter_stream, out_stream); + g_object_unref(filter_stream); + ++#ifndef HAVE_GMIME_2_4 + g_mime_part_set_encoding(part, GMIME_PART_ENCODING_8BIT); ++#else /* HAVE_GMIME_2_4 */ ++ g_mime_part_set_content_encoding(part, GMIME_CONTENT_ENCODING_8BIT); ++#endif /* HAVE_GMIME_2_4 */ + + /* + * Set the charset of the decrypted content to the RFC 2440 "Charset:" +Index: balsa/libbalsa/gmime-part-rfc2440.h +=================================================================== +--- balsa/libbalsa/gmime-part-rfc2440.h (revision 8017) ++++ balsa/libbalsa/gmime-part-rfc2440.h (working copy) +@@ -56,8 +56,14 @@ + GMimeSignatureValidity *g_mime_part_rfc2440_verify(GMimePart * part, + GMimeGpgmeContext * ctx, + GError ** err); ++#ifndef HAVE_GMIME_2_4 + gint g_mime_part_rfc2440_decrypt(GMimePart * part, + GMimeGpgmeContext * ctx, GError ** err); ++#else /* HAVE_GMIME_2_4 */ ++GMimeSignatureValidity *g_mime_part_rfc2440_decrypt(GMimePart * part, ++ GMimeGpgmeContext * ++ ctx, GError ** err); ++#endif /* HAVE_GMIME_2_4 */ + + #ifdef __cplusplus + } +Index: balsa/libbalsa/address-book-text.c +=================================================================== +--- balsa/libbalsa/address-book-text.c (revision 8017) ++++ balsa/libbalsa/address-book-text.c (working copy) +@@ -246,7 +246,11 @@ + if (!lbab_text_group_addresses || !lbab_text_group_addresses->next) + return; + ++#ifndef HAVE_GMIME_2_4 + ia = internet_address_new_group(group_name); ++#else /* HAVE_GMIME_2_4 */ ++ ia = internet_address_group_new(group_name); ++#endif /* HAVE_GMIME_2_4 */ + for (l = lbab_text_group_addresses; l; l = l->next) { + GList *mailbox; + LibBalsaAddress *address = LIBBALSA_ADDRESS(l->data); +@@ -254,16 +258,27 @@ + for (mailbox = address->address_list; mailbox; + mailbox = mailbox->next) { + InternetAddress *member = ++#ifndef HAVE_GMIME_2_4 + internet_address_new_name(address->full_name, + mailbox->data); + internet_address_add_member(ia, member); + internet_address_unref(member); ++#else /* HAVE_GMIME_2_4 */ ++ internet_address_mailbox_new(address->full_name, ++ mailbox->data); ++ internet_address_group_add_member(ia, member); ++ g_object_unref(member); ++#endif /* HAVE_GMIME_2_4 */ + } + } + g_slist_free(lbab_text_group_addresses); + + cmp_data = completion_data_new(ia, NULL); ++#ifndef HAVE_GMIME_2_4 + internet_address_unref(ia); ++#else /* HAVE_GMIME_2_4 */ ++ g_object_unref(ia); ++#endif /* HAVE_GMIME_2_4 */ + *completion_list = g_list_prepend(*completion_list, cmp_data); + } + #endif /* MAKE_GROUP_BY_ORGANIZATION */ +@@ -352,28 +367,50 @@ + && LIBBALSA_ADDRESS_BOOK(ab_text)->dist_list_mode) { + /* Create a group address. */ + InternetAddress *ia = ++#ifndef HAVE_GMIME_2_4 + internet_address_new_group(address->full_name); ++#else /* HAVE_GMIME_2_4 */ ++ internet_address_group_new(address->full_name); ++#endif /* HAVE_GMIME_2_4 */ + + for (l = address->address_list; l; l = l->next) { + InternetAddress *member = ++#ifndef HAVE_GMIME_2_4 + internet_address_new_name(NULL, l->data); + internet_address_add_member(ia, member); + internet_address_unref(member); ++#else /* HAVE_GMIME_2_4 */ ++ internet_address_mailbox_new(NULL, l->data); ++ internet_address_group_add_member((InternetAddressGroup *)ia, member); ++ g_object_unref(member); ++#endif /* HAVE_GMIME_2_4 */ + } + cmp_data = completion_data_new(ia, address->nick_name); + completion_list = g_list_prepend(completion_list, cmp_data); ++#ifndef HAVE_GMIME_2_4 + internet_address_unref(ia); ++#else /* HAVE_GMIME_2_4 */ ++ g_object_unref(ia); ++#endif /* HAVE_GMIME_2_4 */ + } else { + /* Create name addresses. */ + GList *l; + + for (l = address->address_list; l; l = l->next) { + InternetAddress *ia = ++#ifndef HAVE_GMIME_2_4 + internet_address_new_name(address->full_name, l->data); ++#else /* HAVE_GMIME_2_4 */ ++ internet_address_mailbox_new(address->full_name, l->data); ++#endif /* HAVE_GMIME_2_4 */ + cmp_data = completion_data_new(ia, address->nick_name); + completion_list = + g_list_prepend(completion_list, cmp_data); ++#ifndef HAVE_GMIME_2_4 + internet_address_unref(ia); ++#else /* HAVE_GMIME_2_4 */ ++ g_object_unref(ia); ++#endif /* HAVE_GMIME_2_4 */ + } + } + +@@ -728,7 +765,11 @@ + g_completion_complete(ab_text->name_complete, (gchar *) prefix, + new_prefix); list; list = list->next) { + InternetAddress *ia = ((CompletionData *) list->data)->ia; ++#ifndef HAVE_GMIME_2_4 + internet_address_ref(ia); ++#else /* HAVE_GMIME_2_4 */ ++ g_object_ref(ia); ++#endif /* HAVE_GMIME_2_4 */ + res = g_list_prepend(res, ia); + } + +Index: balsa/libbalsa/mailbox_imap.c +=================================================================== +--- balsa/libbalsa/mailbox_imap.c (revision 8017) ++++ balsa/libbalsa/mailbox_imap.c (working copy) +@@ -1798,10 +1798,13 @@ + if (!addr || (addr->name==NULL && addr->addr_spec==NULL)) + return NULL; + ++#ifndef HAVE_GMIME_2_4 + address = internet_address_new(); + ++#endif /* ! HAVE_GMIME_2_4 */ + /* it will be owned by the caller */ + ++#ifndef HAVE_GMIME_2_4 + if (addr->name) { + gchar *tmp = + #if HAVE_GMIME_2_2_5 +@@ -1812,7 +1815,9 @@ + internet_address_set_name(address, tmp); + g_free(tmp); + } ++#endif /* ! HAVE_GMIME_2_4 */ + if (addr->addr_spec) { ++#ifndef HAVE_GMIME_2_4 + gchar *tmp = + #if HAVE_GMIME_2_2_5 + g_mime_utils_header_decode_text(addr->addr_spec); +@@ -1821,16 +1826,42 @@ + #endif /* HAVE_GMIME_2_2_5 */ + internet_address_set_addr(address, tmp); + g_free(tmp); ++#else /* HAVE_GMIME_2_4 */ ++ gchar *tmp = g_mime_utils_header_decode_text(addr->addr_spec); ++ address = internet_address_mailbox_new(NULL, tmp); ++ g_free(tmp); ++ if (addr->name) { ++ tmp = g_mime_utils_header_decode_text(addr->name); ++ internet_address_set_name(address, tmp); ++ g_free(tmp); ++ } ++#endif /* HAVE_GMIME_2_4 */ + } else { + /* Begin group */ ++#ifndef HAVE_GMIME_2_4 + internet_address_set_group + (address, ++#else /* HAVE_GMIME_2_4 */ ++ gchar *tmp = g_mime_utils_header_decode_text(addr->name); ++ address = internet_address_group_new(tmp); ++ g_free(tmp); ++ ++ internet_address_group_set_members ++ (INTERNET_ADDRESS_GROUP(address), ++#endif /* HAVE_GMIME_2_4 */ + internet_address_new_list_from_imap_address_list(addr->next)); + /* Skip to end of group */ ++#ifndef HAVE_GMIME_2_4 + while (addr->next && (addr->name || addr->addr_spec)) ++#else /* HAVE_GMIME_2_4 */ ++ while (addr && addr->addr_spec) ++#endif /* HAVE_GMIME_2_4 */ + addr = addr->next; + *list = addr; + } ++#ifdef HAVE_GMIME_2_4 ++ ++#endif /* HAVE_GMIME_2_4 */ + return address; + } + +@@ -1838,13 +1869,22 @@ + internet_address_new_list_from_imap_address_list(ImapAddress *list) + { + InternetAddress *addr; ++#ifndef HAVE_GMIME_2_4 + InternetAddressList *res = NULL; ++#else /* HAVE_GMIME_2_4 */ ++ InternetAddressList *res = internet_address_list_new(); ++#endif /* HAVE_GMIME_2_4 */ + + for (; list; list = list->next) { + addr = internet_address_new_from_imap_address(&list); + if (addr) { ++#ifndef HAVE_GMIME_2_4 + res = internet_address_list_append(res, addr); + internet_address_unref(addr); ++#else /* HAVE_GMIME_2_4 */ ++ internet_address_list_add(res, addr); ++ g_object_unref(addr); ++#endif /* HAVE_GMIME_2_4 */ + } + } + return res; +@@ -1867,13 +1907,19 @@ + internet_address_new_list_from_imap_address_list(envelope->bcc); + + if(is_embedded) { ++#ifndef HAVE_GMIME_2_4 ++#if HAVE_GMIME_2_2_5 + headers->subject = +-#if HAVE_GMIME_2_2_5 + g_mime_utils_header_decode_text(envelope->subject); + #else /* HAVE_GMIME_2_2_5 */ ++ headers->subject = + g_mime_utils_header_decode_text((unsigned char *) envelope-> + subject); + #endif /* HAVE_GMIME_2_2_5 */ ++#else /* ! HAVE_GMIME_2_4 */ ++ headers->subject = ++ g_mime_utils_header_decode_text(envelope->subject); ++#endif /* ! HAVE_GMIME_2_4 */ + libbalsa_utf8_sanitize(&headers->subject, TRUE, NULL); + } + } +@@ -1991,12 +2037,18 @@ + str = imap_body_get_dsp_param(imap_body, "filename"); + if(!str) str = imap_body_get_param(imap_body, "name"); + if(str) { ++#ifndef HAVE_GMIME_2_4 ++#if HAVE_GMIME_2_2_5 + lbbody->filename = +-#if HAVE_GMIME_2_2_5 + g_mime_utils_header_decode_text(str); + #else /* HAVE_GMIME_2_2_5 */ ++ lbbody->filename = + g_mime_utils_header_decode_text((unsigned char *) str); + #endif /* HAVE_GMIME_2_2_5 */ ++#else /* ! HAVE_GMIME_2_4 */ ++ lbbody->filename = ++ g_mime_utils_header_decode_text(str); ++#endif /* ! HAVE_GMIME_2_4 */ + libbalsa_utf8_sanitize(&lbbody->filename, TRUE, NULL); + } + lbbody->charset = g_strdup(imap_body_get_param(imap_body, "charset")); +@@ -2038,11 +2090,19 @@ + return FALSE; + + stream = g_mime_stream_fs_new(fd); ++#ifndef HAVE_GMIME_2_4 + fstream = g_mime_stream_filter_new_with_stream(stream); ++#else /* HAVE_GMIME_2_4 */ ++ fstream = g_mime_stream_filter_new(stream); ++#endif /* HAVE_GMIME_2_4 */ + g_object_unref(stream); + ++#ifndef HAVE_GMIME_2_4 + filter = g_mime_filter_crlf_new(GMIME_FILTER_CRLF_DECODE, + GMIME_FILTER_CRLF_MODE_CRLF_ONLY); ++#else /* HAVE_GMIME_2_4 */ ++ filter = g_mime_filter_crlf_new(FALSE, FALSE); ++#endif /* HAVE_GMIME_2_4 */ + g_mime_stream_filter_add(GMIME_STREAM_FILTER(fstream), filter); + g_object_unref(filter); + +@@ -2442,7 +2502,11 @@ + part->mime_part = GMIME_OBJECT(g_mime_multipart_new()); + g_mime_object_set_content_type(part->mime_part, type); + } else { ++#ifndef HAVE_GMIME_2_4 + g_mime_content_type_destroy(type); ++#else /* HAVE_GMIME_2_4 */ ++ g_object_unref(type); ++#endif /* HAVE_GMIME_2_4 */ + if (!lbm_imap_get_msg_part_from_cache(msg, part, err)) + return FALSE; + } +@@ -2451,8 +2515,13 @@ + if (parent_part) { + /* GMime will unref and so will we. */ + g_object_ref(part->mime_part); ++#ifndef HAVE_GMIME_2_4 + g_mime_multipart_add_part(GMIME_MULTIPART(parent_part), + part->mime_part); ++#else /* HAVE_GMIME_2_4 */ ++ g_mime_multipart_add(GMIME_MULTIPART(parent_part), ++ part->mime_part); ++#endif /* HAVE_GMIME_2_4 */ + } + + if (GMIME_IS_MULTIPART_SIGNED(part->mime_part) +@@ -2581,11 +2650,20 @@ + if (flags & LIBBALSA_MESSAGE_FLAG_REPLIED) + IMSG_FLAG_SET(imap_flags, IMSGF_ANSWERED); + ++#ifndef HAVE_GMIME_2_4 + tmpstream = g_mime_stream_filter_new_with_stream(stream); ++#else /* HAVE_GMIME_2_4 */ ++ tmpstream = g_mime_stream_filter_new(stream); ++#endif /* HAVE_GMIME_2_4 */ + + crlffilter = ++#ifndef HAVE_GMIME_2_4 + g_mime_filter_crlf_new(GMIME_FILTER_CRLF_ENCODE, + GMIME_FILTER_CRLF_MODE_CRLF_ONLY); ++#else /* HAVE_GMIME_2_4 */ ++ g_mime_filter_crlf_new(TRUE, ++ FALSE); ++#endif /* HAVE_GMIME_2_4 */ + g_mime_stream_filter_add(GMIME_STREAM_FILTER(tmpstream), crlffilter); + g_object_unref(crlffilter); + +@@ -2706,11 +2784,20 @@ + if (flags & LIBBALSA_MESSAGE_FLAG_REPLIED) + IMSG_FLAG_SET(imap_flags, IMSGF_ANSWERED); + ++#ifndef HAVE_GMIME_2_4 + tmpstream = g_mime_stream_filter_new_with_stream(stream); ++#else /* HAVE_GMIME_2_4 */ ++ tmpstream = g_mime_stream_filter_new(stream); ++#endif /* HAVE_GMIME_2_4 */ + + crlffilter = ++#ifndef HAVE_GMIME_2_4 + g_mime_filter_crlf_new(GMIME_FILTER_CRLF_ENCODE, + GMIME_FILTER_CRLF_MODE_CRLF_ONLY); ++#else /* HAVE_GMIME_2_4 */ ++ g_mime_filter_crlf_new(TRUE, ++ FALSE); ++#endif /* HAVE_GMIME_2_4 */ + g_mime_stream_filter_add(GMIME_STREAM_FILTER(tmpstream), crlffilter); + g_object_unref(crlffilter); + +Index: balsa/libbalsa/mailbox_local.c +=================================================================== +--- balsa/libbalsa/mailbox_local.c (revision 8017) ++++ balsa/libbalsa/mailbox_local.c (working copy) +@@ -1035,8 +1035,18 @@ + info->message_id = g_strdup(message->message_id); + info->refs_for_threading = + libbalsa_message_refs_for_threading(message); ++#ifndef HAVE_GMIME_2_4 + info->sender = + internet_address_list_to_string(message->headers->from, FALSE); ++#else /* HAVE_GMIME_2_4 */ ++ ++ info->sender = NULL; ++ if (message->headers->from) ++ info->sender = ++ internet_address_list_to_string(message->headers->from, FALSE); ++ if (!info->sender) ++ info->sender = g_strdup(""); ++#endif /* HAVE_GMIME_2_4 */ + } + + void +Index: balsa/libbalsa/libbalsa.c +=================================================================== +--- balsa/libbalsa/libbalsa.c (revision 8017) ++++ libbalsa/libbalsa.c (working copy) +@@ -627,7 +627,16 @@ + libbalsa_abort_on_timeout(const char *host) + { /* It appears not to be entirely thread safe... Some locks do not + get released as they should be. */ ++#ifndef HAVE_GMIME_2_4 + return libbalsa_ask(ask_timeout_real, (void*)host) != 0; ++#else /* HAVE_GMIME_2_4 */ ++ char *hostname; ++ ++ hostname = g_alloca (strlen (host) + 1); ++ strcpy (hostname, host); ++ ++ return libbalsa_ask(ask_timeout_real, hostname) != 0; ++#endif /* HAVE_GMIME_2_4 */ + } + + +@@ -834,9 +843,17 @@ + GtkWidget *image = NULL; + + stream = g_mime_stream_mem_new(); ++#ifndef HAVE_GMIME_2_4 + stream_filter = g_mime_stream_filter_new_with_stream(stream); ++#else /* HAVE_GMIME_2_4 */ ++ stream_filter = g_mime_stream_filter_new(stream); ++#endif /* HAVE_GMIME_2_4 */ + ++#ifndef HAVE_GMIME_2_4 + filter = g_mime_filter_basic_new_type(GMIME_FILTER_BASIC_BASE64_DEC); ++#else /* HAVE_GMIME_2_4 */ ++ filter = g_mime_filter_basic_new(GMIME_CONTENT_ENCODING_BASE64, FALSE); ++#endif /* HAVE_GMIME_2_4 */ + g_mime_stream_filter_add(GMIME_STREAM_FILTER(stream_filter), filter); + g_object_unref(filter); + +Index: balsa/libbalsa/address.c +=================================================================== +--- balsa/libbalsa/address.c (revision 8017) ++++ balsa/libbalsa/address.c (working copy) +@@ -207,14 +207,22 @@ + gint len = strlen(str); + gchar * newstr = g_malloc0(len + 1); + int state = 0; ++#ifndef HAVE_GMIME_2_4 + #if HAVE_GMIME_2_2_5 + guint32 save; + #else /* HAVE_GMIME_2_2_5 */ + int save; + #endif /* HAVE_GMIME_2_2_5 */ ++#else /* ! HAVE_GMIME_2_4 */ ++ guint32 save; ++#endif /* ! HAVE_GMIME_2_4 */ + + /* qp decode the input string */ ++#ifndef HAVE_GMIME_2_4 + g_mime_utils_quoted_decode_step((unsigned char *) str, len, ++#else /* HAVE_GMIME_2_4 */ ++ g_mime_encoding_quoted_decode_step((unsigned char *) str, len, ++#endif /* HAVE_GMIME_2_4 */ + (unsigned char *) newstr, &state, &save); + + /* free input and return new string */ +@@ -232,7 +240,11 @@ + guint32 save; + + /* base64 decode the input string */ ++#ifndef HAVE_GMIME_2_4 + g_mime_utils_base64_decode_step((unsigned char *) str, len, ++#else /* HAVE_GMIME_2_4 */ ++ g_mime_encoding_base64_decode_step((unsigned char *) str, len, ++#endif /* HAVE_GMIME_2_4 */ + (unsigned char *) newstr, &state, &save); + + /* free input and return new string */ +@@ -553,9 +565,17 @@ + InternetAddress *ia; + gchar *new_str; + ++#ifndef HAVE_GMIME_2_4 + ia = internet_address_new_name(full_name, address); ++#else /* HAVE_GMIME_2_4 */ ++ ia = internet_address_mailbox_new(full_name, address); ++#endif /* HAVE_GMIME_2_4 */ + new_str = internet_address_to_string(ia, FALSE); ++#ifndef HAVE_GMIME_2_4 + internet_address_unref(ia); ++#else /* HAVE_GMIME_2_4 */ ++ g_object_unref(ia); ++#endif /* HAVE_GMIME_2_4 */ + + return new_str; + } +@@ -566,16 +586,30 @@ + InternetAddress *ia; + gchar *res; + ++#ifndef HAVE_GMIME_2_4 + ia = internet_address_new_group(full_name); ++#else /* HAVE_GMIME_2_4 */ ++ ia = internet_address_group_new(full_name); ++#endif /* HAVE_GMIME_2_4 */ + for (; addr_list; addr_list = addr_list->next) { + InternetAddress *member; + ++#ifndef HAVE_GMIME_2_4 + member = internet_address_new_name(NULL, addr_list->data); + internet_address_add_member(ia, member); + internet_address_unref(member); ++#else /* HAVE_GMIME_2_4 */ ++ member = internet_address_mailbox_new(NULL, addr_list->data); ++ internet_address_group_add_member(INTERNET_ADDRESS_GROUP(ia), member); ++ g_object_unref(member); ++#endif /* HAVE_GMIME_2_4 */ + } + res = internet_address_to_string(ia, FALSE); ++#ifndef HAVE_GMIME_2_4 + internet_address_unref(ia); ++#else /* HAVE_GMIME_2_4 */ ++ g_object_unref(ia); ++#endif /* HAVE_GMIME_2_4 */ + + return res; + } +@@ -613,24 +647,51 @@ + + /* Helper */ + static const gchar * ++#ifndef HAVE_GMIME_2_4 + lba_get_name_or_mailbox(const InternetAddressList * address_list, ++#else /* HAVE_GMIME_2_4 */ ++lba_get_name_or_mailbox(InternetAddressList * address_list, ++#endif /* HAVE_GMIME_2_4 */ + gboolean get_name, gboolean in_group) + { + const gchar *retval = NULL; ++#ifdef HAVE_GMIME_2_4 ++ InternetAddress *ia; ++ gint i, len; ++ ++ if (address_list == NULL) ++ return NULL; ++#endif /* HAVE_GMIME_2_4 */ + ++#ifndef HAVE_GMIME_2_4 + for (; address_list; address_list = address_list->next) { + InternetAddress *ia = address_list->address; ++#else /* HAVE_GMIME_2_4 */ ++ len = internet_address_list_length(address_list); ++ for (i = 0; i < len; i++) { ++ ia = internet_address_list_get_address (address_list, i); ++#endif /* HAVE_GMIME_2_4 */ + + if (get_name && ia->name && *ia->name) + return ia->name; + ++#ifndef HAVE_GMIME_2_4 + if (ia->type == INTERNET_ADDRESS_NAME) + retval = ia->value.addr; + else if (ia->type == INTERNET_ADDRESS_GROUP) { ++#else /* HAVE_GMIME_2_4 */ ++ if (INTERNET_ADDRESS_IS_MAILBOX (ia)) ++ retval = INTERNET_ADDRESS_MAILBOX (ia)->addr; ++ else { ++#endif /* HAVE_GMIME_2_4 */ + if (in_group) + g_message("Ignoring nested group address"); + else ++#ifndef HAVE_GMIME_2_4 + retval = lba_get_name_or_mailbox(ia->value.members, ++#else /* HAVE_GMIME_2_4 */ ++ retval = lba_get_name_or_mailbox(INTERNET_ADDRESS_GROUP(ia)->members, ++#endif /* HAVE_GMIME_2_4 */ + get_name, TRUE); + } + if (retval) +@@ -642,20 +703,54 @@ + + /* Get either a name or a mailbox from an InternetAddressList. */ + const gchar * ++#ifndef HAVE_GMIME_2_4 + libbalsa_address_get_name_from_list(const InternetAddressList * + address_list) ++#else /* HAVE_GMIME_2_4 */ ++libbalsa_address_get_name_from_list(InternetAddressList *address_list) ++#endif /* HAVE_GMIME_2_4 */ + { + return lba_get_name_or_mailbox(address_list, TRUE, FALSE); + } + + /* Get a mailbox from an InternetAddressList. */ + const gchar * ++#ifndef HAVE_GMIME_2_4 + libbalsa_address_get_mailbox_from_list(const InternetAddressList * + address_list) ++#else /* HAVE_GMIME_2_4 */ ++libbalsa_address_get_mailbox_from_list(InternetAddressList *address_list) ++#endif /* HAVE_GMIME_2_4 */ + { + return lba_get_name_or_mailbox(address_list, FALSE, FALSE); + } + ++#ifdef HAVE_GMIME_2_4 ++/* Number of individual mailboxes in an InternetAddressList. */ ++gint ++libbalsa_address_n_mailboxes_in_list(InternetAddressList * address_list) ++{ ++ gint i, len, n_mailboxes = 0; ++ ++ g_return_val_if_fail(IS_INTERNET_ADDRESS_LIST(address_list), -1); ++ ++ len = internet_address_list_length(address_list); ++ for (i = 0; i < len; i++) { ++ const InternetAddress *ia = ++ internet_address_list_get_address(address_list, i); ++ ++ if (INTERNET_ADDRESS_IS_MAILBOX(ia)) ++ ++n_mailboxes; ++ else ++ n_mailboxes += ++ libbalsa_address_n_mailboxes_in_list(INTERNET_ADDRESS_GROUP ++ (ia)->members); ++ } ++ ++ return n_mailboxes; ++} ++ ++#endif /* HAVE_GMIME_2_4 */ + /* =================================================================== */ + /* UI PART */ + /* =================================================================== */ +Index: balsa/libbalsa/address.h +=================================================================== +--- balsa/libbalsa/address.h (revision 8017) ++++ balsa/libbalsa/address.h (working copy) +@@ -95,11 +95,23 @@ + void libbalsa_address_set_copy(LibBalsaAddress *dest, LibBalsaAddress *src); + gchar *libbalsa_address_to_gchar(LibBalsaAddress * address, gint n); + ++#ifndef HAVE_GMIME_2_4 + const gchar *libbalsa_address_get_name_from_list(const InternetAddressList ++#else /* HAVE_GMIME_2_4 */ ++const gchar *libbalsa_address_get_name_from_list(InternetAddressList ++#endif /* HAVE_GMIME_2_4 */ + * address_list); ++#ifndef HAVE_GMIME_2_4 + const gchar *libbalsa_address_get_mailbox_from_list(const + InternetAddressList * ++#else /* HAVE_GMIME_2_4 */ ++const gchar *libbalsa_address_get_mailbox_from_list(InternetAddressList * ++#endif /* HAVE_GMIME_2_4 */ + address_list); ++#ifdef HAVE_GMIME_2_4 ++gint libbalsa_address_n_mailboxes_in_list(InternetAddressList * ++ address_list); ++#endif /* HAVE_GMIME_2_4 */ + + /* =================================================================== */ + /* UI PART */ +Index: balsa/libbalsa/html.c +=================================================================== +--- balsa/libbalsa/html.c (revision 8017) ++++ balsa/libbalsa/html.c (working copy) +@@ -789,7 +789,11 @@ + array = g_byte_array_new(); + g_mime_stream_mem_set_byte_array(GMIME_STREAM_MEM(stream), array); + ++#ifndef HAVE_GMIME_2_4 + filter_stream = g_mime_stream_filter_new_with_stream(stream); ++#else /* HAVE_GMIME_2_4 */ ++ filter_stream = g_mime_stream_filter_new(stream); ++#endif /* HAVE_GMIME_2_4 */ + g_object_unref(stream); + + filter = g_mime_filter_enriched_new(flags); +Index: balsa/libbalsa/address-book-extern.c +=================================================================== +--- balsa/libbalsa/address-book-extern.c (revision 8017) ++++ balsa/libbalsa/address-book-extern.c (working copy) +@@ -369,7 +369,11 @@ + if(!name || !*name) + name = _("No-Name"); + *res = g_list_prepend(*res, ++#ifndef HAVE_GMIME_2_4 + internet_address_new_name(name, email)); ++#else /* HAVE_GMIME_2_4 */ ++ internet_address_mailbox_new(name, email)); ++#endif /* HAVE_GMIME_2_4 */ + } + } + +Index: balsa/libbalsa/gmime-application-pkcs7.c +=================================================================== +--- balsa/libbalsa/gmime-application-pkcs7.c (revision 8017) ++++ balsa/libbalsa/gmime-application-pkcs7.c (working copy) +@@ -19,9 +19,7 @@ + * 02111-1307, USA. + */ + +-#ifdef HAVE_CONFIG_H + #include +-#endif + + #include + +@@ -50,7 +48,11 @@ + static void + sign_prepare (GMimeObject *mime_part) + { ++#ifndef HAVE_GMIME_2_4 + GMimePartEncodingType encoding; ++#else /* HAVE_GMIME_2_4 */ ++ GMimeContentEncoding encoding; ++#endif /* HAVE_GMIME_2_4 */ + GMimeObject *subpart; + + if (GMIME_IS_MULTIPART (mime_part)) { +@@ -71,11 +73,21 @@ + subpart = GMIME_MESSAGE_PART (mime_part)->message->mime_part; + sign_prepare (subpart); + } else { ++#ifndef HAVE_GMIME_2_4 + encoding = g_mime_part_get_encoding (GMIME_PART (mime_part)); ++#else /* HAVE_GMIME_2_4 */ ++ encoding = g_mime_part_get_content_encoding (GMIME_PART (mime_part)); ++#endif /* HAVE_GMIME_2_4 */ + ++#ifndef HAVE_GMIME_2_4 + if (encoding != GMIME_PART_ENCODING_BASE64) + g_mime_part_set_encoding (GMIME_PART (mime_part), + GMIME_PART_ENCODING_QUOTEDPRINTABLE); ++#else /* HAVE_GMIME_2_4 */ ++ if (encoding != GMIME_CONTENT_ENCODING_BASE64) ++ g_mime_part_set_content_encoding (GMIME_PART (mime_part), ++ GMIME_CONTENT_ENCODING_QUOTEDPRINTABLE); ++#endif /* HAVE_GMIME_2_4 */ + } + } + +@@ -105,7 +117,11 @@ + + /* get the cleartext */ + stream = g_mime_stream_mem_new (); ++#ifndef HAVE_GMIME_2_4 + filtered_stream = g_mime_stream_filter_new_with_stream (stream); ++#else /* HAVE_GMIME_2_4 */ ++ filtered_stream = g_mime_stream_filter_new (stream); ++#endif /* HAVE_GMIME_2_4 */ + + /* See RFC 2633, Sect. 3.1- the following op's are "SHOULD", so we do it */ + from_filter = g_mime_filter_from_new (GMIME_FILTER_FROM_MODE_ARMOR); +@@ -117,9 +133,15 @@ + g_object_unref (filtered_stream); + g_mime_stream_reset (stream); + ++#ifndef HAVE_GMIME_2_4 + filtered_stream = g_mime_stream_filter_new_with_stream (stream); + crlf_filter = g_mime_filter_crlf_new (GMIME_FILTER_CRLF_ENCODE, + GMIME_FILTER_CRLF_MODE_CRLF_ONLY); ++#else /* HAVE_GMIME_2_4 */ ++ filtered_stream = g_mime_stream_filter_new (stream); ++ crlf_filter = g_mime_filter_crlf_new (TRUE, ++ FALSE); ++#endif /* HAVE_GMIME_2_4 */ + g_mime_stream_filter_add (GMIME_STREAM_FILTER (filtered_stream), crlf_filter); + g_object_unref (crlf_filter); + +@@ -127,7 +149,11 @@ + sig_data_stream = g_mime_stream_mem_new (); + + /* get the signed content */ ++#ifndef HAVE_GMIME_2_4 + if (g_mime_cipher_sign (ctx, userid, GMIME_CIPHER_HASH_DEFAULT, filtered_stream, sig_data_stream, err) == -1) { ++#else /* HAVE_GMIME_2_4 */ ++ if (g_mime_cipher_context_sign (ctx, userid, GMIME_CIPHER_HASH_DEFAULT, filtered_stream, sig_data_stream, err) == -1) { ++#endif /* HAVE_GMIME_2_4 */ + g_object_unref (filtered_stream); + g_object_unref (sig_data_stream); + g_object_unref (stream); +@@ -144,8 +170,13 @@ + g_object_unref(sig_data_stream); + g_mime_part_set_content_object(GMIME_PART(pkcs7), wrapper); + g_mime_part_set_filename(GMIME_PART(pkcs7), "smime.p7m"); ++#ifndef HAVE_GMIME_2_4 + g_mime_part_set_encoding(GMIME_PART(pkcs7), + GMIME_PART_ENCODING_BASE64); ++#else /* HAVE_GMIME_2_4 */ ++ g_mime_part_set_content_encoding(GMIME_PART(pkcs7), ++ GMIME_CONTENT_ENCODING_BASE64); ++#endif /* HAVE_GMIME_2_4 */ + g_object_unref(wrapper); + + /* set the content-type params for this part */ +@@ -198,18 +229,30 @@ + ciphertext = g_mime_stream_mem_new (); + g_mime_data_wrapper_write_to_stream (wrapper, ciphertext); + g_mime_stream_reset(ciphertext); ++#ifndef HAVE_GMIME_2_4 + g_object_unref(wrapper); ++#endif /* ! HAVE_GMIME_2_4 */ + + stream = g_mime_stream_mem_new(); ++#ifndef HAVE_GMIME_2_4 + filtered_stream = g_mime_stream_filter_new_with_stream(stream); + crlf_filter = g_mime_filter_crlf_new(GMIME_FILTER_CRLF_DECODE, + GMIME_FILTER_CRLF_MODE_CRLF_ONLY); ++#else /* HAVE_GMIME_2_4 */ ++ filtered_stream = g_mime_stream_filter_new(stream); ++ crlf_filter = g_mime_filter_crlf_new(FALSE, ++ FALSE); ++#endif /* HAVE_GMIME_2_4 */ + g_mime_stream_filter_add(GMIME_STREAM_FILTER(filtered_stream), + crlf_filter); + g_object_unref(crlf_filter); + + /* get the cleartext */ ++#ifndef HAVE_GMIME_2_4 + *validity = g_mime_cipher_verify(ctx, GMIME_CIPHER_HASH_DEFAULT, ++#else /* HAVE_GMIME_2_4 */ ++ *validity = g_mime_cipher_context_verify(ctx, GMIME_CIPHER_HASH_DEFAULT, ++#endif /* HAVE_GMIME_2_4 */ + ciphertext, filtered_stream, err); + if (!*validity) { + g_object_unref(filtered_stream); +@@ -264,10 +307,19 @@ + + /* get the cleartext */ + stream = g_mime_stream_mem_new (); ++#ifndef HAVE_GMIME_2_4 + filtered_stream = g_mime_stream_filter_new_with_stream (stream); ++#else /* HAVE_GMIME_2_4 */ ++ filtered_stream = g_mime_stream_filter_new (stream); ++#endif /* HAVE_GMIME_2_4 */ + ++#ifndef HAVE_GMIME_2_4 + crlf_filter = g_mime_filter_crlf_new (GMIME_FILTER_CRLF_ENCODE, + GMIME_FILTER_CRLF_MODE_CRLF_ONLY); ++#else /* HAVE_GMIME_2_4 */ ++ crlf_filter = g_mime_filter_crlf_new (TRUE, ++ FALSE); ++#endif /* HAVE_GMIME_2_4 */ + g_mime_stream_filter_add (GMIME_STREAM_FILTER (filtered_stream), crlf_filter); + g_object_unref (crlf_filter); + +@@ -280,7 +332,11 @@ + + /* encrypt the content stream */ + ciphertext = g_mime_stream_mem_new (); ++#ifndef HAVE_GMIME_2_4 + if (g_mime_cipher_encrypt (ctx, FALSE, NULL, recipients, stream, ciphertext, err) == -1) { ++#else /* HAVE_GMIME_2_4 */ ++ if (g_mime_cipher_context_encrypt (ctx, FALSE, NULL, recipients, stream, ciphertext, err) == -1) { ++#endif /* HAVE_GMIME_2_4 */ + g_object_unref (ciphertext); + g_object_unref (stream); + return -1; +@@ -295,7 +351,11 @@ + g_object_unref(ciphertext); + g_mime_part_set_content_object(GMIME_PART(pkcs7), wrapper); + g_mime_part_set_filename(GMIME_PART(pkcs7), "smime.p7m"); ++#ifndef HAVE_GMIME_2_4 + g_mime_part_set_encoding(GMIME_PART(pkcs7), GMIME_PART_ENCODING_BASE64); ++#else /* HAVE_GMIME_2_4 */ ++ g_mime_part_set_content_encoding(GMIME_PART(pkcs7), GMIME_CONTENT_ENCODING_BASE64); ++#endif /* HAVE_GMIME_2_4 */ + g_object_unref(wrapper); + + /* set the content-type params for this part */ +@@ -344,18 +404,30 @@ + ciphertext = g_mime_stream_mem_new(); + g_mime_data_wrapper_write_to_stream (wrapper, ciphertext); + g_mime_stream_reset(ciphertext); ++#ifndef HAVE_GMIME_2_4 + g_object_unref(wrapper); ++#endif /* ! HAVE_GMIME_2_4 */ + + stream = g_mime_stream_mem_new(); ++#ifndef HAVE_GMIME_2_4 + filtered_stream = g_mime_stream_filter_new_with_stream(stream); + crlf_filter = g_mime_filter_crlf_new(GMIME_FILTER_CRLF_DECODE, + GMIME_FILTER_CRLF_MODE_CRLF_ONLY); ++#else /* HAVE_GMIME_2_4 */ ++ filtered_stream = g_mime_stream_filter_new(stream); ++ crlf_filter = g_mime_filter_crlf_new(FALSE, ++ FALSE); ++#endif /* HAVE_GMIME_2_4 */ + g_mime_stream_filter_add(GMIME_STREAM_FILTER(filtered_stream), + crlf_filter); + g_object_unref(crlf_filter); + + /* get the cleartext */ ++#ifndef HAVE_GMIME_2_4 + if (g_mime_cipher_decrypt(ctx, ciphertext, filtered_stream, err) == -1) { ++#else /* HAVE_GMIME_2_4 */ ++ if (g_mime_cipher_context_decrypt(ctx, ciphertext, filtered_stream, err) == NULL) { ++#endif /* HAVE_GMIME_2_4 */ + g_object_unref(filtered_stream); + g_object_unref(ciphertext); + g_object_unref(stream); +Index: balsa/libbalsa/identity.c +=================================================================== +--- balsa/libbalsa/identity.c (revision 8017) ++++ balsa/libbalsa/identity.c (working copy) +@@ -98,7 +98,11 @@ + libbalsa_identity_init(LibBalsaIdentity* ident) + { + ident->identity_name = NULL; ++#ifndef HAVE_GMIME_2_4 + ident->ia = internet_address_new(); ++#else /* HAVE_GMIME_2_4 */ ++ ident->ia = NULL; ++#endif /* HAVE_GMIME_2_4 */ + ident->replyto = NULL; + ident->domain = NULL; + ident->bcc = NULL; +@@ -135,7 +139,12 @@ + { + LibBalsaIdentity *ident = LIBBALSA_IDENTITY(object); + ++#ifndef HAVE_GMIME_2_4 + internet_address_unref(ident->ia); ++#else /* HAVE_GMIME_2_4 */ ++ if (ident->ia) ++ g_object_unref(ident->ia); ++#endif /* HAVE_GMIME_2_4 */ + g_free(ident->identity_name); + g_free(ident->replyto); + g_free(ident->domain); +@@ -203,7 +212,12 @@ + { + g_return_if_fail(ident != NULL); + ++#ifndef HAVE_GMIME_2_4 + internet_address_unref(ident->ia); ++#else /* HAVE_GMIME_2_4 */ ++ if (ident->ia) ++ g_object_unref(ident->ia); ++#endif /* HAVE_GMIME_2_4 */ + ident->ia = ia; + } + +@@ -1469,16 +1483,31 @@ + g_free(id->identity_name); id->identity_name = text; + set_identity_name_in_tree(GTK_TREE_VIEW(tree), id, text); + ++#ifndef HAVE_GMIME_2_4 + text = ident_dialog_get_text(dlg, "identity-fullname"); + g_return_val_if_fail(text != NULL, FALSE); + ia = internet_address_new(); + internet_address_set_name(ia, text); + g_free(text); + ++#endif /* ! HAVE_GMIME_2_4 */ + text = ident_dialog_get_text(dlg, "identity-address"); ++#ifndef HAVE_GMIME_2_4 + internet_address_set_addr(ia, text); ++#else /* HAVE_GMIME_2_4 */ ++ g_return_val_if_fail(text != NULL, FALSE); ++ ia = internet_address_mailbox_new(NULL, text); ++#endif /* HAVE_GMIME_2_4 */ + g_free(text); ++#ifdef HAVE_GMIME_2_4 ++ ++ text = ident_dialog_get_text(dlg, "identity-fullname"); ++ internet_address_set_name(ia, text); ++#endif /* HAVE_GMIME_2_4 */ + libbalsa_identity_set_address(id, ia); ++#ifdef HAVE_GMIME_2_4 ++ g_free(text); ++#endif /* HAVE_GMIME_2_4 */ + + g_free(id->replyto); + id->replyto = ident_dialog_get_text(dlg, "identity-replyto"); +@@ -1850,10 +1879,19 @@ + + ident_dialog_update(dialog); + display_frame_set_field(dialog, "identity-name", ident->identity_name); ++#ifndef HAVE_GMIME_2_4 + display_frame_set_field(dialog, "identity-fullname", ident->ia->name); + if (ident->ia->type == INTERNET_ADDRESS_NAME) ++#else /* HAVE_GMIME_2_4 */ ++ display_frame_set_field(dialog, "identity-fullname", ident->ia ? ident->ia->name : NULL); ++ if (ident->ia && INTERNET_ADDRESS_IS_MAILBOX (ident->ia)) ++#endif /* HAVE_GMIME_2_4 */ + display_frame_set_field(dialog, "identity-address", ++#ifndef HAVE_GMIME_2_4 + ident->ia->value.addr); ++#else /* HAVE_GMIME_2_4 */ ++ INTERNET_ADDRESS_MAILBOX(ident->ia)->addr); ++#endif /* HAVE_GMIME_2_4 */ + else + display_frame_set_field(dialog, "identity-address", NULL); + +@@ -1964,9 +2002,18 @@ + libbalsa_identity_new_config(const gchar* name) + { + LibBalsaIdentity* ident; ++#ifdef HAVE_GMIME_2_4 ++ gchar *fname, *email; ++#endif /* HAVE_GMIME_2_4 */ + gchar* tmpstr; + ++#ifdef HAVE_GMIME_2_4 ++ fname = libbalsa_conf_get_string("FullName"); ++ email = libbalsa_conf_get_string("Address"); ++ ++#endif /* HAVE_GMIME_2_4 */ + ident = LIBBALSA_IDENTITY(libbalsa_identity_new_with_name(name)); ++#ifndef HAVE_GMIME_2_4 + + tmpstr = libbalsa_conf_get_string("FullName"); + internet_address_set_name(ident->ia, tmpstr); +@@ -1975,6 +2022,11 @@ + tmpstr = libbalsa_conf_get_string("Address"); + internet_address_set_addr(ident->ia, tmpstr); + g_free(tmpstr); ++#else /* HAVE_GMIME_2_4 */ ++ ident->ia = internet_address_mailbox_new (fname, email); ++ g_free(fname); ++ g_free(email); ++#endif /* HAVE_GMIME_2_4 */ + + ident->replyto = libbalsa_conf_get_string("ReplyTo"); + ident->domain = libbalsa_conf_get_string("Domain"); +@@ -2025,10 +2077,19 @@ + g_return_if_fail(ident); + + libbalsa_conf_push_group(group); ++#ifndef HAVE_GMIME_2_4 + libbalsa_conf_set_string("FullName", ident->ia->name); ++#else /* HAVE_GMIME_2_4 */ ++ libbalsa_conf_set_string("FullName", ident->ia ? ident->ia->name : NULL); ++#endif /* HAVE_GMIME_2_4 */ + ++#ifndef HAVE_GMIME_2_4 + if (ident->ia->type == INTERNET_ADDRESS_NAME) + libbalsa_conf_set_string("Address", ident->ia->value.addr); ++#else /* HAVE_GMIME_2_4 */ ++ if (ident->ia && INTERNET_ADDRESS_IS_MAILBOX (ident->ia)) ++ libbalsa_conf_set_string("Address", INTERNET_ADDRESS_MAILBOX(ident->ia)->addr); ++#endif /* HAVE_GMIME_2_4 */ + + libbalsa_conf_set_string("ReplyTo", ident->replyto); + libbalsa_conf_set_string("Domain", ident->domain); +Index: balsa/libbalsa/mailbox.c +=================================================================== +--- balsa/libbalsa/mailbox.c (revision 8017) ++++ balsa/libbalsa/mailbox.c (working copy) +@@ -285,29 +285,94 @@ + static gchar* + get_from_field(LibBalsaMessage *message) + { ++#ifndef HAVE_GMIME_2_4 + gboolean append_dots = FALSE; ++#else /* HAVE_GMIME_2_4 */ ++ InternetAddressList *address_list = NULL; ++#endif /* HAVE_GMIME_2_4 */ + const gchar *name_str = NULL; ++#ifdef HAVE_GMIME_2_4 ++ gboolean append_dots = FALSE; ++#endif /* HAVE_GMIME_2_4 */ + gchar *from; ++#ifndef HAVE_GMIME_2_4 + const InternetAddressList *address_list = NULL; ++#endif /* ! HAVE_GMIME_2_4 */ + + g_return_val_if_fail(message->mailbox, NULL); ++#ifndef HAVE_GMIME_2_4 + if (message->mailbox->view && + message->mailbox->view->show == LB_MAILBOX_SHOW_TO) { + if (message->headers && message->headers->to_list) { ++#else /* HAVE_GMIME_2_4 */ ++ ++ if (message->headers) { ++ if (message->mailbox->view && ++ message->mailbox->view->show == LB_MAILBOX_SHOW_TO) ++#endif /* HAVE_GMIME_2_4 */ + address_list = message->headers->to_list; ++#ifndef HAVE_GMIME_2_4 + append_dots = internet_address_list_length(address_list) > 1; + } + } else { + if (message->headers && message->headers->from) ++#else /* HAVE_GMIME_2_4 */ ++ else ++#endif /* HAVE_GMIME_2_4 */ + address_list = message->headers->from; + } ++#ifndef HAVE_GMIME_2_4 + name_str = libbalsa_address_get_name_from_list(address_list); + if(!name_str) /* !addy, or addy contained no name/address */ ++#else /* HAVE_GMIME_2_4 */ ++ ++ if (address_list) { ++ gint i, len = internet_address_list_length(address_list); ++ ++ for (i = 0; i < len && name_str == NULL; i++) { ++ InternetAddress *ia = ++ internet_address_list_get_address(address_list, i); ++ if (ia->name && *ia->name) { ++ name_str = ia->name; ++ if (i < len - 1) ++ append_dots = TRUE; ++ } else if (INTERNET_ADDRESS_IS_MAILBOX(ia)) { ++ name_str = ((InternetAddressMailbox *) ia)->addr; ++ if (i < len - 1) ++ append_dots = TRUE; ++ } else { ++ InternetAddressGroup *g = (InternetAddressGroup *) ia; ++ gint gi, glen = ++ internet_address_list_length(g->members); ++ for (gi = 0; gi < glen && name_str == NULL; gi++) { ++ InternetAddress *ia2 = ++ internet_address_list_get_address(g->members, gi); ++ if (ia2->name && *ia2->name) { ++ name_str = ia2->name; ++ if (gi < glen - 1) ++ append_dots = TRUE; ++ } else if (INTERNET_ADDRESS_IS_MAILBOX(ia2)) { ++ name_str = ((InternetAddressMailbox *) ia2)->addr; ++ if (gi < glen - 1) ++ append_dots = TRUE; ++ } ++ } ++ } ++ } ++ } ++ ++ if (name_str == NULL) ++#endif /* HAVE_GMIME_2_4 */ + name_str = ""; ++#ifndef HAVE_GMIME_2_4 + ++#endif /* ! HAVE_GMIME_2_4 */ + from = append_dots ? g_strconcat(name_str, ",...", NULL) + : g_strdup(name_str); + libbalsa_utf8_sanitize(&from, TRUE, NULL); ++#ifdef HAVE_GMIME_2_4 ++ ++#endif /* HAVE_GMIME_2_4 */ + return from; + } + +@@ -2130,7 +2195,11 @@ + libbalsa_mailbox_view_free(LibBalsaMailboxView * view) + { + if (view->mailing_list_address) ++#ifndef HAVE_GMIME_2_4 + internet_address_list_destroy(view->mailing_list_address); ++#else /* HAVE_GMIME_2_4 */ ++ g_object_unref(view->mailing_list_address); ++#endif /* HAVE_GMIME_2_4 */ + g_free(view->identity_name); + g_free(view); + } +@@ -3789,7 +3858,12 @@ + * message. */ + + static void ++#ifndef HAVE_GMIME_2_4 + lbm_try_reassemble_func(GMimeObject * mime_part, gpointer data) ++#else /* HAVE_GMIME_2_4 */ ++lbm_try_reassemble_func(GMimeObject * parent, GMimeObject * mime_part, ++ gpointer data) ++#endif /* HAVE_GMIME_2_4 */ + { + if (GMIME_IS_MESSAGE_PART(mime_part)) + mime_part = ((GMimeMessagePart *) mime_part)->message->mime_part; +@@ -3877,7 +3951,9 @@ + partial = NULL; + g_mime_multipart_foreach((GMimeMultipart *) + mime_message->mime_part, ++#ifndef HAVE_GMIME_2_4 + (GMimePartFunc) ++#endif /* ! HAVE_GMIME_2_4 */ + lbm_try_reassemble_func, &partial); + if (partial + && strcmp(g_mime_message_partial_get_id(partial), id) == 0) { +Index: balsa/libbalsa/misc.c +=================================================================== +--- balsa/libbalsa/misc.c (revision 8017) ++++ balsa/libbalsa/misc.c (working copy) +@@ -490,16 +490,25 @@ + libbalsa_set_fallback_codeset(LibBalsaCodeset codeset) + { + LibBalsaCodeset ret = sanitize_fallback_codeset; ++#ifndef HAVE_GMIME_2_4 + #if defined(HAVE_GMIME_2_2_7) ++#endif /* ! HAVE_GMIME_2_4 */ + const gchar *charsets[] = { ++#ifndef HAVE_GMIME_2_4 + g_strdup("UTF-8"), + g_strdup(libbalsa_get_codeset_name(NULL, codeset)), ++#else /* HAVE_GMIME_2_4 */ ++ "UTF-8", ++ libbalsa_get_codeset_name(NULL, codeset), ++#endif /* HAVE_GMIME_2_4 */ + NULL + }; + + g_mime_set_user_charsets(charsets); ++#ifndef HAVE_GMIME_2_4 + /* GMime will free the strings. */ + #endif /* HAVE_GMIME_2_2_7 */ ++#endif /* ! HAVE_GMIME_2_4 */ + + sanitize_fallback_codeset = codeset; + return ret; +@@ -1066,23 +1075,46 @@ + const InternetAddress * b) + { + const gchar *a_atptr, *b_atptr; ++#ifdef HAVE_GMIME_2_4 ++ const gchar *a_addr, *b_addr; ++#endif /* HAVE_GMIME_2_4 */ + gint a_atpos, b_atpos; + ++#ifndef HAVE_GMIME_2_4 + if (!a || !b || a->type != INTERNET_ADDRESS_NAME || + b->type != INTERNET_ADDRESS_NAME) ++#else /* HAVE_GMIME_2_4 */ ++ if (!INTERNET_ADDRESS_IS_MAILBOX(a) || !INTERNET_ADDRESS_IS_MAILBOX(b)) ++#endif /* HAVE_GMIME_2_4 */ + return FALSE; + + /* first find the "@" in the two addresses */ ++#ifndef HAVE_GMIME_2_4 + a_atptr = strchr(a->value.addr, '@'); + b_atptr = strchr(b->value.addr, '@'); ++#else /* HAVE_GMIME_2_4 */ ++ a_addr = INTERNET_ADDRESS_MAILBOX(a)->addr; ++ b_addr = INTERNET_ADDRESS_MAILBOX(b)->addr; ++ a_atptr = strchr(a_addr, '@'); ++ b_atptr = strchr(b_addr, '@'); ++#endif /* HAVE_GMIME_2_4 */ + if (!a_atptr || !b_atptr) + return FALSE; ++#ifndef HAVE_GMIME_2_4 + a_atpos = a_atptr - a->value.addr; + b_atpos = b_atptr - b->value.addr; ++#else /* HAVE_GMIME_2_4 */ ++ a_atpos = a_atptr - a_addr; ++ b_atpos = b_atptr - b_addr; ++#endif /* HAVE_GMIME_2_4 */ + + /* now compare the strings */ + if (!a_atpos || !b_atpos || a_atpos != b_atpos || ++#ifndef HAVE_GMIME_2_4 + strncmp(a->value.addr, b->value.addr, a_atpos) || ++#else /* HAVE_GMIME_2_4 */ ++ strncmp(a_addr, b_addr, a_atpos) || ++#endif /* HAVE_GMIME_2_4 */ + g_ascii_strcasecmp(a_atptr, b_atptr)) + return FALSE; + else +Index: balsa/libbalsa/body.c +=================================================================== +--- balsa/libbalsa/body.c (revision 8017) ++++ balsa/libbalsa/body.c (working copy) +@@ -114,11 +114,15 @@ + subj = g_mime_message_get_subject(msg); + if (subj) { + ehdr->subject = ++#ifndef HAVE_GMIME_2_4 + #if HAVE_GMIME_2_2_5 + g_mime_utils_header_decode_text(subj); + #else + g_mime_utils_header_decode_text((const unsigned char *) subj); + #endif ++#else /* ! HAVE_GMIME_2_4 */ ++ g_mime_utils_header_decode_text(subj); ++#endif /* ! HAVE_GMIME_2_4 */ + libbalsa_utf8_sanitize(&ehdr->subject, TRUE, NULL); + } else + ehdr->subject = g_strdup(_("(No subject)")); +@@ -147,7 +151,11 @@ + static void + libbalsa_message_body_set_types(LibBalsaMessageBody * body) + { ++#ifndef HAVE_GMIME_2_4 + const GMimeContentType *type; ++#else /* HAVE_GMIME_2_4 */ ++ GMimeContentType *type; ++#endif /* HAVE_GMIME_2_4 */ + + type = g_mime_object_get_content_type(body->mime_part); + if (g_mime_content_type_is_type(type, "audio", "*")) +@@ -191,7 +199,9 @@ + *next_part = libbalsa_message_body_new(body->message); + libbalsa_message_body_set_mime_body(*next_part, + embedded_message->mime_part); ++#ifndef HAVE_GMIME_2_4 + g_object_unref(embedded_message); ++#endif /* ! HAVE_GMIME_2_4 */ + } + + return *next_part ? &(*next_part)->next : next_part; +@@ -201,13 +211,27 @@ + libbalsa_message_body_set_multipart(LibBalsaMessageBody * body, + LibBalsaMessageBody ** next_part) + { ++#ifndef HAVE_GMIME_2_4 + GList *child; + + for (child = GMIME_MULTIPART(body->mime_part)->subparts; child; + child = child->next) { ++#else /* HAVE_GMIME_2_4 */ ++ GMimeMultipart *multipart = GMIME_MULTIPART(body->mime_part); ++ GMimeObject *part; ++ int count, i; ++ ++ count = g_mime_multipart_get_count (multipart); ++ for (i = 0; i < count; i++) { ++ part = g_mime_multipart_get_part (multipart, i); ++#endif /* HAVE_GMIME_2_4 */ + if (!*next_part) + *next_part = libbalsa_message_body_new(body->message); ++#ifndef HAVE_GMIME_2_4 + libbalsa_message_body_set_mime_body(*next_part, child->data); ++#else /* HAVE_GMIME_2_4 */ ++ libbalsa_message_body_set_mime_body(*next_part, part); ++#endif /* HAVE_GMIME_2_4 */ + next_part = &(*next_part)->next; + } + +@@ -261,19 +285,34 @@ + libbalsa_message_body_get_parameter(LibBalsaMessageBody * body, + const gchar * param) + { ++#ifdef HAVE_GMIME_2_4 ++ GMimeContentType *type; ++#endif /* HAVE_GMIME_2_4 */ + gchar *res = NULL; + + g_return_val_if_fail(body != NULL, NULL); + + if (body->mime_part) { ++#ifndef HAVE_GMIME_2_4 + const GMimeContentType *type = + g_mime_object_get_content_type(body->mime_part); ++#else /* HAVE_GMIME_2_4 */ ++ type = g_mime_object_get_content_type(body->mime_part); ++#endif /* HAVE_GMIME_2_4 */ + res = g_strdup(g_mime_content_type_get_parameter(type, param)); + } else if (body->content_type) { ++#ifndef HAVE_GMIME_2_4 + GMimeContentType *type = + g_mime_content_type_new_from_string(body->content_type); ++#else /* HAVE_GMIME_2_4 */ ++ type = g_mime_content_type_new_from_string(body->content_type); ++#endif /* HAVE_GMIME_2_4 */ + res = g_strdup(g_mime_content_type_get_parameter(type, param)); ++#ifndef HAVE_GMIME_2_4 + g_mime_content_type_destroy(type); ++#else /* HAVE_GMIME_2_4 */ ++ g_object_unref(type); ++#endif /* HAVE_GMIME_2_4 */ + } + + return res; +@@ -416,7 +455,11 @@ + { + if (!GMIME_IS_STREAM_FILTER(stream)) { + GMimeStream *filtered_stream = ++#ifndef HAVE_GMIME_2_4 + g_mime_stream_filter_new_with_stream(stream); ++#else /* HAVE_GMIME_2_4 */ ++ g_mime_stream_filter_new(stream); ++#endif /* HAVE_GMIME_2_4 */ + g_object_unref(stream); + stream = filtered_stream; + } +@@ -449,27 +496,58 @@ + g_mime_part_get_content_object(GMIME_PART(body->mime_part)); + if(!wrapper) /* part is incomplete. */ + return NULL; ++#ifndef HAVE_GMIME_2_4 + stream = g_mime_data_wrapper_get_stream(wrapper); ++#else /* HAVE_GMIME_2_4 */ ++ stream = g_object_ref(g_mime_data_wrapper_get_stream(wrapper)); ++#endif /* HAVE_GMIME_2_4 */ + encoding = g_mime_data_wrapper_get_encoding(wrapper); ++#ifndef HAVE_GMIME_2_4 + g_object_unref(wrapper); ++#endif /* ! HAVE_GMIME_2_4 */ + + switch (encoding) { ++#ifndef HAVE_GMIME_2_4 + case GMIME_PART_ENCODING_BASE64: ++#else /* HAVE_GMIME_2_4 */ ++ case GMIME_CONTENT_ENCODING_BASE64: ++#endif /* HAVE_GMIME_2_4 */ + filter = ++#ifndef HAVE_GMIME_2_4 + g_mime_filter_basic_new_type + (GMIME_FILTER_BASIC_BASE64_DEC); ++#else /* HAVE_GMIME_2_4 */ ++ g_mime_filter_basic_new ++ (GMIME_CONTENT_ENCODING_BASE64, FALSE); ++#endif /* HAVE_GMIME_2_4 */ + stream = + libbalsa_message_body_stream_add_filter(stream, filter); + break; ++#ifndef HAVE_GMIME_2_4 + case GMIME_PART_ENCODING_QUOTEDPRINTABLE: ++#else /* HAVE_GMIME_2_4 */ ++ case GMIME_CONTENT_ENCODING_QUOTEDPRINTABLE: ++#endif /* HAVE_GMIME_2_4 */ + filter = ++#ifndef HAVE_GMIME_2_4 + g_mime_filter_basic_new_type(GMIME_FILTER_BASIC_QP_DEC); ++#else /* HAVE_GMIME_2_4 */ ++ g_mime_filter_basic_new(GMIME_CONTENT_ENCODING_QUOTEDPRINTABLE, FALSE); ++#endif /* HAVE_GMIME_2_4 */ + stream = + libbalsa_message_body_stream_add_filter(stream, filter); + break; ++#ifndef HAVE_GMIME_2_4 + case GMIME_PART_ENCODING_UUENCODE: ++#else /* HAVE_GMIME_2_4 */ ++ case GMIME_CONTENT_ENCODING_UUENCODE: ++#endif /* HAVE_GMIME_2_4 */ + filter = ++#ifndef HAVE_GMIME_2_4 + g_mime_filter_basic_new_type(GMIME_FILTER_BASIC_UU_DEC); ++#else /* HAVE_GMIME_2_4 */ ++ g_mime_filter_basic_new(GMIME_CONTENT_ENCODING_UUENCODE, FALSE); ++#endif /* HAVE_GMIME_2_4 */ + stream = + libbalsa_message_body_stream_add_filter(stream, filter); + break; +@@ -493,7 +571,11 @@ + GMimeFilter *filter_windows; + + stream_null = g_mime_stream_null_new(); ++#ifndef HAVE_GMIME_2_4 + stream_filter = g_mime_stream_filter_new_with_stream(stream_null); ++#else /* HAVE_GMIME_2_4 */ ++ stream_filter = g_mime_stream_filter_new(stream_null); ++#endif /* HAVE_GMIME_2_4 */ + g_object_unref(stream_null); + + filter_windows = g_mime_filter_windows_new(charset); +@@ -622,13 +704,21 @@ + + if (!GMIME_IS_STREAM_FILTER(stream)) { + GMimeStream *stream_filter = ++#ifndef HAVE_GMIME_2_4 + g_mime_stream_filter_new_with_stream(stream); ++#else /* HAVE_GMIME_2_4 */ ++ g_mime_stream_filter_new(stream); ++#endif /* HAVE_GMIME_2_4 */ + g_object_unref(stream); + stream = stream_filter; + } + ++#ifndef HAVE_GMIME_2_4 + filter = g_mime_filter_crlf_new(GMIME_FILTER_CRLF_DECODE, + GMIME_FILTER_CRLF_MODE_CRLF_ONLY); ++#else /* HAVE_GMIME_2_4 */ ++ filter = g_mime_filter_crlf_new(FALSE, FALSE); ++#endif /* HAVE_GMIME_2_4 */ + g_mime_stream_filter_add(GMIME_STREAM_FILTER(stream), filter); + g_object_unref(filter); + } +--- balsa/libbalsa/body.c 2009-01-19 12:14:59.000000000 +0100 ++++ balsa/libbalsa/body.c 2009-01-19 12:30:07.000000000 +0100 +@@ -483,7 +483,11 @@ + + if (body->message->mailbox) { + GMimeDataWrapper *wrapper; ++#ifndef HAVE_GMIME_2_4 + GMimePartEncodingType encoding; ++#else /* HAVE_GMIME_2_4 */ ++ GMimeContentEncoding encoding; ++#endif /* HAVE_GMIME_2_4 */ + if(!libbalsa_mailbox_get_message_part(body->message, body, err)) + return NULL; + +--- balsa-2.3.27/libbalsa/address-book-gpe.c 2008-11-01 21:12:19.000000000 +0100 ++++ balsa-2.3.27/libbalsa/address-book-gpe.c 2009-01-19 12:53:29.000000000 +0100 +@@ -729,7 +729,12 @@ + if(!a->full_name) + a->full_name = create_name(a->first_name, a->last_name); + for(l=a->address_list; l; l = l->next) { +- ia = internet_address_new_name(a->full_name, l->data); ++#ifndef HAVE_GMIME_2_4 ++ ia = internet_address_new_name(a->full_name, l->data); ++#else /* HAVE_GMIME_2_4 */ ++ ia = internet_address_mailbox_new(a->full_name, l->data); ++#endif /* HAVE_GMIME_2_4 */ ++ + gc->res = g_list_prepend(gc->res, ia); + } + if(gc->new_prefix && !*gc->new_prefix) + From priyank at frugalware.org Mon Jan 19 20:32:43 2009 From: priyank at frugalware.org (Priyank) Date: Mon Jan 19 20:32:44 2009 Subject: [Frugalware-git] gservice: silenced compiler warnings Message-ID: <20090119193243.0E60211B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gservice.git;a=commitdiff;h=e3b1d1448eb0a3ecd349c26c0468cc7ebf8eb87d commit e3b1d1448eb0a3ecd349c26c0468cc7ebf8eb87d Author: Priyank Date: Tue Jan 20 01:02:33 2009 +0530 silenced compiler warnings diff --git a/src/gservice-backend.c b/src/gservice-backend.c index c659d7f..d3c1492 100644 --- a/src/gservice-backend.c +++ b/src/gservice-backend.c @@ -375,9 +375,6 @@ gint gsvc_service_get_status (const char *name) { gchar *cmd = NULL; - FILE *pp = NULL; - char line[PATH_MAX+1]; - char *tmp = NULL; gint ret; gint status = -1; diff --git a/src/gservice-backend.h b/src/gservice-backend.h index 66b9016..01b2752 100644 --- a/src/gservice-backend.h +++ b/src/gservice-backend.h @@ -18,7 +18,7 @@ typedef struct _gservice_entry_t } gservice_entry_t; /* returns a list of services */ -GList *gsvc_get_service_list (void); +GList *gsvc_service_get_list (void); /* converts a list of strings to a single string */ /* returned string should be freed */ diff --git a/src/gservice-interface.c b/src/gservice-interface.c index e5616a2..bbe3675 100644 --- a/src/gservice-interface.c +++ b/src/gservice-interface.c @@ -21,6 +21,7 @@ #include "gservice-interface.h" #include "gservice-backend.h" #include "gservice-config.h" +#include "gservice-messages.h" #include "gservice-icon-mapping.h" #include "gservice-about.h" @@ -156,7 +157,7 @@ gservice_setup_treeview (void) renderer = gtk_cell_renderer_text_new (); g_object_set (G_OBJECT(renderer), "wrap-mode", PANGO_WRAP_CHAR, NULL); g_object_set (G_OBJECT(renderer), "wrap-width", 380, NULL); - gtk_cell_renderer_text_set_fixed_height_from_font (renderer, 5); + gtk_cell_renderer_text_set_fixed_height_from_font ((GtkCellRendererText*)renderer, 5); column = gtk_tree_view_column_new_with_attributes (_("Service"), renderer, "markup", 2, @@ -198,9 +199,7 @@ gservice_populate_services (void) GdkPixbuf *pixbuf_off = NULL; GdkPixbuf *pixbuf_inactive = NULL; gboolean show_inactive = TRUE; - gboolean hide = FALSE; GtkTreeIter iter; - gservice_entry_t *e = NULL; /* if a list already exists, free it */ /* @@ -482,7 +481,6 @@ cb_gsvc_button_start_clicked (GtkButton *button, gpointer data) { GtkTreeSelection *selection = NULL; GtkTreeModel *model = NULL; - GtkListStore *store = NULL; GtkTreeIter iter; selection = gtk_tree_view_get_selection (GTK_TREE_VIEW(gsvc_treeview_services)); @@ -536,7 +534,6 @@ cb_gsvc_button_stop_clicked (GtkButton *button, gpointer data) { GtkTreeSelection *selection = NULL; GtkTreeModel *model = NULL; - GtkListStore *store = NULL; GtkTreeIter iter; selection = gtk_tree_view_get_selection (GTK_TREE_VIEW(gsvc_treeview_services)); @@ -583,7 +580,6 @@ cb_gsvc_button_activate_clicked (GtkButton *button, gpointer data) { GtkTreeSelection *selection = NULL; GtkTreeModel *model = NULL; - GtkListStore *store = NULL; GtkTreeIter iter; selection = gtk_tree_view_get_selection (GTK_TREE_VIEW(gsvc_treeview_services)); @@ -635,7 +631,6 @@ cb_gsvc_button_deactivate_clicked (GtkButton *button, gpointer data) { GtkTreeSelection *selection = NULL; GtkTreeModel *model = NULL; - GtkListStore *store = NULL; GtkTreeIter iter; selection = gtk_tree_view_get_selection (GTK_TREE_VIEW(gsvc_treeview_services)); diff --git a/src/gservice-messages.h b/src/gservice-messages.h index 86da9bf..fbd73d2 100644 --- a/src/gservice-messages.h +++ b/src/gservice-messages.h @@ -19,5 +19,7 @@ gint gsvc_question (const char *); char * gsvc_input (const char *, const char *, int *); +gboolean gsvc_warning_special (const char *message); + #endif From bouleetbil at frogdev.info Mon Jan 19 20:41:38 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Mon Jan 19 20:41:39 2009 Subject: [Frugalware-git] frugalware-current: gnumeric-1.8.4-1-i686 Message-ID: <20090119194138.CB6BF11B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=90f98cb27f93e407585d1270d58d305c446c1308 commit 90f98cb27f93e407585d1270d58d305c446c1308 Author: bouleetbil Date: Mon Jan 19 20:34:09 2009 +0100 gnumeric-1.8.4-1-i686 *version bump diff --git a/source/gnome-extra/gnumeric/FrugalBuild b/source/gnome-extra/gnumeric/FrugalBuild index a77ce20..7a62754 100644 --- a/source/gnome-extra/gnumeric/FrugalBuild +++ b/source/gnome-extra/gnumeric/FrugalBuild @@ -2,11 +2,11 @@ # Maintainer: bouleetbil pkgname=gnumeric -pkgver=1.8.3 +pkgver=1.8.4 pkgrel=1 pkgdesc="The GNOME spreadsheet" url="http://www.gnome.org/projects/gnumeric/" -depends=('libgnomedb>=2.99.5' 'libgda>=2.99.5' 'libgsf-gnome' 'desktop-file-utils' 'goffice>=0.5.4') +depends=('libgnomedb>=3.1.2' 'libgda>=3.1.4' 'libgsf-gnome' 'desktop-file-utils' 'goffice>=0.6.4-1') makedepends=('intltool' 'pygtk' 'rarian' 'pkgconfig') groups=('gnome-extra') archs=('i686' 'x86_64') @@ -16,6 +16,6 @@ _F_gnome_schemas=('/etc/gconf/schemas/gnumeric-dialogs.schemas' _F_gnome_scrollkeeper="y" _F_gnome_desktop="y" Finclude gnome gnome-scriptlet -sha1sums=('5a6585549bd705bf1d0e590981c3ef38173f8c08') +sha1sums=('2d765b0d06509e0695c4d3ec96b94f8acba88735') # optimization OK From bouleetbil at frogdev.info Mon Jan 19 20:43:52 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Mon Jan 19 20:43:54 2009 Subject: [Frugalware-git] frugalware-current: perl-gstreamer-0.14-1-i686 Message-ID: <20090119194352.BC34A11B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=432575f57547d1977c9602258e281f38a57e738e commit 432575f57547d1977c9602258e281f38a57e738e Author: bouleetbil Date: Mon Jan 19 20:37:46 2009 +0100 perl-gstreamer-0.14-1-i686 *version bump diff --git a/source/xlib-extra/perl-gstreamer/FrugalBuild b/source/xlib-extra/perl-gstreamer/FrugalBuild index b1c893e..c5a167e 100644 --- a/source/xlib-extra/perl-gstreamer/FrugalBuild +++ b/source/xlib-extra/perl-gstreamer/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: bouleetbil pkgname=perl-gstreamer -pkgver=0.13 +pkgver=0.14 pkgrel=1 pkgdesc="Perl bindings for GStreamer" url="http://search.cpan.org/~tsch/" @@ -13,4 +13,4 @@ _F_perl_author=T/TS/TSCH Finclude perl groups=('xlib-extra') archs=('i686' 'x86_64' 'ppc') -sha1sums=('9f671fc8ed925f7910fd4828eb69b7cf4a7720f8') +sha1sums=('1a1d7ed89b2ca7f9b584ec7c51e534a165aaf38f') From bouleetbil at frogdev.info Mon Jan 19 20:45:58 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Mon Jan 19 20:46:00 2009 Subject: [Frugalware-git] frugalware-current: solfege-3.12.1-1-i686 Message-ID: <20090119194558.5A48C11B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f64b272de34514d363874335ed91ec83266a34a0 commit f64b272de34514d363874335ed91ec83266a34a0 Author: bouleetbil Date: Mon Jan 19 20:39:36 2009 +0100 solfege-3.12.1-1-i686 *version bump diff --git a/source/xapps-extra/solfege/FrugalBuild b/source/xapps-extra/solfege/FrugalBuild index d0abe7f..7b63741 100644 --- a/source/xapps-extra/solfege/FrugalBuild +++ b/source/xapps-extra/solfege/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: bouleetbil pkgname=solfege -pkgver=3.12.0 +pkgver=3.12.1 pkgrel=1 pkgdesc="GNU Solfege is a computer program written to help you practice ear training" depends=('pygtk' 'timidity++' 'lame' 'python-mpd' 'libtimidity') @@ -14,7 +14,7 @@ _F_sourceforge_realname="$pkgname stable" Finclude sourceforge gnome-scriptlet source=($source disableman.diff) url="http://www.solfege.org" -sha1sums=('832387388f03715de2a8c8fca184e516670809da' \ +sha1sums=('54fec6fd5e2bd2a7fa24bd6eba59c56dc3a8f14f' \ '135e455dce66ce1e9fd79b8ce314336ea20f6e5c') # optimization OK From bouleetbil at frogdev.info Mon Jan 19 20:47:21 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Mon Jan 19 20:47:22 2009 Subject: [Frugalware-git] frugalware-current: vala-0.5.6-1-i686 Message-ID: <20090119194721.343E611B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d76f4b6f2e7af29b7f3320ee2a5f65c225f88f39 commit d76f4b6f2e7af29b7f3320ee2a5f65c225f88f39 Author: bouleetbil Date: Mon Jan 19 20:41:13 2009 +0100 vala-0.5.6-1-i686 *version bump diff --git a/source/devel-extra/vala/FrugalBuild b/source/devel-extra/vala/FrugalBuild index 85a5068..cae581d 100644 --- a/source/devel-extra/vala/FrugalBuild +++ b/source/devel-extra/vala/FrugalBuild @@ -3,15 +3,15 @@ # Contributor: jedifox pkgname=vala -pkgver=0.5.5 +pkgver=0.5.6 pkgrel=1 pkgdesc="Vala is a prgramming language that aims to bring modern programming language features to GNOME developers" -depends=('glib2>=2.18.3') +depends=('glib2>=2.18.4') groups=('devel-extra') archs=('i686' 'x86_64') _F_gnome_devel="y" Finclude gnome -sha1sums=('fcb66275ca1d931c4178a4019dd38232a4513834') +sha1sums=('c625845ea5a03289deec0a439119d74a54b9188c') Fconfopts="${Fconfopts[@]} --enable-vapigen" # optimization OK From bouleetbil at frogdev.info Mon Jan 19 20:50:42 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Mon Jan 19 20:50:43 2009 Subject: [Frugalware-git] mono: mono-addins-0.4-1-i686 Message-ID: <20090119195042.63EA811B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=mono.git;a=commitdiff;h=ab48d95908eefea63cffabcc7d44e15181835628 commit ab48d95908eefea63cffabcc7d44e15181835628 Author: bouleetbil Date: Mon Jan 19 20:43:41 2009 +0100 mono-addins-0.4-1-i686 *version bump *moved to xlib-extra *change m8r *finish to test and merge mono-2.2 tomorrow diff --git a/source/xlib-extra/mono-addins/FrugalBuild b/source/xlib-extra/mono-addins/FrugalBuild new file mode 100644 index 0000000..5b69747 --- /dev/null +++ b/source/xlib-extra/mono-addins/FrugalBuild @@ -0,0 +1,19 @@ +# Compiling time: 0.07 SBU +# Maintainer: bouleetbil + +pkgname=mono-addins +pkgver=0.4 +pkgrel=1 +pkgdesc="A framework for creating extensible applications" +url="http://www.mono-project.com/" +depends=('gtk2-sharp>=2.12.6' 'mono>=2.2') +groups=('xlib-extra') +archs=('i686' 'x86_64' 'ppc') +options=('scriptlet') +_F_mono_aot=0 +Finclude mono +up2date="Flasttar http://www.go-mono.com/sources-stable/" +source=(http://www.go-mono.com/sources/$pkgname/$pkgname-$pkgver.tar.bz2) +sha1sums=('ba6a893ae70f8df7d10686333a2d18290976d8be') + +# optimization OK From priyank at frugalware.org Mon Jan 19 20:50:49 2009 From: priyank at frugalware.org (Priyank) Date: Mon Jan 19 20:50:50 2009 Subject: [Frugalware-git] gservice: icons.conf: Added icon mapping for squid Message-ID: <20090119195049.CB9AD11B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gservice.git;a=commitdiff;h=5ed323142590b2e9666690dd2e1a3eed1a11b655 commit 5ed323142590b2e9666690dd2e1a3eed1a11b655 Author: Priyank Date: Tue Jan 20 01:20:38 2009 +0530 icons.conf: Added icon mapping for squid diff --git a/icons.conf b/icons.conf index 9867572..7bf637f 100644 --- a/icons.conf +++ b/icons.conf @@ -24,6 +24,7 @@ local = gservice-local sshd = gservice-remote wine = wine xconsolekit = terminal +squid = proxy # some servers mysqld = server From priyank at frugalware.org Mon Jan 19 21:02:27 2009 From: priyank at frugalware.org (Priyank) Date: Mon Jan 19 21:02:29 2009 Subject: [Frugalware-git] frugalware-current: brasero-0.9.1-1-i686 Message-ID: <20090119200227.C828711B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a7d54cfaddc8480661095cf79ee8940811483987 commit a7d54cfaddc8480661095cf79ee8940811483987 Author: Priyank Date: Tue Jan 20 01:29:54 2009 +0530 brasero-0.9.1-1-i686 * Version bump diff --git a/source/gnome-extra/brasero/FrugalBuild b/source/gnome-extra/brasero/FrugalBuild index b911e91..7a78cb5 100644 --- a/source/gnome-extra/brasero/FrugalBuild +++ b/source/gnome-extra/brasero/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Priyank Gosalia pkgname=brasero -pkgver=0.9.0 +pkgver=0.9.1 pkgrel=1 pkgdesc="A CD/DVD Burning application for the GNOME desktop." url="http://www.gnome.org/projects/brasero/" @@ -22,7 +22,7 @@ _F_gnome_iconcache="y" _F_gnome_devel="y" Finclude gnome gnome-scriptlet Fconfopts="$Fconfopts --enable-search --enable-playlist --enable-preview --enable-inotify --enable-libnotify --disable-schemas-install --enable-caches=no" -sha1sums=('c1ef349d10fbbe15a7c88eeb26fc6a4f3d3cd930') +sha1sums=('bc27acca4779be61adfa805df63305eb3caeaf1b') # optimization OK From priyank at frugalware.org Mon Jan 19 21:11:36 2009 From: priyank at frugalware.org (Priyank) Date: Mon Jan 19 21:11:38 2009 Subject: [Frugalware-git] frugalware-current: gerbv-2.1.0-1-i686 Message-ID: <20090119201136.944B211B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b748e267f63cc7eb0ebdd5787c57bb87790f69bf commit b748e267f63cc7eb0ebdd5787c57bb87790f69bf Author: Priyank Date: Tue Jan 20 01:40:21 2009 +0530 gerbv-2.1.0-1-i686 * Version bump diff --git a/source/xapps-extra/gerbv/FrugalBuild b/source/xapps-extra/gerbv/FrugalBuild index 1ca1248..a8dff8d 100644 --- a/source/xapps-extra/gerbv/FrugalBuild +++ b/source/xapps-extra/gerbv/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Priyank Gosalia pkgname=gerbv -pkgver=2.0.1 +pkgver=2.1.0 pkgrel=1 pkgdesc="The gEDA Gerber Viewer." url="http://geda.seul.org/" @@ -15,7 +15,7 @@ options=('scriptlet') _F_gnome_iconcache="y" _F_gnome_desktop="y" Finclude gnome-scriptlet -sha1sums=('751912d0efa6b1db91d0a8703774df825bc9b79e') +sha1sums=('e8173fb1f55a2140641fcfac8badd4b25d991178') build() { From bouleetbil at frogdev.info Mon Jan 19 22:02:33 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Mon Jan 19 22:02:35 2009 Subject: [Frugalware-git] mono: muine-0.8.10-1-i686 Message-ID: <20090119210233.B12AA11B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=mono.git;a=commitdiff;h=8166ab25ffa72c6f13f5a99475dbc7f1b3972a8c commit 8166ab25ffa72c6f13f5a99475dbc7f1b3972a8c Author: bouleetbil Date: Mon Jan 19 21:55:53 2009 +0100 muine-0.8.10-1-i686 *version bump *change m8r *now hosted by gnome diff --git a/source/gnome-extra/muine/FrugalBuild b/source/gnome-extra/muine/FrugalBuild index ebe8fc3..b936894 100644 --- a/source/gnome-extra/muine/FrugalBuild +++ b/source/gnome-extra/muine/FrugalBuild @@ -1,26 +1,24 @@ # Compiling Time: 0.16 SBU -# Maintainer: AlexExtreme +# Maintainer: bouleetbil # Contributor: detto pkgname=muine -pkgver=0.8.8 -pkgrel=2 +pkgver=0.8.10 +pkgrel=1 pkgdesc="Small music player written in C# featuring easy song/album adding to playlist." -url="http://muine-player.org" archs=('i686' 'x86_64') groups=('gnome-extra') depends=('gnome-sharp' 'gstreamer' 'gst-plugins-base-vorbis' 'gst-plugins-ugly-mad'\ - 'gst-plugins-good-flac' 'gst-plugins-base-gnomevfs' 'gst-plugins-bad-faad2' 'libid3tag' 'dbus') + 'gst-plugins-good-flac' 'gst-plugins-base-gnomevfs' 'gst-plugins-bad-faad2' 'libid3tag' 'dbus'\ + 'ndesk-dbus-glib') makedepends=('perl-xml-parser' 'intltool') -source=($url/releases/$pkgname-$pkgver.tar.gz bug-518828.patch) -up2date="lynx -dump $url/releases | Flasttar" -sha1sums=('42ae6c1bce257268be808ad27adcab4110f2bef8' \ - '160ad523841f27ab98b84138c29e30459bc5a6e5') +sha1sums=('0c1b8420cd89a8fcae86982e205255d469e9dd29') _F_gnome_desktop=y _F_gnome_iconcache=y _F_gnome_schemas=('/etc/gconf/schemas/muine.schemas') options=('scriptlet') -Finclude mono gnome-scriptlet +Finclude mono gnome-scriptlet gnome +url="http://muine-player.org" build () { Fmonoexport From bouleetbil at frogdev.info Mon Jan 19 22:12:14 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Mon Jan 19 22:12:16 2009 Subject: [Frugalware-git] bouleetbilgnome: libgweather-2.24.3-1-i686 Message-ID: <20090119211214.DC40511B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbilgnome.git;a=commitdiff;h=d204f91f39565b2be9a3df67556b199297076623 commit d204f91f39565b2be9a3df67556b199297076623 Author: bouleetbil Date: Mon Jan 19 22:04:40 2009 +0100 libgweather-2.24.3-1-i686 *version bump diff --git a/source/gnome/libgweather/FrugalBuild b/source/gnome/libgweather/FrugalBuild index 804fcae..979c9e8 100644 --- a/source/gnome/libgweather/FrugalBuild +++ b/source/gnome/libgweather/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=libgweather -pkgver=2.24.2 +pkgver=2.24.3 pkgrel=1 pkgdesc="libgweather is a library to access weather information from online services for numerous locations." url="http://www.gnome.org/" @@ -12,7 +12,7 @@ groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64' 'ppc') _F_gnome_schemas=('/etc/gconf/schemas/gweather.schemas') Finclude gnome gnome-scriptlet -sha1sums=('6d25ca48f90102d9e6ee77d77c776ffe34aed659') - +sha1sums=('6a8134d4d2170ea7879dc8f1e847148b3e81edc8') unset MAKEFLAGS + # optimization OK From bouleetbil at frogdev.info Mon Jan 19 22:25:01 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Mon Jan 19 22:25:02 2009 Subject: [Frugalware-git] bouleetbilgnome: gnome-desktop-2.24.3-1-i686 Message-ID: <20090119212501.57D6B11B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbilgnome.git;a=commitdiff;h=ce18b10c3d8b548cfc4c80c6e65a3f486935a42b commit ce18b10c3d8b548cfc4c80c6e65a3f486935a42b Author: bouleetbil Date: Mon Jan 19 22:18:48 2009 +0100 gnome-desktop-2.24.3-1-i686 *version bump diff --git a/source/gnome/gnome-desktop/FrugalBuild b/source/gnome/gnome-desktop/FrugalBuild index 6302c04..2b79a84 100644 --- a/source/gnome/gnome-desktop/FrugalBuild +++ b/source/gnome/gnome-desktop/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=gnome-desktop -pkgver=2.24.2 +pkgver=2.24.3 pkgrel=1 pkgdesc="The GNOME Desktop" url="http://www.gnome.org/" @@ -13,6 +13,6 @@ archs=('i686' 'x86_64' 'ppc') _F_gnome_scrollkeeper="y" Finclude gnome gnome-scriptlet Fconfopts="$Fconfopts --with-gnome-distributor=Frugalware" -sha1sums=('c52d4d26bef1353306cbe851ed9a7c659e22a71e') +sha1sums=('2ebbf2475bb741131b523819fb46e71d4489fa79') # optimization OK From bouleetbil at frogdev.info Mon Jan 19 22:37:15 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Mon Jan 19 22:37:17 2009 Subject: [Frugalware-git] bouleetbilgnome: gnome-system-monitor-2.24.3-1-i686 Message-ID: <20090119213715.6937D11B87A9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbilgnome.git;a=commitdiff;h=f36d57cce5cae44c1a448e0cd7f1185f389aee45 commit f36d57cce5cae44c1a448e0cd7f1185f389aee45 Author: bouleetbil Date: Mon Jan 19 22:30:51 2009 +0100 gnome-system-monitor-2.24.3-1-i686 *version bump diff --git a/source/gnome/gnome-system-monitor/FrugalBuild b/source/gnome/gnome-system-monitor/FrugalBuild index f501706..c6e8c0b 100644 --- a/source/gnome/gnome-system-monitor/FrugalBuild +++ b/source/gnome/gnome-system-monitor/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=gnome-system-monitor -pkgver=2.24.1 +pkgver=2.24.3 pkgrel=1 pkgdesc="A system monitor for GNOME" url="http://www.gnome.org/" @@ -15,6 +15,6 @@ _F_gnome_scrollkeeper="y" _F_gnome_desktop="y" _F_gnome_schemas=('/etc/gconf/schemas/gnome-system-monitor.schemas') Finclude gnome gnome-scriptlet -sha1sums=('e1b8fba8c4482faf8234d27b0f8d10004072060c') +sha1sums=('c223a95d32502b2c0705e0b87afcad902ae293b9') # optimization OK From bouleetbil at frogdev.info Mon Jan 19 22:52:08 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Mon Jan 19 22:52:09 2009 Subject: [Frugalware-git] bouleetbilgnome: gucharmap-2.24.3-1-i686 Message-ID: <20090119215208.BE59411B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbilgnome.git;a=commitdiff;h=b2520d34ef150b06ca0ed3949461fa389da31846 commit b2520d34ef150b06ca0ed3949461fa389da31846 Author: bouleetbil Date: Mon Jan 19 22:45:39 2009 +0100 gucharmap-2.24.3-1-i686 *version bump diff --git a/source/gnome/gucharmap/FrugalBuild b/source/gnome/gucharmap/FrugalBuild index cb81fba..b6769cd 100644 --- a/source/gnome/gucharmap/FrugalBuild +++ b/source/gnome/gucharmap/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Christian Hamar alias krix pkgname=gucharmap -pkgver=2.24.2 +pkgver=2.24.3 pkgrel=1 pkgdesc="A featureful Unicode character map for GNOME" url="http://www.gnome.org/" @@ -14,6 +14,6 @@ _F_gnome_scrollkeeper="y" _F_gnome_iconcache="y" _F_gnome_desktop="y" Finclude gnome gnome-scriptlet -sha1sums=('c5184c4cc8bf086548521c7653aa508883c2bdba') +sha1sums=('bf622acdbc1e682193532cc2b3a1e09c05af7bfa') # optimization OK From bouleetbil at frogdev.info Mon Jan 19 22:54:19 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Mon Jan 19 22:54:21 2009 Subject: [Frugalware-git] bouleetbiltesting: pulseaudio-0.9.14-7-i686 Message-ID: <20090119215419.D8F3611B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbiltesting.git;a=commitdiff;h=0f9208fee0c48c66853a1a629ad23d4be75e34e5 commit 0f9208fee0c48c66853a1a629ad23d4be75e34e5 Author: bouleetbil Date: Mon Jan 19 22:47:08 2009 +0100 pulseaudio-0.9.14-7-i686 *version bump diff --git a/source/multimedia/pulseaudio/FrugalBuild b/source/multimedia/pulseaudio/FrugalBuild index 038bf33..88743d9 100644 --- a/source/multimedia/pulseaudio/FrugalBuild +++ b/source/multimedia/pulseaudio/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: bouleetbil pkgname=pulseaudio -pkgver=0.9.13 +pkgver=0.9.14 pkgrel=7 pkgdesc="PulseAudio is a sound server with an advanced plugin system" url="http://pulseaudio.org/" @@ -13,7 +13,7 @@ groups=('multimedia') archs=('i686') up2date="lynx -dump http://pulseaudio.org/wiki/DownloadPulseAudio#Sourcecode |Flasttar" source=(http://0pointer.de/lennart/projects/$pkgname/$pkgname-$pkgver.tar.gz rc.pulseaudio pulseaudio.sysconfig README.Frugalware) -sha1sums=('c8482f1bb42d5213bfdbe2154e1a55b7bc04c915' \ +sha1sums=('a0fb7c21ee21178e102a1e5a11d8ac474e6f5da4' \ 'd7ecba440e534807dc7111b0d08e05eb9e4f08bc' \ '68ee8d956d5ab70f936365ef4033b84f51461aab' \ '6d77f76a4d5566001b8a3214232b19f037c751d7') From bouleetbil at frogdev.info Mon Jan 19 23:21:20 2009 From: bouleetbil at frogdev.info (bouleetbil) Date: Mon Jan 19 23:21:21 2009 Subject: [Frugalware-git] bouleetbilgnome: gnome-panel-2.24.3-1-i686 Message-ID: <20090119222120.7E67011B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbilgnome.git;a=commitdiff;h=7bae2cb2de90f9a2bf95e156dbd40f4df6623be3 commit 7bae2cb2de90f9a2bf95e156dbd40f4df6623be3 Author: bouleetbil Date: Mon Jan 19 23:14:49 2009 +0100 gnome-panel-2.24.3-1-i686 *version bump diff --git a/source/gnome/gnome-panel/FrugalBuild b/source/gnome/gnome-panel/FrugalBuild index 13f0e0f..9faa417 100644 --- a/source/gnome/gnome-panel/FrugalBuild +++ b/source/gnome/gnome-panel/FrugalBuild @@ -2,13 +2,13 @@ # Maintainer: Christian Hamar alias krix pkgname=gnome-panel -pkgver=2.24.2 +pkgver=2.24.3 pkgrel=1 pkgdesc="GNOME panel and core applets" rodepends=('alacarte>=0.11.1.1') -depends=('gnome-desktop>=2.24.2' 'gnome-menus>=2.24.2' 'libwnck>=2.24.0' \ +depends=('gnome-desktop>=2.24.3' 'gnome-menus>=2.24.2' 'libwnck>=2.24.0' \ 'gnome-vfs>=2.24.0' 'evolution-data-server>=2.24.1' \ - 'rarian>=0.8.0' 'dbus-glib>=0.71' 'avahi-glib>=0.6.17' 'librsvg>=2.22.2' 'libgweather>=2.24.2') + 'rarian>=0.8.0' 'dbus-glib>=0.71' 'avahi-glib>=0.6.17' 'librsvg>=2.22.2' 'libgweather>=2.24.3') makedepends=('intltool' 'gtk-doc>=1.9' 'gnome-doc-utils>=0.14.0') groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64' 'ppc') @@ -26,7 +26,7 @@ _F_gnome_scrollkeeper="y" _F_gnome_iconcache="y" _F_gnome_desktop="y" Finclude gnome gnome-scriptlet -sha1sums=('29a7c1fdea1905cde0efeb3c98d36a86b84cb97b') +sha1sums=('46a115529c2e6ef5429e58e5389ad44660aff428') build() { Fcd From vmiklos at frugalware.org Tue Jan 20 00:19:15 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jan 20 00:19:17 2009 Subject: [Frugalware-git] frugalware-current: qemu-0.9.1-5-i686 Message-ID: <20090119231915.2C5A911B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=af481df0a683aa5e1ecbc29c62de4419f582934e commit af481df0a683aa5e1ecbc29c62de4419f582934e Author: Miklos Vajna Date: Tue Jan 20 00:18:39 2009 +0100 qemu-0.9.1-5-i686 - add USE_DEVEL support (disabled by default, of course) diff --git a/source/xapps-extra/qemu/FrugalBuild b/source/xapps-extra/qemu/FrugalBuild index ab61c14..1c10a70 100644 --- a/source/xapps-extra/qemu/FrugalBuild +++ b/source/xapps-extra/qemu/FrugalBuild @@ -1,35 +1,51 @@ # Compiling Time: 3.00 SBU # Maintainer: Miklos Vajna +USE_DEVEL=${USE_DEVEL:-"n"} + pkgname=qemu pkgver=0.9.1 +Fuse $USE_DEVEL && pkgver=svn6369 pkgrel=5 +Fuse $USE_DEVEL && pkgrel=1 pkgdesc="QEMU is a FAST! processor emulator" url="http://bellard.org/qemu/" depends=('sdl' 'zlib' 'alsa-lib') -makedepends=('gcc-3.3' 'texi2html') +makedepends=('texi2html') +Fuse $USE_DEVEL && makedepends=(${makedepends[@]} 'gcc-3.3') groups=('xapps-extra') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump $url/download.html|grep Source|sed 's/.*-\(.*\)\.t.*/\1/'" source=($url/$pkgname-$pkgver.tar.gz rc.qemu rc.qemu-hu.po \ - rc.qemu-system qemu-system CVE-2008-2004.diff \ - qemu-0.9.1-dirent.patch \ - README.Frugalware) + rc.qemu-system qemu-system README.Frugalware \ + CVE-2008-2004.diff qemu-0.9.1-dirent.patch) sha1sums=('630ea20b5989f0df00128de7f7be661c573ed041' \ '563c18fe297f1e79b0172e3b426310ac5fbf1a83' \ 'ce31601e5712057938227923d4a9adf16eeb36e7' \ '2ba7e84a4bc38907202340ba1323a224dbd5f597' \ 'b1c2b53ef74d1461bbd4f83b8a4f1180187f6a30' \ + '17454e4d54872d32071d478774f96cbab8bb0902' \ 'b7d868669c5324c3afd8d0e0d75f7406150e9839' \ - '8b873471f2473fdbc9cb58bfc069f6a306a544d3' \ - '17454e4d54872d32071d478774f96cbab8bb0902') + '8b873471f2473fdbc9cb58bfc069f6a306a544d3') + +if Fuse $USE_DEVEL; then + source=(${source[1]} ${source[2]} ${source[3]} ${source[4]} ${source[5]}) + sha1sums=(${sha1sums[1]} ${sha1sums[2]} ${sha1sums[3]} ${sha1sums[4]} ${sha1sums[5]}) + _F_scm_type="subversion" + _F_scm_url="svn://svn.savannah.nongnu.org/qemu/trunk" + Finclude scm +fi build() { + if Fuse $USE_DEVEL; then + Funpack_scm + else + Fconfopts="$Fconfopts --enable-alsa" + fi Fpatchall Fsed 'sdl_static=yes' 'sdl_static=no' configure unset CFLAGS - Fconfopts="$Fconfopts --enable-alsa" Fmake make prefix=$Fdestdir$Fprefix bindir=$Fdestdir$Fprefix/bin \ datadir=$Fdestdir$Fprefix/share/qemu \ From boobaa at frugalware.org Tue Jan 20 07:16:09 2009 From: boobaa at frugalware.org (CSÉCSY László) Date: Tue Jan 20 07:16:11 2009 Subject: [Frugalware-git] frugalware-current: gpsbabel-1.3.4-2-i686 Message-ID: <20090120061609.D3E4F11B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=de72402b4e9bdd5394c44ea1789212139c6fd83f commit de72402b4e9bdd5394c44ea1789212139c6fd83f Author: CSÉCSY László Date: Tue Jan 20 07:14:52 2009 +0100 gpsbabel-1.3.4-2-i686 added libusb to depends() closes #3584 if only sourceforge.sh could be relied upon... diff --git a/source/apps-extra/gpsbabel/FrugalBuild b/source/apps-extra/gpsbabel/FrugalBuild index 6226d03..2371413 100644 --- a/source/apps-extra/gpsbabel/FrugalBuild +++ b/source/apps-extra/gpsbabel/FrugalBuild @@ -3,9 +3,9 @@ pkgname=gpsbabel pkgver=1.3.4 -pkgrel=1 +pkgrel=2 pkgdesc="converts GPS waypoints, tracks, and routes from one format to another" -depends=() +depends=('libusb') groups=('apps-extra') archs=('i686' 'x86_64') _F_sourceforge_ext=".tar.gz" From priyank at frugalware.org Tue Jan 20 07:18:01 2009 From: priyank at frugalware.org (Priyank) Date: Tue Jan 20 07:18:02 2009 Subject: [Frugalware-git] gservice: temporary disable toggled signal emission in case of an error while editing runlevel info. Message-ID: <20090120061801.49C2D11B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gservice.git;a=commitdiff;h=6ddcbd716bdf376efbaa57a39b0729c136c6544c commit 6ddcbd716bdf376efbaa57a39b0729c136c6544c Author: Priyank Date: Tue Jan 20 11:47:48 2009 +0530 temporary disable toggled signal emission in case of an error while editing runlevel info. diff --git a/src/gservice-interface.c b/src/gservice-interface.c index bbe3675..194aa3c 100644 --- a/src/gservice-interface.c +++ b/src/gservice-interface.c @@ -71,6 +71,9 @@ static void cb_gsvc_button_deactivate_clicked (GtkButton *button, gpointer data) static void cb_gsvc_button_edit_clicked (GtkButton *button, gpointer data); static void cb_gsvc_service_selected (GtkTreeSelection *selection, gpointer data); +/* handler ids that need to be blocked */ +guint handlers[7] = { 0, 0, 0, 0, 0, 0, 0 }; + static GtkWidget * gservice_get_widget (const char *wname) { @@ -685,6 +688,9 @@ cb_gsvc_r0_toggled (GtkToggleButton *toggle, gpointer data) if (!gsvc_service_set_runlevel (((gservice_entry_t*)data)->name,0,val)) { gsvc_error (_("Error"), _("There was an error while changing runlevel information.")); + g_signal_handler_block ((gpointer)toggle, handlers[0]); + gtk_toggle_button_set_active (toggle, !val); + g_signal_handler_unblock ((gpointer)toggle, handlers[0]); } else { @@ -701,6 +707,9 @@ cb_gsvc_r1_toggled (GtkToggleButton *toggle, gpointer data) if (!gsvc_service_set_runlevel (((gservice_entry_t*)data)->name,1,val)) { gsvc_error (_("Error"), _("There was an error while changing runlevel information.")); + g_signal_handler_block ((gpointer)toggle, handlers[1]); + gtk_toggle_button_set_active (toggle, !val); + g_signal_handler_unblock ((gpointer)toggle, handlers[1]); } else { @@ -716,6 +725,9 @@ cb_gsvc_r2_toggled (GtkToggleButton *toggle, gpointer data) if (!gsvc_service_set_runlevel (((gservice_entry_t*)data)->name,2,val)) { gsvc_error (_("Error"), _("There was an error while changing runlevel information.")); + g_signal_handler_block ((gpointer)toggle, handlers[2]); + gtk_toggle_button_set_active (toggle, !val); + g_signal_handler_unblock ((gpointer)toggle, handlers[2]); } else { @@ -731,6 +743,9 @@ cb_gsvc_r3_toggled (GtkToggleButton *toggle, gpointer data) if (!gsvc_service_set_runlevel (((gservice_entry_t*)data)->name,3,val)) { gsvc_error (_("Error"), _("There was an error while changing runlevel information.")); + g_signal_handler_block ((gpointer)toggle, handlers[3]); + gtk_toggle_button_set_active (toggle, !val); + g_signal_handler_unblock ((gpointer)toggle, handlers[3]); } else { @@ -746,6 +761,9 @@ cb_gsvc_r4_toggled (GtkToggleButton *toggle, gpointer data) if (!gsvc_service_set_runlevel (((gservice_entry_t*)data)->name,4,val)) { gsvc_error (_("Error"), _("There was an error while changing runlevel information.")); + g_signal_handler_block ((gpointer)toggle, handlers[4]); + gtk_toggle_button_set_active (toggle, !val); + g_signal_handler_unblock ((gpointer)toggle, handlers[4]); } else { @@ -761,6 +779,9 @@ cb_gsvc_r5_toggled (GtkToggleButton *toggle, gpointer data) if (!gsvc_service_set_runlevel (((gservice_entry_t*)data)->name,5,val)) { gsvc_error (_("Error"), _("There was an error while changing runlevel information.")); + g_signal_handler_block ((gpointer)toggle, handlers[5]); + gtk_toggle_button_set_active (toggle, !val); + g_signal_handler_unblock ((gpointer)toggle, handlers[5]); } else { @@ -776,6 +797,9 @@ cb_gsvc_r6_toggled (GtkToggleButton *toggle, gpointer data) if (!gsvc_service_set_runlevel (((gservice_entry_t*)data)->name,6,val)) { gsvc_error (_("Error"), _("There was an error while changing runlevel information.")); + g_signal_handler_block ((gpointer)toggle, handlers[6]); + gtk_toggle_button_set_active (toggle, !val); + g_signal_handler_unblock ((gpointer)toggle, handlers[6]); } else { @@ -869,13 +893,13 @@ cb_gsvc_button_edit_clicked (GtkButton *button, gpointer data) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(gsvc_service_edit_dlg_r5), entry->runlevel[5]); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(gsvc_service_edit_dlg_r6), entry->runlevel[6]); /* connect signals so that the user will be able to edit the runlevels */ - g_signal_connect (G_OBJECT(gsvc_service_edit_dlg_r0), "toggled", G_CALLBACK(cb_gsvc_r0_toggled), (gpointer)entry); - g_signal_connect (G_OBJECT(gsvc_service_edit_dlg_r1), "toggled", G_CALLBACK(cb_gsvc_r1_toggled), (gpointer)entry); - g_signal_connect (G_OBJECT(gsvc_service_edit_dlg_r2), "toggled", G_CALLBACK(cb_gsvc_r2_toggled), (gpointer)entry); - g_signal_connect (G_OBJECT(gsvc_service_edit_dlg_r3), "toggled", G_CALLBACK(cb_gsvc_r3_toggled), (gpointer)entry); - g_signal_connect (G_OBJECT(gsvc_service_edit_dlg_r4), "toggled", G_CALLBACK(cb_gsvc_r4_toggled), (gpointer)entry); - g_signal_connect (G_OBJECT(gsvc_service_edit_dlg_r5), "toggled", G_CALLBACK(cb_gsvc_r5_toggled), (gpointer)entry); - g_signal_connect (G_OBJECT(gsvc_service_edit_dlg_r6), "toggled", G_CALLBACK(cb_gsvc_r6_toggled), (gpointer)entry); + handlers[0] = g_signal_connect (G_OBJECT(gsvc_service_edit_dlg_r0), "toggled", G_CALLBACK(cb_gsvc_r0_toggled), (gpointer)entry); + handlers[1] = g_signal_connect (G_OBJECT(gsvc_service_edit_dlg_r1), "toggled", G_CALLBACK(cb_gsvc_r1_toggled), (gpointer)entry); + handlers[2] = g_signal_connect (G_OBJECT(gsvc_service_edit_dlg_r2), "toggled", G_CALLBACK(cb_gsvc_r2_toggled), (gpointer)entry); + handlers[3] = g_signal_connect (G_OBJECT(gsvc_service_edit_dlg_r3), "toggled", G_CALLBACK(cb_gsvc_r3_toggled), (gpointer)entry); + handlers[4] = g_signal_connect (G_OBJECT(gsvc_service_edit_dlg_r4), "toggled", G_CALLBACK(cb_gsvc_r4_toggled), (gpointer)entry); + handlers[5] = g_signal_connect (G_OBJECT(gsvc_service_edit_dlg_r5), "toggled", G_CALLBACK(cb_gsvc_r5_toggled), (gpointer)entry); + handlers[6] = g_signal_connect (G_OBJECT(gsvc_service_edit_dlg_r6), "toggled", G_CALLBACK(cb_gsvc_r6_toggled), (gpointer)entry); /* and the service icon */ GdkPixbuf *pixbuf = gsvc_icon_mapping_get_icon_for_service (entry->name, 48); gtk_image_set_from_pixbuf (GTK_IMAGE(gsvc_service_edit_dlg_svcicon), pixbuf); From priyank at frugalware.org Tue Jan 20 08:00:19 2009 From: priyank at frugalware.org (Priyank) Date: Tue Jan 20 08:00:20 2009 Subject: [Frugalware-git] gservice: It is now possible to reset runlevel info Message-ID: <20090120070019.83CB211B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gservice.git;a=commitdiff;h=7018610cf556b528fe24479c9a859e23f7d0a69e commit 7018610cf556b528fe24479c9a859e23f7d0a69e Author: Priyank Date: Tue Jan 20 12:30:07 2009 +0530 It is now possible to reset runlevel info diff --git a/data/gservice.glade b/data/gservice.glade index e3c5c66..1fb53f1 100644 --- a/data/gservice.glade +++ b/data/gservice.glade @@ -1,6 +1,6 @@ - + 570 @@ -517,8 +517,38 @@ True + 8 GTK_BUTTONBOX_END + + True + True + True + 0 + + + True + + + True + gtk-revert-to-saved + + + + + True + 0 + Reset + + + 1 + + + + + + + True True @@ -528,6 +558,9 @@ 0 + + 1 + diff --git a/src/gservice-backend.c b/src/gservice-backend.c index d3c1492..d5db2fd 100644 --- a/src/gservice-backend.c +++ b/src/gservice-backend.c @@ -551,4 +551,31 @@ gsvc_service_set_runlevel (const char *service, guint runlevel, gboolean val) return ret; } +gboolean +gsvc_service_reset_runlevels (gservice_entry_t *entry) +{ + char *cmd = NULL; + char *svc = NULL; + gboolean ret = FALSE; + + if (entry) + { + svc = g_strdup_printf ("rc.%s", entry->name); + cmd = g_strdup_printf ("chkconfig %s reset", svc); + if (!system(cmd)) + { + ret = TRUE; + } + if (!gsvc_service_get_runlevel_info(entry)) + { + ret = FALSE; + } + } + g_free (svc); + g_free (cmd); + + return ret; +} + + diff --git a/src/gservice-backend.h b/src/gservice-backend.h index 01b2752..c6d9d5b 100644 --- a/src/gservice-backend.h +++ b/src/gservice-backend.h @@ -48,5 +48,9 @@ gboolean gsvc_service_deactivate (const char *service); /* returns TRUE on success, FALSE on failure */ gboolean gsvc_service_set_runlevel (const char *service, guint runlevel, gboolean val); +/* reset the runlevel information to what is specified in the init script */ +/* returns TRUE on success, FALSE On failure */ +gboolean gsvc_service_reset_runlevels (gservice_entry_t *entry); + #endif diff --git a/src/gservice-interface.c b/src/gservice-interface.c index 194aa3c..ac8ec77 100644 --- a/src/gservice-interface.c +++ b/src/gservice-interface.c @@ -48,6 +48,7 @@ static GtkWidget *gsvc_service_edit_dlg_r3 = NULL; static GtkWidget *gsvc_service_edit_dlg_r4 = NULL; static GtkWidget *gsvc_service_edit_dlg_r5 = NULL; static GtkWidget *gsvc_service_edit_dlg_r6 = NULL; +static GtkWidget *gsvc_service_edit_dlg_reset_btn = NULL; extern GladeXML *xml; extern gsvc_config_t *conf; @@ -350,6 +351,7 @@ gservice_interface_init (void) gsvc_service_edit_dlg_r4 = gservice_get_widget ("r4_check"); gsvc_service_edit_dlg_r5 = gservice_get_widget ("r5_check"); gsvc_service_edit_dlg_r6 = gservice_get_widget ("r6_check"); + gsvc_service_edit_dlg_reset_btn = gservice_get_widget ("gsvc_service_edit_dlg_reset_btn"); gtk_widget_show (gsvc_splash_screen); while (gtk_events_pending()) gtk_main_iteration (); @@ -715,6 +717,7 @@ cb_gsvc_r1_toggled (GtkToggleButton *toggle, gpointer data) { ((gservice_entry_t*)data)->runlevel[1] = val; } + return; } @@ -733,6 +736,7 @@ cb_gsvc_r2_toggled (GtkToggleButton *toggle, gpointer data) { ((gservice_entry_t*)data)->runlevel[2] = val; } + return; } @@ -751,6 +755,7 @@ cb_gsvc_r3_toggled (GtkToggleButton *toggle, gpointer data) { ((gservice_entry_t*)data)->runlevel[3] = val; } + return; } @@ -769,6 +774,7 @@ cb_gsvc_r4_toggled (GtkToggleButton *toggle, gpointer data) { ((gservice_entry_t*)data)->runlevel[4] = val; } + return; } @@ -787,6 +793,7 @@ cb_gsvc_r5_toggled (GtkToggleButton *toggle, gpointer data) { ((gservice_entry_t*)data)->runlevel[5] = val; } + return; } @@ -805,6 +812,43 @@ cb_gsvc_r6_toggled (GtkToggleButton *toggle, gpointer data) { ((gservice_entry_t*)data)->runlevel[6] = val; } + + return; +} + +static void +cb_gsvc_service_edit_dlg_reset_clicked (GtkButton *button, gpointer data) +{ + gservice_entry_t *entry = (gservice_entry_t*) data; + if (gsvc_service_reset_runlevels(entry)) + { + g_signal_handler_block ((gpointer)gsvc_service_edit_dlg_r6, handlers[6]); + g_signal_handler_block ((gpointer)gsvc_service_edit_dlg_r5, handlers[5]); + g_signal_handler_block ((gpointer)gsvc_service_edit_dlg_r4, handlers[4]); + g_signal_handler_block ((gpointer)gsvc_service_edit_dlg_r3, handlers[3]); + g_signal_handler_block ((gpointer)gsvc_service_edit_dlg_r2, handlers[2]); + g_signal_handler_block ((gpointer)gsvc_service_edit_dlg_r1, handlers[1]); + g_signal_handler_block ((gpointer)gsvc_service_edit_dlg_r0, handlers[0]); + gtk_toggle_button_set_active (gsvc_service_edit_dlg_r0, entry->runlevel[0]); + gtk_toggle_button_set_active (gsvc_service_edit_dlg_r0, entry->runlevel[1]); + gtk_toggle_button_set_active (gsvc_service_edit_dlg_r0, entry->runlevel[2]); + gtk_toggle_button_set_active (gsvc_service_edit_dlg_r0, entry->runlevel[3]); + gtk_toggle_button_set_active (gsvc_service_edit_dlg_r0, entry->runlevel[4]); + gtk_toggle_button_set_active (gsvc_service_edit_dlg_r0, entry->runlevel[5]); + gtk_toggle_button_set_active (gsvc_service_edit_dlg_r0, entry->runlevel[6]); + g_signal_handler_unblock ((gpointer)gsvc_service_edit_dlg_r6, handlers[6]); + g_signal_handler_unblock ((gpointer)gsvc_service_edit_dlg_r5, handlers[5]); + g_signal_handler_unblock ((gpointer)gsvc_service_edit_dlg_r4, handlers[4]); + g_signal_handler_unblock ((gpointer)gsvc_service_edit_dlg_r3, handlers[3]); + g_signal_handler_unblock ((gpointer)gsvc_service_edit_dlg_r2, handlers[2]); + g_signal_handler_unblock ((gpointer)gsvc_service_edit_dlg_r1, handlers[1]); + g_signal_handler_unblock ((gpointer)gsvc_service_edit_dlg_r0, handlers[0]); + } + else + { + gsvc_error (_("Error"), _("An error occurred while trying to reset runlevel information.")); + } + return; } @@ -900,6 +944,7 @@ cb_gsvc_button_edit_clicked (GtkButton *button, gpointer data) handlers[4] = g_signal_connect (G_OBJECT(gsvc_service_edit_dlg_r4), "toggled", G_CALLBACK(cb_gsvc_r4_toggled), (gpointer)entry); handlers[5] = g_signal_connect (G_OBJECT(gsvc_service_edit_dlg_r5), "toggled", G_CALLBACK(cb_gsvc_r5_toggled), (gpointer)entry); handlers[6] = g_signal_connect (G_OBJECT(gsvc_service_edit_dlg_r6), "toggled", G_CALLBACK(cb_gsvc_r6_toggled), (gpointer)entry); + g_signal_connect (G_OBJECT(gsvc_service_edit_dlg_reset_btn), "clicked", G_CALLBACK(cb_gsvc_service_edit_dlg_reset_clicked), (gpointer)entry); /* and the service icon */ GdkPixbuf *pixbuf = gsvc_icon_mapping_get_icon_for_service (entry->name, 48); gtk_image_set_from_pixbuf (GTK_IMAGE(gsvc_service_edit_dlg_svcicon), pixbuf); From priyank at frugalware.org Tue Jan 20 08:40:40 2009 From: priyank at frugalware.org (Priyank) Date: Tue Jan 20 08:40:42 2009 Subject: [Frugalware-git] frugalware-current: ncmpc-0.13-1-i686 Message-ID: <20090120074040.DFB0411B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=916c52643f237adfdbcd884aea6ca87ac94e74f9 commit 916c52643f237adfdbcd884aea6ca87ac94e74f9 Author: Priyank Date: Tue Jan 20 13:09:21 2009 +0530 ncmpc-0.13-1-i686 * Version bump diff --git a/source/multimedia-extra/ncmpc/FrugalBuild b/source/multimedia-extra/ncmpc/FrugalBuild index 533fa41..fa0a401 100644 --- a/source/multimedia-extra/ncmpc/FrugalBuild +++ b/source/multimedia-extra/ncmpc/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: Sector pkgname=ncmpc -pkgver=0.12 +pkgver=0.13 pkgrel=1 pkgdesc="ncmpc is a ncurses based music manager for mpd" url="http://mpd.wikia.com/wiki/Client:Ncmpc" @@ -14,6 +14,6 @@ archs=('i686' 'x86_64') _F_sourceforge_dirname=musicpd Finclude sourceforge up2date="lynx -dump $url | grep Version | sed 's/.*n: \(.*\) */\1/'" -sha1sums=('e6e12a69300de9a00b0a75a89d2718d78a120fd1') +sha1sums=('5238a136e2e15f7e8c588b58828e7a12e40be7c6') # optimization OK From boobaa at frugalware.org Tue Jan 20 08:50:21 2009 From: boobaa at frugalware.org (CSÉCSY László) Date: Tue Jan 20 08:50:22 2009 Subject: [Frugalware-git] frugalware-current: man-pages-3.17-1-i686 Message-ID: <20090120075021.5AC4511B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=78b55cab54a1990540575015b4aec2b3ade668a3 commit 78b55cab54a1990540575015b4aec2b3ade668a3 Author: CSÉCSY László Date: Tue Jan 20 08:49:17 2009 +0100 man-pages-3.17-1-i686 version bump diff --git a/source/apps/man-pages/FrugalBuild b/source/apps/man-pages/FrugalBuild index 0033347..2435edd 100644 --- a/source/apps/man-pages/FrugalBuild +++ b/source/apps/man-pages/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: VMiklos pkgname=man-pages -pkgver=3.16 +pkgver=3.17 pkgrel=1 pkgdesc="Man pages are online documentation for Linux" url="http://www.win.tue.nl/~aeb/linux/man" @@ -41,4 +41,4 @@ build() Frm /usr/share/man/man4/mouse.4 } -sha1sums=('5508600e4d8752ee19840aa7469c93775e6bce29') +sha1sums=('cd0f1b775b5ddd025e3a5305ed4e7b368bde1565') From boobaa at frugalware.org Tue Jan 20 08:55:06 2009 From: boobaa at frugalware.org (CSÉCSY László) Date: Tue Jan 20 08:55:08 2009 Subject: [Frugalware-git] frugalware-current: phpmyadmin-3.1.2-1-i686 Message-ID: <20090120075506.A23B411B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=cdae34d91be391cd3987aa4f969ca26a18919b49 commit cdae34d91be391cd3987aa4f969ca26a18919b49 Author: CSÉCSY László Date: Tue Jan 20 08:53:14 2009 +0100 phpmyadmin-3.1.2-1-i686 version bump diff --git a/source/network-extra/phpmyadmin/FrugalBuild b/source/network-extra/phpmyadmin/FrugalBuild index 625437e..45ded51 100644 --- a/source/network-extra/phpmyadmin/FrugalBuild +++ b/source/network-extra/phpmyadmin/FrugalBuild @@ -3,7 +3,7 @@ # Maintainer: CSÉCSY László pkgname=phpmyadmin -pkgver=3.1.1 +pkgver=3.1.2 pkgrel=1 pkgdesc="Set of PHP-scripts to administrate MySQL over the WWW." _F_sourceforge_ext="-all-languages.tar.bz2" @@ -29,4 +29,4 @@ build() Frm /var/www/html/phpMyAdmin-${pkgver//_/-}-all-languages.tar.bz2 } -sha1sums=('89cc0425323bdd4d6865688b93bc24b713513d07') +sha1sums=('c5e43fb49888bd31df968c386a456b1b07125fb7') From boobaa at frugalware.org Tue Jan 20 08:56:40 2009 From: boobaa at frugalware.org (CSÉCSY László) Date: Tue Jan 20 08:56:41 2009 Subject: [Frugalware-git] frugalware-current: drupal-admin_menu-5.x_2.7-1-i686 Message-ID: <20090120075640.9477211B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=aae6df1986ce3bc847bce31ed382d12eaab54db6 commit aae6df1986ce3bc847bce31ed382d12eaab54db6 Author: CSÉCSY László Date: Tue Jan 20 08:56:33 2009 +0100 drupal-admin_menu-5.x_2.7-1-i686 version bump diff --git a/source/network-extra/drupal-admin_menu/FrugalBuild b/source/network-extra/drupal-admin_menu/FrugalBuild index 0555dd3..6f25eef 100644 --- a/source/network-extra/drupal-admin_menu/FrugalBuild +++ b/source/network-extra/drupal-admin_menu/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: CSÉCSY László _F_drupal_module=admin_menu -pkgver=5.x_2.6 +pkgver=5.x_2.7 pkgrel=1 pkgdesc="Provides a handy theme-independent administration interface" Finclude drupal -sha1sums=('a9011acccfed812b6cdaa6394b9cf6f2cdc0e26f') +sha1sums=('689e51a8b74df290b6c2127c7b06149af3157ed7') From boobaa at frugalware.org Tue Jan 20 09:42:06 2009 From: boobaa at frugalware.org (CSÉCSY László) Date: Tue Jan 20 09:42:08 2009 Subject: [Frugalware-git] frugalware-current: gpsbabel-1.3.6-1-i686 Message-ID: <20090120084206.C55DD11B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f593d6afc7977071b6d46a7e8caaff8ef155573a commit f593d6afc7977071b6d46a7e8caaff8ef155573a Author: CSÉCSY László Date: Tue Jan 20 09:40:43 2009 +0100 gpsbabel-1.3.6-1-i686 version bump well, they became aware of sf.net's uselessness in turn using a weird download method, but wtfc :S diff --git a/source/apps-extra/gpsbabel/FrugalBuild b/source/apps-extra/gpsbabel/FrugalBuild index 2371413..925c31f 100644 --- a/source/apps-extra/gpsbabel/FrugalBuild +++ b/source/apps-extra/gpsbabel/FrugalBuild @@ -2,15 +2,15 @@ # Maintainer: CSÉCSY László pkgname=gpsbabel -pkgver=1.3.4 -pkgrel=2 +pkgver=1.3.6 +pkgrel=1 pkgdesc="converts GPS waypoints, tracks, and routes from one format to another" depends=('libusb') groups=('apps-extra') archs=('i686' 'x86_64') -_F_sourceforge_ext=".tar.gz" -_F_sourceforge_broken_up2date=1 -Finclude sourceforge -sha1sums=('9b504ce151bb44b86558cce5c3f727819cdb30c5') +url="http://www.gpsbabel.org/" +up2date="lynx -dump $url|grep released -m1|sed 's/.*l \(.*\) r.*/\1/'" +source="http://www.gpsbabel.org/plan9.php?dl=gpsbabel-1.3.6.tar.gz" +sha1sums=('8ff86e356539ca493b33527b91032adb3b452a78') # optimization OK From priyank at frugalware.org Tue Jan 20 13:26:43 2009 From: priyank at frugalware.org (Priyank) Date: Tue Jan 20 13:26:46 2009 Subject: [Frugalware-git] gservice: gservice.desktop: initial import Message-ID: <20090120122643.4E3B111B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gservice.git;a=commitdiff;h=629795ff5a977c6e777a1187bc007ce0f3e034f8 commit 629795ff5a977c6e777a1187bc007ce0f3e034f8 Author: Priyank Date: Tue Jan 20 14:32:04 2009 +0530 gservice.desktop: initial import diff --git a/Makefile.am b/Makefile.am index 847b331..04ac0e1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,7 +6,11 @@ icon_DATA = data/gservice.png confdir = $(sysconfdir)/gservice conf_DATA = main.conf icons.conf -EXTRA_DIST = $(icon_DATA) $(conf_DATA) +menuentrydir = $(datadir)/applications +menuentry_DATA = gservice.desktop + +EXTRA_DIST = $(icon_DATA) $(conf_DATA) $(menuentry_DATA) + diff --git a/gservice.desktop b/gservice.desktop new file mode 100644 index 0000000..889dbce --- /dev/null +++ b/gservice.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=gService (Runlevel Editor) +Comment=Frugalware Runlevel Editor +Exec=gksu gservice +Terminal=false +Categories=Application;System; +Type=Application +StartupNotify=true +Icon=gservice.png From priyank at frugalware.org Tue Jan 20 13:26:43 2009 From: priyank at frugalware.org (Priyank) Date: Tue Jan 20 13:26:48 2009 Subject: [Frugalware-git] gservice: POTFILES.in: add gservice-interface.c Message-ID: <20090120122643.79F0A11B87A9@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gservice.git;a=commitdiff;h=20ad2ce194249e945bcbe10db57b09f67ab172fe commit 20ad2ce194249e945bcbe10db57b09f67ab172fe Author: Priyank Date: Tue Jan 20 14:33:26 2009 +0530 POTFILES.in: add gservice-interface.c diff --git a/po/POTFILES.in b/po/POTFILES.in index f6518e9..64d18b3 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1 +1,3 @@ data/gservice.glade +src/gservice-interface.c + From vmiklos at frugalware.org Tue Jan 20 14:04:45 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jan 20 14:04:46 2009 Subject: [Frugalware-git] frugalware-current: validator-0.8.4-1-i686 Message-ID: <20090120130445.73CE611B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8ccf40ab06ed869c6b147b77440fd1621cfa6861 commit 8ccf40ab06ed869c6b147b77440fd1621cfa6861 Author: Miklos Vajna Date: Tue Jan 20 14:04:30 2009 +0100 validator-0.8.4-1-i686 - version bump - up2date fix diff --git a/source/network-extra/validator/FrugalBuild b/source/network-extra/validator/FrugalBuild index f4b8828..8d250f5 100644 --- a/source/network-extra/validator/FrugalBuild +++ b/source/network-extra/validator/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Miklos Vajna pkgname=validator -pkgver=0.8.1 -pkgrel=2 +pkgver=0.8.4 +pkgrel=1 pkgdesc="The W3C Markup Validator." url="http://validator.w3.org/" rodepends=('perl-config-general' 'perl-net-ip' 'perl-set-intspan' \ @@ -14,12 +14,12 @@ rodepends=('perl-config-general' 'perl-net-ip' 'perl-set-intspan' \ backup=('etc/httpd/conf/modules.d/validator.conf') groups=('network-extra') archs=('i686' 'x86_64') -up2date="lynx -dump http://validator.w3.org/whatsnew.html|grep Release|sed 's/.* -- \(.*\) R.*/\1/;q'" +up2date="Flasttar $url/dist|sed 's/_/\./g'" source=($url/dist/validator-${pkgver//./_}.tar.gz \ $url/dist/sgml-lib-${pkgver//./_}.tar.gz \ proxy.patch) -sha1sums=('eef9f1e15831812059650499d96e0fa04649ef38' \ - 'f572f27f5c7fbbe98b6242035a2e2e3fedf4f0aa' \ +sha1sums=('a3746d2a24ec3c0f6f26ca7884f028733cf53949' \ + 'f69bfa9c0dc007ceca19f579822bfe5ab2889856' \ '32d2f8042488d778acb64a39d997e0fe73bed61a') build() From vmiklos at frugalware.org Tue Jan 20 14:21:44 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jan 20 14:21:46 2009 Subject: [Frugalware-git] homepage-ng: news: make it valid xhtml again Message-ID: <20090120132144.5F6E211B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=c770f073866f059ffe1f2e57c156a3fdd3a423bb commit c770f073866f059ffe1f2e57c156a3fdd3a423bb Author: Miklos Vajna Date: Tue Jan 20 14:21:40 2009 +0100 news: make it valid xhtml again diff --git a/frugalware/xml/news.xml b/frugalware/xml/news.xml index 729b123..996174b 100644 --- a/frugalware/xml/news.xml +++ b/frugalware/xml/news.xml @@ -82,7 +82,7 @@ Example: Mon, 07 Aug 2006 12:34:56 -0600 --> phayz 0 Frugalware New Year logo
    +
    Frugalware New Year logo

    The Frugalware team would like to wish everyone a Happy New Year. 2008 was a year of many major achievements, including new developers, new contributors, a GUI installer (fwife), more translations, and many new packages. We look forward to an equally successful 2009. ]]>     @@ -94,7 +94,7 @@ Example: Mon, 07 Aug 2006 12:34:56 -0600 --> phayz 0 Frugalware Christmas logo
    +
    Frugalware Christmas logo

    The Frugalware team would like to wish everyone a Merry Christmas. If you don't celebrate Christmas, we hope you can enjoy the best of this time of year, while avoiding the worst. :) ]]>     From vmiklos at frugalware.org Tue Jan 20 14:24:37 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jan 20 14:24:38 2009 Subject: [Frugalware-git] homepage-ng: more xhtml fixes Message-ID: <20090120132437.E0D1811B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=b66f5a8e9dbc67ff24b873e4b93086a1d7db556a commit b66f5a8e9dbc67ff24b873e4b93086a1d7db556a Author: Miklos Vajna Date: Tue Jan 20 14:24:34 2009 +0100 more xhtml fixes diff --git a/frugalware/xml/news.xml b/frugalware/xml/news.xml index 996174b..225f355 100644 --- a/frugalware/xml/news.xml +++ b/frugalware/xml/news.xml @@ -82,7 +82,7 @@ Example: Mon, 07 Aug 2006 12:34:56 -0600 --> phayz 0 Frugalware New Year logo
    +
    Frugalware New Year logo

    The Frugalware team would like to wish everyone a Happy New Year. 2008 was a year of many major achievements, including new developers, new contributors, a GUI installer (fwife), more translations, and many new packages. We look forward to an equally successful 2009. ]]>     @@ -94,7 +94,7 @@ Example: Mon, 07 Aug 2006 12:34:56 -0600 --> phayz 0 Frugalware Christmas logo
    +
    Frugalware Christmas logo

    The Frugalware team would like to wish everyone a Merry Christmas. If you don't celebrate Christmas, we hope you can enjoy the best of this time of year, while avoiding the worst. :) ]]>     @@ -154,7 +154,7 @@ Example: Mon, 07 Aug 2006 12:34:56 -0600 -->
  • nVidia FX card support becomes a legacy
  • "Mon ami - you grow more beautiful by the day" - by Devil505
  • Frugalware's contributors are people too! - Martin Burda
    • -
  • Focus On Package(s) - Menumaker & Conky
    • +
  • Focus On Package(s) - Menumaker & Conky
    • You can read it here. We hope you like it! ]]> @@ -193,7 +193,7 @@ Example: Mon, 07 Aug 2006 12:34:56 -0600 --> Download for i686, x86_64 and ppc: See our mirror list. Don't forget to check the integrity of the install images before burning!
    In case your client does not support trackerless torrents, see + href="http://linuxtracker.org/index.php?page=torrent-details&id=0b448325f2e6fb3384b5b5908d2fa044a500b030"> here.
    NOTE: Click here to read more about what media you need for the installation.
    ]]> From priyank at frugalware.org Tue Jan 20 15:43:28 2009 From: priyank at frugalware.org (Priyank) Date: Tue Jan 20 15:43:29 2009 Subject: [Frugalware-git] frugalware-current: avahi-0.6.24-3-i686 Message-ID: <20090120144328.3A0A911B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8d839aab7882c9177299e0c6c157c1bc5c0592b2 commit 8d839aab7882c9177299e0c6c157c1bc5c0592b2 Author: Priyank Date: Tue Jan 20 14:43:47 2009 +0530 avahi-0.6.24-3-i686 * Added status checking to rc.avahi-daemon (ok with crazy) diff --git a/source/network/avahi/FrugalBuild b/source/network/avahi/FrugalBuild index d7a4945..f8aaf2a 100644 --- a/source/network/avahi/FrugalBuild +++ b/source/network/avahi/FrugalBuild @@ -4,7 +4,7 @@ pkgname=avahi pkgver=0.6.24 -pkgrel=2 +pkgrel=3 pkgdesc="A multicast/unicast DNS-SD framework" archs=('i686' 'x86_64' 'ppc') url="http://www.avahi.org" @@ -22,7 +22,7 @@ source=(http://avahi.org/download/$pkgname-$pkgver.tar.gz \ README.Frugalware) Finclude mono sha1sums=('a187af361fefc8bda026936bb07ccdeb41dc74bc' \ - 'fdd4d9aea612d9aceff3c126b9238536a4c807ad' \ + '926faad00a60b3208e4036c73e71f78dbc6dace9' \ '5f6b99e4917458b24736519bdd1e510763310589' \ '723e2e691d35063bd8aefeaf1063fdba812a9249' \ 'b31a9b9bf972739d2976ef510690968851e8b588' \ diff --git a/source/network/avahi/rc.avahi-daemon b/source/network/avahi/rc.avahi-daemon index 4cf2711..4e76fbb 100644 --- a/source/network/avahi/rc.avahi-daemon +++ b/source/network/avahi/rc.avahi-daemon @@ -11,21 +11,30 @@ source /lib/initscripts/functions TEXTDOMAIN=avahi-daemon TEXTDOMAINDIR=/lib/initscripts/messages -actions=(restart start stop reload) +actions=(restart start stop reload status) daemon=$"Avahi mDNS/DNS-SD Daemon" +pid="pidof avahi-daemon 2> /dev/null" rc_start() { - start_msg - /usr/sbin/avahi-daemon -D >> /dev/null 2>&1 - ok $? + start_msg + if [ -z "$(eval $pid)" ]; then + /usr/sbin/avahi-daemon -D >> /dev/null 2>&1 + ok $? + else + ok 999 + fi } rc_stop() { stop_msg - /usr/sbin/avahi-daemon -k >> /dev/null 2>&1 - ok $? + if [ -n "$(eval $pid)" ]; then + /usr/sbin/avahi-daemon -k >> /dev/null 2>&1 + ok $? + else + ok 999 + fi } rc_reload() From vmiklos at frugalware.org Tue Jan 20 16:02:57 2009 From: vmiklos at frugalware.org (Miklos Vajna) Date: Tue Jan 20 16:03:00 2009 Subject: [Frugalware-git] frugalware-current: balsa-2.3.27-1-i686 Message-ID: <20090120150257.58C8011B8632@genesis.frugalware.org> Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=10f38a9d0a86b092992efc4ddd7a1a9a33d596e5 commit 10f38a9d0a86b092992efc4ddd7a1a9a33d596e5 Author: Miklos Vajna Date: Tue Jan 20 16:02:18 2009 +0100 balsa-2.3.27-1-i686 - compress gmime-2.4-with-2.2.patch. it's huge and we won't tweak it in the future so it's history does not matter anyway. diff --git a/source/gnome-extra/balsa/FrugalBuild b/source/gnome-extra/balsa/FrugalBuild index 2bb53e1..0cf80a2 100644 --- a/source/gnome-extra/balsa/FrugalBuild +++ b/source/gnome-extra/balsa/FrugalBuild @@ -7,7 +7,7 @@ pkgrel=1 pkgdesc="Balsa is an e-mail client for GNOME" url="http://balsa.gnome.org" up2date="lynx -dump $url/download.html | Flasttar" -source=($url/$pkgname-$pkgver.tar.bz2 gmime-2.4-with-2.2.patch) +source=($url/$pkgname-$pkgver.tar.bz2 gmime-2.4-with-2.2.patch.bz2) options=('scriptlet') depends=('libesmtp' 'gmime' 'aspell' 'libgnomeprint' 'libgnomeprintui' 'libbonobo' \ 'libgnome' 'libgnomeui' 'gnome-vfs' 'gtkhtml' 'gpgme' 'sqlite3' 'openssl' 'gtkspell' \ @@ -21,7 +21,7 @@ Finclude gnome-scriptlet groups=('gnome-extra') archs=('i686' 'x86_64') sha1sums=('79b2e9fcf015403b097f025ac8e0902672aa9bbd' \ - '8513e0636adb5f2f3c793f0322f3860930c26baa') + 'd3840bd871089a5fb84fd1c877b4cbd973e8e755') Fconfopts="${Fconfopts[@]} --with-ssl --with-gtkprint --with-gpgme=gpgme-config \ --with-sqlite=sqlite3 --with-gtkspell --with-gtksourceview=yes" diff --git a/source/gnome-extra/balsa/gmime-2.4-with-2.2.patch b/source/gnome-extra/balsa/gmime-2.4-with-2.2.patch deleted file mode 100644 index d8e897f..0000000 --- a/source/gnome-extra/balsa/gmime-2.4-with-2.2.patch +++ /dev/null @@ -1,4676 +0,0 @@ -see http://bugzilla.gnome.org/show_bug.cgi?id=537507 - -Index: balsa/balsa/src/balsa-mime-widget-message.c -=================================================================== ---- balsa/src/balsa-mime-widget-message.c (revision 8017) -+++ balsa/src/balsa-mime-widget-message.c (working copy) -@@ -315,9 +315,15 @@ - - /* create a message */ - message = libbalsa_message_new(); -+#ifndef HAVE_GMIME_2_4 - data = internet_address_to_string(balsa_app.current_ident->ia, FALSE); - message->headers->from = internet_address_parse_string(data); - g_free(data); -+#else /* HAVE_GMIME_2_4 */ -+ message->headers->from = internet_address_list_new(); -+ internet_address_list_add(message->headers->from, -+ balsa_app.current_ident->ia); -+#endif /* HAVE_GMIME_2_4 */ - - data = libbalsa_message_body_get_parameter(mime_body, "subject"); - if (data) { -@@ -326,7 +332,11 @@ - } - - data = libbalsa_message_body_get_parameter(mime_body, "server"); -+#ifndef HAVE_GMIME_2_4 - message->headers->to_list = internet_address_parse_string(data); -+#else /* HAVE_GMIME_2_4 */ -+ message->headers->to_list = internet_address_list_parse_string(data); -+#endif /* HAVE_GMIME_2_4 */ - g_free(data); - - /* the original body my have some data to be returned as commands... */ -@@ -624,7 +634,11 @@ - { - gchar *value; - -+#ifndef HAVE_GMIME_2_4 - if (list == NULL) -+#else /* HAVE_GMIME_2_4 */ -+ if (list == NULL || internet_address_list_length(list) == 0) -+#endif /* HAVE_GMIME_2_4 */ - return; - - if (!(bm->shown_headers == HEADERS_ALL || -Index: balsa/src/store-address.c -=================================================================== ---- balsa/src/store-address.c (revision 8017) -+++ balsa/src/store-address.c (working copy) -@@ -59,13 +59,22 @@ - StoreAddressInfo * info); - static void store_address_add_address(StoreAddressInfo * info, - const gchar * label, -+#ifndef HAVE_GMIME_2_4 - const InternetAddress * address, - const InternetAddress * group); -+#else /* HAVE_GMIME_2_4 */ -+ InternetAddress * address, -+ InternetAddress * group); -+#endif /* HAVE_GMIME_2_4 */ - static void store_address_add_lbaddress(StoreAddressInfo * info, - const LibBalsaAddress *address); - static void store_address_add_list(StoreAddressInfo * info, - const gchar * label, -+#ifndef HAVE_GMIME_2_4 - const InternetAddressList * list); -+#else /* HAVE_GMIME_2_4 */ -+ InternetAddressList * list); -+#endif /* HAVE_GMIME_2_4 */ - - /* - * public interface: balsa_store_address -@@ -348,8 +357,13 @@ - * make a new page in the notebook */ - static void - store_address_add_address(StoreAddressInfo * info, -+#ifndef HAVE_GMIME_2_4 - const gchar * lab, const InternetAddress * ia, - const InternetAddress * group) -+#else /* HAVE_GMIME_2_4 */ -+ const gchar * lab, InternetAddress * ia, -+ InternetAddress * group) -+#endif /* HAVE_GMIME_2_4 */ - { - gchar *text; - LibBalsaAddress *address; -@@ -366,7 +380,11 @@ - address = libbalsa_address_new(); - address->full_name = - g_strdup(ia->name ? ia->name : group ? group->name : NULL); -+#ifndef HAVE_GMIME_2_4 - address->address_list = g_list_prepend(NULL, g_strdup(ia->value.addr)); -+#else /* HAVE_GMIME_2_4 */ -+ address->address_list = g_list_prepend(NULL, g_strdup(INTERNET_ADDRESS_MAILBOX (ia)->addr)); -+#endif /* HAVE_GMIME_2_4 */ - ew = libbalsa_address_get_edit_widget(address, entries, NULL, NULL); - g_object_unref(address); - -@@ -409,20 +427,47 @@ - static void - store_address_add_list(StoreAddressInfo * info, - const gchar * label, -+#ifndef HAVE_GMIME_2_4 - const InternetAddressList * list) -+#else /* HAVE_GMIME_2_4 */ -+ InternetAddressList * list) -+#endif /* HAVE_GMIME_2_4 */ - { -+#ifndef HAVE_GMIME_2_4 - for (; list; list = list->next) { - InternetAddress *ia = list->address; - - if (ia->type == INTERNET_ADDRESS_NAME) -+#else /* HAVE_GMIME_2_4 */ -+ int i, j; -+ -+ for (i = 0; i < internet_address_list_length (list); i++) { -+ InternetAddress *ia = internet_address_list_get_address (list, i); -+ -+ if (INTERNET_ADDRESS_IS_MAILBOX (ia)) -+#endif /* HAVE_GMIME_2_4 */ - store_address_add_address(info, label, ia, NULL); -+#ifndef HAVE_GMIME_2_4 - else if (ia->type == INTERNET_ADDRESS_GROUP) { - InternetAddressList *member; -+#else /* HAVE_GMIME_2_4 */ -+ else { -+ InternetAddressList *members = INTERNET_ADDRESS_GROUP (ia)->members; -+#endif /* HAVE_GMIME_2_4 */ - -+#ifndef HAVE_GMIME_2_4 - for (member = ia->value.members; member; member = member->next) { - InternetAddress *member_address = member->address; -+#else /* HAVE_GMIME_2_4 */ -+ for (j = 0; j < internet_address_list_length (members); j++) { -+ InternetAddress *member_address = internet_address_list_get_address (members, j); -+#endif /* HAVE_GMIME_2_4 */ - -+#ifndef HAVE_GMIME_2_4 - if (member_address->type == INTERNET_ADDRESS_NAME) -+#else /* HAVE_GMIME_2_4 */ -+ if (INTERNET_ADDRESS_IS_MAILBOX (member_address)) -+#endif /* HAVE_GMIME_2_4 */ - store_address_add_address(info, label, member_address, - ia); - } -Index: balsa/src/sendmsg-window.c -=================================================================== ---- balsa/src/sendmsg-window.c (revision 8017) -+++ balsa/src/sendmsg-window.c (working copy) -@@ -890,26 +890,46 @@ - static gint - delete_handler(BalsaSendmsg * bsmsg) - { -+#ifndef HAVE_GMIME_2_4 - InternetAddressList *l = - libbalsa_address_view_get_list(bsmsg->recipient_view, "To:"); - const gchar *tmp = l && l->address && l->address->name ? - l->address->name : _("(No name)"); -+#else /* HAVE_GMIME_2_4 */ -+ InternetAddressList *list; -+ const InternetAddress *ia; -+ const gchar *tmp; -+#endif /* HAVE_GMIME_2_4 */ - gint reply; - GtkWidget *d; - - if (balsa_app.debug) -+#ifndef HAVE_GMIME_2_4 - printf("delete_event_cb\n"); -+#else /* HAVE_GMIME_2_4 */ -+ printf("%s\n", __func__); -+#endif /* HAVE_GMIME_2_4 */ - - if (bsmsg->state == SENDMSG_STATE_CLEAN) - return FALSE; - -+#ifdef HAVE_GMIME_2_4 -+ list = libbalsa_address_view_get_list(bsmsg->recipient_view, "To:"); -+ ia = internet_address_list_get_address(list, 0); -+ tmp = ia && ia->name ? ia->name : _("(No name)"); -+ -+#endif /* HAVE_GMIME_2_4 */ - d = gtk_message_dialog_new(GTK_WINDOW(bsmsg->window), - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_QUESTION, - GTK_BUTTONS_YES_NO, - _("The message to '%s' is modified.\n" - "Save message to Draftbox?"), tmp); -+#ifndef HAVE_GMIME_2_4 - internet_address_list_destroy(l); -+#else /* HAVE_GMIME_2_4 */ -+ g_object_unref(list); -+#endif /* HAVE_GMIME_2_4 */ - gtk_dialog_set_default_response(GTK_DIALOG(d), GTK_RESPONSE_YES); - gtk_dialog_add_button(GTK_DIALOG(d), - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); -@@ -1243,7 +1263,11 @@ - libbalsa_address_view_get_list(bsmsg->recipient_view, - address_types[type]); - gchar *p = internet_address_list_to_string(list, FALSE); -+#ifndef HAVE_GMIME_2_4 - internet_address_list_destroy(list); -+#else /* HAVE_GMIME_2_4 */ -+ g_object_unref(list); -+#endif /* HAVE_GMIME_2_4 */ - fprintf(tmp, "%s %s\n", _(address_types[type]), p); - g_free(p); - } -@@ -1455,6 +1479,7 @@ - #endif - - if (bsmsg->ident->bcc) { -+#ifndef HAVE_GMIME_2_4 - InternetAddressList *l, - *old_ident_list, *new_ident_list, - *old_list, *new_list = NULL; -@@ -1474,20 +1499,68 @@ - break; - if (!m) /* We didn't find this address. */ - new_list = internet_address_list_append(new_list, ia); -+#else /* HAVE_GMIME_2_4 */ -+ InternetAddressList *bcc_list, *ident_list; -+ int i, j; -+ -+ bcc_list = -+ libbalsa_address_view_get_list(bsmsg->recipient_view, "Bcc:"); -+ -+ ident_list = internet_address_list_parse_string(bsmsg->ident->bcc); -+ if (ident_list) { -+ /* Remove any Bcc addresses that came from the old identity -+ * from the list. */ -+ gint ident_list_len = internet_address_list_length(ident_list); -+ -+ for (i = 0; i < internet_address_list_length(bcc_list); i++) { -+ InternetAddress *ia = -+ internet_address_list_get_address (bcc_list, i); -+ -+ for (j = 0; j < ident_list_len; j++) { -+ InternetAddress *ia2 = -+ internet_address_list_get_address(ident_list, j); -+ if (libbalsa_ia_rfc2821_equal(ia, ia2)) -+ break; -+ } -+ -+ if (j < ident_list_len) { -+ /* This address was found in the identity. */ -+ internet_address_list_remove_at(bcc_list, i); -+ --i; -+ } -+ } -+ g_object_unref(ident_list); -+#endif /* HAVE_GMIME_2_4 */ - } -+#ifndef HAVE_GMIME_2_4 - internet_address_list_destroy(old_list); - internet_address_list_destroy(old_ident_list); -+#endif /* ! HAVE_GMIME_2_4 */ - - /* Add the new Bcc addresses, if any: */ -+#ifndef HAVE_GMIME_2_4 - new_ident_list = internet_address_parse_string(ident->bcc); - new_list = internet_address_list_concat(new_list, new_ident_list); - internet_address_list_destroy(new_ident_list); -+#else /* HAVE_GMIME_2_4 */ -+ ident_list = internet_address_list_parse_string(ident->bcc); -+ if (ident_list) { -+ internet_address_list_append(bcc_list, ident_list); -+ g_object_unref(ident_list); -+ } -+#endif /* HAVE_GMIME_2_4 */ - - /* Set the resulting list: */ -+#ifndef HAVE_GMIME_2_4 - libbalsa_address_view_set_from_list(bsmsg->recipient_view, - "Bcc:", - new_list); - internet_address_list_destroy(new_list); -+#else /* HAVE_GMIME_2_4 */ -+ libbalsa_address_view_set_from_list(bsmsg->recipient_view, "Bcc:", -+ bcc_list); -+ g_object_unref(bcc_list); -+#endif /* HAVE_GMIME_2_4 */ - } - - /* change the subject to use the reply/forward strings */ -@@ -1980,12 +2053,16 @@ - if (!subject) - headers->subject = g_strdup(_("(no subject)")); - else -+#ifndef HAVE_GMIME_2_4 - #if HAVE_GMIME_2_2_5 - headers->subject = g_mime_utils_header_decode_text(subject); - #else /* HAVE_GMIME_2_2_5 */ - headers->subject = - g_mime_utils_header_decode_text((guchar *) subject); - #endif /* HAVE_GMIME_2_2_5 */ -+#else /* ! HAVE_GMIME_2_4 */ -+ headers->subject = g_mime_utils_header_decode_text(subject); -+#endif /* ! HAVE_GMIME_2_4 */ - } - libbalsa_utf8_sanitize(&headers->subject, - balsa_app.convert_unknown_8bit, -@@ -3372,7 +3449,11 @@ - - gtk_tree_store_append(store, &iter, parent); - if (body->mime_part) -+#ifndef HAVE_GMIME_2_4 - disp_type = g_mime_part_get_content_disposition(GMIME_PART(body->mime_part)); -+#else /* HAVE_GMIME_2_4 */ -+ disp_type = g_mime_object_get_disposition(body->mime_part); -+#endif /* HAVE_GMIME_2_4 */ - else - disp_type = NULL; - preselect = !disp_type || *disp_type == '\0' || -@@ -3794,7 +3875,11 @@ - g_free(from); - } - -+#ifndef HAVE_GMIME_2_4 - if (headers->to_list) { -+#else /* HAVE_GMIME_2_4 */ -+ if (internet_address_list_length(headers->to_list) > 0) { -+#endif /* HAVE_GMIME_2_4 */ - gchar *to_list = - internet_address_list_to_string(headers->to_list, - FALSE); -@@ -3802,7 +3887,11 @@ - g_free(to_list); - } - -+#ifndef HAVE_GMIME_2_4 - if (headers->cc_list) { -+#else /* HAVE_GMIME_2_4 */ -+ if (internet_address_list_length(headers->cc_list) > 0) { -+#endif /* HAVE_GMIME_2_4 */ - gchar *cc_list = - internet_address_list_to_string(headers->cc_list, - FALSE); -@@ -4221,18 +4310,63 @@ - * particular identity, other than the default. The to_list of the - * original message needs to be set in order for it to work. - **/ -+#ifdef HAVE_GMIME_2_4 -+/* First a helper; groups cannot be nested, and are not allowed in the -+ * From: list. */ -+#endif /* HAVE_GMIME_2_4 */ - static gboolean -+#ifndef HAVE_GMIME_2_4 - guess_identity(BalsaSendmsg* bsmsg, LibBalsaMessage * message) -+#else /* HAVE_GMIME_2_4 */ -+guess_identity_from_list(BalsaSendmsg * bsmsg, InternetAddressList * list, -+ gboolean allow_group) -+#endif /* HAVE_GMIME_2_4 */ - { -+#ifndef HAVE_GMIME_2_4 - const gchar *address_string; - GList *ilist; - LibBalsaIdentity *ident; - const gchar *tmp; -+#else /* HAVE_GMIME_2_4 */ -+ gint i; -+#endif /* HAVE_GMIME_2_4 */ - -+#ifdef HAVE_GMIME_2_4 -+ for (i = 0; i < internet_address_list_length(list); i++) { -+ InternetAddress *ia = internet_address_list_get_address(list, i); - -+ if (INTERNET_ADDRESS_IS_GROUP(ia)) { -+ InternetAddressList *members = -+ INTERNET_ADDRESS_GROUP(ia)->members; -+ if (allow_group -+ && guess_identity_from_list(bsmsg, members, FALSE)) -+ return TRUE; -+ } else { -+ GList *l; -+#endif /* HAVE_GMIME_2_4 */ -+ -+#ifdef HAVE_GMIME_2_4 -+ for (l = balsa_app.identities; l; l = l->next) { -+ LibBalsaIdentity *ident = LIBBALSA_IDENTITY(l->data); -+ if (libbalsa_ia_rfc2821_equal(ia, ident->ia)) { -+ bsmsg->ident = ident; -+ return TRUE; -+ } -+ } -+ } -+ } -+ -+ return FALSE; -+} -+ -+static gboolean -+guess_identity(BalsaSendmsg* bsmsg, LibBalsaMessage * message) -+{ -+#endif /* HAVE_GMIME_2_4 */ - if (!message || !message->headers || !balsa_app.identities) - return FALSE; /* use default */ - -+#ifndef HAVE_GMIME_2_4 - if (bsmsg->type == SEND_CONTINUE) { - if (message->headers->from) { - /* -@@ -4292,6 +4426,21 @@ - } - } - } -+#else /* HAVE_GMIME_2_4 */ -+ if (bsmsg->type == SEND_CONTINUE) -+ return guess_identity_from_list(bsmsg, message->headers->from, -+ FALSE); -+ -+ if (bsmsg->type != SEND_NORMAL) -+ /* bsmsg->type == SEND_REPLY || bsmsg->type == SEND_REPLY_ALL || -+ * bsmsg->type == SEND_REPLY_GROUP || bsmsg->type == SEND_FORWARD_ATTACH || -+ * bsmsg->type == SEND_FORWARD_INLINE */ -+ return guess_identity_from_list(bsmsg, message->headers->to_list, -+ TRUE) -+ || guess_identity_from_list(bsmsg, message->headers->cc_list, -+ TRUE); -+ -+#endif /* HAVE_GMIME_2_4 */ - return FALSE; - } - -@@ -4483,6 +4632,7 @@ - static void - sw_cc_add_list(InternetAddressList **new_cc, InternetAddressList * list) - { -+#ifndef HAVE_GMIME_2_4 - for (; list; list = list->next) { - InternetAddress *ia; - -@@ -4496,6 +4646,23 @@ - break; - if (!ident) - *new_cc = internet_address_list_append(*new_cc, ia); -+#else /* HAVE_GMIME_2_4 */ -+ int i; -+ -+ for (i = 0; i < internet_address_list_length(list); i++) { -+ InternetAddress *ia = internet_address_list_get_address (list, i); -+ GList *ident; -+ -+ /* do not insert any of my identities into the cc: list */ -+ for (ident = balsa_app.identities; ident; ident = ident->next) -+ if (libbalsa_ia_rfc2821_equal -+ (ia, LIBBALSA_IDENTITY(ident->data)->ia)) -+ break; -+ if (!ident) { -+ if (*new_cc == NULL) -+ *new_cc = internet_address_list_new(); -+ internet_address_list_add(*new_cc, ia); -+#endif /* HAVE_GMIME_2_4 */ - } - } - } -@@ -4755,7 +4922,12 @@ - libbalsa_address_view_set_from_list(bsmsg->recipient_view, - "Cc:", - new_cc); -+#ifndef HAVE_GMIME_2_4 - internet_address_list_destroy(new_cc); -+#else /* HAVE_GMIME_2_4 */ -+ if (new_cc) -+ g_object_unref(new_cc); -+#endif /* HAVE_GMIME_2_4 */ - } - - static void -@@ -5493,7 +5665,12 @@ - - message = libbalsa_message_new(); - -+#ifndef HAVE_GMIME_2_4 - message->headers->from = internet_address_list_prepend(NULL, ident->ia); -+#else /* HAVE_GMIME_2_4 */ -+ message->headers->from = internet_address_list_new (); -+ internet_address_list_add(message->headers->from, ident->ia); -+#endif /* HAVE_GMIME_2_4 */ - - tmp = gtk_editable_get_chars(GTK_EDITABLE(bsmsg->subject[1]), 0, -1); - strip_chars(tmp, "\r\n"); -@@ -5713,9 +5890,14 @@ - { - InternetAddressList * ia_list; - gboolean can_encrypt; -+#ifndef HAVE_GMIME_2_4 - InternetAddressList * from_list; - InternetAddressList * cc_list; -+#endif /* ! HAVE_GMIME_2_4 */ - gpgme_protocol_t protocol; -+#ifdef HAVE_GMIME_2_4 -+ gint len; -+#endif /* HAVE_GMIME_2_4 */ - - /* check if the user wants to see the message */ - if (!bsmsg->ident->warn_send_plain) -@@ -5726,24 +5908,52 @@ - return TRUE; - - /* we can not encrypt if we have bcc recipients */ -+#ifndef HAVE_GMIME_2_4 - if ((ia_list = libbalsa_address_view_get_list(bsmsg->recipient_view, "Bcc:"))) { - internet_address_list_destroy(ia_list); - return TRUE; - } -+#else /* HAVE_GMIME_2_4 */ -+ ia_list = libbalsa_address_view_get_list(bsmsg->recipient_view, "Bcc:"); -+ len = internet_address_list_length(ia_list); -+ g_object_unref(ia_list); -+ if (len > 0) -+ return TRUE; -+#endif /* HAVE_GMIME_2_4 */ - - /* collect all to and cc recipients */ -+#ifndef HAVE_GMIME_2_4 - ia_list = libbalsa_address_view_get_list(bsmsg->recipient_view, "To:"); - cc_list = libbalsa_address_view_get_list(bsmsg->recipient_view, "Cc:"); - from_list = internet_address_list_prepend(NULL, bsmsg->ident->ia); -+#endif /* ! HAVE_GMIME_2_4 */ - protocol = bsmsg->gpg_mode & LIBBALSA_PROTECT_SMIMEV3 ? - GPGME_PROTOCOL_CMS : GPGME_PROTOCOL_OpenPGP; -+#ifndef HAVE_GMIME_2_4 - can_encrypt = libbalsa_can_encrypt_for_all(from_list, protocol) & - libbalsa_can_encrypt_for_all(ia_list, protocol) & - libbalsa_can_encrypt_for_all(cc_list, protocol); - internet_address_list_destroy(from_list); - internet_address_list_destroy(ia_list); - internet_address_list_destroy(cc_list); -+#else /* HAVE_GMIME_2_4 */ - -+ ia_list = libbalsa_address_view_get_list(bsmsg->recipient_view, "To:"); -+ can_encrypt = libbalsa_can_encrypt_for_all(ia_list, protocol); -+ g_object_unref(ia_list); -+ if (can_encrypt) { -+ ia_list = libbalsa_address_view_get_list(bsmsg->recipient_view, "Cc:"); -+ can_encrypt = libbalsa_can_encrypt_for_all(ia_list, protocol); -+ g_object_unref(ia_list); -+ } -+ if (can_encrypt) { -+ ia_list = internet_address_list_new(); -+ internet_address_list_add(ia_list, bsmsg->ident->ia); -+ can_encrypt = libbalsa_can_encrypt_for_all(ia_list, protocol); -+ g_object_unref(ia_list); -+ } -+#endif /* HAVE_GMIME_2_4 */ -+ - /* ask the user if we could encrypt this message */ - if (can_encrypt) { - GtkWidget *dialog; -@@ -6757,7 +6967,11 @@ - if (mailing_list_address) { - libbalsa_address_view_set_from_list(bsmsg->recipient_view, "To:", - mailing_list_address); -+#ifndef HAVE_GMIME_2_4 - internet_address_list_destroy(mailing_list_address); -+#else /* HAVE_GMIME_2_4 */ -+ g_object_unref(mailing_list_address); -+#endif /* HAVE_GMIME_2_4 */ - return; - } - -@@ -6891,6 +7105,9 @@ - - list = libbalsa_address_view_get_list(bsmsg->recipient_view, "To:"); - to_string = internet_address_list_to_string(list, FALSE); -+#ifdef HAVE_GMIME_2_4 -+ g_object_unref(list); -+#endif /* HAVE_GMIME_2_4 */ - title = g_strdup_printf(title_format, to_string, - gtk_entry_get_text(GTK_ENTRY(bsmsg->subject[1]))); - g_free(to_string); -Index: balsa/src/save-restore.c -=================================================================== ---- balsa/src/save-restore.c (revision 8017) -+++ balsa/src/save-restore.c (working copy) -@@ -1766,7 +1766,11 @@ - libbalsa_conf_get_string_with_default("MailingListAddress", - &def); - view->mailing_list_address = -+#ifndef HAVE_GMIME_2_4 - def ? NULL : internet_address_parse_string(address); -+#else /* HAVE_GMIME_2_4 */ -+ def ? NULL : internet_address_list_parse_string(address); -+#endif /* HAVE_GMIME_2_4 */ - g_free(address); - - view->identity_name = libbalsa_conf_get_string("Identity"); -Index: balsa/src/balsa-message.c -=================================================================== ---- balsa/src/balsa-message.c (revision 8017) -+++ balsa/src/balsa-message.c (working copy) -@@ -1022,14 +1022,26 @@ - balsa_message_sender_to_gchar(InternetAddressList * list, gint which) - { - if (!list) -+#ifndef HAVE_GMIME_2_4 - return g_strdup(_("(No sender)")); - if (which < 0) - return internet_address_list_to_string(list, FALSE); - while (which > 0 && list->next) { - list = list->next; - --which; -+#else /* HAVE_GMIME_2_4 */ -+ return g_strdup(_("(No sender)")); -+ else if (which < 0) -+ return internet_address_list_to_string(list, FALSE); -+ else { -+ InternetAddress *ia = -+ internet_address_list_get_address(list, which); -+ return internet_address_to_string(ia, FALSE); -+#endif /* HAVE_GMIME_2_4 */ - } -+#ifndef HAVE_GMIME_2_4 - return internet_address_to_string(list->address, FALSE); -+#endif /* ! HAVE_GMIME_2_4 */ - } - - static void -@@ -2041,7 +2053,11 @@ - (g_mime_content_type_is_type(type, "application", "pkcs7-signature") || - g_mime_content_type_is_type(type, "application", "x-pkcs7-signature")))) - add_body(bm, body); -+#ifndef HAVE_GMIME_2_4 - g_mime_content_type_destroy(type); -+#else /* HAVE_GMIME_2_4 */ -+ g_object_unref(type); -+#endif /* HAVE_GMIME_2_4 */ - #else - if (libbalsa_message_body_is_inline(body) || - bm->force_inline || -@@ -2078,7 +2094,11 @@ - } else { /* default to multipart/mixed */ - body = add_multipart_mixed(bm, body->parts); - } -+#ifndef HAVE_GMIME_2_4 - g_mime_content_type_destroy(type); -+#else /* HAVE_GMIME_2_4 */ -+ g_object_unref(type); -+#endif /* HAVE_GMIME_2_4 */ - - return body; - } -@@ -2269,21 +2289,39 @@ - } - - static const InternetAddress * -+#ifndef HAVE_GMIME_2_4 - bm_get_mailbox(const InternetAddressList * list) -+#else /* HAVE_GMIME_2_4 */ -+bm_get_mailbox(InternetAddressList * list) -+#endif /* HAVE_GMIME_2_4 */ - { - InternetAddress *ia; - - if (!list) -+#ifndef HAVE_GMIME_2_4 - return NULL; -+#else /* HAVE_GMIME_2_4 */ -+ return NULL; -+#endif /* HAVE_GMIME_2_4 */ - -+#ifndef HAVE_GMIME_2_4 - ia = list->address; - if (!ia || ia->type == INTERNET_ADDRESS_NONE) - return NULL; -+#else /* HAVE_GMIME_2_4 */ -+ ia = internet_address_list_get_address(list, 0); -+#endif /* HAVE_GMIME_2_4 */ - -+#ifndef HAVE_GMIME_2_4 - while (ia->type == INTERNET_ADDRESS_GROUP && ia->value.members) - ia = ia->value.members->address; - if (!ia || ia->type == INTERNET_ADDRESS_NONE) - return NULL; -+#else /* HAVE_GMIME_2_4 */ -+ while (ia && INTERNET_ADDRESS_IS_GROUP(ia)) -+ ia = internet_address_list_get_address(INTERNET_ADDRESS_GROUP(ia)-> -+ members, 0); -+#endif /* HAVE_GMIME_2_4 */ - - return ia; - } -@@ -2292,10 +2330,19 @@ - handle_mdn_request(GtkWindow *parent, LibBalsaMessage *message) - { - gboolean suspicious, found; -+#ifndef HAVE_GMIME_2_4 - const InternetAddressList *use_from; - const InternetAddressList *list; -+#else /* HAVE_GMIME_2_4 */ -+ InternetAddressList *use_from; -+ InternetAddressList *list; -+ InternetAddress *from, *dn; -+#endif /* HAVE_GMIME_2_4 */ - BalsaMDNReply action; - LibBalsaMessage *mdn; -+#ifdef HAVE_GMIME_2_4 -+ gint i, len; -+#endif /* HAVE_GMIME_2_4 */ - - /* Check if the dispnotify_to address is equal to the (in this order, - if present) reply_to, from or sender address. */ -@@ -2307,28 +2354,58 @@ - use_from = message->sender; - else - use_from = NULL; -+#ifdef HAVE_GMIME_2_4 -+ -+#endif /* HAVE_GMIME_2_4 */ - /* note: neither Disposition-Notification-To: nor Reply-To:, From: or - Sender: may be address groups */ -+#ifndef HAVE_GMIME_2_4 - suspicious = - !libbalsa_ia_rfc2821_equal(message->headers->dispnotify_to->address, - use_from->address); -+#else /* HAVE_GMIME_2_4 */ -+ from = -+ use_from ? internet_address_list_get_address(use_from, 0) : NULL; -+ dn = internet_address_list_get_address(message->headers->dispnotify_to, -+ 0); -+ suspicious = !libbalsa_ia_rfc2821_equal(dn, from); -+#endif /* HAVE_GMIME_2_4 */ - - if (!suspicious) { - /* Try to find "my" address first in the to, then in the cc list */ -+#ifndef HAVE_GMIME_2_4 - list = message->headers->to_list; -+#endif /* ! HAVE_GMIME_2_4 */ - found = FALSE; -+#ifndef HAVE_GMIME_2_4 - while (list && !found) { -+#else /* HAVE_GMIME_2_4 */ -+ -+ list = message->headers->to_list; -+ len = list ? internet_address_list_length(list) : 0; -+ for (i = 0; i < len && !found; i++) -+#endif /* HAVE_GMIME_2_4 */ - found = libbalsa_ia_rfc2821_equal(balsa_app.current_ident->ia, - bm_get_mailbox(list)); -+#ifndef HAVE_GMIME_2_4 - list = list->next; - } -+#endif /* ! HAVE_GMIME_2_4 */ - if (!found) { - list = message->headers->cc_list; -+#ifndef HAVE_GMIME_2_4 - while (list && !found) { - found = libbalsa_ia_rfc2821_equal(balsa_app.current_ident->ia, - bm_get_mailbox(list)); - list = list->next; - } -+#else /* HAVE_GMIME_2_4 */ -+ len = list ? internet_address_list_length(list) : 0; -+ for (i = 0; i < len && !found; i++) -+ found = -+ libbalsa_ia_rfc2821_equal(balsa_app.current_ident->ia, -+ bm_get_mailbox(list)); -+#endif /* HAVE_GMIME_2_4 */ - } - suspicious = !found; - } -@@ -2350,7 +2427,11 @@ - if (action == BALSA_MDN_REPLY_ASKME) { - gchar *sender; - gchar *reply_to; -+#ifndef HAVE_GMIME_2_4 - sender = internet_address_to_string (use_from->address, FALSE); -+#else /* HAVE_GMIME_2_4 */ -+ sender = from ? internet_address_to_string (from, FALSE) : NULL; -+#endif /* HAVE_GMIME_2_4 */ - reply_to = - internet_address_list_to_string (message->headers->dispnotify_to, - FALSE); -@@ -2393,14 +2474,26 @@ - - /* create a message with the header set from the incoming message */ - message = libbalsa_message_new(); -+#ifndef HAVE_GMIME_2_4 - dummy = internet_address_to_string(balsa_app.current_ident->ia, FALSE); - message->headers->from = internet_address_parse_string(dummy); - g_free (dummy); -+#else /* HAVE_GMIME_2_4 */ -+ message->headers->from = internet_address_list_new(); -+ internet_address_list_add(message->headers->from, -+ balsa_app.current_ident->ia); -+#endif /* HAVE_GMIME_2_4 */ - message->headers->date = time(NULL); - libbalsa_message_set_subject(message, "Message Disposition Notification"); -+#ifndef HAVE_GMIME_2_4 - message->headers->to_list = - internet_address_list_prepend(NULL, for_msg->headers-> - dispnotify_to->address); -+#else /* HAVE_GMIME_2_4 */ -+ message->headers->to_list = internet_address_list_new(); -+ internet_address_list_append(message->headers->to_list, -+ for_msg->headers->dispnotify_to); -+#endif /* HAVE_GMIME_2_4 */ - - /* RFC 2298 requests this mime type... */ - message->subtype = g_strdup("report"); -@@ -2440,7 +2533,13 @@ - g_string_append_printf(report, "Original-Recipient: %s\n", - original_rcpt); - g_string_append_printf(report, "Final-Recipient: rfc822; %s\n", -+#ifndef HAVE_GMIME_2_4 - balsa_app.current_ident->ia->value.addr); -+#else /* HAVE_GMIME_2_4 */ -+ INTERNET_ADDRESS_MAILBOX(balsa_app. -+ current_ident->ia)-> -+ addr); -+#endif /* HAVE_GMIME_2_4 */ - if (for_msg->message_id) - g_string_append_printf(report, "Original-Message-ID: <%s>\n", - for_msg->message_id); -Index: balsa/libinit_balsa/assistant_page_user.c -=================================================================== ---- balsa/libinit_balsa/assistant_page_user.c (revision 8017) -+++ balsa/libinit_balsa/assistant_page_user.c (working copy) -@@ -246,6 +246,9 @@ - const gchar *host, *mailbox; - gchar *uhoh; - LibBalsaIdentity *ident; -+#ifdef HAVE_GMIME_2_4 -+ InternetAddress *ia; -+#endif /* HAVE_GMIME_2_4 */ - #if ENABLE_ESMTP - LibBalsaSmtpServer *smtp_server; - #endif /* ENABLE_ESMTP */ -@@ -292,9 +295,16 @@ - } else { - ident = balsa_app.current_ident; - } -+#ifndef HAVE_GMIME_2_4 - internet_address_set_name(ident->ia, mailbox); - internet_address_set_addr(ident->ia, - gtk_entry_get_text(GTK_ENTRY(user->email))); -+#else /* HAVE_GMIME_2_4 */ -+ ia = internet_address_mailbox_new(mailbox, -+ gtk_entry_get_text(GTK_ENTRY -+ (user->email))); -+ libbalsa_identity_set_address(ident, ia); -+#endif /* HAVE_GMIME_2_4 */ - - /* outgoing mail */ - #if ENABLE_ESMTP -Index: configure.in -=================================================================== ---- balsa/configure.in (revision 8017) -+++ balsa/configure.in (working copy) -@@ -51,6 +51,13 @@ - with_gnome=yes - ]) - -+AC_ARG_WITH([gmime], -+ AC_HELP_STRING([--with-gmime=VERSION], -+ [version of GMime to link against]), -+ [ with_gmime=$withval ], -+ [ with_gmime=2.4 ] -+) -+ - dnl ########################################################################### - dnl Configure locking - dnl ########################################################################### -@@ -350,7 +357,6 @@ - PKG_CHECK_MODULES(BALSA, [ - glib-2.0 - gtk+-2.0 >= 2.4 --gmime-2.0 >= 2.1.9 - $gnome_extras - $gnome_print_extras - ]) -@@ -359,7 +365,6 @@ - libgnome-2.0 libgnomeui-2.0 - glib-2.0 - gtk+-2.0 >= 2.4 -- gmime-2.0 >= 2.1.9 - ]) - - dnl ########################################################################## -@@ -780,6 +785,45 @@ - fi - AM_CONDITIONAL([BUILD_WITH_GTKSOURCEVIEW2], [test x$with_gtksourceview = x2 ]) - -+# GMime configuration -+# -+if test $with_gmime == 2.4 ; then -+ if $PKG_CONFIG --exists gmime-2.4 ; then -+ if $PKG_CONFIG --atleast-version=2.3.8 gmime-2.4 ; then -+ PKG_CHECK_MODULES(GMIME, [ gmime-2.4 ]) -+ AC_DEFINE(HAVE_GMIME_2_4, 1, -+ [Defined when GMime-2.4 is available.]) -+ AC_MSG_NOTICE([Note: using GMime Version 2.4]) -+ else -+ AC_MSG_ERROR([*** Your GMime-2.4 installation is too old]) -+ fi -+ else -+ AC_MSG_ERROR([*** You requested GMime-2.4 but it was not found.]) -+ fi -+else -+ if test $with_gmime == 2.0 ; then -+ if $PKG_CONFIG --atleast-version=2.1.9 gmime-2.0 ; then -+ PKG_CHECK_MODULES(GMIME, [ gmime-2.0 ]) -+ if $PKG_CONFIG --atleast-version=2.2.5 gmime-2.0 ; then -+ AC_DEFINE(HAVE_GMIME_2_2_5,1, -+ [Defined when GMime is at least version 2.2.5.]) -+ fi -+ if $PKG_CONFIG --atleast-version=2.2.7 gmime-2.0 ; then -+ AC_DEFINE(HAVE_GMIME_2_2_7,1, -+ [Defined when GMime is at least version 2.2.7.]) -+ fi -+ AC_MSG_NOTICE([Note: using GMime Version 2.0]) -+ else -+ AC_MSG_ERROR([*** Your GMime installation is too old]) -+ fi -+ else -+ AC_MSG_ERROR([*** Unrecognized GMime version]) -+ fi -+fi -+BALSA_CFLAGS="$BALSA_CFLAGS $GMIME_CFLAGS" -+BALSA_LIBS="$BALSA_LIBS $GMIME_LIBS" -+BALSA_AB_LIBS="$BALSA_AB_LIBS $GMIME_LIBS" -+ - dnl ##################################################################### - dnl 5. Headers. - dnl ##################################################################### -@@ -935,16 +979,6 @@ - dnl things that it fixes, for eg. user installs, package builds etc. - dnl AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache) - --dnl check GMime version --if $PKG_CONFIG --atleast-version=2.2.5 gmime-2.0 ; then -- AC_DEFINE(HAVE_GMIME_2_2_5,1,[Defined when GMime is at least version -- 2.2.5.]) --fi --if $PKG_CONFIG --atleast-version=2.2.7 gmime-2.0 ; then -- AC_DEFINE(HAVE_GMIME_2_2_7,1,[Defined when GMime is at least version -- 2.2.7.]) --fi -- - dnl ##################################################################### - dnl 8. Output - dnl ##################################################################### -@@ -975,6 +1009,7 @@ - echo " Installing into prefix: $prefix" - echo " Using multithreading: $use_threads" - echo " Enable compile warnings: $set_more_warnings" -+echo " Use GMime: $with_gmime" - echo " Use ESMTP : $with_esmtp" - echo " Use WebKit (experimental): $use_webkit" - echo " Use GtkHTML: $use_gtkhtml" -Index: libbalsa/abook-completion.c -=================================================================== ---- balsa/libbalsa/abook-completion.c (revision 8017) -+++ balsa/libbalsa/abook-completion.c (working copy) -@@ -46,7 +46,11 @@ - - ret = g_new0(CompletionData, 1); - -+#ifndef HAVE_GMIME_2_4 - internet_address_ref(ia); -+#else /* HAVE_GMIME_2_4 */ -+ g_object_ref(ia); -+#endif /* HAVE_GMIME_2_4 */ - ret->ia = ia; - - string = g_string_new(nick_name); -@@ -78,7 +82,11 @@ - void - completion_data_free(CompletionData * data) - { -+#ifndef HAVE_GMIME_2_4 - internet_address_unref(data->ia); -+#else /* HAVE_GMIME_2_4 */ -+ g_object_unref(data->ia); -+#endif /* HAVE_GMIME_2_4 */ - g_free(data->string); - g_free(data); - } -Index: balsa/libbalsa/address-book-rubrica.c -=================================================================== ---- balsa/libbalsa/address-book-rubrica.c (revision 8017) -+++ balsa/libbalsa/address-book-rubrica.c (working copy) -@@ -236,8 +236,12 @@ - g_completion_complete(ab_text->name_complete, (gchar *) prefix, - new_prefix); list; list = list->next) { - InternetAddress *ia = ((CompletionData *) list->data)->ia; -+#ifndef HAVE_GMIME_2_4 - internet_address_ref(ia); - res = g_list_prepend(res, ia); -+#else /* HAVE_GMIME_2_4 */ -+ res = g_list_prepend(res, g_object_ref(ia)); -+#endif /* HAVE_GMIME_2_4 */ - } - - return g_list_reverse(res); -@@ -469,28 +473,51 @@ - && LIBBALSA_ADDRESS_BOOK(ab_rubrica)->dist_list_mode) { - /* Create a group address. */ - InternetAddress *ia = -+#ifndef HAVE_GMIME_2_4 - internet_address_new_group(address->full_name); -+#else /* HAVE_GMIME_2_4 */ -+ internet_address_group_new(address->full_name); -+ InternetAddressGroup *group = (InternetAddressGroup *) ia; -+#endif /* HAVE_GMIME_2_4 */ - - for (l = address->address_list; l; l = l->next) { - InternetAddress *member = -+#ifndef HAVE_GMIME_2_4 - internet_address_new_name(NULL, l->data); - internet_address_add_member(ia, member); - internet_address_unref(member); -+#else /* HAVE_GMIME_2_4 */ -+ internet_address_mailbox_new(NULL, l->data); -+ internet_address_group_add_member(group, member); -+ g_object_unref(member); -+#endif /* HAVE_GMIME_2_4 */ - } - cmp_data = completion_data_new(ia, address->nick_name); - completion_list = g_list_prepend(completion_list, cmp_data); -+#ifndef HAVE_GMIME_2_4 - internet_address_unref(ia); -+#else /* HAVE_GMIME_2_4 */ -+ g_object_unref(ia); -+#endif /* HAVE_GMIME_2_4 */ - } else { - /* Create name addresses. */ - GList *l; - - for (l = address->address_list; l; l = l->next) { - InternetAddress *ia = -+#ifndef HAVE_GMIME_2_4 - internet_address_new_name(address->full_name, l->data); -+#else /* HAVE_GMIME_2_4 */ -+ internet_address_mailbox_new(address->full_name, l->data); -+#endif /* HAVE_GMIME_2_4 */ - cmp_data = completion_data_new(ia, address->nick_name); - completion_list = - g_list_prepend(completion_list, cmp_data); -+#ifndef HAVE_GMIME_2_4 - internet_address_unref(ia); -+#else /* HAVE_GMIME_2_4 */ -+ g_object_unref(ia); -+#endif /* HAVE_GMIME_2_4 */ - } - } - } -Index: balsa/libbalsa/gmime-gpgme-context.c -=================================================================== ---- balsa/libbalsa/gmime-gpgme-context.c (revision 8017) -+++ balsa/libbalsa/gmime-gpgme-context.c (working copy) -@@ -62,9 +62,17 @@ - GMimeStream * istream, - GMimeStream * ostream, GError ** err); - -+#ifndef HAVE_GMIME_2_4 - static int g_mime_gpgme_decrypt(GMimeCipherContext * ctx, - GMimeStream * istream, - GMimeStream * ostream, GError ** err); -+#else /* HAVE_GMIME_2_4 */ -+static GMimeSignatureValidity *g_mime_gpgme_decrypt(GMimeCipherContext * -+ ctx, -+ GMimeStream * istream, -+ GMimeStream * ostream, -+ GError ** err); -+#endif /* HAVE_GMIME_2_4 */ - - - /* internal passphrase callback */ -@@ -634,7 +642,11 @@ - * Decrypt istream to ostream. In RFC 2440 mode, also try to check an included - * signature (if any). - */ -+#ifndef HAVE_GMIME_2_4 - static int -+#else /* HAVE_GMIME_2_4 */ -+static GMimeSignatureValidity * -+#endif /* HAVE_GMIME_2_4 */ - g_mime_gpgme_decrypt(GMimeCipherContext * context, GMimeStream * istream, - GMimeStream * ostream, GError ** error) - { -@@ -649,10 +661,18 @@ - NULL, /* seek method */ - cb_data_release /* release method */ - }; -+#ifdef HAVE_GMIME_2_4 -+ GMimeSignatureValidity *validity; -+#endif /* HAVE_GMIME_2_4 */ - - /* some paranoia checks */ -+#ifndef HAVE_GMIME_2_4 - g_return_val_if_fail(ctx, -1); - g_return_val_if_fail(ctx->gpgme_ctx, -1); -+#else /* HAVE_GMIME_2_4 */ -+ g_return_val_if_fail(ctx, NULL); -+ g_return_val_if_fail(ctx->gpgme_ctx, NULL); -+#endif /* HAVE_GMIME_2_4 */ - gpgme_ctx = ctx->gpgme_ctx; - protocol = gpgme_get_protocol(gpgme_ctx); - -@@ -672,13 +692,21 @@ - gpgme_data_new_from_cbs(&crypt, &cbs, - istream)) != GPG_ERR_NO_ERROR) { - g_set_error_from_gpgme(error, err, _("could not get data from stream")); -+#ifndef HAVE_GMIME_2_4 - return -1; -+#else /* HAVE_GMIME_2_4 */ -+ return NULL; -+#endif /* HAVE_GMIME_2_4 */ - } - if ((err = gpgme_data_new_from_cbs(&plain, &cbs, ostream)) != - GPG_ERR_NO_ERROR) { - g_set_error_from_gpgme(error, err, _("could not create new data object")); - gpgme_data_release(crypt); -+#ifndef HAVE_GMIME_2_4 - return -1; -+#else /* HAVE_GMIME_2_4 */ -+ return NULL; -+#endif /* HAVE_GMIME_2_4 */ - } - - /* try to decrypt */ -@@ -688,7 +716,11 @@ - g_set_error_from_gpgme(error, err, _("decryption failed")); - gpgme_data_release(plain); - gpgme_data_release(crypt); -+#ifndef HAVE_GMIME_2_4 - return -1; -+#else /* HAVE_GMIME_2_4 */ -+ return NULL; -+#endif /* HAVE_GMIME_2_4 */ - } - gpgme_data_release(plain); - gpgme_data_release(crypt); -@@ -696,7 +728,27 @@ - /* try to get information about the signature (if any) */ - ctx->sig_state = g_mime_gpgme_sigstat_new_from_gpgme_ctx(gpgme_ctx); - -+#ifndef HAVE_GMIME_2_4 - return 0; -+#else /* HAVE_GMIME_2_4 */ -+ validity = g_mime_signature_validity_new(); -+ if (ctx->sig_state) { -+ switch (ctx->sig_state->status) -+ { -+ case GPG_ERR_NO_ERROR: -+ g_mime_signature_validity_set_status(validity, GMIME_SIGNATURE_STATUS_GOOD); -+ break; -+ case GPG_ERR_NOT_SIGNED: -+ g_mime_signature_validity_set_status(validity, GMIME_SIGNATURE_STATUS_UNKNOWN); -+ break; -+ default: -+ g_mime_signature_validity_set_status(validity, GMIME_SIGNATURE_STATUS_BAD); -+ } -+ } else -+ g_mime_signature_validity_set_status(validity, GMIME_SIGNATURE_STATUS_UNKNOWN); -+ -+ return validity; -+#endif /* HAVE_GMIME_2_4 */ - } - - -Index: balsa/libbalsa/mailbox_mh.c -=================================================================== ---- balsa/libbalsa/mailbox_mh.c (revision 8017) -+++ balsa/libbalsa/mailbox_mh.c (working copy) -@@ -1094,9 +1094,15 @@ - } - out_stream = g_mime_stream_fs_new(fd); - -+#ifndef HAVE_GMIME_2_4 - crlffilter = g_mime_filter_crlf_new(GMIME_FILTER_CRLF_DECODE, - GMIME_FILTER_CRLF_MODE_CRLF_ONLY); - in_stream = g_mime_stream_filter_new_with_stream(stream); -+#else /* HAVE_GMIME_2_4 */ -+ crlffilter = g_mime_filter_crlf_new(FALSE, -+ FALSE); -+ in_stream = g_mime_stream_filter_new(stream); -+#endif /* HAVE_GMIME_2_4 */ - g_mime_stream_filter_add(GMIME_STREAM_FILTER(in_stream), crlffilter); - g_object_unref(crlffilter); - -Index: balsa/libbalsa/mailbox_mbox.c -=================================================================== ---- balsa/libbalsa/mailbox_mbox.c (revision 8017) -+++ balsa/libbalsa/mailbox_mbox.c (working copy) -@@ -353,7 +353,11 @@ - */ - static void - lbm_mbox_header_cb(GMimeParser * parser, const char *header, -+#ifndef HAVE_GMIME_2_4 - const char *value, off_t offset, -+#else /* HAVE_GMIME_2_4 */ -+ const char *value, gint64 offset, -+#endif /* HAVE_GMIME_2_4 */ - gpointer user_data) - { - struct message_info *msg_info = *(struct message_info **) user_data; -@@ -1787,7 +1791,11 @@ - - message = libbalsa_message_new(); - -+#ifndef HAVE_GMIME_2_4 - header = g_mime_message_get_header (mime_message, "Status"); -+#else /* HAVE_GMIME_2_4 */ -+ header = g_mime_object_get_header (GMIME_OBJECT(mime_message), "Status"); -+#endif /* HAVE_GMIME_2_4 */ - if (header) { - if (strchr(header, 'R') == NULL) /* not found == not READ */ - flags |= LIBBALSA_MESSAGE_FLAG_NEW; -@@ -1797,7 +1805,11 @@ - flags |= LIBBALSA_MESSAGE_FLAG_RECENT; - } else - flags |= LIBBALSA_MESSAGE_FLAG_NEW | LIBBALSA_MESSAGE_FLAG_RECENT; -+#ifndef HAVE_GMIME_2_4 - header = g_mime_message_get_header (mime_message, "X-Status"); -+#else /* HAVE_GMIME_2_4 */ -+ header = g_mime_object_get_header (GMIME_OBJECT(mime_message), "X-Status"); -+#endif /* HAVE_GMIME_2_4 */ - if (header) { - if (strchr(header, 'D') != NULL) /* found == DELETED */ - flags |= LIBBALSA_MESSAGE_FLAG_DELETED; -@@ -1821,10 +1833,18 @@ - /* Create headers with spaces in place of flags, if necessary, so we - * can later update them in place. */ - lbm_mbox_status_hdr(flags, 2, new_header); -+#ifndef HAVE_GMIME_2_4 - g_mime_message_set_header(message, "Status", new_header->str); -+#else /* HAVE_GMIME_2_4 */ -+ g_mime_object_set_header(GMIME_OBJECT(message), "Status", new_header->str); -+#endif /* HAVE_GMIME_2_4 */ - g_string_truncate(new_header, 0); - lbm_mbox_x_status_hdr(flags, 3, new_header); -+#ifndef HAVE_GMIME_2_4 - g_mime_message_set_header(message, "X-Status", new_header->str); -+#else /* HAVE_GMIME_2_4 */ -+ g_mime_object_set_header(GMIME_OBJECT(message), "X-Status", new_header->str); -+#endif /* HAVE_GMIME_2_4 */ - g_string_free(new_header, TRUE); - } - -@@ -1832,7 +1852,12 @@ - * Encode text parts as quoted-printable. - */ - static void -+#ifndef HAVE_GMIME_2_4 - lbm_mbox_prepare_object(GMimeObject * mime_part) -+#else /* HAVE_GMIME_2_4 */ -+lbm_mbox_prepare_object(GMimeObject * parent, GMimeObject * mime_part, -+ gpointer data) -+#endif /* HAVE_GMIME_2_4 */ - { - g_mime_object_remove_header(mime_part, "Content-Length"); - -@@ -1842,21 +1867,58 @@ - /* Do not break crypto. */ - return; - -+#ifdef HAVE_GMIME_2_4 -+ if (parent) -+ /* We have been called by g_mime_multipart_foreach, which -+ * recursively descends the multipart tree, so we must not -+ * start another descent. */ -+ return; -+ -+#endif /* HAVE_GMIME_2_4 */ -+#ifndef HAVE_GMIME_2_4 - g_mime_multipart_foreach((GMimeMultipart *) mime_part, - (GMimePartFunc) lbm_mbox_prepare_object, - NULL); -+#else /* HAVE_GMIME_2_4 */ -+ g_mime_multipart_foreach((GMimeMultipart *) mime_part, -+ lbm_mbox_prepare_object, -+ NULL); -+#endif /* HAVE_GMIME_2_4 */ - } else if (GMIME_IS_MESSAGE_PART(mime_part)) -+#ifndef HAVE_GMIME_2_4 - lbm_mbox_prepare_object(GMIME_OBJECT - (((GMimeMessagePart *) mime_part)-> - message)); -+#else /* HAVE_GMIME_2_4 */ -+ lbm_mbox_prepare_object(NULL, -+ GMIME_OBJECT -+ (((GMimeMessagePart *) mime_part)-> -+ message), NULL); -+#endif /* HAVE_GMIME_2_4 */ - else if (GMIME_IS_MESSAGE(mime_part))