[Frugalware-git] fwsetup-ng: also parse config during install setup
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fwsetup-ng.git;a=commitdiff;h=ff719a71577b67af86d28f44f8c9ba31b26ebfb5
commit ff719a71577b67af86d28f44f8c9ba31b26ebfb5
Author: James Buren r...@frugalware.org
Date: Wed Aug 29 01:13:05 2012 -0500
also parse config during install setup
diff --git a/src/install.c b/src/install.c
index 24383c0..a7532a0 100644
--- a/src/install.c
+++ b/src/install.c
@@ -1,8 +1,15 @@
#include pacman.h
#include local.h
-static bool install_setup(void)
+static bool install_setup(pacman_cb_db_register cb)
{
+ if(cb == 0)
+ {
+errno = EINVAL;
+fprintf(logfile,%s: %s\n,__func__,strerror(errno));
+return false;
+ }
+
if(!mkdir_recurse(INSTALL_ROOT /var/cache/pacman-g2/pkg))
return false;
@@ -21,5 +28,11 @@ static bool install_setup(void)
return false;
}
+ if(pacman_parse_config(/etc/pacman-g2.conf,cb,) == -1)
+ {
+fprintf(logfile,%s: %s\n,__func__,pacman_strerror(pm_errno));
+return false;
+ }
+
return true;
}
diff --git a/src/local.h b/src/local.h
index 23174fb..90699b7 100644
--- a/src/local.h
+++ b/src/local.h
@@ -10,6 +10,8 @@
#include limits.h
#define _(S) S
+#define LOGFILE fwsetup.log
+#define INSTALL_ROOT /home/ryuo/fwsetup-ng/root
#define NEWT_WIDTH 70
#define NEWT_HEIGHT 21
diff --git a/src/utility.c b/src/utility.c
index 20a7dd8..46f95cc 100644
--- a/src/utility.c
+++ b/src/utility.c
@@ -3,7 +3,7 @@
extern bool mkdir_recurse(const char *path)
{
char buf[PATH_MAX] = {0};
- char *s = buf;
+ char *s = buf + 1;
if(path == 0)
{
@@ -17,7 +17,7 @@ extern bool mkdir_recurse(const char *path)
while((s = strchr(s,'/')) != 0)
{
*s = 0;
-
+
if(mkdir(buf,0755) == -1 errno != EEXIST)
{
fprintf(logfile,%s: %s\n,__func__,strerror(errno));
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] fwsetup-ng: in install setup, use our generic register callback
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fwsetup-ng.git;a=commitdiff;h=cdd1d625ffb5fdc305d5433e70af866f38235562
commit cdd1d625ffb5fdc305d5433e70af866f38235562
Author: James Buren r...@frugalware.org
Date: Wed Aug 29 01:39:11 2012 -0500
in install setup, use our generic register callback
diff --git a/src/install.c b/src/install.c
index a7532a0..c87074b 100644
--- a/src/install.c
+++ b/src/install.c
@@ -1,15 +1,26 @@
#include pacman.h
#include local.h
-static bool install_setup(pacman_cb_db_register cb)
+static PM_DB **databases = 0;
+
+static void install_database_callback(const char *name,PM_DB *db)
{
- if(cb == 0)
- {
-errno = EINVAL;
-fprintf(logfile,%s: %s\n,__func__,strerror(errno));
-return false;
- }
+ static size_t n = 1;
+
+ if(name == 0 || db == 0)
+return;
+
+ databases = realloc(databases,sizeof(PM_DB *) * (n + 1));
+ databases[n - 1] = db;
+
+ databases[n] = 0;
+
+ ++n;
+}
+
+static bool install_setup(void)
+{
if(!mkdir_recurse(INSTALL_ROOT /var/cache/pacman-g2/pkg))
return false;
@@ -28,7 +39,7 @@ static bool install_setup(pacman_cb_db_register cb)
return false;
}
- if(pacman_parse_config(/etc/pacman-g2.conf,cb,) == -1)
+ if(pacman_parse_config(/etc/pacman-g2.conf,install_database_callback,)
== -1)
{
fprintf(logfile,%s: %s\n,__func__,pacman_strerror(pm_errno));
return false;
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] artwork: * updating gtk3 theme
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=artwork.git;a=commitdiff;h=645c04cb0b4d2ded0f31bef596c7f5cedc65b4b6
commit 645c04cb0b4d2ded0f31bef596c7f5cedc65b4b6
Author: Devil505 devil505li...@gmail.com
Date: Wed Aug 29 09:29:19 2012 +0200
* updating gtk3 theme
diff --git a/gnome-frugalware/theme/Frugalware/gtk-2.0/apps/xfce-panel.rc
b/gnome-frugalware/theme/Frugalware/gtk-2.0/apps/xfce-panel.rc
index 9bdf5ef..28c1d9b 100644
--- a/gnome-frugalware/theme/Frugalware/gtk-2.0/apps/xfce-panel.rc
+++ b/gnome-frugalware/theme/Frugalware/gtk-2.0/apps/xfce-panel.rc
@@ -65,7 +65,6 @@ style workspace-switcher = theme-panel
style window-buttons = theme-panel
{
- font_name = 9
xthickness = 3
ythickness = 3
@@ -87,11 +86,16 @@ style window-buttons = theme-panel
}
}
+style indicator = theme-panel
+{
+ xthickness = 0
+ ythickness = 0
+}
+
widget *PanelWidget* style theme-panel
widget *PanelApplet* style theme-panel
widget *fast-user-switch* style theme-panel
widget *CPUFreq*Applet* style theme-panel
-widget *indicator-applet*style theme-panel
class PanelApp* style theme-panel
class PanelToplevel* style theme-panel
widget_class *PanelToplevel* style theme-panel
@@ -123,4 +127,7 @@ widget_class *Panel*GtkMenuBar* style
theme-main-menu-text
widget *.clock-applet-button.*style theme-panel-text
widget *PanelApplet* style theme-panel-text
+# Override general panel-style with specific plugin-styles
+widget *indicator-applet*style indicator
+widget *indicator-button*style indicator
widget *XfceTasklist* style window-buttons
diff --git a/gnome-frugalware/theme/Frugalware/gtk-2.0/gtkrc
b/gnome-frugalware/theme/Frugalware/gtk-2.0/gtkrc
index 555172b..27fba02 100644
--- a/gnome-frugalware/theme/Frugalware/gtk-2.0/gtkrc
+++ b/gnome-frugalware/theme/Frugalware/gtk-2.0/gtkrc
@@ -91,7 +91,7 @@ style default
fg[PRELIGHT] = @fg_color
fg[SELECTED] = @selected_fg_color
fg[ACTIVE]= @fg_color
- fg[INSENSITIVE] = darker (@bg_color)
+ fg[INSENSITIVE] = mix (0.4, @fg_color, @bg_color)
bg[NORMAL]= @bg_color
bg[PRELIGHT] = shade (1.02, @bg_color)
@@ -234,7 +234,7 @@ style entry = wider
style button = wider
{
bg[NORMAL]= shade (1.02, @bg_color)
- bg[PRELIGHT] = shade (0.9, @base_color)
+ bg[PRELIGHT] = shade (1.07, @bg_color)
bg[ACTIVE]= shade (0.85, @bg_color)
bg[SELECTED] = shade (0.5, @selected_bg_color)
bg[INSENSITIVE] = shade (0.95, @bg_color)
@@ -285,15 +285,15 @@ style menu
GtkMenuBar :: shadow-type = GTK_SHADOW_NONE
bg[SELECTED] = @selected_bg_color
- bg[NORMAL]= shade (0.98, @base_color)
+ bg[NORMAL]= shade (1.18, @bg_color)
bg[PRELIGHT] = @selected_bg_color
- bg[ACTIVE]= shade (0.98, @base_color)
- bg[INSENSITIVE] = shade (0.98, @base_color)
+ bg[ACTIVE]= shade (1.18, @bg_color)
+ bg[INSENSITIVE] = shade (1.18, @bg_color)
fg[NORMAL]= @fg_color # Color for normal text.
fg[PRELIGHT] = @base_color
fg[SELECTED] = @base_color
fg[ACTIVE]= @base_color
- fg[INSENSITIVE] = shade (0.75, @bg_color) # Text color for
non-interactive menu items
+ fg[INSENSITIVE] = mix (0.4, @fg_color, @bg_color) # Text color for
non-interactive menu items
text[NORMAL] = @text_color # Color for menu-item radio/checks.
base[NORMAL] = @bg_color # Color for menu-item radio/checks background.
text[PRELIGHT]= @base_color
@@ -527,7 +527,7 @@ style radiocheck
bg[INSENSITIVE] = shade (0.95, @bg_color)
text[PRELIGHT] = shade (0.8, @selected_bg_color)
fg[ACTIVE] = @fg_color
- fg[INSENSITIVE] = shade (0.55, @bg_color)
+ fg[INSENSITIVE] = mix (0.4, @fg_color, @bg_color)
engine murrine
{
@@ -787,7 +787,7 @@ style fg-is-text-color-workaround
fg[PRELIGHT]= @text_color
fg[ACTIVE] = @selected_fg_color
fg[SELECTED]= @selected_fg_color
- fg[INSENSITIVE] = darker (@bg_color)
+ fg[INSENSITIVE] = mix (0.4, @text_color, @bg_color)
}
widget_class *GtkListItem* style fg-is-text-color-workaround
# The same problem also exists for GtkCList and GtkCTree.
diff --git
a/gnome-frugalware/theme/Frugalware/gtk-3.0/apps/gnome-applications.css
b/gnome-frugalware/theme/Frugalware/gtk-3.0/apps/gnome-applications.css
index 55e9608..88a3bb1 100644
--- a/gnome-frugalware/theme/Frugalware/gtk-3.0/apps/gnome-applications.css
+++ b/gnome-frugalware/theme/Frugalware/gtk-3.0/apps/gnome-applications.css
@@ -7,8 +7,8 @@ PanelToplevel {
background-image: -gtk-gradient(linear, left top, left bottom,
from (shade(@theme_bg_color, 1.5)),
to (shade(@theme_bg_color, 1.05)));
-padding: 0;
+padding: 0;
color: @theme_fg_color;
}
@@ -17,11 +17,11 @@ PanelApplet {
}
[Frugalware-git] artwork: * updating xfwm4 theme
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=artwork.git;a=commitdiff;h=6756d3133551499f26eeacedfd920c3b1c15860a
commit 6756d3133551499f26eeacedfd920c3b1c15860a
Author: Devil505 devil505li...@gmail.com
Date: Wed Aug 29 09:30:29 2012 +0200
* updating xfwm4 theme
diff --git a/xfce-frugalware/Frugalware/xfwm4/bottom-active.png
b/xfce-frugalware/Frugalware/xfwm4/bottom-active.png
new file mode 100644
index 000..ff91258
Binary files /dev/null and b/xfce-frugalware/Frugalware/xfwm4/bottom-active.png
differ
diff --git a/xfce-frugalware/Frugalware/xfwm4/bottom-active.xpm
b/xfce-frugalware/Frugalware/xfwm4/bottom-active.xpm
deleted file mode 100644
index c3d9036..000
--- a/xfce-frugalware/Frugalware/xfwm4/bottom-active.xpm
+++ /dev/null
@@ -1,6 +0,0 @@
-/* XPM */
-static char * right_active_xpm[] = {
-1 1 2 1,
- c None,
-. c #939393,
-.};
diff --git a/xfce-frugalware/Frugalware/xfwm4/bottom-inactive.png
b/xfce-frugalware/Frugalware/xfwm4/bottom-inactive.png
new file mode 12
index 000..d53233b
--- /dev/null
+++ b/xfce-frugalware/Frugalware/xfwm4/bottom-inactive.png
@@ -0,0 +1 @@
+bottom-active.png
\ No newline at end of file
diff --git a/xfce-frugalware/Frugalware/xfwm4/bottom-inactive.xpm
b/xfce-frugalware/Frugalware/xfwm4/bottom-inactive.xpm
deleted file mode 100644
index c3d9036..000
--- a/xfce-frugalware/Frugalware/xfwm4/bottom-inactive.xpm
+++ /dev/null
@@ -1,6 +0,0 @@
-/* XPM */
-static char * right_active_xpm[] = {
-1 1 2 1,
- c None,
-. c #939393,
-.};
diff --git a/xfce-frugalware/Frugalware/xfwm4/bottom-left-active.xpm
b/xfce-frugalware/Frugalware/xfwm4/bottom-left-active.xpm
index c3d9036..6741abd 100644
--- a/xfce-frugalware/Frugalware/xfwm4/bottom-left-active.xpm
+++ b/xfce-frugalware/Frugalware/xfwm4/bottom-left-active.xpm
@@ -1,6 +1,7 @@
/* XPM */
-static char * right_active_xpm[] = {
-1 1 2 1,
+static char * bottom_left_active_xpm[] = {
+2 2 2 1,
c None,
. c #939393,
-.};
+ .,
+ };
diff --git a/xfce-frugalware/Frugalware/xfwm4/bottom-left-inactive.xpm
b/xfce-frugalware/Frugalware/xfwm4/bottom-left-inactive.xpm
deleted file mode 100644
index c3d9036..000
--- a/xfce-frugalware/Frugalware/xfwm4/bottom-left-inactive.xpm
+++ /dev/null
@@ -1,6 +0,0 @@
-/* XPM */
-static char * right_active_xpm[] = {
-1 1 2 1,
- c None,
-. c #939393,
-.};
diff --git a/xfce-frugalware/Frugalware/xfwm4/bottom-left-inactive.xpm
b/xfce-frugalware/Frugalware/xfwm4/bottom-left-inactive.xpm
new file mode 12
index 000..d70de34
--- /dev/null
+++ b/xfce-frugalware/Frugalware/xfwm4/bottom-left-inactive.xpm
@@ -0,0 +1 @@
+bottom-left-active.xpm
\ No newline at end of file
diff --git a/xfce-frugalware/Frugalware/xfwm4/bottom-right-active.png
b/xfce-frugalware/Frugalware/xfwm4/bottom-right-active.png
new file mode 100644
index 000..633a010
Binary files /dev/null and
b/xfce-frugalware/Frugalware/xfwm4/bottom-right-active.png differ
diff --git a/xfce-frugalware/Frugalware/xfwm4/bottom-right-active.xpm
b/xfce-frugalware/Frugalware/xfwm4/bottom-right-active.xpm
deleted file mode 100644
index c3d9036..000
--- a/xfce-frugalware/Frugalware/xfwm4/bottom-right-active.xpm
+++ /dev/null
@@ -1,6 +0,0 @@
-/* XPM */
-static char * right_active_xpm[] = {
-1 1 2 1,
- c None,
-. c #939393,
-.};
diff --git a/xfce-frugalware/Frugalware/xfwm4/bottom-right-inactive.png
b/xfce-frugalware/Frugalware/xfwm4/bottom-right-inactive.png
new file mode 12
index 000..624915b
--- /dev/null
+++ b/xfce-frugalware/Frugalware/xfwm4/bottom-right-inactive.png
@@ -0,0 +1 @@
+bottom-right-active.png
\ No newline at end of file
diff --git a/xfce-frugalware/Frugalware/xfwm4/bottom-right-inactive.xpm
b/xfce-frugalware/Frugalware/xfwm4/bottom-right-inactive.xpm
deleted file mode 100644
index c3d9036..000
--- a/xfce-frugalware/Frugalware/xfwm4/bottom-right-inactive.xpm
+++ /dev/null
@@ -1,6 +0,0 @@
-/* XPM */
-static char * right_active_xpm[] = {
-1 1 2 1,
- c None,
-. c #939393,
-.};
diff --git a/xfce-frugalware/Frugalware/xfwm4/left-active.xpm
b/xfce-frugalware/Frugalware/xfwm4/left-active.xpm
index c3d9036..515c592 100644
--- a/xfce-frugalware/Frugalware/xfwm4/left-active.xpm
+++ b/xfce-frugalware/Frugalware/xfwm4/left-active.xpm
@@ -1,6 +1,7 @@
/* XPM */
-static char * right_active_xpm[] = {
-1 1 2 1,
+static char * left_active_xpm[] = {
+2 2 2 1,
c None,
. c #939393,
-.};
+ .,
+ .};
diff --git a/xfce-frugalware/Frugalware/xfwm4/left-inactive.xpm
b/xfce-frugalware/Frugalware/xfwm4/left-inactive.xpm
deleted file mode 100644
index c3d9036..000
--- a/xfce-frugalware/Frugalware/xfwm4/left-inactive.xpm
+++ /dev/null
@@ -1,6 +0,0 @@
-/* XPM */
-static char * right_active_xpm[] = {
-1 1 2 1,
- c None,
-. c #939393,
-.};
diff --git a/xfce-frugalware/Frugalware/xfwm4/left-inactive.xpm
b/xfce-frugalware/Frugalware/xfwm4/left-inactive.xpm
new file mode 12
index 000..ebcf490
--- /dev/null
+++
[Frugalware-git] frugalware-current: xfce4-places-plugin-1.4.0-1-i686 * Version bump
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5df6100d8dd8d2046c74d2b8b7be2b0274bca00a
commit 5df6100d8dd8d2046c74d2b8b7be2b0274bca00a
Author: Pingax pin...@frugalware.fr
Date: Wed Aug 29 11:48:34 2012 +0200
xfce4-places-plugin-1.4.0-1-i686
* Version bump
diff --git a/source/xfce4/xfce4-places-plugin/FrugalBuild
b/source/xfce4/xfce4-places-plugin/FrugalBuild
index c151e1d..a7f84d5 100644
--- a/source/xfce4/xfce4-places-plugin/FrugalBuild
+++ b/source/xfce4/xfce4-places-plugin/FrugalBuild
@@ -4,7 +4,7 @@
# Contributor: Priyank Gosalia priyan...@gmail.com
pkgname=xfce4-places-plugin
-pkgver=1.3.0
+pkgver=1.4.0
pkgrel=1
pkgdesc=A file browser launcher plugin for the Xfce4 panel.
makedepends=('intltool')
@@ -14,6 +14,6 @@ archs=('i686' 'x86_64')
_F_gnome_iconcache=y
_F_xfce_category=panel-plugins
Finclude xfce4 gnome-scriptlet
-sha1sums=('b59204735262a9ff4d5caf9ee3e5eabc4b974898')
+sha1sums=('81af5eb9847731c6554ed5e3b1385c6d9d41224d')
# optimization OK
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: python-httplib2-0.7.5-1-i686 * Version bump
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8d8e7b3be8582499f0034a3d3b1f8bd872637707
commit 8d8e7b3be8582499f0034a3d3b1f8bd872637707
Author: Pingax pin...@frugalware.fr
Date: Wed Aug 29 13:43:00 2012 +0200
python-httplib2-0.7.5-1-i686
* Version bump
diff --git a/source/devel-extra/python-httplib2/FrugalBuild
b/source/devel-extra/python-httplib2/FrugalBuild
index ac90abb..6dc25c6 100644
--- a/source/devel-extra/python-httplib2/FrugalBuild
+++ b/source/devel-extra/python-httplib2/FrugalBuild
@@ -3,7 +3,7 @@
# Contribuor: Devil505 devil505li...@gmail.com
pkgname=python-httplib2
-pkgver=0.7.4
+pkgver=0.7.5
pkgrel=1
pkgdesc=A comprehensive HTTP client library
depends=('python=2.7')
@@ -13,4 +13,4 @@ _F_googlecode_name=httplib2
Finclude googlecode
groups=('devel-extra')
archs=('i686' 'x86_64')
-sha1sums=('91e5cbd92216721cc1cd701f9e83a89a14384961')
+sha1sums=('a4a14064f97a3abc88024dc7c5d2f11c0d6cf47f')
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: libshout-2.3.1-1-i686 * Version bump
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e28ebf2d61383e2b8b82c95271f9bd79c8c59055
commit e28ebf2d61383e2b8b82c95271f9bd79c8c59055
Author: Pingax pin...@frugalware.fr
Date: Wed Aug 29 13:48:56 2012 +0200
libshout-2.3.1-1-i686
* Version bump
diff --git a/source/lib/libshout/FrugalBuild b/source/lib/libshout/FrugalBuild
index 38857b6..1490478 100644
--- a/source/lib/libshout/FrugalBuild
+++ b/source/lib/libshout/FrugalBuild
@@ -3,7 +3,7 @@
# Contributor: Tuxbubling tuxbubl...@tiscali.fr
pkgname=libshout
-pkgver=2.3.0
+pkgver=2.3.1
pkgrel=1
pkgdesc=Library which can be used to write a source client like ices.
url=http://www.icecast.org/;
@@ -12,7 +12,7 @@ archs=('i686' 'x86_64')
depends=('libvorbis' 'libtheora' 'speex')
up2date=lynx -dump
'http://downloads.us.xiph.org/releases/libshout/?C=M;O=A'|grep
'libshout-\(.*\).tar.gz$'|sort -n -r|head -n 1|sed 's/.*-\(.*\).t.*/\1/'
source=(http://downloads.us.xiph.org/releases/$pkgname/$pkgname-$pkgver.tar.gz)
-sha1sums=('a6f26441ec27b6f9b55fba38b99bd1d7ca17fecf')
+sha1sums=('147c5670939727420d0e2ad6a20468e2c2db1e20')
build()
{
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: libdvdcss-1.2.11-1-i686 * Version bump
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5548bafffec38549bee6701dd1aef0fecb0adaa8
commit 5548bafffec38549bee6701dd1aef0fecb0adaa8
Author: Pingax pin...@frugalware.fr
Date: Wed Aug 29 13:53:25 2012 +0200
libdvdcss-1.2.11-1-i686
* Version bump
diff --git a/source/lib/libdvdcss/FrugalBuild b/source/lib/libdvdcss/FrugalBuild
index d36ea7b..8b7f3b4 100644
--- a/source/lib/libdvdcss/FrugalBuild
+++ b/source/lib/libdvdcss/FrugalBuild
@@ -3,7 +3,7 @@
# Contributor: Shrift shr...@frugalware.org
pkgname=libdvdcss
-pkgver=1.2.10
+pkgver=1.2.11
pkgrel=1
pkgdesc=libdvdcss is a cross-platform library for transparent DVD device
access with on-the-fly CSS decryption.
url=http://www.videolan.org/libdvdcss/;
@@ -12,6 +12,6 @@ archs=('i686' 'x86_64' 'arm')
depends=('glibc')
up2date=Flasttar http://download.videolan.org/pub/libdvdcss/last/;
source=http://download.videolan.org/pub/libdvdcss/last/$pkgname-$pkgver.tar.gz;
-sha1sums=('36f54610a66ef2f2d4f011fc95aeb256229de321')
+sha1sums=('c55c74be9e399821ec98e79ae8b5ded6f023571d')
# optimization OK
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: mpg123-1.14.4-1-i686 * Version bump
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7ca5b2d78a4447517f37b557e2a6616f476c8a5b
commit 7ca5b2d78a4447517f37b557e2a6616f476c8a5b
Author: Pingax pin...@frugalware.fr
Date: Wed Aug 29 14:01:08 2012 +0200
mpg123-1.14.4-1-i686
* Version bump
diff --git a/source/multimedia-extra/mpg123/FrugalBuild
b/source/multimedia-extra/mpg123/FrugalBuild
index 1a1e8ae..f8d2654 100644
--- a/source/multimedia-extra/mpg123/FrugalBuild
+++ b/source/multimedia-extra/mpg123/FrugalBuild
@@ -3,7 +3,7 @@
# Contributor: Kooda ko...@upyum.com
pkgname=mpg123
-pkgver=1.14.3
+pkgver=1.14.4
pkgrel=1
pkgdesc=mpg123 is the fast and Free MPEG Audio Player
url=http://www.mpg123.de;
@@ -13,7 +13,7 @@ groups=('multimedia-extra')
archs=('i686' 'x86_64')
up2date=Flasttar $url/download/
source=($url/download/$pkgname-$pkgver.tar.bz2)
-sha1sums=('c3cd800121bccf15d8fc31a30575a5dce8aaa5d5')
+sha1sums=('9f53e27bb40b8df3d3b6df25f5f9a8a83b1fccfe')
subpkgs=('libmpg123')
subdescs=('libmpg123 is the API used by the mpg123 audio player')
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: doxygen-1.8.2-1-i686 * Version bump
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=be8da06ae636d121bd0b5aaad455f7e896dc652b
commit be8da06ae636d121bd0b5aaad455f7e896dc652b
Author: Pingax pin...@frugalware.fr
Date: Wed Aug 29 14:22:51 2012 +0200
doxygen-1.8.2-1-i686
* Version bump
diff --git a/source/devel-extra/doxygen/FrugalBuild
b/source/devel-extra/doxygen/FrugalBuild
index 781e979..b71e5c5 100644
--- a/source/devel-extra/doxygen/FrugalBuild
+++ b/source/devel-extra/doxygen/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: Pingax pin...@frugalware.fr
pkgname=doxygen
-pkgver=1.8.0
+pkgver=1.8.2
pkgrel=1
pkgdesc=Doxygen is the documentation system for C/C++
url=http://www.doxygen.org/;
@@ -15,5 +15,5 @@ groups=('devel-extra')
archs=('i686' 'x86_64' 'arm')
up2date=lynx -dump http://www.stack.nl/~dimitri/doxygen/download.html|grep
'latest'|sed 's/.* v\([^ ]*\) .*/\1/;q'
source=(ftp://ftp.stack.nl/pub/users/dimitri/$pkgname-$pkgver.src.tar.gz)
-sha1sums=('7f4348418dc3efefd357b32a2b5c8010211ab284')
+sha1sums=('7b88ade3989ce0f43f0fb2b2574436c4f1fa1c5a')
Fconfopts=$Fconfopts --prefix $Fprefix --docdir
$Fprefix/share/doc/$pkgname-$pkgver
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: tesseract-ocr-3.01-2-x86_64
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=cf46e967347cb45f9487cd7a4c3a965a93609de0
commit cf46e967347cb45f9487cd7a4c3a965a93609de0
Author: Daniel Exner d...@dragonslave.de
Date: Wed Aug 29 13:03:13 2012 +0200
tesseract-ocr-3.01-2-x86_64
* release bump
* rebuild with new leptonica
diff --git a/source/xapps-extra/tesseract-ocr/FrugalBuild
b/source/xapps-extra/tesseract-ocr/FrugalBuild
index 13dd8ea..4fe5c23 100644
--- a/source/xapps-extra/tesseract-ocr/FrugalBuild
+++ b/source/xapps-extra/tesseract-ocr/FrugalBuild
@@ -3,12 +3,12 @@
pkgname=tesseract-ocr
pkgver=3.01
-pkgrel=1
+pkgrel=2
pkgdesc=An OCR program
archs=('i686' 'x86_64')
groups=('xapps-extra')
url=http://code.google.com/p/tesseract-ocr;
-depends=('libtiff=3.9.2' 'libjpeg=8a' 'leptonica')
+depends=('libtiff=3.9.5' 'libjpeg=8c' 'leptonica=1.69')
_F_archive_name=tesseract
up2date=Flasttar $url
# up2date from Finclude googlecode does not work :/
source=(http://$pkgname.googlecode.com/files/$_F_archive_name-$pkgver.tar.gz \
@@ -78,8 +78,8 @@ sha1sums=('c0b605d7192b3071842fe535c82b89c65f2d9c67' \
build() {
Fcd
- [ -f Makefile.in ] || automake
- [ -f Makefile ] || ./configure --prefix=/usr
+ sed -i '1,1i#include unistd.h' viewer/svutil.cpp || Fdie
+ Fautogen
Fmake
Fmakeinstall
Fmkdir usr/share/tessdata
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: openssh-6.1p1-1-x86_64
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=82c69cc53e003150c61ee322ba7a3772e43c9b92
commit 82c69cc53e003150c61ee322ba7a3772e43c9b92
Author: Miklos Vajna vmik...@frugalware.org
Date: Wed Aug 29 13:12:25 2012 +0200
openssh-6.1p1-1-x86_64
- up to 6.1p1
diff --git a/source/network/openssh/FrugalBuild
b/source/network/openssh/FrugalBuild
index 40d55e3..38abe7a 100644
--- a/source/network/openssh/FrugalBuild
+++ b/source/network/openssh/FrugalBuild
@@ -3,8 +3,8 @@
# Maintainer: voroskoi voros...@frugalware.org
pkgname=openssh
-pkgver=6.0p1
-pkgrel=2
+pkgver=6.1p1
+pkgrel=1
pkgdesc='Secure Shell daemon and clients'
url=http://www.openssh.com/;
backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config')
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: rekonq-1.1-1-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3700da9003f855299c016f9eada0eb5ea0893c9b
commit 3700da9003f855299c016f9eada0eb5ea0893c9b
Author: Melko me...@frugalware.org
Date: Wed Aug 29 13:04:18 2012 +0200
rekonq-1.1-1-i686
* version bump
diff --git a/source/kde-extra/rekonq/FrugalBuild
b/source/kde-extra/rekonq/FrugalBuild
index 477c5f5..cc3ddcb 100644
--- a/source/kde-extra/rekonq/FrugalBuild
+++ b/source/kde-extra/rekonq/FrugalBuild
@@ -3,7 +3,7 @@
# Contributor: Devil505 devil505li...@gmail.com
pkgname=rekonq
-pkgver=1.0
+pkgver=1.1
pkgrel=1
pkgdesc='A WebKit based web browser for KDE'
groups=('kde-extra')
@@ -13,8 +13,6 @@ Finclude sourceforge kde
depends=(${depends[@]} kdelibs=$_F_kde_ver libqtcore libqtgui
libqtnetwork \
libqtwebkit gtk+2 'libthreadweaver' 'libkutils')
makedepends=(${makedepends[@]} kdelibs-compiletime=$_F_kde_ver
'docbook-xsl' ksgmltools2=$_F_kde_ver libkdeclarative=$_F_kde_ver)
-source=(${source[@]} 'fix-build.patch')
-sha1sums=('b5f20c59dc21d57a0557104999d2a0e0423a7611' \
- '4b7a0f82ed208e9e69f18ed95512375900ff3dd1')
+sha1sums=('1b9cdc9a50c4b5e1c34b90c73f5c43c4f596ae51')
# optimization OK
diff --git a/source/kde-extra/rekonq/fix-build.patch
b/source/kde-extra/rekonq/fix-build.patch
deleted file mode 100644
index 1a401ce..000
--- a/source/kde-extra/rekonq/fix-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
rekonq-0.9.0/doc/nl/index.docbook~ 2012-03-02 15:31:21.730372412 +
-+++ rekonq-0.9.0/doc/nl/index.docbook 2012-03-02 15:31:48.780152894 +
-@@ -82,7 +82,7 @@
- /surname
- /personname
- /author
--ged.vertaald;Freek.de.Kruijf;
-+Freek.de.Kruijf;
- /authorgroup
- legalnotice
- FDLNotice;/legalnotice
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: libgphoto2-2.5.0-1-x86_64
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=fa73349dd3c68e09f4a3cc1522f342bb9864b09a
commit fa73349dd3c68e09f4a3cc1522f342bb9864b09a
Author: Elentir elen...@frugalware.org
Date: Wed Aug 29 13:43:11 2012 +0200
libgphoto2-2.5.0-1-x86_64
* version bump
diff --git a/source/lib/libgphoto2/FrugalBuild
b/source/lib/libgphoto2/FrugalBuild
index b6d785c..eb79624 100644
--- a/source/lib/libgphoto2/FrugalBuild
+++ b/source/lib/libgphoto2/FrugalBuild
@@ -3,8 +3,8 @@
# Maintainer: Elentir elen...@frugalware.org
pkgname=libgphoto2
-pkgver=2.4.14
-pkgrel=2
+pkgver=2.5.0
+pkgrel=1
pkgdesc=A portable library to gives access to many digital cameras
groups=('lib')
archs=('i686' 'x86_64')
@@ -15,7 +15,7 @@ _F_sourceforge_realname=libgphoto
_F_sourceforge_ext=.tar.bz2
Finclude sourceforge
url=http://www.gphoto.org;
-sha1sums=('c932f44d51e820245ff3394ee01a5e9df429dfef')
+sha1sums=('b8383933525b71308b3b24ba43c88a4c5d999cf8')
build() {
UDEV_RULES=${Fdestdir}/lib/udev/rules.d/40-${pkgname}.rules
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] mxw: document how to reconnect
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=mxw.git;a=commitdiff;h=4ad37df7444dacacc3527c21421f4cabdffdd3ef commit 4ad37df7444dacacc3527c21421f4cabdffdd3ef Author: Miklos Vajna vmik...@frugalware.org Date: Wed Aug 29 13:46:25 2012 +0200 document how to reconnect diff --git a/TRICKS b/TRICKS index 5f002ea..039121e 100644 --- a/TRICKS +++ b/TRICKS @@ -21,3 +21,9 @@ in most cases. If a change has been made for example to the anydatetime module, you need: eval reload(anydatetime) + +Reconnect: + +eval c.quit() + +it will reconnect automatically. ___ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: darktable-1.0.5-2-x86_64
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=354fa226803ca131bb607ce160a87bc4f762644e
commit 354fa226803ca131bb607ce160a87bc4f762644e
Author: Elentir elen...@frugalware.org
Date: Wed Aug 29 13:52:41 2012 +0200
darktable-1.0.5-2-x86_64
* rebuild with libgphoto2=2.5.0
diff --git a/source/gnome-extra/darktable/FrugalBuild
b/source/gnome-extra/darktable/FrugalBuild
index 9fea159..be4a16d 100644
--- a/source/gnome-extra/darktable/FrugalBuild
+++ b/source/gnome-extra/darktable/FrugalBuild
@@ -5,9 +5,9 @@
pkgname=darktable
pkgver=1.0.5
-pkgrel=1
+pkgrel=2
pkgdesc=A virtual lighttable and darkroom for photographers (manage RAW
images)
-depends=('curl' 'libgphoto2' 'openexr=1.7.0' 'lcms' 'exiv2=0.23' 'libglade'
'sqlite3'\
+depends=('curl' 'libgphoto2=2.5.0' 'openexr=1.7.0' 'lcms' 'exiv2=0.23'
'libglade' 'sqlite3'\
'libgnome-keyring' 'librsvg' 'lensfun=0.2.6' 'lcms2')
makedepends=('intltool')
groups=('gnome-extra')
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: phpbb-3.0.11-1-i686 * Version bump * Adjust up2date
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2a45b10bdc1887ca76712fdb4fbd83b5c9e23598
commit 2a45b10bdc1887ca76712fdb4fbd83b5c9e23598
Author: Pingax pin...@frugalware.fr
Date: Wed Aug 29 15:57:07 2012 +0200
phpbb-3.0.11-1-i686
* Version bump
* Adjust up2date
diff --git a/source/network-extra/phpbb/FrugalBuild
b/source/network-extra/phpbb/FrugalBuild
index e9b1544..0c32ea4 100644
--- a/source/network-extra/phpbb/FrugalBuild
+++ b/source/network-extra/phpbb/FrugalBuild
@@ -4,7 +4,7 @@
pkgname=phpbb
_F_archive_name=phpBB
-pkgver=3.0.10
+pkgver=3.0.11
pkgrel=1
pkgdesc=A fully-featured online forum solution for your website
url=http://www.phpbb.com;
@@ -14,9 +14,9 @@ groups=('network-extra')
archs=('i686' 'x86_64')
replaces=('phpbb-php5mod')
backup=(var/www/phpBB3/config.php)
-up2date=Flasttar $url/downloads/olympus.php
+up2date=lynx -dump https://www.phpbb.com/downloads/|grep -m1 .tar.bz2|sed
's/.*phpBB-\(.*\)\.tar.bz2*/\1/'
source=($url/files/release/$_F_archive_name-$pkgver.tar.bz2 $source
phpbbsetup README.Frugalware)
-sha1sums=('451b4ae1a3dfb0d59f2c89c8438d927cfdf2ddc2' \
+sha1sums=('1ecd91729d87d774ebcaea4d8dbce572c681296a' \
'580608066ea98c79ddc83fc10db33a51e5061be3' \
'116bc9724acbf9a3d9448c333af4fb1be3e6e840')
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: coxpcall-1.13.0-1-i686 * Typo
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c56b5e56b7b5a315609ddf439529bd8bd3c9ea51 commit c56b5e56b7b5a315609ddf439529bd8bd3c9ea51 Author: Pingax pin...@frugalware.fr Date: Wed Aug 29 16:01:45 2012 +0200 coxpcall-1.13.0-1-i686 * Typo diff --git a/source/lib-extra/coxpcall/FrugalBuild b/source/lib-extra/coxpcall/FrugalBuild index 8576c4c..b6c7a06 100644 --- a/source/lib-extra/coxpcall/FrugalBuild +++ b/source/lib-extra/coxpcall/FrugalBuild @@ -1,5 +1,5 @@ # Compiling Time: 0 SBU -# Maintainer: Pignax pin...@frugalware.fr +# Maintainer: Pingax pin...@frugalware.fr # Contributor: Kooda ko...@upyum.com pkgname=coxpcall ___ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: digikam-2.8.0-2-x86_64
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=65c6bc5552df1601c7a53e170338a67fad137154
commit 65c6bc5552df1601c7a53e170338a67fad137154
Author: Elentir elen...@frugalware.org
Date: Wed Aug 29 14:41:48 2012 +0200
digikam-2.8.0-2-x86_64
* rebuild with libgphoto=2.5.0
diff --git a/source/kde-extra/digikam/FrugalBuild
b/source/kde-extra/digikam/FrugalBuild
index 52d8ae8..21cd980 100644
--- a/source/kde-extra/digikam/FrugalBuild
+++ b/source/kde-extra/digikam/FrugalBuild
@@ -4,19 +4,21 @@
pkgname=digikam
pkgver=2.8.0
-pkgrel=1
+pkgrel=2
pkgdesc=Digital photo management application for kde
_F_sourceforge_ext=.tar.bz2
_F_archive_grepv=\-[a-z]
Finclude sourceforge kde
+source=(${source[@]} support-libgphoto2-2.5.0.patch)
depends=(libkdcraw=$_F_kde_ver libkipi=$_F_kde_ver
libkde3support=$_F_kde_ver \
- 'lensfun=0.2.6' 'liblqr' 'libgphoto2' libknotify=$_F_kde_ver
'qjson=0.7.1' libkdewebkit=$_F_kde_ver)
+ 'lensfun=0.2.6' 'liblqr' 'libgphoto2=2.5.0' libknotify=$_F_kde_ver
'qjson=0.7.1' libkdewebkit=$_F_kde_ver)
makedepends=(${makedepends[@]} kdepimlibs-compiletime=$_F_kde_ver 'boost'
'ksgmltools2' 'mysql' \
'libqtdesigner' 'soprano-backend-redland=2.7.0' kdelibs=$_F_kde_ver
kdepimlibs=$_F_kde_ver)
groups=('kde-extra' 'kde-apps')
archs=('i686' 'x86_64')
options=('scriptlet')
-sha1sums=('43672f7f46e53f9a71516f79aa700d77143cecf5')
+sha1sums=('43672f7f46e53f9a71516f79aa700d77143cecf5' \
+ '62c8e101a5fd149001641fc8f9311de9f3e1f13b')
subpkgs=(${subpkgs[@]} libkface)
subdescs=(${subdescs[@]} Library to perform face recognition and detection
over pictures.)
diff --git a/source/kde-extra/digikam/support-libgphoto2-2.5.0.patch
b/source/kde-extra/digikam/support-libgphoto2-2.5.0.patch
new file mode 100644
index 000..a0a0623
--- /dev/null
+++ b/source/kde-extra/digikam/support-libgphoto2-2.5.0.patch
@@ -0,0 +1,242 @@
+diff -Naur digikam-2.8.0/core/CMakeLists.txt digikam-2.8.0/core/CMakeLists.txt
+--- digikam-2.8.0/core/CMakeLists.txt 2012-08-06 13:15:12.0 +0200
digikam-2.8.0/core/CMakeLists.txt 2012-08-29 14:29:08.765701351 +0200
+@@ -329,6 +329,24 @@
+ MACRO_OPTIONAL_FIND_PACKAGE(USB)
+ ENDIF (NOT WIN32 AND HAVE_GPHOTO2)
+
++IF(GPHOTO2_FOUND)
++EXEC_PROGRAM(gphoto2-config ARGS --version RETURN_VALUE _return_VALUE
OUTPUT_VARIABLE GPHOTO2_VERSION)
++STRING(REPLACE libgphoto2 GPHOTO2_VERSION ${GPHOTO2_VERSION})
++MACRO_ENSURE_VERSION(2.4.0 ${GPHOTO2_VERSION} VERSION_GPHOTO2)
++IF(VERSION_GPHOTO2 AND LIBUSB_FOUND)
++SET(GPHOTO2_FOUND true)
++ELSE(VERSION_GPHOTO2 AND LIBUSB_FOUND)
++SET(GPHOTO2_FOUND false)
++ENDIF(VERSION_GPHOTO2 AND LIBUSB_FOUND)
++MACRO_ENSURE_VERSION(2.5.0 ${GPHOTO2_VERSION} VERSION_GPHOTO25)
++IF(VERSION_GPHOTO25)
++SET(HAVE_GPHOTO25 1)
++ELSE(VERSION_GPHOTO25)
++SET(HAVE_GPHOTO25 0)
++ENDIF(VERSION_GPHOTO25)
++ENDIF(GPHOTO2_FOUND)
++
++
+ MACRO_OPTIONAL_FIND_PACKAGE(KdepimLibs)
+ MACRO_BOOL_TO_01(KDEPIMLIBS_FOUND HAVE_KDEPIMLIBS)
+
+@@ -378,6 +396,8 @@
+
+ CONFIGURE_FILE(digikam/utils/config-digikam.h.cmake
${CMAKE_CURRENT_BINARY_DIR}/digikam/utils/config-digikam.h)
+
++
++
+ #
==
+ # Log messages
+
+@@ -428,18 +448,10 @@
+ #
+
+ IF(GPHOTO2_FOUND)
+-EXEC_PROGRAM(gphoto2-config ARGS --version RETURN_VALUE _return_VALUE
OUTPUT_VARIABLE GPHOTO2_VERSION)
+-STRING(REPLACE libgphoto2 GPHOTO2_VERSION ${GPHOTO2_VERSION})
+-MACRO_ENSURE_VERSION(2.4.0 ${GPHOTO2_VERSION} VERSION_GPHOTO2)
+-IF(VERSION_GPHOTO2 AND LIBUSB_FOUND)
+-SET(GPHOTO2_FOUND true)
+-ELSE(VERSION_GPHOTO2 AND LIBUSB_FOUND)
+-SET(GPHOTO2_FOUND false)
+-ENDIF(VERSION_GPHOTO2 AND LIBUSB_FOUND)
+-ENDIF(GPHOTO2_FOUND)
+-
+-IF(GPHOTO2_FOUND)
+ MESSAGE(STATUS libgphoto2 and libusb libraries found YES
(optional))
++IF(HAVE_GPHOTO25)
++MESSAGE(STATUS libgphoto2 2.5 library found. YES
(optional))
++endIF(HAVE_GPHOTO25)
+ ELSE(GPHOTO2_FOUND)
+ MESSAGE(STATUS libgphoto2 and libusb libraries found NO
(optional))
+ MESSAGE(STATUS )
+diff -Naur digikam-2.8.0/core/digikam/utils/config-digikam.h.cmake
digikam-2.8.0/core/digikam/utils/config-digikam.h.cmake
+--- digikam-2.8.0/core/digikam/utils/config-digikam.h.cmake2012-08-06
13:15:12.0 +0200
digikam-2.8.0/core/digikam/utils/config-digikam.h.cmake2012-08-29
14:29:08.765701351 +0200
+@@ -45,6 +45,9 @@
+ /* Define to 1 if GPhoto2 shared library is installed */
+ #cmakedefine HAVE_GPHOTO2 1
+
++/* Define to 1 if libgphoto2 2.5 shared library is installed */
++#cmakedefine HAVE_GPHOTO25 1
++
+ /* Define to 1 if thumbnails database is used */
+ #cmakedefine USE_THUMBS_DB 1
+
+diff -Naur digikam-2.8.0/core/utilities/cameragui/devices/gpcamera.cpp
[Frugalware-git] frugalware-current: sane-backends-1.0.22-3-x86_64
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=39e46de3ad472af5722baca19e86762b04bebf34
commit 39e46de3ad472af5722baca19e86762b04bebf34
Author: Elentir elen...@frugalware.org
Date: Wed Aug 29 14:48:28 2012 +0200
sane-backends-1.0.22-3-x86_64
* rebuild with libgphoto2=2.5.0
diff --git a/source/multimedia/sane-backends/FrugalBuild
b/source/multimedia/sane-backends/FrugalBuild
index aa4246c..e983721 100644
--- a/source/multimedia/sane-backends/FrugalBuild
+++ b/source/multimedia/sane-backends/FrugalBuild
@@ -3,10 +3,10 @@
pkgname=sane-backends
pkgver=1.0.22
-pkgrel=2
+pkgrel=3
pkgdesc=Scanner Access Now Easy
url=http://www.sane-project.org;
-depends=('libieee1284' 'libgphoto2=2.4.8-2' 'libjpeg=8a' 'libtool=2.2.6a')
+depends=('libieee1284' 'libgphoto2=2.5.0' 'libjpeg=8a' 'libtool=2.2.6a')
groups=('multimedia')
archs=('i686' 'x86_64')
up2date=lynx -dump http://www.sane-project.org/|grep 'ackend.*released'|sed
's/.*s-\([^ ]*\) .*/\1/'
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: firefox-15.0-1-x86_64 * Version bump
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d6223221a598e3db352a3dcb3c42d298e16c0b3d
commit d6223221a598e3db352a3dcb3c42d298e16c0b3d
Author: Baste ba...@frugalware.org
Date: Wed Aug 29 14:50:58 2012 +0200
firefox-15.0-1-x86_64
* Version bump
diff --git a/source/xapps/firefox/FrugalBuild b/source/xapps/firefox/FrugalBuild
index ec564cb..c61404f 100644
--- a/source/xapps/firefox/FrugalBuild
+++ b/source/xapps/firefox/FrugalBuild
@@ -3,7 +3,7 @@
# Contributor: Miklos Vajna vmik...@frugalware.org
pkgname=firefox
-pkgver=14.0.1
+pkgver=15.0
pathver=${pkgver} # version used in path names
pkgrel=1
pkgdesc=Mozilla Firefox web browser
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: firefox-i18n-15.0-1-x86_64 * Version bump
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c394517d0adf06b12b0136783702f78fdc3965bd commit c394517d0adf06b12b0136783702f78fdc3965bd Author: Baste ba...@frugalware.org Date: Wed Aug 29 14:59:35 2012 +0200 firefox-i18n-15.0-1-x86_64 * Version bump diff --git a/source/locale-extra/firefox-i18n/FrugalBuild b/source/locale-extra/firefox-i18n/FrugalBuild index b0e7c2d..1a84bbd 100644 --- a/source/locale-extra/firefox-i18n/FrugalBuild +++ b/source/locale-extra/firefox-i18n/FrugalBuild @@ -2,96 +2,96 @@ # Maintainer: Michel Hermier herm...@frugalware.org _F_mozilla_i18n_name=firefox -pkgver=14.0.1 +pkgver=15.0 pkgrel=1 Finclude mozilla-i18n -mozilla_i18n_lang_add 'af' '379d046d3281bb515a0a521cb2e907a13af542ed' -mozilla_i18n_lang_add 'ak' 'c6f82f9c90aba750386d8eee454008cfd608510d' -mozilla_i18n_lang_add 'ar' '62b0874d12469170e01b1138b18062e736179543' -mozilla_i18n_lang_add 'as' 'b6059adbc4589b97774adcbbb93a1a9805f126da' -mozilla_i18n_lang_add 'ast' 'bdd7285efbde367f0769e0a3f26e62cd482064d0' -mozilla_i18n_lang_add 'be' 'b9a69c9a066147310fca1450c0a11318587f9fed' -mozilla_i18n_lang_add 'bg' '3761ced8cb6333bb83fd093f05a46d96e74fae0c' -mozilla_i18n_lang_add 'bn-BD' '10685cf54406780a92f5ca1e0e37e749d202e2ff' -mozilla_i18n_lang_add 'bn-IN' '7fab4e77e71af99eff065854014cae7f0a279b74' -mozilla_i18n_lang_add 'br' '58737af9474d60a8ae14f386f458e5cdfa31d8fd' -mozilla_i18n_lang_add 'bs' '6a4191974c4f3371d61237016cb5482fb4ac5a8a' -mozilla_i18n_lang_add 'ca' 'b69e4a6ee7fa49bd8e8ac567ba716490f17ffa4c' -mozilla_i18n_lang_add 'cs' 'c6527d3bfc9b0f459bed575f4ae8eeffa2fc8377' -mozilla_i18n_lang_add 'csb' '384d93c70224b56718a06ed79cdac3ef69d87100' -mozilla_i18n_lang_add 'cy' 'e3532d77652e92e3eed827d12572ddc93cd8a081' -mozilla_i18n_lang_add 'da' 'bd4bf2540ccaee91a7c904f2f5f692ff206b5b08' -mozilla_i18n_lang_add 'de' 'ec0068bb5004205cab3db705bc0ade9cec5a4fe8' -mozilla_i18n_lang_add 'el' 'c9fccf3971efb3c455822d820b862e00ce8cba08' -mozilla_i18n_lang_add 'en-GB' '89cc34954b9b09f74ba6a2fc28ff27d1739463b3' -mozilla_i18n_lang_add 'en-US' '15373b88d79d61ec6dabf8d38b99c137cb5eaef6' -mozilla_i18n_lang_add 'en-ZA' 'b76a76396c4427312b45f11daa54df862e32c957' -mozilla_i18n_lang_add 'eo' 'dd381cf224cf7617b75a0ed2abeadbc62d14e8e6' -mozilla_i18n_lang_add 'es-AR' 'd751d474e6b51187dd24a4a40d303af4989fd9d6' -mozilla_i18n_lang_add 'es-CL' '140c19cdb025b734fd23c98b5846a1b00e2bbce9' -mozilla_i18n_lang_add 'es-ES' 'a6b74a054a57767f9cd4434f714ec12323815018' -mozilla_i18n_lang_add 'es-MX' '945c9f2a06dbe495b0fbc9aafa46545f3a85110a' -mozilla_i18n_lang_add 'et' 'c5e9bde256dd59e4133be342bfffa8783c5526ea' -mozilla_i18n_lang_add 'eu' '6ddd029b8493d8e7297431d87968626ddf3f9f29' -mozilla_i18n_lang_add 'fa' 'be3e65243e748934baa2d889f2348bcdfd9c65ba' -mozilla_i18n_lang_add 'ff' 'c68b5f7f4e849cfe9734036c9a4d0fc37428ac0f' -mozilla_i18n_lang_add 'fi' '7f6a8a355e20bbfd9e87479b70876d3ef268cae9' -mozilla_i18n_lang_add 'fr' 'c680172ce6360d0e97d706c8ea625b24948eed0a' -mozilla_i18n_lang_add 'fy-NL' '3dea991c7b45e4dddc3382ade543d6ce2b9e5119' -mozilla_i18n_lang_add 'ga-IE' '59c6076ea10c8d5fa8db1475e9215751f7e68118' -mozilla_i18n_lang_add 'gd' '059f2e102e9720225523adeb82a8ea27e551d567' -mozilla_i18n_lang_add 'gl' '61088b59ee242ff2c143305a0f9dd88594c7fb9a' -mozilla_i18n_lang_add 'gu-IN' '0d5bce21afec4fadb62234d052e92aa8a2db069e' -mozilla_i18n_lang_add 'he' '9502084206ac9374c161e9ce66e66a39be230669' -mozilla_i18n_lang_add 'hi-IN' '77e6193a0c3a866f00f449b1d461c1d2904726ba' -mozilla_i18n_lang_add 'hr' 'a74194697ca2209d668cd4f8d6fc2e6519b7a7cd' -mozilla_i18n_lang_add 'hu' 'dc43aa1fb64303d3f05feba3676b1a2f9f88a643' -mozilla_i18n_lang_add 'hy-AM' '300c9059475285b548a6456199d956ab051a830a' -mozilla_i18n_lang_add 'id' 'bb799c980a594b74ffa29b16135f1f5428d030b9' -mozilla_i18n_lang_add 'is' 'f4e32c5783b59abac4d4dadf72bf8ccb641ed0e0' -mozilla_i18n_lang_add 'it' '691c0c1a894aa894a518c5a397e1532b962c8144' -mozilla_i18n_lang_add 'ja' '474646af938ec44fadda3c6584d2298990f29850' -mozilla_i18n_lang_add 'kk' '6cc7bfa48ad34f97e2e2bd43c73a3d087a7bde8a' -mozilla_i18n_lang_add 'km' 'a52ca95f41d305fda7e9d83b4c35e97f2c51c76d' -mozilla_i18n_lang_add 'kn' '126aef3ad2ebc0ff067eae1b48786948d70fd389' -mozilla_i18n_lang_add 'ko' '98f546605a24f8bfc16212ba3ed00adce7840283' -mozilla_i18n_lang_add 'ku' '80512669e12e2fe81129ed6cb8d8e41165d94dde' -mozilla_i18n_lang_add 'lg' '90defc208c075a33d8fef5daad05f473d7fa9d58' -mozilla_i18n_lang_add 'lij' '0d3f1a9921f6973d6724b8a990bc422d2cbd3f98' -mozilla_i18n_lang_add 'lt' 'f442ff05a4ae070450556aa3b81025617e4e41d1' -mozilla_i18n_lang_add 'lv' '77d97489ebaf5161774d1f1911abcc9c152de5b3' -mozilla_i18n_lang_add 'mai' '9fb932285a5860467307c9fdd131345a91769b48' -mozilla_i18n_lang_add 'mk' 'a42c271c6685faac173dd89a05ade5dec537b97b' -mozilla_i18n_lang_add 'ml' '271b4b1e63432d29853a9719d8e1ea99af24f7d1' -mozilla_i18n_lang_add 'mr' 'aa335da0dfe9aac785383963d6136202e0ece3aa' -mozilla_i18n_lang_add 'nb-NO'
[Frugalware-git] frugalware-current: gtkam-0.2.0-1-x86_64
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=36d93a6c42165bfce767449075d2d0321d41cea9
commit 36d93a6c42165bfce767449075d2d0321d41cea9
Author: Elentir elen...@frugalware.org
Date: Wed Aug 29 15:26:02 2012 +0200
gtkam-0.2.0-1-x86_64
* version bump
diff --git a/source/gnome-extra/gtkam/FrugalBuild
b/source/gnome-extra/gtkam/FrugalBuild
index eee27bf..9ffa352 100644
--- a/source/gnome-extra/gtkam/FrugalBuild
+++ b/source/gnome-extra/gtkam/FrugalBuild
@@ -2,10 +2,10 @@
# Maintainer: bouleetbil bouleet...@frogdev.info
pkgname=gtkam
-pkgver=0.1.18
+pkgver=0.2.0
pkgrel=1
pkgdesc=GTKam is a GTK-frontend to gphoto2.
-depends=('libgnomeui=2.24.3-2' 'libgphoto2' 'atk' 'libxml2=2.7.8' \
+depends=('libgnomeui=2.24.3-2' 'libgphoto2=2.5.0' 'atk' 'libxml2=2.7.8' \
'gimp=2.6.8-3' 'pango' 'libexif-gtk=0.3.5-6' 'openssl=1.0.0')
groups=('gnome-extra')
archs=('i686' 'x86_64')
@@ -14,6 +14,6 @@ _F_gnome_scrollkeeper=y
_F_gnome_desktop=y
options=('scriptlet')
Finclude sourceforge gnome-scriptlet
-sha1sums=('8ce550b88a01ee4cd48df290e64ea422f35f5f39')
+sha1sums=('d02c2483e47ac76e47b7d95de84798c1c4e8753e')
# optimization OK
diff --git a/source/gnome-extra/gtkam/fix_corrupted_pngs.patch
b/source/gnome-extra/gtkam/fix_corrupted_pngs.patch
deleted file mode 100644
index 13908b1..000
Binary files a/source/gnome-extra/gtkam/fix_corrupted_pngs.patch and /dev/null
differ
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: sqlite3-3.7.13-2-x86_64 * Fix origver to 3.7.13 * Real version 3.7.13
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d0d3358ae9291272c9e17bd68e20f5f0c2afdf33
commit d0d3358ae9291272c9e17bd68e20f5f0c2afdf33
Author: Baste ba...@frugalware.org
Date: Wed Aug 29 15:57:54 2012 +0200
sqlite3-3.7.13-2-x86_64
* Fix origver to 3.7.13
* Real version 3.7.13
diff --git a/source/lib/sqlite3/FrugalBuild b/source/lib/sqlite3/FrugalBuild
index ec963e6..8d8e14f 100644
--- a/source/lib/sqlite3/FrugalBuild
+++ b/source/lib/sqlite3/FrugalBuild
@@ -4,8 +4,8 @@
pkgname=sqlite3
pkgver=3.7.13
-origver=3071100
-pkgrel=1
+origver=3071300
+pkgrel=2
pkgdesc=A C library that implements an SQL database engine
url=http://www.sqlite.org/;
depends=('readline')
@@ -15,7 +15,7 @@ archs=('i686' 'x86_64' 'arm')
_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-src-${origver}.zip)
-sha1sums=('4bcb60c0a79e42fe01c64108deac66473123f4e7')
+sha1sums=('186db0ce8c6aad212753f083272004e4c270ecb9')
subpkgs=('lemon')
subdescs=('The Lemon program is an LALR(1) parser generator.')
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] melkotesting: telepathy-logger-qt-0.5.0-1-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=melkotesting.git;a=commitdiff;h=b742f3d7ae29de4500a50c94f0dcc0b51b7badc2
commit b742f3d7ae29de4500a50c94f0dcc0b51b7badc2
Author: Melko me...@frugalware.org
Date: Wed Aug 29 19:34:11 2012 +0200
telepathy-logger-qt-0.5.0-1-i686
* new package
diff --git a/source/xlib-extra/telepathy-logger-qt/FrugalBuild
b/source/xlib-extra/telepathy-logger-qt/FrugalBuild
new file mode 100644
index 000..5f855b2
--- /dev/null
+++ b/source/xlib-extra/telepathy-logger-qt/FrugalBuild
@@ -0,0 +1,24 @@
+# Compiling Time: 0.40 SBU
+# Maintainer: Melko me...@frugalware.org
+
+pkgname=telepathy-logger-qt
+pkgver=0.5.0
+pkgrel=1
+pkgdesc=Qt bindings for telepathy logger.
+groups=('xlib-extra')
+archs=('i686' 'x86_64')
+Finclude kde
+depends=('telepathy-qt4' 'telepathy-logger' 'qt-gstreamer')
+makedepends=(${makedepends[@]} boost)
+up2date=Flastverdir $_F_kde_mirror/unstable/kde-telepathy/
+source=($_F_kde_mirror/unstable/kde-telepathy/$pkgver/src/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('09d949e60c5b140b20c61ec1d52830e7b98cd50e')
+
+build(){
+ CMake_prepare_build
+ cmake -DCMAKE_INSTALL_PREFIX=/usr .. || Fdie
+ make || Fdie
+ CMake_install
+}
+
+# optimization OK
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] melkotesting: ktp-text-ui-0.5.0-2-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=melkotesting.git;a=commitdiff;h=8c5a5fcbe39ba7c0464dcb1c3e24cdd62de08e19
commit 8c5a5fcbe39ba7c0464dcb1c3e24cdd62de08e19
Author: Melko me...@frugalware.org
Date: Wed Aug 29 19:50:15 2012 +0200
ktp-text-ui-0.5.0-2-i686
* enable logging feature
diff --git a/source/kde-extra/ktp-text-ui/FrugalBuild
b/source/kde-extra/ktp-text-ui/FrugalBuild
index 5f969c2..2595aae 100644
--- a/source/kde-extra/ktp-text-ui/FrugalBuild
+++ b/source/kde-extra/ktp-text-ui/FrugalBuild
@@ -3,13 +3,13 @@
pkgname=ktp-text-ui
pkgver=0.5.0
-pkgrel=1
+pkgrel=2
pkgdesc=Telepathy text chat handler.
groups=('kde-extra')
archs=('i686' 'x86_64')
Finclude kde
-depends=(ktp-common-internals=$pkgver libqtwebkit=$_F_kde_qtver
libknotify=$_F_kde_ver)
-makedepends=(${makedepends[@]} kdelibs=$_F_kde_ver
kdelibs-compiletime=$_F_kde_ver)
+depends=(ktp-common-internals=$pkgver libqtwebkit=$_F_kde_qtver
libknotify=$_F_kde_ver 'qt-gstreamer' 'telepathy-logger')
+makedepends=(${makedepends[@]} kdelibs=$_F_kde_ver
kdelibs-compiletime=$_F_kde_ver 'telepathy-logger-qt' 'boost')
up2date=Flastverdir $_F_kde_mirror/unstable/kde-telepathy/
source=($_F_kde_mirror/unstable/kde-telepathy/$pkgver/src/${pkgname}-${pkgver}.tar.bz2)
sha1sums=('a12e8b996a0cdb5db5a3cd34fb5bfa87dd4f5e41')
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: dvdstyler-2.3-1-x86_64
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8ebd1bce1612431ebdec1d7d84cc326344d11869
commit 8ebd1bce1612431ebdec1d7d84cc326344d11869
Author: kikadf kikadf...@gmail.com
Date: Wed Aug 29 19:52:05 2012 +0200
dvdstyler-2.3-1-x86_64
* Version bump
diff --git a/source/gnome-extra/dvdstyler/FrugalBuild
b/source/gnome-extra/dvdstyler/FrugalBuild
index 1391da5..82b1610 100644
--- a/source/gnome-extra/dvdstyler/FrugalBuild
+++ b/source/gnome-extra/dvdstyler/FrugalBuild
@@ -1,36 +1,30 @@
-# Compiling Time: 0.65 SBU
+# Compiling Time: 1.41 SBU
# Maintainer: kikadf kikadf...@gmail.com
# Contributor: crazy cr...@frugalware.org
# Contributor: BMH1980 bmh1...@frugalware.org
pkgname=dvdstyler
-pkgver=2.2
+pkgver=2.3
pkgrel=1
pkgdesc=DVDStyler is a crossplatform dvd authoring system.
-url=http://www.dvdstyler.de;
_F_sourceforge_dirname=dvdstyler
_F_sourceforge_name=DVDStyler
_F_sourceforge_ext=.tar.bz2
_F_cd_path=$_F_sourceforge_name-$pkgver
makedepends=('dvdauthor' 'netpbm')
-depends=('mpgtx' 'wxgtk=2.8.12' 'wxsvg=1.1.8' 'mjpegtools=1.9.0' 'cdrtools'
\
+depends=('mpgtx' 'wxgtk=2.8.12' 'wxsvg=1.1.9' 'mjpegtools=1.9.0' 'cdrtools'
\
'dvd+rw-tools' 'libexif' 'ffmpeg=0.10.3' 'xine-ui' \
'gettext' 'xmlto' 'zip' 'libgnomeui' 'gst-plugins-base')
Finclude sourceforge
-source=($source use_ffmpeg_instead_of_libav.patch)
options=('scriptlet')
groups=('gnome-extra')
archs=('i686' 'x86_64')
-sha1sums=('4c6ca85d00ca243719dc22a704e2a30bd7facf2a' \
- '85556c5994343946a8849220ca3499549576a70c')
+sha1sums=('277f96a6ec3aad3da7ddeb5c6005bb2072dd8601')
build()
{
unset MAKEFLAGS
Fsed 'rmdir $$t' '' docs/Makefile.in
-# Fsed 'DonateDlg.$(OBJEXT) ' '' src/Makefile.in
-# Fsed 'DonateDlg.cpp ' '' src/Makefile.in
-# Fsed '@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/DonateDlg.Po@am__quote@' '' src/Makefile.in
Fsed 'LIBS = @LIBS@' 'LIBS = @LIBS@ -ljpeg' src/Makefile.in
Fbuild
}
diff --git a/source/gnome-extra/dvdstyler/use_ffmpeg_instead_of_libav.patch
b/source/gnome-extra/dvdstyler/use_ffmpeg_instead_of_libav.patch
deleted file mode 100644
index 6d98829..000
--- a/source/gnome-extra/dvdstyler/use_ffmpeg_instead_of_libav.patch
+++ /dev/null
@@ -1,314 +0,0 @@
-diff -Naur DVDStyler-2.2/src/mediaenc_ffmpeg.cpp
DVDStyler-2.2.new/src/mediaenc_ffmpeg.cpp
DVDStyler-2.2/src/mediaenc_ffmpeg.cpp 2012-03-04 18:36:10.0
+0100
-+++ DVDStyler-2.2.new/src/mediaenc_ffmpeg.cpp 2012-05-21 18:06:11.0
+0200
-@@ -3,7 +3,7 @@
- // Purpose: FFMPEG Media Encoder
- // Author: Alex Thuering
- // Created: 04.08.2007
--// RCS-ID: $Id: mediaenc_ffmpeg.cpp,v 1.28 2012/03/04 17:36:10 ntalex
Exp $
-+// RCS-ID: $Id: mediaenc_ffmpeg.cpp,v 1.27 2011/08/02 19:03:48 ntalex
Exp $
- // Copyright: (c) Alex Thuering
- // Licence: GPL
- /
-@@ -26,7 +26,6 @@
- #define __STDC_LIMIT_MACROS
- #include libavformat/avformat.h
- #include libswscale/swscale.h
--#include libavutil/mathematics.h
- }
-
- #define AUDIO_BUF_SIZE 524288
-@@ -167,18 +166,12 @@
-
- AVCodecContext* c = m_audioStm-codec;
- c-thread_count = m_threadCount;
-- c-time_base.den = 25;
-- c-time_base.num = 1;
- c-codec_id = (CodecID) codecId;
- c-codec_type = AVMEDIA_TYPE_AUDIO;
- c-bit_rate = 64000;
- c-sample_rate = 48000;
- c-sample_fmt = codecId == CODEC_ID_AC3 ? AV_SAMPLE_FMT_FLT :
AV_SAMPLE_FMT_S16;
- c-channels = 2;
-- // some formats want stream headers to be separate
-- if(m_outputCtx-oformat-flags AVFMT_GLOBALHEADER)
-- c-flags |= CODEC_FLAG_GLOBAL_HEADER;
--
- return true;
- }
-
-diff -Naur DVDStyler-2.2/src/mediatrc_ffmpeg.cpp
DVDStyler-2.2.new/src/mediatrc_ffmpeg.cpp
DVDStyler-2.2/src/mediatrc_ffmpeg.cpp 2012-04-29 21:28:04.0
+0200
-+++ DVDStyler-2.2.new/src/mediatrc_ffmpeg.cpp 2012-05-21 18:51:02.0
+0200
-@@ -3,7 +3,7 @@
- // Purpose: FFMPEG Media Transcoder
- // Author: Alex Thuering
- // Created: 26.04.2008
--// RCS-ID: $Id: mediatrc_ffmpeg.cpp,v 1.44 2012/04/29 19:28:04 ntalex
Exp $
-+// RCS-ID: $Id: mediatrc_ffmpeg.cpp,v 1.41 2012/01/22 20:40:34 ntalex
Exp $
- // Copyright: (c) Alex Thuering
- // Licence: GPL
- /
-@@ -22,12 +22,11 @@
- #include libavutil/fifo.h
- #include libavutil/dict.h
- #include libavutil/pixdesc.h
--#include libavutil/mathematics.h
- #include libswscale/swscale.h
--#include libavcodec/avcodec.h
-+#include libavfilter/avcodec.h
- #include libavfilter/avfilter.h
- #include libavfilter/avfiltergraph.h
--#include libavfilter/vsrc_buffer.h
-+#include libavfilter/buffersink.h
- }
-
- #define AUDIO_BUF_SIZE 5
-@@ -47,68 +46,6 @@
- #if LIBAVFORMAT_VERSION_INT AV_VERSION_INT(53, 4, 0)
- #define AVIO_FLAG_WRITE AVIO_WRONLY
- #endif
--#define
[Frugalware-git] frugalware-current: python-lettuce-0.2.7-1-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b57f12f2d8ff6f1364990c88fb011e336047e7cc
commit b57f12f2d8ff6f1364990c88fb011e336047e7cc
Author: Slown sl...@frugalware.org
Date: Wed Aug 29 18:55:12 2012 +0100
python-lettuce-0.2.7-1-i686
* version bump
diff --git a/source/devel-extra/python-lettuce/FrugalBuild
b/source/devel-extra/python-lettuce/FrugalBuild
index 2a757fd..234f075 100644
--- a/source/devel-extra/python-lettuce/FrugalBuild
+++ b/source/devel-extra/python-lettuce/FrugalBuild
@@ -3,7 +3,7 @@
pkgname=python-lettuce
_F_archive_name=${pkgname/python-/}
-pkgver=0.2.6
+pkgver=0.2.7
pkgrel=1
pkgdesc=Behaviour Driven Development for Python
depends=('python=2.7')
@@ -12,4 +12,4 @@ groups=('devel-extra')
archs=('i686' 'x86_64')
_F_pypi_name=${pkgname/python-/}
Finclude pypi
-sha1sums=('b4daac9ae230cf4ad2078fef72ebeaac4753ce40')
+sha1sums=('0be16c4a1c338f631a14f5637ecfc2e3ef2c6c44')
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: netembryo-0.1.2.g9d64c1f-1-x86_64
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ebf25f3b877fb019225db765cc9d13f87b027e5f
commit ebf25f3b877fb019225db765cc9d13f87b027e5f
Author: kikadf kikadf...@gmail.com
Date: Wed Aug 29 19:56:39 2012 +0200
netembryo-0.1.2.g9d64c1f-1-x86_64
* Change m8r
* Version bump
* Add sctp support
diff --git a/source/network-extra/netembryo/FrugalBuild
b/source/network-extra/netembryo/FrugalBuild
index bb38c68..09ea77d 100644
--- a/source/network-extra/netembryo/FrugalBuild
+++ b/source/network-extra/netembryo/FrugalBuild
@@ -1,16 +1,23 @@
-# Compiling Time: 0.01 SBU
-# Maintainer: bouleetbil bouleet...@frogdev.info
+# Compiling Time: 0.14 SBU
+# Maintainer: kikadf kikadf...@gmail.com
+# Contributor: bouleetbil bouleet...@frogdev.info
pkgname=netembryo
-pkgver=0.1.1
-pkgrel=2
+pkgver=0.1.2.g9d64c1f
+pkgrel=1
pkgdesc=a network abstraction library
url=http://lscube.org/projects/netembryo/;
-depends=('openssl=1.0.0')
+depends=('openssl=1.0.0' 'lksctp-tools')
+_F_scm_type=git
+_F_scm_url=git://git.lscube.org/netembryo
+Finclude scm
groups=('network-extra')
archs=('i686' 'x86_64')
-up2date=Flasttar http://lscube.org/download;
-source=(http://lscube.org/files/downloads/$pkgname/$pkgname-$pkgver.tar.bz2)
-sha1sums=('e647e71be4091d18c0e628f7f959e2433fbcd824')
-# optimization OK
+build()
+{
+ Funpack_scm
+ Fautoreconf
+ Fbuild
+}
+
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: python3-httplib2-0.7.5-1-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=34d182235d6f7c7c68cc68f96d2b1f2fd9331ea8
commit 34d182235d6f7c7c68cc68f96d2b1f2fd9331ea8
Author: Slown sl...@frugalware.org
Date: Wed Aug 29 18:59:27 2012 +0100
python3-httplib2-0.7.5-1-i686
* version bump
diff --git a/source/devel-extra/python3-httplib2/FrugalBuild
b/source/devel-extra/python3-httplib2/FrugalBuild
index becea34..cbb8f68 100644
--- a/source/devel-extra/python3-httplib2/FrugalBuild
+++ b/source/devel-extra/python3-httplib2/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: Slown sl...@frugalware.org
pkgname=python3-httplib2
-pkgver=0.7.4
+pkgver=0.7.5
pkgrel=1
pkgdesc=A comprehensive HTTP client library, supporting many features
depends=('python-3.0')
@@ -11,7 +11,7 @@ _F_googlecode_name=httplib2
Finclude googlecode
groups=('devel-extra')
archs=('i686' 'x86_64')
-sha1sums=('91e5cbd92216721cc1cd701f9e83a89a14384961')
+sha1sums=('a4a14064f97a3abc88024dc7c5d2f11c0d6cf47f')
build() {
Fcd
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: python-six-1.2.0-1-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=cf7bb16ec3fcad3b4ddbe14373cf9753aeb015d4
commit cf7bb16ec3fcad3b4ddbe14373cf9753aeb015d4
Author: Slown sl...@frugalware.org
Date: Wed Aug 29 19:00:54 2012 +0100
python-six-1.2.0-1-i686
* version bump
diff --git a/source/lib-extra/python-six/FrugalBuild
b/source/lib-extra/python-six/FrugalBuild
index fac3d00..e63d385 100644
--- a/source/lib-extra/python-six/FrugalBuild
+++ b/source/lib-extra/python-six/FrugalBuild
@@ -3,7 +3,7 @@
pkgname=python-six
_F_archive_name=six
-pkgver=1.1.0
+pkgver=1.2.0
pkgrel=1
pkgdesc=Python 2 and 3 compatibility utilities
depends=('python')
@@ -11,4 +11,4 @@ groups=('lib-extra')
archs=('i686' 'x86_64')
_F_pypi_name=six
Finclude pypi
-sha1sums=('2e6ca983a232cfacc94df37a26d641be1ead2524')
+sha1sums=('51203c5b4e3b837bf9b419e8c0ea5fa08b81a649')
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: python-mahotas-0.9.1-1-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=716930bb875c10b7c77c08b26f7148fc1e5f23df
commit 716930bb875c10b7c77c08b26f7148fc1e5f23df
Author: Slown sl...@frugalware.org
Date: Wed Aug 29 19:03:55 2012 +0100
python-mahotas-0.9.1-1-i686
* version bump
diff --git a/source/lib-extra/python-mahotas/FrugalBuild
b/source/lib-extra/python-mahotas/FrugalBuild
index cd96cd4..02dfc5b 100644
--- a/source/lib-extra/python-mahotas/FrugalBuild
+++ b/source/lib-extra/python-mahotas/FrugalBuild
@@ -1,9 +1,9 @@
-# Compiling Time: 0.42 SBU
+# Compiling Time: 0.43 SBU
# Maintainer: Slown sl...@frugalware.org
pkgname=python-mahotas
_F_archive_name=mahotas
-pkgver=0.9
+pkgver=0.9.1
pkgrel=1
pkgdesc=A set of functions for image processing in Python
depends=('numpy')
@@ -12,6 +12,6 @@ groups=('lib-extra')
archs=('i686' 'x86_64')
_F_pypi_name=mahotas
Finclude pypi
-sha1sums=('a1ce8282e0df8d0756925330b53be2c2efb76f3a')
+sha1sums=('1a95ebe1589ec27c253f7e17eb2f651fe3407bf8')
# optimization OK
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: taskcoach-1.3.18-1-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c1d76ae0ed92d5b7a8e896a2798140c6264daccb
commit c1d76ae0ed92d5b7a8e896a2798140c6264daccb
Author: Slown sl...@frugalware.org
Date: Wed Aug 29 19:06:19 2012 +0100
taskcoach-1.3.18-1-i686
* version bump
diff --git a/source/xapps-extra/taskcoach/FrugalBuild
b/source/xapps-extra/taskcoach/FrugalBuild
index ade44f7..76f4df7 100644
--- a/source/xapps-extra/taskcoach/FrugalBuild
+++ b/source/xapps-extra/taskcoach/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: Slown sl...@frugalware.org
pkgname=taskcoach
-pkgver=1.3.17
+pkgver=1.3.18
pkgrel=1
pkgdesc=A simple open source todo manager to manage personal tasks and todo
lists
rodepends=('wxpython-u8=2.8.9.2')
@@ -10,7 +10,7 @@ groups=('xapps-extra')
archs=('i686' 'x86_64')
_F_sourceforge_name=TaskCoach
Finclude sourceforge
-sha1sums=('43eb170a877ca9b5a03e45c68062b3050b7157a1')
+sha1sums=('cd1013d9c62d830ec5ed264766bc4b355bdff5b1')
build() {
Fcd
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: groonga-2.0.6-1-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=093603131030a9c98d007324a30c32345eac5bea
commit 093603131030a9c98d007324a30c32345eac5bea
Author: Slown sl...@frugalware.org
Date: Wed Aug 29 19:17:25 2012 +0100
groonga-2.0.6-1-i686
* version bump
diff --git a/source/lib-extra/groonga/FrugalBuild
b/source/lib-extra/groonga/FrugalBuild
index dc3efba..8f28f81 100644
--- a/source/lib-extra/groonga/FrugalBuild
+++ b/source/lib-extra/groonga/FrugalBuild
@@ -1,8 +1,8 @@
-# Compiling Time: 3.99 SBU
+# Compiling Time: 2.53 SBU
# Maintainer: Slown sl...@frugalware.org
pkgname=groonga
-pkgver=2.0.5
+pkgver=2.0.6
pkgrel=1
pkgdesc=An opensource fulltext search engine
url=http://www.groonga.org;
@@ -12,7 +12,7 @@ groups=('lib-extra')
archs=('i686' 'x86_64')
up2date=lynx -dump http://packages.groonga.org/source/groonga | Flasttar
source=(http://packages.groonga.org/source/$pkgname/$pkgname-$pkgver.tar.gz)
-sha1sums=('0256c3e5e800e9763995b31e0864268e6a40678c')
+sha1sums=('a012a86d03e193f2ab029de2f1e09aa5f0e52bcf')
build() {
Fconf --prefix=/usr \
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: icoutils-0.30.0-1-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=95b919025acc3cba31a544188e61b38835528d81
commit 95b919025acc3cba31a544188e61b38835528d81
Author: Slown sl...@frugalware.org
Date: Wed Aug 29 19:19:37 2012 +0100
icoutils-0.30.0-1-i686
* version bump
diff --git a/source/apps-extra/icoutils/FrugalBuild
b/source/apps-extra/icoutils/FrugalBuild
index 4e25d46..9aaf34c 100644
--- a/source/apps-extra/icoutils/FrugalBuild
+++ b/source/apps-extra/icoutils/FrugalBuild
@@ -1,9 +1,9 @@
-# Compiling Time: 0.11 SBU
+# Compiling Time: 0.12 SBU
# Maintainer: Slown slownli...@gmail.com
pkgname=icoutils
-pkgver=0.29.1
-pkgrel=2
+pkgver=0.30.0
+pkgrel=1
pkgdesc=A set of command-line programs for extracting and converting images
url=http://www.nongnu.org/icoutils/;
depends=('libpng')
@@ -11,7 +11,6 @@ groups=('apps-extra')
archs=('i686' 'x86_64')
up2date=Flasttar $url
source=(http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.bz2)
-sha1sums=('312036e81d8c1800fb21ca6fc6b6ff3219e2c030')
-
+sha1sums=('983fd6797ef2111ad5b8afffbf64b1667101f65b')
# optimization OK
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: cls-1.1-1-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=21a6c8249c2351a2e1b2bd70b06413ee885b49fb
commit 21a6c8249c2351a2e1b2bd70b06413ee885b49fb
Author: Slown sl...@frugalware.org
Date: Wed Aug 29 20:36:24 2012 +0100
cls-1.1-1-i686
* new package
diff --git a/source/games-extra/cls/FrugalBuild
b/source/games-extra/cls/FrugalBuild
new file mode 100644
index 000..67ae6c1
--- /dev/null
+++ b/source/games-extra/cls/FrugalBuild
@@ -0,0 +1,14 @@
+# Compiling Time: 0 SBU
+# Maintainer: Slown sl...@frugalware.org
+
+pkgname=cls
+pkgver=1.1
+pkgrel=1
+pkgdesc=A simple ncurses game.
+url=http://kfgz.mydevil.net/cls;
+depends=('ncurses')
+groups=('games-extra')
+archs=('i686' 'x86_64')
+up2date=Flasttar $url
+source=($url/$pkgname-$pkgver.tar.gz)
+sha1sums=('b24fd7592022dc1d90eba566e65e74b2e4bfc9b4')
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-1.7: t: nobody thinks this will be ever corrected in a stable branch
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-1.7.git;a=commitdiff;h=a3b6340a73aec3a747b37d7b80f37ff6a5fcf60b commit a3b6340a73aec3a747b37d7b80f37ff6a5fcf60b Author: Miklos Vajna vmik...@frugalware.org Date: Wed Aug 29 22:07:42 2012 +0200 t: nobody thinks this will be ever corrected in a stable branch diff --git a/t/deps-extra-i686 b/t/deps-extra-i686 deleted file mode 100755 index f3b9bf7..000 --- a/t/deps-extra-i686 +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -fakeroot python deps-extra.py $@ i686 diff --git a/t/deps-xorg-i686 b/t/deps-xorg-i686 deleted file mode 100755 index e024117..000 --- a/t/deps-xorg-i686 +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -fakeroot python deps-xorg.py $@ i686 ___ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] fwsetup-ng: register global variables needed for tracking pacman downloads
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fwsetup-ng.git;a=commitdiff;h=7d3a272bfb720e16975546aeef0372e62b758ff3
commit 7d3a272bfb720e16975546aeef0372e62b758ff3
Author: James Buren r...@frugalware.org
Date: Wed Aug 29 17:48:34 2012 -0500
register global variables needed for tracking pacman downloads
diff --git a/src/install.c b/src/install.c
index c87074b..0aa5742 100644
--- a/src/install.c
+++ b/src/install.c
@@ -2,21 +2,36 @@
#include local.h
static PM_DB **databases = 0;
+static size_t databases_size = 1;
+static char dl_filename[PM_DLFNM_LEN+1] = {0};
+static int dl_offset = 0;
+static struct timeval dl_time0 = {0};
+static struct timeval dl_time1 = {0};
+static float dl_rate = 0;
+static int dl_xfered1 = 0;
+static unsigned char dl_eta_h = 0;
+static unsigned char dl_eta_m = 0;
+static unsigned char dl_eta_s = 0;
+static int dl_remain = 0;
+static int dl_total = 0;
static void install_database_callback(const char *name,PM_DB *db)
{
- static size_t n = 1;
-
if(name == 0 || db == 0)
return;
- databases = realloc(databases,sizeof(PM_DB *) * (n + 1));
+ databases = realloc(databases,sizeof(PM_DB *) * (databases_size + 1));
+
+ databases[databases_size - 1] = db;
- databases[n - 1] = db;
+ databases[databases_size] = 0;
- databases[n] = 0;
+ ++databases_size;
+}
- ++n;
+static int install_download_callback(PM_NETBUF *ctl,int xfered,void *arg)
+{
+ return 1;
}
static bool install_setup(void)
@@ -45,5 +60,77 @@ static bool install_setup(void)
return false;
}
+ if(pacman_set_option(PM_OPT_DLCB,(long) install_download_callback) == -1)
+ {
+fprintf(logfile,%s: %s\n,__func__,pacman_strerror(pm_errno));
+return false;
+ }
+
+ if(pacman_set_option(PM_OPT_DLFNM,(long) dl_filename) == -1)
+ {
+fprintf(logfile,%s: %s\n,__func__,pacman_strerror(pm_errno));
+return false;
+ }
+
+ if(pacman_set_option(PM_OPT_DLOFFSET,(long) dl_offset) == -1)
+ {
+fprintf(logfile,%s: %s\n,__func__,pacman_strerror(pm_errno));
+return false;
+ }
+
+ if(pacman_set_option(PM_OPT_DLT0,(long) dl_time0) == -1)
+ {
+fprintf(logfile,%s: %s\n,__func__,pacman_strerror(pm_errno));
+return false;
+ }
+
+ if(pacman_set_option(PM_OPT_DLT,(long) dl_time1) == -1)
+ {
+fprintf(logfile,%s: %s\n,__func__,pacman_strerror(pm_errno));
+return false;
+ }
+
+ if(pacman_set_option(PM_OPT_DLRATE,(long) dl_rate) == -1)
+ {
+fprintf(logfile,%s: %s\n,__func__,pacman_strerror(pm_errno));
+return false;
+ }
+
+ if(pacman_set_option(PM_OPT_DLXFERED1,(long) dl_xfered1) == -1)
+ {
+fprintf(logfile,%s: %s\n,__func__,pacman_strerror(pm_errno));
+return false;
+ }
+
+ if(pacman_set_option(PM_OPT_DLETA_H,(long) dl_eta_h) == -1)
+ {
+fprintf(logfile,%s: %s\n,__func__,pacman_strerror(pm_errno));
+return false;
+ }
+
+ if(pacman_set_option(PM_OPT_DLETA_M,(long) dl_eta_m) == -1)
+ {
+fprintf(logfile,%s: %s\n,__func__,pacman_strerror(pm_errno));
+return false;
+ }
+
+ if(pacman_set_option(PM_OPT_DLETA_S,(long) dl_eta_s) == -1)
+ {
+fprintf(logfile,%s: %s\n,__func__,pacman_strerror(pm_errno));
+return false;
+ }
+
+ if(pacman_set_option(PM_OPT_DLREMAIN,(long) dl_remain) == -1)
+ {
+fprintf(logfile,%s: %s\n,__func__,pacman_strerror(pm_errno));
+return false;
+ }
+
+ if(pacman_set_option(PM_OPT_DLHOWMANY,(long) dl_total) == -1)
+ {
+fprintf(logfile,%s: %s\n,__func__,pacman_strerror(pm_errno));
+return false;
+ }
+
return true;
}
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] fwsetup-ng: use libpacman's internal definitions for directories before creating them ourself.
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fwsetup-ng.git;a=commitdiff;h=debde1a79434cb6fa3a72c629bf77fd45920220e
commit debde1a79434cb6fa3a72c629bf77fd45920220e
Author: James Buren r...@frugalware.org
Date: Wed Aug 29 18:37:12 2012 -0500
use libpacman's internal definitions for directories before creating them
ourself.
diff --git a/src/install.c b/src/install.c
index 0aa5742..9f8e2b2 100644
--- a/src/install.c
+++ b/src/install.c
@@ -36,17 +36,10 @@ static int install_download_callback(PM_NETBUF *ctl,int
xfered,void *arg)
static bool install_setup(void)
{
- if(!mkdir_recurse(INSTALL_ROOT /var/cache/pacman-g2/pkg))
-return false;
-
- if(!mkdir_recurse(INSTALL_ROOT /var/cache/pacman-g2/src))
-return false;
-
- if(!mkdir_recurse(INSTALL_ROOT /var/lib/pacman-g2/local))
-return false;
-
- if(!mkdir_recurse(INSTALL_ROOT /var/log))
-return false;
+ char path[PATH_MAX] = {0};
+ const char *dbdir = 0;
+ const char *cachedir = 0;
+ const char *hooksdir = 0;
if(pacman_initialize(INSTALL_ROOT) == -1)
{
@@ -132,5 +125,38 @@ static bool install_setup(void)
return false;
}
+ if(pacman_get_option(PM_OPT_DBPATH,(long *) dbdir) == -1)
+ {
+fprintf(logfile,%s: %s\n,__func__,pacman_strerror(pm_errno));
+return false;
+ }
+
+ if(pacman_get_option(PM_OPT_CACHEDIR,(long *) cachedir) == -1)
+ {
+fprintf(logfile,%s: %s\n,__func__,pacman_strerror(pm_errno));
+return false;
+ }
+
+ if(pacman_get_option(PM_OPT_HOOKSDIR,(long *) hooksdir) == -1)
+ {
+fprintf(logfile,%s: %s\n,__func__,pacman_strerror(pm_errno));
+return false;
+ }
+
+ snprintf(path,PATH_MAX,%s/%s,INSTALL_ROOT,dbdir);
+
+ if(!mkdir_recurse(path))
+return false;
+
+ snprintf(path,PATH_MAX,%s/%s,INSTALL_ROOT,cachedir);
+
+ if(!mkdir_recurse(path))
+return false;
+
+ snprintf(path,PATH_MAX,%s/%s,INSTALL_ROOT,hooksdir);
+
+ if(!mkdir_recurse(path))
+return false;
+
return true;
}
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] fwsetup-ng: begin caching some of the download data in the callback
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fwsetup-ng.git;a=commitdiff;h=edf00260eaad37a93949d0eac9398222311e273a
commit edf00260eaad37a93949d0eac9398222311e273a
Author: James Buren r...@frugalware.org
Date: Wed Aug 29 22:07:00 2012 -0500
begin caching some of the download data in the callback
diff --git a/src/install.c b/src/install.c
index 9f8e2b2..d71cb2f 100644
--- a/src/install.c
+++ b/src/install.c
@@ -1,6 +1,15 @@
#include pacman.h
#include local.h
+struct dldata
+{
+ int amount;
+ int total;
+ int percent;
+ char percent_text[5];
+ float timediff;
+};
+
static PM_DB **databases = 0;
static size_t databases_size = 1;
static char dl_filename[PM_DLFNM_LEN+1] = {0};
@@ -29,8 +38,20 @@ static void install_database_callback(const char *name,PM_DB
*db)
++databases_size;
}
-static int install_download_callback(PM_NETBUF *ctl,int xfered,void *arg)
+static int install_download_callback(PM_NETBUF *ctl,int dl_xfered0,void *arg)
{
+ struct dldata dl = {0};
+
+ dl.amount = dl_xfered0 + dl_offset;
+
+ dl.total = * (int *) arg;
+
+ dl.percent = (float) dl.amount / dl.total * 100;
+
+ gettimeofday(dl_time1,0);
+
+ dl.timediff = (dl_time1.tv_sec - dl_time0.tv_sec) + (float)
(dl_time1.tv_usec - dl_time0.tv_usec) / 100;
+
return 1;
}
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] fwsetup-ng: import byte macros
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwsetup-ng.git;a=commitdiff;h=00c72c9e1febc0cbd73d2422196e4171298e9ef9 commit 00c72c9e1febc0cbd73d2422196e4171298e9ef9 Author: James Buren r...@frugalware.org Date: Wed Aug 29 22:30:03 2012 -0500 import byte macros diff --git a/src/local.h b/src/local.h index 90699b7..ab58aec 100644 --- a/src/local.h +++ b/src/local.h @@ -6,6 +6,7 @@ #include string.h #include unistd.h #include sys/stat.h +#include sys/time.h #include errno.h #include limits.h @@ -14,6 +15,10 @@ #define INSTALL_ROOT /home/ryuo/fwsetup-ng/root #define NEWT_WIDTH 70 #define NEWT_HEIGHT 21 +#define KIBIBYTE (1LLU 10LLU) +#define MEBIBYTE (1LLU 20LLU) +#define GIBIBYTE (1LLU 30LLU) +#define TEBIBYTE (1LLU 40LLU) extern bool mkdir_recurse(const char *path); extern int ui_main(int argc,char **argv); ___ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] fwsetup-ng: also record an ETA estimate
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fwsetup-ng.git;a=commitdiff;h=31d7fba0238980ccf47f03789c74bcdc4d256aa0
commit 31d7fba0238980ccf47f03789c74bcdc4d256aa0
Author: James Buren r...@frugalware.org
Date: Wed Aug 29 23:42:19 2012 -0500
also record an ETA estimate
diff --git a/src/install.c b/src/install.c
index d71cb2f..fc8b71c 100644
--- a/src/install.c
+++ b/src/install.c
@@ -8,6 +8,7 @@ struct dldata
int percent;
char percent_text[5];
float timediff;
+ char rate_text[47];
};
static PM_DB **databases = 0;
@@ -48,10 +49,31 @@ static int install_download_callback(PM_NETBUF *ctl,int
dl_xfered0,void *arg)
dl.percent = (float) dl.amount / dl.total * 100;
+ snprintf(dl.percent_text,5,%d%%,dl.percent);
+
gettimeofday(dl_time1,0);
dl.timediff = (dl_time1.tv_sec - dl_time0.tv_sec) + (float) (dl_time1.tv_usec -
dl_time0.tv_usec) / 100;
+ if(dl.amount == dl.total)
+ {
+dl_rate = dl_xfered0 / (dl.timediff * KIBIBYTE);
+dl_eta_h = (int) dl.timediff / 3600;
+dl_eta_m = (int) dl.timediff % 3600 / 60;
+dl_eta_s = (int) dl.timediff % 3600 % 60;
+ }
+ else if(dl.timediff 1.0)
+ {
+dl_rate = (dl_xfered0 - dl_xfered1) / (dl.timediff * KIBIBYTE);
+dl_xfered1 = dl_xfered0;
+gettimeofday(dl_time0,0);
+dl_eta_h = (int) ((dl.total - dl.amount) / (dl_rate * KIBIBYTE)) / 3600;
+dl_eta_m = (int) ((dl.total - dl.amount) / (dl_rate * KIBIBYTE)) % 3600 /
60;
+dl_eta_s = (int) ((dl.total - dl.amount) / (dl_rate * KIBIBYTE)) % 3600 %
60;
+ }
+
+ snprintf(dl.rate_text,47,%.1fKiB/s,dl_rate);
+
return 1;
}
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
