[Frugalware-git] frugalware-current: avrdude-5.8-1-x86_64
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=fc6209aea6839e31f3699a9cd4e29e7fca534306
commit fc6209aea6839e31f3699a9cd4e29e7fca534306
Author: Laszlo Papp djsz...@archlinux.us
Date: Mon Nov 2 06:10:00 2009 +0900
avrdude-5.8-1-x86_64
* new package
diff --git a/source/devel-extra/avrdude/FrugalBuild
b/source/devel-extra/avrdude/FrugalBuild
new file mode 100644
index 000..2e2d715
--- /dev/null
+++ b/source/devel-extra/avrdude/FrugalBuild
@@ -0,0 +1,18 @@
+# Compiling Time: 0.01 SBU
+# Maintainer: Elentir elen...@mailoo.org
+# Contributor: Laszlo Papp djsz...@archlinux.us
+
+pkgname=avrdude
+pkgver=5.8
+pkgrel=1
+pkgdesc=Download/upload/manipulate the ROM and EEPROM contents of AVR
microcontrollers
+url=http://www.nongnu.org/avrdude/;
+depends=('libusb' 'readline')
+makedepends=('bison' 'flex')
+groups=('devel-extra')
+license=GPL
+archs=('i686' 'x86_64')
+up2date=Flasttar http://download.savannah.gnu.org/releases/$pkgname;
+source=(http://download.savannah.gnu.org/releases/$pkgname/${pkgname}-${pkgver}.tar.gz;)
+sha1sums=('77198df91a7176bbdab19ef4a4caf0bdc5862c94')
+
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: avra-1.2.3a-1-x86_64
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=39b43e8f180f653c7ec9834ea934a9a8c39b39f8
commit 39b43e8f180f653c7ec9834ea934a9a8c39b39f8
Author: Laszlo Papp djsz...@archlinux.us
Date: Mon Nov 2 06:15:00 2009 +0900
avra-1.2.3a-1-x86_64
* new package
diff --git a/source/devel-extra/avra/FrugalBuild
b/source/devel-extra/avra/FrugalBuild
new file mode 100644
index 000..af3f0e7
--- /dev/null
+++ b/source/devel-extra/avra/FrugalBuild
@@ -0,0 +1,23 @@
+# Compiling Time: 0.01 SBU
+# Maintainer: Elentir elen...@mailoo.org
+# Contributor: Laszlo Papp djszapi at archlinux.us
+
+pkgname=avra
+pkgver=1.2.3a
+pkgrel=1
+pkgdesc=Atmel AVR Assembler
+license=GPL
+depends=('glibc')
+groups=('devel-extra')
+archs=('i686' 'x86_64')
+_F_sourceforge_ext=-src.tar.bz2
+Finclude sourceforge
+sha1sums=('e8ff7e41860d4466487117b95b08adb05245e551')
+
+build()
+{
+ Fcd $pkgname-1.2.3
+ Fautoreconf
+ Fbuild
+}
+
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: avarice-2.10-1-x86_64
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a562dd72ad3e35dca767cac8934b1959ab2b213f
commit a562dd72ad3e35dca767cac8934b1959ab2b213f
Author: Laszlo Papp djsz...@archlinux.us
Date: Mon Nov 2 06:18:00 2009 +0900
avarice-2.10-1-x86_64
* new package
diff --git a/source/devel-extra/avarice/FrugalBuild
b/source/devel-extra/avarice/FrugalBuild
new file mode 100644
index 000..689b20d
--- /dev/null
+++ b/source/devel-extra/avarice/FrugalBuild
@@ -0,0 +1,19 @@
+# Compiling Time: 0.01 SBU
+# Maintainer: Elentir elen...@mailoo.org
+# Contributor: Laszlo Papp djszapi at archlinux.us
+
+pkgname=avarice
+pkgver=2.10
+pkgrel=1
+pkgdesc=Tool for debugging AVR devices via JTAG with gdb
+license=GPL
+depends=('libusb' 'zlib')
+groups=('devel-extra')
+archs=('i686' 'x86_64')
+_F_sourceforge_ext=.tar.bz2
+Finclude sourceforge
+source=($source jtag2usb.patch)
+Fconfopts=${fconfop...@]} --enable-unicode --enable-clock --with-taglib
--with-curl
+sha1sums=('fbac00e37f90185f24a17023eccc111493792cb1' \
+ '907b8fde80227c2e441d416a93a1112f23d5473b')
+
diff --git a/source/devel-extra/avarice/jtag2usb.patch
b/source/devel-extra/avarice/jtag2usb.patch
new file mode 100644
index 000..8e77a5e
--- /dev/null
+++ b/source/devel-extra/avarice/jtag2usb.patch
@@ -0,0 +1,48 @@
+--- src/jtag2usb.cc2007/02/17 22:41:46 1.9
src/jtag2usb.cc2009/06/25 09:29:21 1.10
+@@ -18,7 +18,7 @@
+ * This file implements the libusb-based USB connection to a JTAG ICE
+ * mkII.
+ *
+- * $Id: jtag2usb.cc,v 1.9 2007/02/17 22:41:46 joerg_wunsch Exp $
++ * $Id: jtag2usb.cc,v 1.10 2009/06/25 09:29:21 joerg_wunsch Exp $
+ */
+
+
+@@ -70,7 +70,7 @@
+ struct usb_bus *bus;
+ struct usb_device *dev;
+ usb_dev_handle *udev;
+- char *serno, *cp2;
++ char *devnamecopy, *serno, *cp2;
+ u_int16_t pid;
+ size_t x;
+
+@@ -85,6 +85,9 @@
+ break;
+ }
+
++ devnamecopy = new char[x = strlen(jtagDeviceName) + 1];
++ memcpy(devnamecopy, jtagDeviceName, x);
++
+ /*
+* The syntax for usb devices is defined as:
+*
+@@ -95,7 +98,7 @@
+* right-to-left, so only the least significant nibbles need to be
+* specified.
+*/
+- if ((serno = strchr(jtagDeviceName, ':')) != NULL)
++ if ((serno = strchr(devnamecopy, ':')) != NULL)
+ {
+ /* first, drop all colons there if any */
+ cp2 = ++serno;
+@@ -159,6 +162,8 @@
+ }
+ }
+ }
++
++ delete devnamecopy;
+ if (!found)
+ {
+ printf(did not find any%s USB device \%s\\n,
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: cgdb-0.6.4-1-x86_64
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9560b1c33122022374a9e3f8bf081f3909138997
commit 9560b1c33122022374a9e3f8bf081f3909138997
Author: Laszlo Papp djsz...@archlinux.us
Date: Mon Nov 2 06:21:00 2009 +0900
cgdb-0.6.4-1-x86_64
* new package
diff --git a/source/devel-extra/cgdb/FrugalBuild
b/source/devel-extra/cgdb/FrugalBuild
new file mode 100644
index 000..f7b7c88
--- /dev/null
+++ b/source/devel-extra/cgdb/FrugalBuild
@@ -0,0 +1,16 @@
+# Compiling Time: 0.01 SBU
+# Maintainer: Elentir elen...@mailoo.org
+# Contributor: Laszlo Papp djsz...@archlinux.us
+
+pkgname=cgdb
+pkgver=0.6.4
+pkgrel=1
+pkgdesc=Curses-based interface to the GNU Debugger
+url=http://cgdb.sourceforge.net/;
+depends=('readline=5.1' 'ncurses' 'gdb')
+backup=('etc/colorgcc/colorgccrc')
+groups=('devel-extra')
+archs=('i686' 'x86_64')
+Finclude sourceforge
+sha1sums=('5f1246d151dc419aa08890291175b4b2094e62c9')
+
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: libftdi-0.16-1-x86_64
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6543d90baac3800e3b5356ac7e4b7a9e7df19e84
commit 6543d90baac3800e3b5356ac7e4b7a9e7df19e84
Author: Laszlo Papp djsz...@archlinux.us
Date: Mon Nov 2 06:24:00 2009 +0900
libftdi-0.16-1-x86_64
* new package
diff --git a/source/lib-extra/libftdi/FrugalBuild
b/source/lib-extra/libftdi/FrugalBuild
new file mode 100644
index 000..b1beeb4
--- /dev/null
+++ b/source/lib-extra/libftdi/FrugalBuild
@@ -0,0 +1,23 @@
+# Compiling Time: 0.01 SBU
+# Maintainer: Elentir elen...@mailoo.org
+# Contributor: Laszlo Papp djsz...@archlinux.us
+
+pkgname=libftdi
+pkgver=0.16
+pkgrel=1
+pkgdesc=A library to talk to FTDI chips
+url=http://www.intra2net.com/en/developer/libftdi/;
+depends=('libusb')
+groups=('lib-extra')
+archs=('i686' 'x86_64')
+up2date=Flasttar $url/download.php
+source=($url/download/$pkgname-$pkgver.tar.gz)
+sha1sums=('03e453ea0b74e41ffe5bf0476c1997a4faa072c3')
+
+build()
+{
+ Fcd
+ Fsed -i no-install examples/Makefile.in
+ Fbuild
+}
+
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: libftd2xx-0.4.16-1-x86_64
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=70aa03b4df12c584eafb7ef368aaabfeab6d9b11
commit 70aa03b4df12c584eafb7ef368aaabfeab6d9b11
Author: Laszlo Papp djsz...@archlinux.us
Date: Mon Nov 2 06:26:00 2009 +0900
libftd2xx-0.4.16-1-x86_64
* new package
diff --git a/source/lib-extra/libftd2xx/55-ft2232.rules
b/source/lib-extra/libftd2xx/55-ft2232.rules
new file mode 100644
index 000..b1afe49
--- /dev/null
+++ b/source/lib-extra/libftd2xx/55-ft2232.rules
@@ -0,0 +1,6 @@
+SUBSYSTEM!=usb|usb_device, GOTO=ft2232_rules_end
+ACTION!=add, GOTO=ft2232_rules_end
+
+ATTRS{idVendor}==0403, ATTRS{idProduct}==cff8, MODE=0660, GROUP=tty
+
+LABEL=ft2232_rules_end
diff --git a/source/lib-extra/libftd2xx/FrugalBuild
b/source/lib-extra/libftd2xx/FrugalBuild
new file mode 100644
index 000..d98b0c0
--- /dev/null
+++ b/source/lib-extra/libftd2xx/FrugalBuild
@@ -0,0 +1,39 @@
+# Compiling Time: 0.01 SBU
+# Maintainer: Elentir elen...@mailoo.org
+# Contributor: Laszlo Papp djszapi at archlinux.us
+
+pkgname=libftd2xx
+pkgver=0.4.16
+pkgrel=1
+pkgdesc=Library that allows a direct access to a USB FTDI2XX chip based
device
+url=http://www.ftdichip.com;
+depends=('glibc')
+groups=('lib-extra')
+archs=('i686' 'x86_64')
+Fpkgversep=
+up2date=Flasttar $url/Drivers/D2XX.htm
+
+if [ $CARCH = 'x86_64' ] ; then
+ source=($url/Drivers/D2XX/Linux/${pkgname}${pkgver}_x86_64.tar.gz
+ 55-ft2232.rules)
+ sha1sums=('bc7067b4feb068346001482a37d9fe03bac41819' \
+ '283a8d00054a663d13c9faf7eabd525f081b94c6')
+else
+ source=($url/Drivers/D2XX/Linux/${pkgname}${pkgver}.tar.gz \
+ 55-ft2232.rules)
+ sha1sums=('4aa0d18b7d8f2c42c2d880e0c3feb75d0e9a80f4' \
+ '283a8d00054a663d13c9faf7eabd525f081b94c6')
+fi
+
+build()
+{
+ Fcd ${pkgname}${pkgver}_${CARCH}
+ Fexerel ${pkgname}.so.${pkgver} usr/lib/${pkgname}.so.${pkgver}
+ Fln ${pkgname}.so.${pkgver} /usr/lib/${pkgname}.so
+ Fexerel static_lib/${pkgname}.a.${pkgver} usr/lib/${pkgname}.a.${pkgver}
+ Fln ${pkgname}.a.${pkgver} /usr/lib/${pkgname}.a
+ Ffilerel ftd2xx.h usr/include/ftd2xx.h
+ Ffilerel WinTypes.h usr/include/WinTypes.h
+ Ffilerel ../55-ft2232.rules usr/udev/rules.d/55-ft2232.rules
+}
+
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: tavrasm-122jb-1-x86_64
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a3267d2301986a998c5516cc9f7a5622bee8d3bc
commit a3267d2301986a998c5516cc9f7a5622bee8d3bc
Author: Laszlo Papp djsz...@archlinux.us
Date: Sat Nov 7 16:58:00 2009 +0900
tavrasm-122jb-1-x86_64
* new package
diff --git a/source/devel-extra/tavrasm/FrugalBuild
b/source/devel-extra/tavrasm/FrugalBuild
new file mode 100644
index 000..644d653
--- /dev/null
+++ b/source/devel-extra/tavrasm/FrugalBuild
@@ -0,0 +1,24 @@
+# Compiling Time: 0.01 SBU
+# Maintainer: Elentir elen...@mailoo.org
+# Contributor: Laszlo Papp djszapi at archlinux.us
+
+pkgname=tavrasm
+pkgver=122jb
+pkgrel=1
+pkgdesc=Assembler for the Atmel AVR series of microcontrollers
+url=http://freshmeat.net/projects/tavrasm/;
+depends=('libgcc')
+groups=('devel-extra')
+archs=('i686' 'x86_64')
+Fpkgversep=.
+up2date=Flastarchive http://avr.bruger.mine.nu/${pkgname}.html .zip
+source=(http://avr.bruger.mine.nu/${pkgname}.${pkgver}.zip;)
+sha1sums=('01e54712409bab18c368765ca321d1131445999a')
+
+build()
+{
+ Fcd ${pkgname}.${pkgver}/src
+ Fmake
+ Fexerel ${pkgname} usr/bin/${pkgname}
+}
+
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: urjtag-0.10-1-x86_64
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d6bd23303d9b45d7c5078e69036726528c941925
commit d6bd23303d9b45d7c5078e69036726528c941925
Author: Laszlo Papp djsz...@archlinux.us
Date: Sat Nov 7 17:04:00 2009 +0900
urjtag-0.10-1-x86_64
* new package
diff --git a/source/devel-extra/urjtag/FrugalBuild
b/source/devel-extra/urjtag/FrugalBuild
new file mode 100644
index 000..33213ba
--- /dev/null
+++ b/source/devel-extra/urjtag/FrugalBuild
@@ -0,0 +1,16 @@
+# Compiling Time: 0.01 SBU
+# Maintainer: Elentir elen...@mailoo.org
+# Contributor: Laszlo Papp djsz...@archlinux.us
+
+pkgname=urjtag
+pkgver=0.10
+pkgrel=1
+pkgdesc=Enhanced, modern tool for communicating over JTAG with flash chips,
CPUs,and many more
+depends=('libftd2xx')
+makedepends=('gcc' 'libftd2xx' 'flex' 'bison')
+groups=('devel-extra')
+archs=('i686' 'x86_64')
+Fconfopts=${fconfop...@]} --with-ftd2xx
+Finclude sourceforge
+sha1sums=('1e21f07d758e9e151d932e95c0b3b11fd178eace')
+
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: avarice-2.10-2-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5abc0fc8fa63f88b53f1a1c67c8092dc18d64eaf
commit 5abc0fc8fa63f88b53f1a1c67c8092dc18d64eaf
Author: Elentir elen...@mailoo.org
Date: Sat Nov 7 20:48:03 2009 +0100
avarice-2.10-2-i686
* fix sha1sum
diff --git a/source/devel-extra/avarice/FrugalBuild
b/source/devel-extra/avarice/FrugalBuild
index 689b20d..6b43f9c 100644
--- a/source/devel-extra/avarice/FrugalBuild
+++ b/source/devel-extra/avarice/FrugalBuild
@@ -4,7 +4,7 @@
pkgname=avarice
pkgver=2.10
-pkgrel=1
+pkgrel=2
pkgdesc=Tool for debugging AVR devices via JTAG with gdb
license=GPL
depends=('libusb' 'zlib')
@@ -15,5 +15,5 @@ Finclude sourceforge
source=($source jtag2usb.patch)
Fconfopts=${fconfop...@]} --enable-unicode --enable-clock --with-taglib
--with-curl
sha1sums=('fbac00e37f90185f24a17023eccc111493792cb1' \
- '907b8fde80227c2e441d416a93a1112f23d5473b')
+ 'e8e028e1137b085c93ff7352b2efdc4329c4c5e3')
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: givaro-3.3.0-1-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d894f02081808d27b7dcc1a20a34d828cc3eb7d9
commit d894f02081808d27b7dcc1a20a34d828cc3eb7d9
Author: Elentir elen...@mailoo.org
Date: Sat Nov 7 21:04:46 2009 +0100
givaro-3.3.0-1-i686
* version bump
diff --git a/source/lib-extra/givaro/FrugalBuild
b/source/lib-extra/givaro/FrugalBuild
index f960c51..40285a5 100644
--- a/source/lib-extra/givaro/FrugalBuild
+++ b/source/lib-extra/givaro/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: Elentir elen...@mailoo.org
pkgname=givaro
-pkgver=3.2.14
+pkgver=3.3.0
pkgrel=1
pkgdesc=C++ library for arithmetic and algebraic computations
url=http://ljk.imag.fr/CASYS/LOGICIELS/givaro/;
@@ -12,6 +12,6 @@ archs=('i686' 'x86_64')
source=($url/Downloads/$pkgname-$pkgver.tar.gz)
up2date=lynx -dump $url/Downloads/ | grep -v rc | Flasttar
Fconfopts=$Fconfopts --enable-shared
-sha1sums=('17fee6de13b96a008fdb21018fc5a51c9e750167')
+sha1sums=('6eacec1706e6b58905197b194085a37e123b7489')
# optimization OK
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: cgal-3.5-1-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4454404974b25b1d0eb2946934c7b95b3f5469dd
commit 4454404974b25b1d0eb2946934c7b95b3f5469dd
Author: Elentir elen...@mailoo.org
Date: Sat Nov 7 21:13:41 2009 +0100
cgal-3.5-1-i686
* version bump
diff --git a/source/lib-extra/cgal/FrugalBuild
b/source/lib-extra/cgal/FrugalBuild
index a1944d3..059f0aa 100644
--- a/source/lib-extra/cgal/FrugalBuild
+++ b/source/lib-extra/cgal/FrugalBuild
@@ -2,8 +2,8 @@
# Maintainer: Elentir elen...@mailoo.org
pkgname=cgal
-pkgver=3.4
-rel_id=15692
+pkgver=3.5
+rel_id=24197
pkgrel=1
pkgdesc=An efficient C++ software library of geometric data structures and
algorithms
url=http://www.cgal.org/;
@@ -18,7 +18,7 @@ Finclude cmake
source=(http://gforge.inria.fr/frs/download.php/$rel_id/$_F_archive_name-$pkgver.tar.gz;)
_F_archive_grepv=beta
up2date=Flasttar http://gforge.inria.fr/frs/?group_id=52;
-sha1sums=('68996f1a9411aa257ff698d6e22d8b88c78424ae')
+sha1sums=('4b0f7ce3123ebcea3aca14cab6f1baaafc80e48d')
build() {
Fcd
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: libftd2xx-0.4.16-2-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=346bc224daf80c112fe1021d7a70426eba597d7e
commit 346bc224daf80c112fe1021d7a70426eba597d7e
Author: Elentir elen...@mailoo.org
Date: Sat Nov 7 21:26:33 2009 +0100
libftd2xx-0.4.16-2-i686
* fix cd path
diff --git a/source/lib-extra/libftd2xx/FrugalBuild
b/source/lib-extra/libftd2xx/FrugalBuild
index d98b0c0..54857e2 100644
--- a/source/lib-extra/libftd2xx/FrugalBuild
+++ b/source/lib-extra/libftd2xx/FrugalBuild
@@ -4,7 +4,7 @@
pkgname=libftd2xx
pkgver=0.4.16
-pkgrel=1
+pkgrel=2
pkgdesc=Library that allows a direct access to a USB FTDI2XX chip based device
url=http://www.ftdichip.com;
depends=('glibc')
@@ -16,6 +16,7 @@ up2date=Flasttar $url/Drivers/D2XX.htm
if [ $CARCH = 'x86_64' ] ; then
source=($url/Drivers/D2XX/Linux/${pkgname}${pkgver}_x86_64.tar.gz
55-ft2232.rules)
+ _F_cd_path=${pkgname}${pkgver}_${CARCH}
sha1sums=('bc7067b4feb068346001482a37d9fe03bac41819' \
'283a8d00054a663d13c9faf7eabd525f081b94c6')
else
@@ -27,7 +28,7 @@ fi
build()
{
- Fcd ${pkgname}${pkgver}_${CARCH}
+ Fcd
Fexerel ${pkgname}.so.${pkgver} usr/lib/${pkgname}.so.${pkgver}
Fln ${pkgname}.so.${pkgver} /usr/lib/${pkgname}.so
Fexerel static_lib/${pkgname}.a.${pkgver} usr/lib/${pkgname}.a.${pkgver}
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: picasm-114-1-x86_64
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=fcfd784fc127e187fc94cdf9c5626ecbe2ecb874
commit fcfd784fc127e187fc94cdf9c5626ecbe2ecb874
Author: Laszlo Papp djsz...@archlinux.us
Date: Mon Nov 2 06:29:00 2009 +0900
picasm-114-1-x86_64
* new package
diff --git a/source/devel-extra/picasm/FrugalBuild
b/source/devel-extra/picasm/FrugalBuild
new file mode 100644
index 000..d507c58
--- /dev/null
+++ b/source/devel-extra/picasm/FrugalBuild
@@ -0,0 +1,25 @@
+# Compiling Time: 0.01 SBU
+# Maintainer: Elentir elen...@mailoo.org
+# Contributor: Laszlo Papp djszapi at archlinux.us
+
+pkgname=picasm
+pkgver=114
+pkgrel=1
+pkgdesc=Assembler for the Microchip PIC
+url=http://www.hippy.freeserve.co.uk/picasm.htm;
+license=GPL
+depends=('glibc')
+groups=('devel-extra')
+archs=('i686' 'x86_64')
+Fpkgversep=
+up2date=Flasttar http://www.jmp.fi/~trossi/pic/;
+source=(http://www.jmp.fi/~trossi/pic/${pkgname}${pkgver}.tar.bz2;)
+sha1sums=('137689c08ebc8e8842aa62521c47f7c88f70d239')
+
+build()
+{
+ Fcd
+ Fmake
+ Fexerel ${pkgname} usr/bin/${pkgname}
+}
+
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: swi-prolog-5.8.0-1-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2fca7380a358d8dd816b71b98e485a5eea8284ad
commit 2fca7380a358d8dd816b71b98e485a5eea8284ad
Author: Elentir elen...@mailoo.org
Date: Fri Nov 13 23:33:10 2009 +0100
swi-prolog-5.8.0-1-i686
* version bump
diff --git a/source/devel-extra/swi-prolog/FrugalBuild
b/source/devel-extra/swi-prolog/FrugalBuild
index 78fe8bf..88e49b0 100644
--- a/source/devel-extra/swi-prolog/FrugalBuild
+++ b/source/devel-extra/swi-prolog/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: Elentir elen...@mailoo.org
pkgname=swi-prolog
-pkgver=5.6.64
+pkgver=5.8.0
pkgrel=1
pkgdesc=SWI-Prolog is a comprehensive Prolog environment
url=http://www.swi-prolog.org;
@@ -12,7 +12,6 @@ groups=('devel-extra')
_F_archive_name=pl
up2date=Flasttar http://www.swi-prolog.org/download/stable/src/;
source=(http://www.swi-prolog.org/download/stable/src/$_F_archive_name-$pkgver.tar.gz;)
-sha1sums=('7fd5a27fef1d94644d7d2ea255a414986b3a1d83')
+sha1sums=('76f52f6b79226985d09e2f5a42014477971f17f4')
# optimization OK
-
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: m4ri-20091101-1-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=38f7b3906590c8a75f425e8266fbcb2c614e636b
commit 38f7b3906590c8a75f425e8266fbcb2c614e636b
Author: Elentir elen...@mailoo.org
Date: Sat Nov 14 14:23:36 2009 +0100
m4ri-20091101-1-i686
* version bump
diff --git a/source/lib-extra/m4ri/FrugalBuild
b/source/lib-extra/m4ri/FrugalBuild
index 5dd53c7..62ac871 100644
--- a/source/lib-extra/m4ri/FrugalBuild
+++ b/source/lib-extra/m4ri/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: Elentir elen...@mailoo.org
pkgname=m4ri
-pkgver=20090512
+pkgver=20091101
pkgrel=1
pkgdesc=Library for fast arithmetic with dense matrices over F(2)
url=http://m4ri.sagemath.org/;
@@ -11,6 +11,6 @@ groups=('lib-extra')
archs=('i686' 'x86_64')
source=($url/downloads/$pkgname-$pkgver.tar.gz)
up2date=Flasttar $url/downloads/
-sha1sums=('f573bc1522100a400c16db8693baa5841515f574')
+sha1sums=('90fa8d934aeb5514bca4a45512854f232f9f9963')
# optimization OK
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: r-2.10.0-1-x86_64
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e836c38cf404ff64c13de8981e712cd3d6b48615
commit e836c38cf404ff64c13de8981e712cd3d6b48615
Author: Elentir elen...@mailoo.org
Date: Sat Nov 14 16:06:21 2009 +0100
r-2.10.0-1-x86_64
* version bump
* fix libdir for x86_64
diff --git a/source/xapps-extra/r/FrugalBuild b/source/xapps-extra/r/FrugalBuild
index c66b4e2..42bd41e 100644
--- a/source/xapps-extra/r/FrugalBuild
+++ b/source/xapps-extra/r/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: Elentir elen...@mailoo.org
pkgname=r
-pkgver=2.9.2
+pkgver=2.10.0
pkgrel=1
pkgdesc=R is a language and environment for statistical computing and
graphics.
url=http://www.r-project.org;
@@ -13,7 +13,8 @@ archs=('i686' 'x86_64')
_F_archive_name=R
source=(http://cran.r-project.org/src/base/R-2/$_F_archive_name-$pkgver.tar.gz;)
up2date=Flasttar http://cran.r-project.org/src/base/R-2/;
-sha1sums=('3934743b67a57691db724606c575e38a35ecb590')
+sha1sums=('72249c2fd4dc88d76f775c06b0336c8f934fb358')
+Fconfopts=--libdir=/usr/lib
unset MAKEFLAGS
# optimization OK
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: ocamlgraph-1.3-1-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8f61141e41b899fd8e83a9bc6d5fb48f97cecf4d
commit 8f61141e41b899fd8e83a9bc6d5fb48f97cecf4d
Author: Elentir elen...@mailoo.org
Date: Sat Nov 14 19:51:32 2009 +0100
ocamlgraph-1.3-1-i686
* version bump
diff --git a/source/lib-extra/ocamlgraph/FrugalBuild
b/source/lib-extra/ocamlgraph/FrugalBuild
index 082fabd..2bd531f 100644
--- a/source/lib-extra/ocamlgraph/FrugalBuild
+++ b/source/lib-extra/ocamlgraph/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: Elentir elen...@mailoo.org
pkgname=ocamlgraph
-pkgver=1.1
+pkgver=1.3
pkgrel=1
pkgdesc=Ocamlgraph is a graph library for Objective Caml
url=http://ocamlgraph.lri.fr;
@@ -11,7 +11,7 @@ depends=('ocaml=3.11.1')
groups=('lib-extra')
archs=('i686' 'x86_64')
up2date=Flasttar $url/download/
-sha1sums=('70152127fd05aa97006434614441425182e87471')
+sha1sums=('79f1fe80c95a6521e19536b2b0834b0b77a89eb1')
build() {
Fmake
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: gnusim8085-1.3.5-1-x86_64
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a92c228600fce1c3beef88e9c54b50fe7f72f57e
commit a92c228600fce1c3beef88e9c54b50fe7f72f57e
Author: Laszlo Papp djsza...@gmail.com
Date: Sat Nov 21 12:42:48 2009 +0100
gnusim8085-1.3.5-1-x86_64
* new package
diff --git a/source/devel-extra/gnusim8085/FrugalBuild
b/source/devel-extra/gnusim8085/FrugalBuild
new file mode 100644
index 000..649d2a5
--- /dev/null
+++ b/source/devel-extra/gnusim8085/FrugalBuild
@@ -0,0 +1,14 @@
+# Compiling Time: 0.01 SBU
+# Maintainer: Elentir elen...@mailoo.org
+# Contributor: Laszlo Papp djszapi at archlinux.us
+
+pkgname=gnusim8085
+pkgver=1.3.5
+pkgrel=1
+pkgdesc=GNOME simulator and assembler for the Intel 8085 Microprocessor
+depends=('gtksourceview')
+groups=('devel-extra')
+archs=('i686' 'x86_64')
+Finclude sourceforge
+sha1sums=('106481dcbafdc93da93e12ff46b27a406ddacd09')
+
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: swi-prolog-5.8.1-1-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ee3215888154a64e24c6407d61143c45ed89c5b6
commit ee3215888154a64e24c6407d61143c45ed89c5b6
Author: Elentir elen...@mailoo.org
Date: Sat Nov 21 19:54:46 2009 +0100
swi-prolog-5.8.1-1-i686
* version bump
diff --git a/source/devel-extra/swi-prolog/FrugalBuild
b/source/devel-extra/swi-prolog/FrugalBuild
index 88e49b0..c884b55 100644
--- a/source/devel-extra/swi-prolog/FrugalBuild
+++ b/source/devel-extra/swi-prolog/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: Elentir elen...@mailoo.org
pkgname=swi-prolog
-pkgver=5.8.0
+pkgver=5.8.1
pkgrel=1
pkgdesc=SWI-Prolog is a comprehensive Prolog environment
url=http://www.swi-prolog.org;
@@ -12,6 +12,6 @@ groups=('devel-extra')
_F_archive_name=pl
up2date=Flasttar http://www.swi-prolog.org/download/stable/src/;
source=(http://www.swi-prolog.org/download/stable/src/$_F_archive_name-$pkgver.tar.gz;)
-sha1sums=('76f52f6b79226985d09e2f5a42014477971f17f4')
+sha1sums=('f3466d14cb791dfdb023020a982139a44fdb89d3')
# optimization OK
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: 4ti2-1.3.2-1-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5381e89b8760b630baa9e0cb056ebe4e5d9d7a2b
commit 5381e89b8760b630baa9e0cb056ebe4e5d9d7a2b
Author: Elentir elen...@mailoo.org
Date: Sat Nov 21 21:12:31 2009 +0100
4ti2-1.3.2-1-i686
* new package
diff --git a/source/apps-extra/4ti2/FrugalBuild
b/source/apps-extra/4ti2/FrugalBuild
new file mode 100755
index 000..223f47a
--- /dev/null
+++ b/source/apps-extra/4ti2/FrugalBuild
@@ -0,0 +1,17 @@
+# Compiling Time: 1.17 SBU
+# Maintainer: Elentir elen...@mailoo.org
+
+pkgname=4ti2
+pkgver=1.3.2
+pkgrel=1
+pkgdesc=A package for algebraic, geometric and combinatorial problems on
linear spaces
+archs=('i686' 'x86_64')
+url=http://www.4ti2.de;
+depends=('glpk')
+groups=('apps-extra')
+up2date=Flasttar $url/download_4ti2.html
+source=($url/version_$pkgver/$pkgname-$pkgver.tar.gz)
+Fconfopts=$Fconfopts --enable-shared
+sha1sums=('bb0bddb3a9de6f6c7e296b5315b8b7e59ea5')
+
+# optimization OK
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: chomp-20090710-1-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2b0b30442bde7a9a1105b42ec26bc961a8e38dfb
commit 2b0b30442bde7a9a1105b42ec26bc961a8e38dfb
Author: Elentir elen...@mailoo.org
Date: Sat Nov 21 22:17:20 2009 +0100
chomp-20090710-1-i686
* new package
diff --git a/source/apps-extra/chomp/FrugalBuild
b/source/apps-extra/chomp/FrugalBuild
new file mode 100644
index 000..27cec94
--- /dev/null
+++ b/source/apps-extra/chomp/FrugalBuild
@@ -0,0 +1,29 @@
+# Compiling Time: 2.03 SBU
+# Maintainer: Elentir elen...@mailoo.org
+
+pkgname=chomp
+pkgver=20090710
+pkgrel=1
+pkgdesc=A software package for homology computations in n-dimensions
+url=http://chomp.rutgers.edu;
+groups=('apps-extra')
+archs=('i686' 'x86_64')
+depends=('libstdc++')
+up2date=lynx -dump $url/advanced/download.php | grep [0-9]*-[0-9]*-[0-9]* |
sed 's/\(.*\)\([0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}\)/\2/g' | sort | tail -1 | sed
's/-//g'
+source=('http://chomp.rutgers.edu/download/chomp-full.tar.gz'
gcc43-chomp.patch)
+_F_cd_path=chomp-full
+sha1sums=('8498da95469801cce50eacd6b98d29523ff39ac1' \
+ '2e33504b569d436b6682662c502e8ac3fd8a6caf')
+unset MAKEFLAGS
+
+build() {
+ Fpatchall
+ Fsed COMPILE = \$(CXX) -O2 -ansi -pedantic -Wall COMPILE = \$(CXX)
-ansi $CFLAGS make/config/unx
+ Fmake
+ Finstall 755 $_F_cd_path/bin/* usr/bin/
+ Fcp $_F_cd_path/include/ usr/
+ Fcp $_F_cd_path/lib/ usr/
+ Fdoc $_F_cd_path/license.txt
+}
+
+# optimization OK
diff --git a/source/apps-extra/chomp/gcc43-chomp.patch
b/source/apps-extra/chomp/gcc43-chomp.patch
new file mode 100644
index 000..a249a00
--- /dev/null
+++ b/source/apps-extra/chomp/gcc43-chomp.patch
@@ -0,0 +1,44 @@
+diff -Naur chomp-full/include/capd/interval/Interval_Op.hpp
chomp-fullnew/include/capd/interval/Interval_Op.hpp
+--- chomp-full/include/capd/interval/Interval_Op.hpp 2009-07-08
14:18:00.0 +0200
chomp-fullnew/include/capd/interval/Interval_Op.hpp2009-11-15
12:49:39.273724136 +0100
+@@ -23,6 +23,7 @@
+
+ #include capd/interval/IntervalError.h
+ #include iostream
++#include cstdio
+
+ namespace chomp{
+ namespace intervals{
+diff -Naur chomp-full/include/capd/vectalg/Matrix.hpp
chomp-fullnew/include/capd/vectalg/Matrix.hpp
+--- chomp-full/include/capd/vectalg/Matrix.hpp 2009-07-08 14:18:02.0
+0200
chomp-fullnew/include/capd/vectalg/Matrix.hpp 2009-11-15
12:48:44.863586141 +0100
+@@ -18,6 +18,7 @@
+
+ #include vector
+ #include stack
++#include cstdio
+
+ #include capd/capd/minmax.h
+ #include capd/vectalg/Matrix.h
+diff -Naur chomp-full/include/capd/vectalg/Vector.hpp
chomp-fullnew/include/capd/vectalg/Vector.hpp
+--- chomp-full/include/capd/vectalg/Vector.hpp 2008-09-22 20:54:27.0
+0200
chomp-fullnew/include/capd/vectalg/Vector.hpp 2009-11-15
12:53:43.403485279 +0100
+@@ -19,6 +19,7 @@
+ #include cmath
+ #include stack
+ #include stdexcept
++#include cstdio
+
+ #include capd/capd/minmax.h
+ #include capd/capd/power.h
+diff -Naur chomp-full/include/chomp/multiwork/mwdata.h
chomp-fullnew/include/chomp/multiwork/mwdata.h
+--- chomp-full/include/chomp/multiwork/mwdata.h2009-01-13
21:12:24.0 +0100
chomp-fullnew/include/chomp/multiwork/mwdata.h 2009-11-15
12:55:59.932384160 +0100
+@@ -34,6 +34,7 @@
+ #ifndef _CHOMP_MULTIWORK_MWDATA_H_
+ #define _CHOMP_MULTIWORK_MWDATA_H_
+
++#include cstdio
+ #include chomp/multiwork/mwconfig.h
+
+ // include an appropriate header file for 'string' if necessary
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: frobby-0.8.2-1-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1e268aa7ebe3d974acb25a50c34451b5ad2eab0f
commit 1e268aa7ebe3d974acb25a50c34451b5ad2eab0f
Author: Elentir elen...@mailoo.org
Date: Sat Nov 21 22:39:59 2009 +0100
frobby-0.8.2-1-i686
* new package
diff --git a/source/apps-extra/frobby/FrugalBuild
b/source/apps-extra/frobby/FrugalBuild
new file mode 100755
index 000..669765e
--- /dev/null
+++ b/source/apps-extra/frobby/FrugalBuild
@@ -0,0 +1,30 @@
+# Compiling Time: 1.93 SBU
+# Maintainer: Elentir elen...@mailoo.org
+
+pkgname=frobby
+pkgver=0.8.2
+pkgrel=1
+pkgdesc=A software system for computations with monomial ideals
+archs=('i686' 'x86_64')
+url=http://www.broune.com/frobby/;
+groups=('apps-extra')
+depends=('gmp')
+Fpkgversep=_v
+up2date=Flasttar $url
+source=($url/$pkgname$Fpkgversep$pkgver.tar.gz gcc43-frobby.patch)
+sha1sums=('0e75a0b78eeef43df491393a5c1fd1421b9e47d8' \
+ '3925ed89c557ab3b225cd3c33c9cfa21cddcf2ab')
+
+build() {
+ Fpatchall
+ Fmake
+ make library || Fdie
+ make library MODE=shared || Fdie
+ Finstall 755 $_F_cd_path/bin/frobby usr/bin/frobby
+ Finstall 644 $_F_cd_path/bin/libfrobby.a usr/lib/libfrobby.a
+ Finstall 644 $_F_cd_path/bin/libfrobby.so usr/lib/libfrobby.so
+ Finstall 644 $_F_cd_path/src/frobby.h usr/include/frobby.h
+ Finstall 644 $_F_cd_path/src/stdinc.h usr/include/stdinc.h
+}
+
+# optimization OK
diff --git a/source/apps-extra/frobby/gcc43-frobby.patch
b/source/apps-extra/frobby/gcc43-frobby.patch
new file mode 100755
index 000..e8719f9
--- /dev/null
+++ b/source/apps-extra/frobby/gcc43-frobby.patch
@@ -0,0 +1,11 @@
+diff -Naur frobby_v0.8.2/src/test/TestSuite.cpp
frobby_v0.8.2/src/test/TestSuite.cpp
+--- frobby_v0.8.2/src/test/TestSuite.cpp 2009-07-07 05:40:18.0
+0200
frobby_v0.8.2/src/test/TestSuite.cpp 2009-11-09 23:09:15.093908794
+0100
+@@ -14,6 +14,7 @@
+You should have received a copy of the GNU General Public License
+along with this program. If not, see http://www.gnu.org/licenses/.
+ */
++#include algorithm
+ #include stdinc.h
+ #include TestSuite.h
+
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: gf2x-0.9.6-1-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d3431a4908d3be78cdf37c0729006774e5fa0ba4
commit d3431a4908d3be78cdf37c0729006774e5fa0ba4
Author: Elentir elen...@mailoo.org
Date: Sat Nov 28 23:49:19 2009 +0100
gf2x-0.9.6-1-i686
* version bump
diff --git a/source/lib-extra/gf2x/FrugalBuild
b/source/lib-extra/gf2x/FrugalBuild
index 1aaf0ea..5db1607 100644
--- a/source/lib-extra/gf2x/FrugalBuild
+++ b/source/lib-extra/gf2x/FrugalBuild
@@ -2,8 +2,8 @@
# Maintainer: Elentir elen...@mailoo.org
pkgname=gf2x
-pkgver=0.9.5
-rel_id=22129
+pkgver=0.9.6
+rel_id=24875
pkgrel=1
pkgdesc=gf2x is a library for multiplying polynomials over the binary field
url=http://gf2x.gforge.inria.fr/;
@@ -12,7 +12,7 @@ depends=('glibc')
groups=('lib-extra')
archs=('i686')
up2date=Flasttar http://gforge.inria.fr/frs/?group_id=1874;
-sha1sums=('13e8fc2f9b4310cbbcba09c3264201b368f7672a')
+sha1sums=('51fd9ccb6274f9e73e44d9b0bd96763025f81f5d')
Fconfopts=${fconfop...@]} --enable-sse2=no
# optimization OK
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: givaro-3.3.1-1-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4a07c4d83240394c1e1ed503b18303498219c5cd
commit 4a07c4d83240394c1e1ed503b18303498219c5cd
Author: Elentir elen...@mailoo.org
Date: Sun Dec 20 16:33:31 2009 +0100
givaro-3.3.1-1-i686
* version bump
diff --git a/source/lib-extra/givaro/FrugalBuild
b/source/lib-extra/givaro/FrugalBuild
index 40285a5..54c8c6d 100644
--- a/source/lib-extra/givaro/FrugalBuild
+++ b/source/lib-extra/givaro/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: Elentir elen...@mailoo.org
pkgname=givaro
-pkgver=3.3.0
+pkgver=3.3.1
pkgrel=1
pkgdesc=C++ library for arithmetic and algebraic computations
url=http://ljk.imag.fr/CASYS/LOGICIELS/givaro/;
@@ -12,6 +12,6 @@ archs=('i686' 'x86_64')
source=($url/Downloads/$pkgname-$pkgver.tar.gz)
up2date=lynx -dump $url/Downloads/ | grep -v rc | Flasttar
Fconfopts=$Fconfopts --enable-shared
-sha1sums=('6eacec1706e6b58905197b194085a37e123b7489')
+sha1sums=('fa060b0dad9f90a8af9286527c903bf36efca3fd')
# optimization OK
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: libsigsegv-2.8-1-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=85cb6d49bb26d88b3ae7aebce675d59135401115
commit 85cb6d49bb26d88b3ae7aebce675d59135401115
Author: Elentir elen...@mailoo.org
Date: Sun Dec 20 16:41:01 2009 +0100
libsigsegv-2.8-1-i686
* version bump
diff --git a/source/lib-extra/libsigsegv/FrugalBuild
b/source/lib-extra/libsigsegv/FrugalBuild
index 8db4861..51505d7 100644
--- a/source/lib-extra/libsigsegv/FrugalBuild
+++ b/source/lib-extra/libsigsegv/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: Elentir elen...@mailoo.org
pkgname=libsigsegv
-pkgver=2.7
+pkgver=2.8
pkgrel=1
pkgdesc=GNU libsigsegv is a library for handling page faults in user mode.
url=http://savannah.gnu.org/projects/$pkgname/;
@@ -12,7 +12,6 @@ signatures=($source.sig)
depends=('glibc')
groups=('lib-extra')
archs=('i686' 'x86_64')
-sha1sums=('ef515a9d81b50b83981b73fdfea84d8f5fd8a141')
Fconfopts=$Fconfopts --enable-shared
# optimization OK
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: swi-prolog-5.8.2-1-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=064e1706cc769ff4d80f949c7e122c137f7ffe16
commit 064e1706cc769ff4d80f949c7e122c137f7ffe16
Author: Elentir elen...@mailoo.org
Date: Sun Dec 20 16:46:32 2009 +0100
swi-prolog-5.8.2-1-i686
* version bump
diff --git a/source/devel-extra/swi-prolog/FrugalBuild
b/source/devel-extra/swi-prolog/FrugalBuild
index c884b55..64cf42d 100644
--- a/source/devel-extra/swi-prolog/FrugalBuild
+++ b/source/devel-extra/swi-prolog/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: Elentir elen...@mailoo.org
pkgname=swi-prolog
-pkgver=5.8.1
+pkgver=5.8.2
pkgrel=1
pkgdesc=SWI-Prolog is a comprehensive Prolog environment
url=http://www.swi-prolog.org;
@@ -12,6 +12,6 @@ groups=('devel-extra')
_F_archive_name=pl
up2date=Flasttar http://www.swi-prolog.org/download/stable/src/;
source=(http://www.swi-prolog.org/download/stable/src/$_F_archive_name-$pkgver.tar.gz;)
-sha1sums=('f3466d14cb791dfdb023020a982139a44fdb89d3')
+sha1sums=('1e2d98a7b9f5ffba6c34724c9757d46a662ff4c5')
# optimization OK
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: libftdi-0.17-1-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=179eae6806a9ef3f0526ea46da5d4c55d209080f
commit 179eae6806a9ef3f0526ea46da5d4c55d209080f
Author: Elentir elen...@mailoo.org
Date: Sun Dec 20 16:59:31 2009 +0100
libftdi-0.17-1-i686
* version bump
diff --git a/source/lib-extra/libftdi/FrugalBuild
b/source/lib-extra/libftdi/FrugalBuild
index b1beeb4..cecc3fd 100644
--- a/source/lib-extra/libftdi/FrugalBuild
+++ b/source/lib-extra/libftdi/FrugalBuild
@@ -3,7 +3,7 @@
# Contributor: Laszlo Papp djsz...@archlinux.us
pkgname=libftdi
-pkgver=0.16
+pkgver=0.17
pkgrel=1
pkgdesc=A library to talk to FTDI chips
url=http://www.intra2net.com/en/developer/libftdi/;
@@ -12,7 +12,7 @@ groups=('lib-extra')
archs=('i686' 'x86_64')
up2date=Flasttar $url/download.php
source=($url/download/$pkgname-$pkgver.tar.gz)
-sha1sums=('03e453ea0b74e41ffe5bf0476c1997a4faa072c3')
+sha1sums=('e2ab367f20df8f38fa9754070ad0bea5aa0f6f7a')
build()
{
@@ -21,3 +21,4 @@ build()
Fbuild
}
+# optimization OK
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: r-2.10.1-1-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f1b1aeadf813895a2c56a213c9f29aadda3d4533
commit f1b1aeadf813895a2c56a213c9f29aadda3d4533
Author: Elentir elen...@mailoo.org
Date: Sun Dec 20 17:04:47 2009 +0100
r-2.10.1-1-i686
* version bump
diff --git a/source/xapps-extra/r/FrugalBuild b/source/xapps-extra/r/FrugalBuild
index 42bd41e..56cf862 100644
--- a/source/xapps-extra/r/FrugalBuild
+++ b/source/xapps-extra/r/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: Elentir elen...@mailoo.org
pkgname=r
-pkgver=2.10.0
+pkgver=2.10.1
pkgrel=1
pkgdesc=R is a language and environment for statistical computing and
graphics.
url=http://www.r-project.org;
@@ -13,7 +13,7 @@ archs=('i686' 'x86_64')
_F_archive_name=R
source=(http://cran.r-project.org/src/base/R-2/$_F_archive_name-$pkgver.tar.gz;)
up2date=Flasttar http://cran.r-project.org/src/base/R-2/;
-sha1sums=('72249c2fd4dc88d76f775c06b0336c8f934fb358')
+sha1sums=('f5b1969fde3642c233f5198e44a7bf17a7b85ab6')
Fconfopts=--libdir=/usr/lib
unset MAKEFLAGS
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: mathgl-1.9-1-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=cb4b9c45defd38809247d7971e49b33745df4658
commit cb4b9c45defd38809247d7971e49b33745df4658
Author: Elentir elen...@mailoo.org
Date: Sun Dec 20 17:49:34 2009 +0100
mathgl-1.9-1-i686
* version bump
* add subpkgs for glut, fltk and qt interfaces
diff --git a/source/xlib-extra/mathgl/FrugalBuild
b/source/xlib-extra/mathgl/FrugalBuild
index 8b2a327..473efe3 100644
--- a/source/xlib-extra/mathgl/FrugalBuild
+++ b/source/xlib-extra/mathgl/FrugalBuild
@@ -2,17 +2,37 @@
# Maintainer: Elentir elen...@mailoo.org
pkgname=mathgl
-pkgver=1.8.1
-pkgrel=2
+pkgver=1.9
+pkgrel=1
pkgdesc=A library for making high-quality scientific graphics, fast data
plotting and handling of large data arrays
archs=('i686' 'x86_64')
-depends=('fltk' 'gsl' 'libgl' 'freeglut' 'libjpeg' 'libqtgui' 'libtiff'
'libgomp')
+depends=('fltk' 'gsl' 'libjpeg' 'libtiff' 'libgomp' 'libgl')
+makedepends=('python' )
groups=('xlib-extra')
_F_sourceforge_dirname=$pkgname
_F_sourceforge_ext=.tgz
+# 1.9.0.1version is a windows release and is broken on linux
+_F_archive_grepv=1.9.0.1
Finclude sourceforge
Fconfopts=$Fconfopts --enable-fltk --enable-glut --enable-qt --enable-jpeg
--enable-tiff
-sha1sums=('307153645a514b071c192b883153f6aa8d9ad52f')
+sha1sums=('79c733a50c235c14ba089ef5583985b83383114f')
-# optimization OK
+subpkgs=('mathgl-qt' 'mathgl-fltk' 'mathgl-glut')
+subdescs=('QT interface for Mathgl library' 'FLTK interface for Mathgl
library' 'GLUT interface for Mathgl library')
+subdepends=('libqtgui' 'fltk' 'freeglut')
+subrodepends=('mathgl' 'mathgl' 'mathgl')
+subgroups=('xlib-extra' 'xlib-extra' 'xlib-extra')
+subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64')
+
+build() {
+ Fbuild
+ Fsplit mathgl-qt usr/bin/mgl_qt_example
+ Fsplit mathgl-qt usr/lib/libmgl-qt.*
+ Fsplit mathgl-fltk usr/lib/libmgl-fltk.*
+ Fsplit mathgl-fltk usr/bin/mgl_fltk_example
+ Fsplit mathgl-fltk usr/bin/mglview
+ Fsplit mathgl-glut usr/bin/mgl_glut_example
+ Fsplit mathgl-glut usr/lib/libmgl-glut.*
+}
+# optimization OK
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: apron-0.9.10-1-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=843478ea2d7f7e9f239aaf5e6fd732e5c86e1ccd
commit 843478ea2d7f7e9f239aaf5e6fd732e5c86e1ccd
Author: Elentir elen...@mailoo.org
Date: Sun Dec 20 21:42:33 2009 +0100
apron-0.9.10-1-i686
* version bump
* remove apron patch
diff --git a/source/lib-extra/apron/FrugalBuild
b/source/lib-extra/apron/FrugalBuild
index d0649e6..c524cb6 100644
--- a/source/lib-extra/apron/FrugalBuild
+++ b/source/lib-extra/apron/FrugalBuild
@@ -2,25 +2,23 @@
# Maintainer: Elentir elen...@mailoo.org
pkgname=apron
-pkgver=0.9.9
-pkgrel=2
+pkgver=0.9.10
+pkgrel=1
pkgdesc=Library for static analysis of the numerical variables of a program by
Abstract Interpretation
url=http://apron.cri.ensmp.fr/library/;
-source=($url/$pkgname-$pkgver.tgz $pkgname.patch)
+source=($url/$pkgname-dist-$pkgver.tgz)
depends=('ocaml=3.11.1' 'camlidl=1.05-3' 'gmp' 'mpfr')
groups=('lib-extra')
archs=('i686' 'x86_64')
up2date=Flasttar $url
-sha1sums=('31a607622c325869006eff21c2708f37448a7290' \
- '43e946c28f80b14509f6501ab92a6a1189cd31c0')
+_F_cd_path=$pkgname-dist-$pkgver
+sha1sums=('2defc170d522ab1c7ec0c50036d931411aa2fbc6')
+unset MAKEFLAGS
build() {
- unset MAKEFLAGS
Fcd
mv Makefile.config.model Makefile.config || Fdie
- ## -i is incompatible with -pack option in ocamlc.opt
- Fsed $(OCAMLINC) -i -pack $(OCAMLINC) -pack mlapronidl/Makefile
+ Fsed APRON_PREFIX = /tmp APRON_PREFIX = $Fdestdir/usr Makefile.config
+ Fsed MLGMPIDL_PREFIX = /tmp MLGMPIDL_PREFIX = $Fdestdir/usr
Makefile.config
Fbuild
}
-
-# optimization OK
diff --git a/source/lib-extra/apron/apron.patch
b/source/lib-extra/apron/apron.patch
deleted file mode 100644
index 1df3afc..000
--- a/source/lib-extra/apron/apron.patch
+++ /dev/null
@@ -1,46 +0,0 @@
Makefile.config2008-06-09 16:10:50.0 +0200
-+++ Makefile.config2009-01-25 17:38:45.0 +0100
-@@ -29,12 +29,12 @@
- # Where to install and to find APRON
- # ($(APRON_PREFIX)/include, $(APRON_PREFIX)/lib)
- #
--APRON_PREFIX = /usr
-+APRON_PREFIX = $(prefix)
-
- # Where to install and to find MLGMPIDL
- # ($(MLGMPIDL_PREFIX)/lib)
- #
--MLGMPIDL_PREFIX = /usr/local
-+MLGMPIDL_PREFIX = $(prefix)
-
- # Where to find GMP ($(GMP_PREFIX)/include, ($GMP_PREFIX)/lib
- #
-@@ -64,12 +64,9 @@
- CC = gcc
-
- # C compilation flags
--CFLAGS = \
---Wcast-qual -Wswitch -Werror-implicit-function-declaration \
---Wall -Wextra -Wundef -Wbad-function-cast -Wcast-align -Wstrict-prototypes \
---Wno-unused \
-+CFLAGS += \
- -std=c99 -U__STRICT_ANSI__ \
---O3 -DNDEBUG
-+-DNDEBUG
-
- # C compilation flags in debug (or profile) mode
- CFLAGS_DEBUG = \
-@@ -88,11 +85,8 @@
- # C++ compiler
- CXX = g++
- # C++ compilation flags
--CXXFLAGS = \
---Wcast-qual -Wswitch \
---Wall -Wextra -Wundef -Wcast-align \
---Wno-unused \
---O3 -DNDEBUG
-+CXXFLAGS += \
-+-DNDEBUG
- # C++ compilation flags in debug (or profile) mode
- CXXFLAGS_DEBUG = \
- -Wcast-qual -Wswitch \
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: frama-c-20090902-1-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5228822713d4676a6f9bd40f5ca6229ce9e5423c
commit 5228822713d4676a6f9bd40f5ca6229ce9e5423c
Author: Elentir elen...@mailoo.org
Date: Mon Dec 21 11:23:44 2009 +0100
frama-c-20090902-1-i686
* version bump
* fix up2date
* add x86_64 to archs
diff --git a/source/xapps-extra/frama-c/FrugalBuild
b/source/xapps-extra/frama-c/FrugalBuild
index 846ddf1..75d6193 100644
--- a/source/xapps-extra/frama-c/FrugalBuild
+++ b/source/xapps-extra/frama-c/FrugalBuild
@@ -2,22 +2,22 @@
# Maintainer: Elentir elen...@mailoo.org
pkgname=frama-c
-pkgver=20081201
-pkgextraver=Lithium
-pkgrel=2
+pkgver=20090902
+rel_id=Beryllium
+pkgrel=1
pkgdesc=Static analyser for C code
url=http://frama-c.cea.fr;
-source=($url/download/$pkgname-$pkgextraver-$pkgver.tar.gz)
-depends=('gtk+2' 'ocaml=3.11.1' 'lablgtk2=2.12.0' 'gtksourceview'
'lablgtk2-gtksourceview1=2.12.0' 'lablgtk2-gnomecanvas=2.12.0'
'apron=0.9.9-2')
+source=($url/download/$pkgname-$rel_id-$pkgver.tar.gz)
+depends=('gtk+2' 'ocaml=3.11.1' 'lablgtk2=2.12.0' 'gtksourceview'
'lablgtk2-gtksourceview1=2.12.0' 'lablgtk2-gnomecanvas=2.12.0'
'apron=0.9.10')
options=('scriptlet')
groups=('xapps-extra')
-archs=('i686')
-up2date=Flasttar $url/download.html | sed 's/$pkgextraver.//g'
-_F_cd_path=$pkgname-$pkgextraver-$pkgver
+archs=('i686' 'x86_64')
+up2date=lynx -dump http://frama-c.cea.fr/download.html | grep tar.gz | grep
-v why | sort -r | tail -1 | sed 's/\(.*\)-\(.*\).tar.gz/\2/g'
+_F_cd_path=$pkgname-$rel_id-$pkgver
_F_desktop_name=Frama-C
_F_desktop_exec=frama-c-gui
_F_desktop_categories=Development;
-sha1sums=('e724cd21d77e44645e9369763c848e59cced110b')
+sha1sums=('2496ebabc0b95d92a52e3d43079c48167601888f')
build() {
unset MAKEFLAGS
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: noteo-0.1.7-1-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=608e0dc16ca87e9f9bfb806e34a1bd2bc9a61d01
commit 608e0dc16ca87e9f9bfb806e34a1bd2bc9a61d01
Author: Elentir elen...@mailoo.org
Date: Mon Dec 21 11:36:46 2009 +0100
noteo-0.1.7-1-i686
* new package
diff --git a/source/xapps-extra/noteo/FrugalBuild
b/source/xapps-extra/noteo/FrugalBuild
new file mode 100644
index 000..12e476e
--- /dev/null
+++ b/source/xapps-extra/noteo/FrugalBuild
@@ -0,0 +1,12 @@
+# Compiling Time: 0.01 SBU
+# Maintainer: Elentir elen...@mailoo.org
+
+ pkgname=noteo
+ pkgver=0.1.7
+ pkgrel=1
+ pkgdesc=A notifications system
+ depends=('pygtk' 'configobj')
+ groups=('xapps-extra')
+ archs=('i686' 'x86_64')
+ Finclude googlecode
+ sha1sums=('950b3c67d3e5e835653b537628cd10816196644d')
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: functy-0.22-1-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2ba5c28f3eaa73914cc2235632f316369d750c1f
commit 2ba5c28f3eaa73914cc2235632f316369d750c1f
Author: Elentir elen...@mailoo.org
Date: Mon Dec 21 17:40:20 2009 +0100
functy-0.22-1-i686
* new package
diff --git a/source/xapps-extra/functy/FrugalBuild
b/source/xapps-extra/functy/FrugalBuild
new file mode 100755
index 000..ffa1a7d
--- /dev/null
+++ b/source/xapps-extra/functy/FrugalBuild
@@ -0,0 +1,16 @@
+# Compiling Time: 0.07 SBU
+# Maintainer: Elentir elen...@mailoo.org
+
+pkgname=functy
+pkgver=0.22
+pkgrel=1
+pkgdesc=A 3D graph drawing package
+archs=('i686' 'x86_64')
+depends=('gtkglext' 'freeglut' 'libglade')
+makedepends=('symbolic')
+groups=('xapps-extra')
+_F_sourceforge_ext=.zip
+Finclude sourceforge
+sha1sums=('c4086a59d1c16182843d34cd320198f4c503ba33')
+
+# optimization OK
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: hdf5-1.8.4-2-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c88a3f2372e268eb567ef6f9e630d9d189aaa339
commit c88a3f2372e268eb567ef6f9e630d9d189aaa339
Author: Elentir elen...@mailoo.org
Date: Tue Dec 22 11:31:19 2009 +0100
hdf5-1.8.4-2-i686
* enable fortran interface and add subpkg for it
diff --git a/source/lib-extra/hdf5/FrugalBuild
b/source/lib-extra/hdf5/FrugalBuild
old mode 100755
new mode 100644
index 31a64d1..555d442
--- a/source/lib-extra/hdf5/FrugalBuild
+++ b/source/lib-extra/hdf5/FrugalBuild
@@ -3,20 +3,34 @@
pkgname=hdf5
pkgver=1.8.4
-pkgrel=1
+pkgrel=2
pkgdesc=Library and file format for storing scientific data
url=http://www.hdfgroup.org/HDF5/;
archs=('i686' 'x86_64')
groups=('lib-extra')
depends=('zlib' 'libstdc++')
+makedepends=('gcc-gfortran')
up2date=Flasttar ftp://ftp.hdfgroup.org/HDF5/current/src/;
source=(ftp://ftp.hdfgroup.org/HDF5/current/src/$pkgname-$pkgver.tar.gz)
Fconfopts=$Fconfopts --enable-hl \
--enable-production \
+ --enable-fortran \
--enable-cxx --with-pic \
--with-pthread=/usr/lib/ \
--disable-sharedlib-rpath
sha1sums=('37877e29c49a6af3e23aa9ad798ef12b8ba1c05c')
unset MAKEFLAGS
+subpkgs=('hdf5-fortran')
+subdescs=('Fortran interface for hdf5 library')
+subdepends=('libgfortran')
+subrodepends=('hdf5')
+subgroups=('lib-extra')
+subarchs=('i686 x86_64')
+
+build() {
+ Fbuild
+ Fsplit hdf5-fortran usr/lib/*fortran*
+}
+
# optimization OK
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: sympy-0.6.6-1-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=51543f917119185f8f87c77e847081ac0602f031
commit 51543f917119185f8f87c77e847081ac0602f031
Author: Elentir elen...@mailoo.org
Date: Tue Dec 22 12:24:25 2009 +0100
sympy-0.6.6-1-i686
* version bump
* fix up2date
diff --git a/source/lib-extra/sympy/FrugalBuild
b/source/lib-extra/sympy/FrugalBuild
index cba62a3..0597836 100644
--- a/source/lib-extra/sympy/FrugalBuild
+++ b/source/lib-extra/sympy/FrugalBuild
@@ -2,14 +2,11 @@
# Maintainer: Elentir elen...@mailoo.org
pkgname=sympy
-pkgver=0.6.5
+pkgver=0.6.6
pkgrel=1
pkgdesc=SymPy is a Python library for symbolic mathematics.
archs=('i686' 'x86_64')
groups=('lib-extra')
depends=('python=2.6')
Finclude googlecode
-## broken up2date with only Finclude
-up2date=Flasttar http://code.google.com/p/$pkgname/downloads/list;
-sha1sums=('d6669973256aec02ca465009aa58e70d0b93')
-
+sha1sums=('aad5f919552a4e3710baee83ef0b2573d1950881')
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: ntl-5.5.2-1-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2102d5050598012652f46c88341ea9457815285f
commit 2102d5050598012652f46c88341ea9457815285f
Author: Elentir elen...@mailoo.org
Date: Tue Dec 22 17:03:52 2009 +0100
ntl-5.5.2-1-i686
* new package
diff --git a/source/lib-extra/ntl/FrugalBuild b/source/lib-extra/ntl/FrugalBuild
new file mode 100644
index 000..940fbee
--- /dev/null
+++ b/source/lib-extra/ntl/FrugalBuild
@@ -0,0 +1,16 @@
+# Compiling Time: 1.71 SBU
+# Maintainer: Elentir elen...@mailoo.org
+
+pkgname=ntl
+pkgver=5.5.2
+pkgrel=1
+pkgdesc=A C++ Library for doing Number Theory
+url=http://www.shoup.net/ntl;
+depends=('gmp' 'libstdc++')
+groups=('lib-extra')
+archs=('i686' 'x86_64')
+source=($url/$pkgname-$pkgver.tar.gz)
+up2date=Flasttar $url/download.html
+Fconfopts=SHARED=on NTL_GMP_LIP=on PREFIX=/usr
LIBDIR=\$(DESTDIR)\$(PREFIX)/lib INCLUDEDIR=\$(DESTDIR)\$(PREFIX)/include
DOCDIR=\$(DESTDIR)\$(PREFIX)/share/doc/$pkgname-$pkgver
+_F_cd_path=$pkgname-$pkgver/src
+sha1sums=('b45e3858f7f351afeb7fbb831b256befc4892b06')
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: openbox-3.4.9-1-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5ad7c58e4a5fe709e1851d5f754538eb552ae79d
commit 5ad7c58e4a5fe709e1851d5f754538eb552ae79d
Author: Elentir elen...@mailoo.org
Date: Tue Dec 22 21:10:57 2009 +0100
openbox-3.4.9-1-i686
* version bump
diff --git a/source/xlib/openbox/FrugalBuild b/source/xlib/openbox/FrugalBuild
index 16e295a..d7c78b6 100644
--- a/source/xlib/openbox/FrugalBuild
+++ b/source/xlib/openbox/FrugalBuild
@@ -3,7 +3,7 @@
# Maintainer: crazy cr...@frugalware.org
pkgname=openbox
-pkgver=3.4.8
+pkgver=3.4.9
pkgrel=1
pkgdesc=A standards compliant, fast, light-weight, extensible window manager.
pkgdesc_localized=('hu_HU Egy szabványoknak megfelelõ, gyors, pehelysúlyú,
kiterjeszthetõ ablakkezelõ.' \
@@ -17,7 +17,7 @@ backup=(etc/xdg/openbox/{menu.xml,rc.xml})
options=('scriptlet')
up2date=lynx -dump
'http://icculus.org/openbox/index.php/Openbox:Download'|grep -v pkg|grep -m1
'openbox-\(.*\).tar.gz$'|Flasttar
source=($url/releases/$pkgname-$pkgver.tar.gz)
-sha1sums=('dae3c3d84ce896e93a52bca0d098fe37c4df4424')
+sha1sums=('afb7efc8140c327ce8ddc355b39748683469b675')
build () {
Fbuild
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: mathgl-1.9-2-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=21aeebf381f50c1a112ea788cc743dd09cfa0ffb
commit 21aeebf381f50c1a112ea788cc743dd09cfa0ffb
Author: Elentir elen...@mailoo.org
Date: Tue Dec 22 21:23:19 2009 +0100
mathgl-1.9-2-i686
* fix depends
* add hdf5 and gif support
* enable python and octave interfaces and associated subpkgs
diff --git a/source/xlib-extra/mathgl/FrugalBuild
b/source/xlib-extra/mathgl/FrugalBuild
index 473efe3..44ea232 100644
--- a/source/xlib-extra/mathgl/FrugalBuild
+++ b/source/xlib-extra/mathgl/FrugalBuild
@@ -1,38 +1,55 @@
-# Compiling Time: 0.61 SBU
+# Compiling Time: 2.08 SBU
# Maintainer: Elentir elen...@mailoo.org
pkgname=mathgl
pkgver=1.9
-pkgrel=1
+pkgrel=2
pkgdesc=A library for making high-quality scientific graphics, fast data
plotting and handling of large data arrays
archs=('i686' 'x86_64')
-depends=('fltk' 'gsl' 'libjpeg' 'libtiff' 'libgomp' 'libgl')
-makedepends=('python' )
+depends=('gsl' 'libjpeg' 'libgif' 'libpng' 'libgomp' 'libgl' 'hdf5')
+makedepends=('swig')
groups=('xlib-extra')
_F_sourceforge_dirname=$pkgname
_F_sourceforge_ext=.tgz
# 1.9.0.1version is a windows release and is broken on linux
_F_archive_grepv=1.9.0.1
Finclude sourceforge
-Fconfopts=$Fconfopts --enable-fltk --enable-glut --enable-qt --enable-jpeg
--enable-tiff
-sha1sums=('79c733a50c235c14ba089ef5583985b83383114f')
+source=($source mgloctave.install)
+Fconfopts=$Fconfopts --enable-fltk --enable-glut --enable-qt --enable-jpeg
--enable-gif --enable-hdf5 --enable-python --enable-octave
+sha1sums=('79c733a50c235c14ba089ef5583985b83383114f' \
+ '9c9d3b6b62fb8f0dd0e33639d9ad3d160820547e')
+
+subpkgs=('mathgl-qt' 'mathgl-fltk' 'mathgl-glut' 'mathgl-python'
'mathgl-octave')
+subdescs=('QT interface for Mathgl library' 'FLTK interface for Mathgl
library' 'GLUT interface for Mathgl library' \
+ 'Python interface for Mathgl library'
'Octave interface for Mathgl library')
+subdepends=('libqtgui' 'fltk' 'freeglut' 'python=2.6 python-numeric' 'octave')
+subrodepends=('mathgl' 'mathgl' 'mathgl' 'mathgl' 'mathgl')
+subgroups=('xlib-extra' 'xlib-extra' 'xlib-extra' 'xlib-extra' 'xlib-extra')
+subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686
x86_64')
+subinstall=(mgloctave.install)
-subpkgs=('mathgl-qt' 'mathgl-fltk' 'mathgl-glut')
-subdescs=('QT interface for Mathgl library' 'FLTK interface for Mathgl
library' 'GLUT interface for Mathgl library')
-subdepends=('libqtgui' 'fltk' 'freeglut')
-subrodepends=('mathgl' 'mathgl' 'mathgl')
-subgroups=('xlib-extra' 'xlib-extra' 'xlib-extra')
-subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64')
build() {
- Fbuild
+ # fix a mislocation of arrayobject.h
+ Fsed numpy/arrayobject.h Numeric/arrayobject.h lang/numpy.i
+ Fconf
+ # use v16 symbols for hdf5 library
+ Fsed DEFS = -DHAVE_CONFIG_H DEFS = -DHAVE_CONFIG_H -DH5_USE_16_API
mgl/Makefile
+ Fmakeinstall
+ # Qt interface
Fsplit mathgl-qt usr/bin/mgl_qt_example
Fsplit mathgl-qt usr/lib/libmgl-qt.*
+ # Fltk interface
Fsplit mathgl-fltk usr/lib/libmgl-fltk.*
- Fsplit mathgl-fltk usr/bin/mgl_fltk_example
+ Fsplit mathgl-fltk usr/bin/mgl_fltk_example
Fsplit mathgl-fltk usr/bin/mglview
+ # Glut interface
Fsplit mathgl-glut usr/bin/mgl_glut_example
Fsplit mathgl-glut usr/lib/libmgl-glut.*
+ # Python interface
+ Fsplit mathgl-python usr/lib/python2.6
+ # Octave interface
+ Fsplit mathgl-octave usr/share/mathgl/octave
}
# optimization OK
diff --git a/source/xlib-extra/mathgl/mgloctave.install
b/source/xlib-extra/mathgl/mgloctave.install
new file mode 100644
index 000..5bd0abf
--- /dev/null
+++ b/source/xlib-extra/mathgl/mgloctave.install
@@ -0,0 +1,18 @@
+post_install()
+{
+ octave -q -H --no-site-file --eval pkg install -global
/usr/share/mathgl/octave/mathgl.tar.gz;
+}
+
+post_upgrade()
+{
+ post_install
+}
+
+post_remove()
+{
+ octave -q -H --no-site-file --eval pkg uninstall mathgl;
+}
+
+op=$1
+shift
+$op $*
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: udav-0.5.2-1-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=eac623dd7c7df59e9281a2095b63833ab10e
commit eac623dd7c7df59e9281a2095b63833ab10e
Author: Elentir elen...@mailoo.org
Date: Tue Dec 22 22:08:54 2009 +0100
udav-0.5.2-1-i686
* new package
diff --git a/source/xapps-extra/udav/FrugalBuild
b/source/xapps-extra/udav/FrugalBuild
new file mode 100644
index 000..d9eadf5
--- /dev/null
+++ b/source/xapps-extra/udav/FrugalBuild
@@ -0,0 +1,24 @@
+# Compiling Time: 0.24 SBU
+# Maintainer: Elentir elen...@mailoo.org
+
+pkgname=udav
+pkgver=0.5.2
+pkgrel=1
+pkgdesc=QT software for data arrays visualization based on MathGL library
+archs=('i686' 'x86_64')
+groups=('xapps-extra')
+depends=('mathgl-qt' 'hdf5')
+_F_sourceforge_ext=.tgz
+Finclude sourceforge
+sha1sums=('5d857ded986d65613d8a0f5d482ea33baf30f1b1')
+
+build() {
+ # fix install path
+ Fsed /usr/local/share/doc/udav/ help.path =
$Fdestdir/usr/share/doc/$pkgname-$pkgver/ src/src.pro
+ Fsed target.path = /usr/local/bin/ target.path = $Fdestdir/usr/bin/
src/src.pro
+ # use v16 symbols of hdf5 library
+ qmake DEFINES *= H5_USE_16_API udav.pro || Fdie
+ Fmakeinstall
+}
+
+# optimization OK
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: udav-0.5.2-2-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1e60291572380328b6b76408eaa2ea8f29870d11
commit 1e60291572380328b6b76408eaa2ea8f29870d11
Author: Elentir elen...@mailoo.org
Date: Tue Dec 22 22:57:24 2009 +0100
udav-0.5.2-2-i686
* fix depends
diff --git a/source/xapps-extra/udav/FrugalBuild
b/source/xapps-extra/udav/FrugalBuild
index d9eadf5..f693f1c 100644
--- a/source/xapps-extra/udav/FrugalBuild
+++ b/source/xapps-extra/udav/FrugalBuild
@@ -3,11 +3,11 @@
pkgname=udav
pkgver=0.5.2
-pkgrel=1
+pkgrel=2
pkgdesc=QT software for data arrays visualization based on MathGL library
archs=('i686' 'x86_64')
groups=('xapps-extra')
-depends=('mathgl-qt' 'hdf5')
+depends=('mathgl-qt' 'hdf5' 'libxdamage')
_F_sourceforge_ext=.tgz
Finclude sourceforge
sha1sums=('5d857ded986d65613d8a0f5d482ea33baf30f1b1')
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: cgal-3.5.1-1-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1bd4d8aa56c784dc8cdb811aca75285583e3c4a7
commit 1bd4d8aa56c784dc8cdb811aca75285583e3c4a7
Author: Elentir elen...@mailoo.org
Date: Wed Dec 23 11:49:28 2009 +0100
cgal-3.5.1-1-i686
* version bump
diff --git a/source/lib-extra/cgal/FrugalBuild
b/source/lib-extra/cgal/FrugalBuild
index 059f0aa..b0f6beb 100644
--- a/source/lib-extra/cgal/FrugalBuild
+++ b/source/lib-extra/cgal/FrugalBuild
@@ -2,8 +2,8 @@
# Maintainer: Elentir elen...@mailoo.org
pkgname=cgal
-pkgver=3.5
-rel_id=24197
+pkgver=3.5.1
+rel_id=25109
pkgrel=1
pkgdesc=An efficient C++ software library of geometric data structures and
algorithms
url=http://www.cgal.org/;
@@ -18,7 +18,7 @@ Finclude cmake
source=(http://gforge.inria.fr/frs/download.php/$rel_id/$_F_archive_name-$pkgver.tar.gz;)
_F_archive_grepv=beta
up2date=Flasttar http://gforge.inria.fr/frs/?group_id=52;
-sha1sums=('4b0f7ce3123ebcea3aca14cab6f1baaafc80e48d')
+sha1sums=('12518977d42cb2d689395526f64599ee5bcb6849')
build() {
Fcd
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] fwife: fix tryconnect function
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fwife.git;a=commitdiff;h=71050f29a84e04a6b3f7cbd765f8cc57d3a3b575
commit 71050f29a84e04a6b3f7cbd765f8cc57d3a3b575
Author: Elentir elen...@mailoo.org
Date: Wed Dec 23 20:59:19 2009 +0100
fix tryconnect function
* change return value
* rename to is_connected
diff --git a/src/plugins/configsource.c b/src/plugins/configsource.c
index dc67e6f..67d4a38 100644
--- a/src/plugins/configsource.c
+++ b/src/plugins/configsource.c
@@ -426,53 +426,46 @@ void timeout(int sig)
longjmp( timeout_jump, 1 ) ;
}
-int tryconnect()
+int is_connected()
{
int sControl;
char *host = www.frugalware.org;
int port = 80;
int timeouttime = 2;
struct sockaddr_in sin;
- struct hostent* phe;
+ struct hostent* phe;
memset(sin,0,sizeof(sin));
- sin.sin_family = AF_INET;
+ sin.sin_family = AF_INET;
sin.sin_port = htons(port);
-
- if ((signed)(sin.sin_addr.s_addr = inet_addr(host)) == -1)
- {
+
+ if ((signed)(sin.sin_addr.s_addr = inet_addr(host)) == -1) {
if ((phe = gethostbyname(host)) == NULL)
- {
return -1;
- }
memcpy((char *)sin.sin_addr, phe-h_addr, phe-h_length);
}
sControl = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
if (sControl == -1)
- {
return -1;
- }
-
+
signal(SIGALRM, timeout) ;
alarm(timeouttime) ;
-if (setjmp(timeout_jump) == 1)
-{
+/* timed out */
+if (setjmp(timeout_jump) == 1) {
close(sControl);
- return 1;
-}
-else
-{
- if (connect(sControl, (struct sockaddr *)sin, sizeof(sin)) ==
-1)
- {
+ return 0;
+} else {
+ if (connect(sControl, (struct sockaddr *)sin, sizeof(sin)) ==
-1) {
close(sControl);
alarm(0);
return -1;
}
}
-
+
+/* connected */
alarm(0);
close(sControl);
- return 0;
+ return 1;
}
int testdhcp(char *iface)
@@ -480,7 +473,7 @@ int testdhcp(char *iface)
system(g_strdup_printf(ifconfig %s up, iface));
system(g_strdup_printf(dhcpcd -n -t 2 %s, iface));
- if(tryconnect() != 0) {
+ if(is_connected() 1) {
system(g_strdup_printf(dhcpcd --release %s, iface));
system(g_strdup_printf(ifconfig %s down, iface));
return -1;
@@ -1066,7 +1059,7 @@ int post_net_config()
system(netconfig start);
- if(tryconnect() != 0) {
+ if(is_connected() 1) {
int ret = fwife_question(_(Fwife cannot connect to internet with this
configuration, do you want to apply this configuration anyway?));
if(ret == GTK_RESPONSE_YES) {
free(host);
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] fwife: little fixes in greet plugin
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fwife.git;a=commitdiff;h=d044bd56300578775ecd7a8518bffa48cb3ad6e3
commit d044bd56300578775ecd7a8518bffa48cb3ad6e3
Author: Elentir elen...@mailoo.org
Date: Sat Dec 26 17:22:45 2009 +0100
little fixes in greet plugin
* fix includes
* typo fix in welcome message
diff --git a/src/plugins/greet.c b/src/plugins/greet.c
index 3c509fd..b46ab41 100644
--- a/src/plugins/greet.c
+++ b/src/plugins/greet.c
@@ -25,7 +25,6 @@
#include stdio.h
#include gtk/gtk.h
-#includestring.h
#include common.h
@@ -56,10 +55,10 @@ plugin_t *info()
GtkWidget *load_gtk_widget()
{
GtkWidget *widget = gtk_label_new (NULL);
- gtk_label_set_markup(GTK_LABEL(widget), _(span face=\Times New Roman
12\bWelcome among the users of Frugalware!\n\n/b/span\n
+ gtk_label_set_markup(GTK_LABEL(widget), _(bWelcome among the users
of Frugalware!\n\n/b\n
The aim of creating Frugalware was to help you to do your work faster and
simpler.\n
-We hope that you will
like our product.\n\n
- span font_desc=\Times New
Roman italic 8\ foreground=\#FF\The Frugalware Developer
Team/span\n));
+ We hope that you will
like our product.\n\n
+ span style=\italic\
font=\10\ foreground=\#FF\The Frugalware Developer Team/span\n));
return widget;
}
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] fwife: new pre netconf plugin
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fwife.git;a=commitdiff;h=73c6734cacf4614e8415d10e0c5cf089df608457
commit 73c6734cacf4614e8415d10e0c5cf089df608457
Author: Elentir elen...@mailoo.org
Date: Sun Dec 27 17:28:15 2009 +0100
new pre netconf plugin
* do not ask anymore for netconf if a working connection is detected
* scan for access points and essid (wifi configuration)
* check mirrors status (down or up atm)
* clean old netconf functions
diff --git a/data/images/Makefile.am b/data/images/Makefile.am
index 31cf08a..b10bcaa 100644
--- a/data/images/Makefile.am
+++ b/data/images/Makefile.am
@@ -22,4 +22,8 @@ images_DATA = adduser.png \
configure24.png \
xorg48.png \
mouse48.png \
- dsl24.png
+ dsl24.png \
+ signal-25.png \
+ signal-50.png \
+ signal-75.png \
+ signal-100.png
diff --git a/data/images/signal-100.png b/data/images/signal-100.png
new file mode 100644
index 000..744a12b
Binary files /dev/null and b/data/images/signal-100.png differ
diff --git a/data/images/signal-25.png b/data/images/signal-25.png
new file mode 100644
index 000..c4e12d4
Binary files /dev/null and b/data/images/signal-25.png differ
diff --git a/data/images/signal-50.png b/data/images/signal-50.png
new file mode 100644
index 000..198733a
Binary files /dev/null and b/data/images/signal-50.png differ
diff --git a/data/images/signal-75.png b/data/images/signal-75.png
new file mode 100644
index 000..eaadde4
Binary files /dev/null and b/data/images/signal-75.png differ
diff --git a/src/plugins/configsource.c b/src/plugins/configsource.c
index 67d4a38..a3ca636 100644
--- a/src/plugins/configsource.c
+++ b/src/plugins/configsource.c
@@ -1,9 +1,9 @@
/*
* configsource.c for Fwife
- *
+ *
* Copyright (c) 2005 by Miklos Vajna vmik...@frugalware.org
* Copyright (c) 2008, 2009 by Albar Boris bori...@cegetel.net
- *
+ *
* 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
@@ -16,18 +16,18 @@
*
* 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,
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
* USA.
*/
-
+
#ifdef HAVE_CONFIG_H
#include config.h
#endif
#include stdio.h
-#include gtk/gtk.h
#include unistd.h
#include stdlib.h
+#include gtk/gtk.h
#include net/if.h
#include glib.h
@@ -55,21 +55,21 @@ static GtkWidget *viewserver = NULL;
extern GtkWidget *assistant;
-int pre_net_config();
-int post_net_config();
int run_net_config();
+int is_connected(char *host, int port, int timeouttime);
enum
{
- COLUMN_USE,
- COLUMN_NAME,
- COLUMN_FROM,
- NUM_COLUMNS
+ COLUMN_STATUS,
+ COLUMN_USE,
+ COLUMN_NAME,
+ COLUMN_FROM,
+ NUM_COLUMNS
};
plugin_t plugin =
{
- configsource,
+ configsource,
desc,
20,
load_gtk_widget,
@@ -126,7 +126,7 @@ GList *getmirrors(char *fn)
mirrors = g_list_append(mirrors, GINT_TO_POINTER(0)); //unchecked by default in
checkbox
}
}
- FREE(preferred);
+ free(preferred);
fclose(fp);
return (mirrors);
}
@@ -167,7 +167,7 @@ void fixed_toggled(GtkCellRendererToggle *cell, gchar
*path_str, gpointer data)
gtk_tree_model_get (model, iter, COLUMN_FROM, from, -1);
/* set new value */
- fixed ^= 1;
+ fixed ^= 1;
gtk_list_store_set (GTK_LIST_STORE (model), iter, COLUMN_USE, fixed, -1);
gtk_tree_path_free (path);
@@ -181,15 +181,15 @@ void add_mirror (GtkWidget *button, gpointer data)
GtkTreeModel *model = gtk_tree_view_get_model (treeview);
char* sName = NULL;
- sName = fwife_entry(_(Add a custom server),
+ sName = fwife_entry(_(Add a custom server),
_(You may specify a custom mirror (eg. LAN) so you can download packages
faster.\nEnter server's address below :)
, NULL);
if(sName) {
gtk_list_store_append (GTK_LIST_STORE (model), iter);
gtk_list_store_set (GTK_LIST_STORE (model), iter,
- 0, TRUE, 1, sName, 2,
CUSTOM, -1);
+ COLUMN_USE, TRUE,
COLUMN_NAME, sName, COLUMN_FROM, CUSTOM, -1);
}
- return;
+ return;
}
/* delete a custom mirror to the list */
@@ -204,11 +204,10 @@ void remove_mirror (GtkWidget *widget, gpointer data)
{
gint i;
GtkTreePath *path;
- gchar *old_text, *from;
+ gchar *from;
+
+ gtk_tree_model_get (model, iter, COLUMN_FROM, from, -1);
- gtk_tree_model_get (model, iter, 1, old_text, -1);
- gtk_tree_model_get (model, iter, 2, from, -1);
-
/* don't delete default mirrors */
if(strcmp(from, CUSTOM)) {
fwife_error(_(Can't delete default mirrors));
@@ -231,35 +230,37 @@ GtkWidget
[Frugalware-git] fwife: clean plugin code
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fwife.git;a=commitdiff;h=2f36771a9b4f6b6279afa5fed580d9546046611b
commit 2f36771a9b4f6b6279afa5fed580d9546046611b
Author: Elentir elen...@mailoo.org
Date: Sun Dec 27 18:31:40 2009 +0100
clean plugin code
* fix trailling whitespace
* remove broken dhcp test
diff --git a/src/plugins/netconf.c b/src/plugins/netconf.c
index 811cba4..af500c8 100644
--- a/src/plugins/netconf.c
+++ b/src/plugins/netconf.c
@@ -56,9 +56,6 @@ extern GtkWidget *assistant;
/* profile used do write configuration */
static fwnet_profile_t *newprofile=NULL;
-/* Used to timeout a connect */
-static jmp_buf timeout_jump;
-
enum
{
COLUMN_NET_IMAGE,
@@ -91,74 +88,6 @@ plugin_t *info()
return plugin;
}
-void timeout(int sig)
-{
-longjmp( timeout_jump, 1 ) ;
-}
-
-int tryconnect()
-{
- int sControl;
- char *host = www.frugalware.org;
- int port = 80;
- int timeouttime = 2;
- struct sockaddr_in sin;
- struct hostent* phe;
-
- memset(sin,0,sizeof(sin));
- sin.sin_family = AF_INET;
- sin.sin_port = htons(port);
-
- if ((signed)(sin.sin_addr.s_addr = inet_addr(host)) == -1)
- {
- if ((phe = gethostbyname(host)) == NULL)
- {
- return -1;
- }
- memcpy((char *)sin.sin_addr, phe-h_addr, phe-h_length);
- }
- sControl = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
- if (sControl == -1)
- {
- return -1;
- }
-
- signal(SIGALRM, timeout) ;
-alarm(timeouttime) ;
-if (setjmp(timeout_jump) == 1)
-{
- close(sControl);
- return 1;
-}
-else
-{
- if (connect(sControl, (struct sockaddr *)sin, sizeof(sin)) ==
-1)
- {
- close(sControl);
- alarm(0);
- return -1;
- }
-}
-
- alarm(0);
- close(sControl);
- return 0;
-}
-
-int testdhcp(char *iface)
-{
- system(g_strdup_printf(ifconfig %s up, iface));
- system(g_strdup_printf(dhcpcd -n -t 2 %s, iface));
-
- if(tryconnect() != 0) {
- system(g_strdup_printf(dhcpcd --release %s, iface));
- system(g_strdup_printf(ifconfig %s down, iface));
- return -1;
- }
-
- return 1;
-}
-
GtkWidget *getNettypeCombo()
{
GtkWidget *combo;
@@ -184,9 +113,7 @@ GtkWidget *getNettypeCombo()
gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), renderer, TRUE);
gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo), renderer,text, 1,
NULL);
-
- for (i = 0; i 4; i+=2)
- {
+ for (i = 0; i 4; i+=2) {
gtk_list_store_append (store, iter);
gtk_list_store_set (store, iter, 0, types[i], 1, types[i+1], -1);
}
@@ -445,15 +372,12 @@ int dsl_config(GtkWidget *button, gpointer data)
passwd = (char*)gtk_entry_get_text(GTK_ENTRY(pEntryPass));
passverify = (char*)gtk_entry_get_text(GTK_ENTRY(pEntryVerify));
- if(strcmp(passverify, passwd))
- {
+ if(strcmp(passverify, passwd)) {
fwife_error(_(Passwords do not match! Try again.));
gtk_widget_destroy(pBoite);
dsl_config(button, data);
return 0;
- }
- else
- {
+ } else {
snprintf(newprofile-adsl_username, PATH_MAX, uname);
snprintf(newprofile-adsl_password, PATH_MAX, passwd);
snprintf(newprofile-adsl_interface, IF_NAMESIZE, iface);
@@ -489,10 +413,8 @@ int add_interface(GtkWidget *button, gpointer data)
return 0;
}
- for(i=0;ig_list_length(interfaceslist); i+=2)
- {
- if(!strcmp((char*)g_list_nth_data(interfaceslist, i), iface))
- {
+ for(i=0;ig_list_length(interfaceslist); i+=2) {
+ if(!strcmp((char*)g_list_nth_data(interfaceslist, i), iface)) {
int retquest = fwife_question(_(This interface has been already configured! Do
you want to configure it again?));
if(retquest == GTK_RESPONSE_YES) {
free(g_list_nth_data(interfaceslist, i));
@@ -516,14 +438,12 @@ int add_interface(GtkWidget *button, gpointer data)
if(nettype == NULL)
return -1;
- if(strcmp(nettype, lo))
- {
+ if(strcmp(nettype, lo)) {
interfaceslist = g_list_append(interfaceslist, strdup(iface));
interfaceslist = g_list_append(interfaceslist, newinterface);
}
- if(strcmp(nettype, lo) fwnet_is_wireless_device(iface))
- {
+ if(strcmp(nettype, lo) fwnet_is_wireless_device(iface)) {
switch(fwife_question(_(It seems that this network card has a wireless
extension.\n\nConfigure your wireless now?)))
{
case GTK_RESPONSE_YES:
@@ -534,8 +454,7 @@ int add_interface(GtkWidget *button, gpointer data)
}
}
- if(!strcmp(nettype, dhcp))
- {
+ if(!strcmp(nettype, dhcp)) {
ptr = fwife_entry(_(Set DHCP hostname), _(Some network providers require
that the DHCP hostname be\n
[Frugalware-git] fwife: * remove useless function and fix treeview
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fwife.git;a=commitdiff;h=bc220dbbbc50ecc27625aa92ec002c1feb675ab6
commit bc220dbbbc50ecc27625aa92ec002c1feb675ab6
Author: Elentir elen...@mailoo.org
Date: Sun Dec 27 20:51:52 2009 +0100
* remove useless function and fix treeview
diff --git a/src/plugins/netconf.c b/src/plugins/netconf.c
index af500c8..8242625 100644
--- a/src/plugins/netconf.c
+++ b/src/plugins/netconf.c
@@ -88,12 +88,25 @@ plugin_t *info()
return plugin;
}
-GtkWidget *getNettypeCombo()
+char *ask_nettype()
{
- GtkWidget *combo;
+ char *str = NULL;
GtkTreeIter iter;
+ GtkTreeModel *model;
+ GtkWidget *combo;
GtkListStore *store;
- gint i;
+ int i;
+
+ GtkWidget *pBoite = gtk_dialog_new_with_buttons(_(Select network
type),
+
GTK_WINDOW(assistant),
+
GTK_DIALOG_MODAL,
+
GTK_STOCK_OK,GTK_RESPONSE_OK,
+ NULL);
+
+ GtkWidget *labelinfo = gtk_label_new(_(Now we need to know how your
machine connects to the network.\n
+ If you have an internal network card and an assigned
IP address, gateway, and DNS,\n use 'static'
+ to enter these values.\n
+ If your IP address is assigned by a DHCP server
(commonly used by cable modem services),\n select 'dhcp'. \n));
char *types[] =
{
@@ -120,37 +133,16 @@ GtkWidget *getNettypeCombo()
gtk_combo_box_set_active(GTK_COMBO_BOX(combo), 0);
- return combo;
-}
-
-char *ask_nettype()
-{
- char *str = NULL;
- GtkTreeIter iter;
- GtkTreeModel *model;
-
- GtkWidget *pBoite = gtk_dialog_new_with_buttons(_(Select network
type),
-
GTK_WINDOW(assistant),
-
GTK_DIALOG_MODAL,
-
GTK_STOCK_OK,GTK_RESPONSE_OK,
- NULL);
-
- GtkWidget *labelinfo = gtk_label_new(_(Now we need to know how your
machine connects to the network.\n
- If you have an internal network card and an assigned
IP address, gateway, and DNS,\n use 'static'
- to enter these values.\n
- If your IP address is assigned by a DHCP server
(commonly used by cable modem services),\n select 'dhcp'. \n));
-
- GtkWidget *combotype = getNettypeCombo();
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(pBoite)-vbox), labelinfo, FALSE, FALSE,
5);
- gtk_box_pack_start(GTK_BOX(GTK_DIALOG(pBoite)-vbox), combotype, FALSE,
FALSE, 5);
+ gtk_box_pack_start(GTK_BOX(GTK_DIALOG(pBoite)-vbox), combo, FALSE,
FALSE, 5);
gtk_widget_show_all(GTK_DIALOG(pBoite)-vbox);
switch (gtk_dialog_run(GTK_DIALOG(pBoite)))
{
case GTK_RESPONSE_OK:
- gtk_combo_box_get_active_iter(GTK_COMBO_BOX(combotype),
iter);
- model =
gtk_combo_box_get_model(GTK_COMBO_BOX(combotype));
+ gtk_combo_box_get_active_iter(GTK_COMBO_BOX(combo),
iter);
+ model = gtk_combo_box_get_model(GTK_COMBO_BOX(combo));
gtk_tree_model_get (model, iter, 0, str, -1);
break;
/* user cancel */
@@ -504,7 +496,6 @@ GtkWidget *load_gtk_widget()
GtkWidget *info;
GtkListStore *store;
- GtkTreeModel *model;
GtkTreeViewColumn *col;
GtkCellRenderer *renderer;
@@ -517,11 +508,8 @@ GtkWidget *load_gtk_widget()
gtk_box_pack_start(GTK_BOX(pVBox), info, FALSE, FALSE, 5);
store = gtk_list_store_new(5, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING,
G_TYPE_STRING, G_TYPE_STRING);
- model = GTK_TREE_MODEL(store);
-
- viewif = gtk_tree_view_new_with_model(model);
- g_object_unref (model);
- gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(viewif), TRUE);
+ viewif = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store));
+ g_object_unref (store);
renderer = gtk_cell_renderer_pixbuf_new();
col = gtk_tree_view_column_new_with_attributes (, renderer, pixbuf,
COLUMN_NET_IMAGE, NULL);
@@ -531,12 +519,10 @@ GtkWidget *load_gtk_widget()
col = gtk_tree_view_column_new_with_attributes (_(Device), renderer, text,
COLUMN_NET_NAME, NULL);
gtk_tree_view_append_column(GTK_TREE_VIEW(viewif), col);
- renderer = gtk_cell_renderer_text_new();
col = gtk_tree_view_column_new_with_attributes (_(Description), renderer,
text, COLUMN_NET_DESC, NULL);
gtk_tree_view_column_set_expand (col, TRUE);
gtk_tree_view_append_column(GTK_TREE_VIEW(viewif), col);
- renderer = gtk_cell_renderer_text_new();
col = gtk_tree_view_column_new_with_attributes (_(Configuration), renderer,
text, COLUMN_NET_TYPE, NULL);
gtk_tree_view_append_column(GTK_TREE_VIEW(viewif), col
[Frugalware-git] fwife: add support for scanning wifi access points in post netconf plugin
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fwife.git;a=commitdiff;h=d70bf06963a0cd425b9b10dc8869a1c921828fb1
commit d70bf06963a0cd425b9b10dc8869a1c921828fb1
Author: Elentir elen...@mailoo.org
Date: Sun Dec 27 21:47:31 2009 +0100
add support for scanning wifi access points in post netconf plugin
diff --git a/src/plugins/netconf.c b/src/plugins/netconf.c
index 8242625..52afe03 100644
--- a/src/plugins/netconf.c
+++ b/src/plugins/netconf.c
@@ -88,6 +88,252 @@ plugin_t *info()
return plugin;
}
+struct two_ptr {
+ void *first;
+ void *sec;
+};
+
+struct wifi_ap {
+ char *address;
+ char *essid;
+ char *encmode;
+ char *cypher;
+ char *protocol;
+ char *mode;
+ int quality;
+ int channel;
+ int encryption;
+};
+
+void free_wifi_ap(struct wifi_ap *ap)
+{
+ if(ap != NULL) {
+ free(ap-address);
+ free(ap-essid);
+ free(ap-encmode);
+ free(ap-cypher);
+ free(ap-protocol);
+ free(ap-mode);
+ }
+ free(ap);
+}
+
+/* Parser for iwlist command */
+GList *list_entry_points(char *ifacename)
+{
+ char *line = malloc(256);
+ size_t len = 0;
+ FILE * fp = NULL;
+ char *command = NULL;
+ struct wifi_ap *ap = NULL;
+ char *tok = NULL;
+
+ GList *entrys = NULL;
+
+ /* up interface */
+ command = g_strdup_printf(ifconfig %s up, ifacename);
+ system(command);
+ free(command);
+ /* scan APs */
+ command = g_strdup_printf(iwlist %s scan, ifacename);
+ fp = popen(command, r);
+
+ while (getline(line, len, fp) != -1) {
+ if((tok = strstr(line, Address: )) != NULL) {
+ if(ap != NULL)
+ entrys = g_list_append(entrys, ap);
+
+ ap = malloc(sizeof(struct wifi_ap));
+ memset(ap, 0, sizeof(struct wifi_ap));
+ strchr(tok+9, '\n')[0] = '\0';
+ ap-address = strdup(tok+9);
+ continue;
+ }
+
+ if((tok = strstr(line, ESSID:\)) != NULL) {
+ strchr(tok+7, '')[0] = '\0';
+ ap-essid = strdup(tok+7);
+ continue;
+ }
+
+ if((tok = strstr(line, Protocol:)) != NULL) {
+ strchr(tok+9, '\n')[0] = '\0';
+ ap-protocol = strdup(tok+9);
+ continue;
+ }
+
+ if((tok = strstr(line, Encryption key:)) != NULL) {
+ if(strstr(tok, on) != NULL)
+ ap-encryption = 1;
+ else
+ ap-encryption = 0;
+ continue;
+ }
+
+ if((tok = strstr(line, Channel:)) != NULL) {
+ strchr(tok+8, '\n')[0] = '\0';
+ ap-channel= atoi(tok+8);
+ continue;
+ }
+
+ if((tok = strstr(line, Mode:)) != NULL) {
+ strchr(tok+5, '\n')[0] = '\0';
+ ap-mode = strdup(tok+5);
+ continue;
+ }
+
+ if((tok = strstr(line, Quality=)) != NULL) {
+ strchr(tok+8, '/')[0] = '\0';
+ ap-quality = atoi(tok+8);
+ continue;
+ }
+
+ if((tok = strstr(line, IE: )) != NULL strstr(line,
Unknown) == NULL) {
+ strchr(tok+4, '\n')[0] = '\0';
+ ap-encmode = strdup(tok+4);
+ continue;
+ }
+
+ if((tok = strstr(line, Group Cipher : )) != NULL) {
+ strchr(tok+15, '\n')[0] = '\0';
+ ap-cypher = strdup(tok+15);
+ continue;
+ }
+ }
+
+ if(ap != NULL)
+ entrys = g_list_append(entrys, ap);
+
+ free(line);
+ free(command);
+ pclose(fp);
+ return entrys;
+}
+
+char *select_entry_point(fwnet_interface_t *interface)
+{
+ GtkWidget* pBoite;
+
+ GtkWidget *viewif;
+ GtkListStore *store;
+ GtkTreeViewColumn *col;
+ GtkCellRenderer *renderer;
+ GtkTreeIter iter;
+ GtkTreeModel *model;
+ GtkTreeSelection *selection;
+ GdkPixbuf
[Frugalware-git] fwife: fix refresh of wifi access points dialogbox
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fwife.git;a=commitdiff;h=cefdc315708361a545ee4287feba008fe7101dd7
commit cefdc315708361a545ee4287feba008fe7101dd7
Author: Elentir elen...@mailoo.org
Date: Sun Dec 27 21:51:01 2009 +0100
fix refresh of wifi access points dialogbox
and typo fix acess-access
diff --git a/src/plugins/configsource.c b/src/plugins/configsource.c
index a3ca636..132a50f 100644
--- a/src/plugins/configsource.c
+++ b/src/plugins/configsource.c
@@ -592,8 +592,7 @@ char *select_entry_point(fwnet_interface_t *interface)
GList *listaps = NULL;
struct wifi_ap *ap = NULL;
-begin:
- pBoite = gtk_dialog_new_with_buttons(_(Select your acess point :),
+ pBoite = gtk_dialog_new_with_buttons(_(Select your access point :),
GTK_WINDOW(assistant),
GTK_DIALOG_MODAL,
GTK_STOCK_REFRESH, GTK_RESPONSE_APPLY,
@@ -635,65 +634,67 @@ begin:
cellview = gtk_cell_view_new ();
- if((listaps = list_entry_points(interface-name)) == NULL)
- return NULL;
-
- for(i = 0; i g_list_length(listaps); i++) {
- ap = (struct wifi_ap*)g_list_nth_data(listaps, i);
-
gtk_list_store_append(GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(viewif))),
iter);
-
- /* set image according to quality signal */
- if(ap-quality 25)
- connectimg =
gtk_image_get_pixbuf(GTK_IMAGE(gtk_image_new_from_file(g_strdup_printf(%s/signal-25.png,
IMAGEDIR;
- else if(ap-quality = 25 ap-quality 50)
- connectimg =
gtk_image_get_pixbuf(GTK_IMAGE(gtk_image_new_from_file(g_strdup_printf(%s/signal-50.png,
IMAGEDIR;
- else if(ap-quality = 50 ap-quality 75)
- connectimg =
gtk_image_get_pixbuf(GTK_IMAGE(gtk_image_new_from_file(g_strdup_printf(%s/signal-75.png,
IMAGEDIR;
- else if(ap-quality = 75)
- connectimg =
gtk_image_get_pixbuf(GTK_IMAGE(gtk_image_new_from_file(g_strdup_printf(%s/signal-100.png,
IMAGEDIR;
-
- if(ap-encryption == 1) {
-
gtk_list_store_set(GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(viewif))),
iter,
-
0,
connectimg, 1, ap-address, 2, ap-essid,
-
3,
ap-mode, 4, ap-protocol,
-
5,
ap-encmode, 6, ap-cypher,
-
-1);
- } else {
-
gtk_list_store_set(GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(viewif))),
iter,
-
0,
connectimg, 1, ap-address, 2, ap-essid,
-
3,
ap-mode, 4, ap-protocol,
-
5,
_(No encryption), 6, ,
-
-1);
- }
- free_wifi_ap(ap);
- g_object_unref(connectimg);
- }
-
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(pBoite)-vbox), viewif, TRUE, TRUE, 5);
gtk_widget_show_all(GTK_DIALOG(pBoite)-vbox);
- switch (gtk_dialog_run(GTK_DIALOG(pBoite)))
-{
-case GTK_RESPONSE_OK:
+ while(1) {
+ if((listaps = list_entry_points(interface-name)) == NULL)
+ return NULL;
+
+ for(i = 0; i g_list_length(listaps); i++) {
+ ap = (struct wifi_ap*)g_list_nth_data(listaps, i);
+
gtk_list_store_append(GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(viewif))),
iter);
+
+ /* set image according to quality signal */
+ if(ap-quality 25)
+ connectimg =
gtk_image_get_pixbuf(GTK_IMAGE(gtk_image_new_from_file(g_strdup_printf(%s/signal-25.png,
IMAGEDIR;
+ else if(ap-quality = 25 ap-quality 50)
+ connectimg =
gtk_image_get_pixbuf(GTK_IMAGE(gtk_image_new_from_file(g_strdup_printf(%s/signal-50.png,
IMAGEDIR
[Frugalware-git] fwife: fix warning
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fwife.git;a=commitdiff;h=241764d88d54281a8e20e6bd6116a12361e0092b
commit 241764d88d54281a8e20e6bd6116a12361e0092b
Author: Elentir elen...@mailoo.org
Date: Sun Dec 27 22:03:55 2009 +0100
fix warning
diff --git a/src/plugins/select.c b/src/plugins/select.c
index 2408ea2..9654ef5 100644
--- a/src/plugins/select.c
+++ b/src/plugins/select.c
@@ -1341,7 +1341,7 @@ int run(GList **config)
if((pkgsize + (*compressedsize)) freespace) {
LOG(freespace : %lld, packages space : %lld, freespace, pkgsize);
fwife_error(_(No enought diskspace available to install all packages));
- g_list_foreach(allpkgs, free, NULL);
+ g_list_foreach(allpkgs, (GFunc)g_free, NULL);
g_list_free(allpkgs);
return 1;
}
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] fwife: add msgbox to apply the current network config in netconf plugin
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fwife.git;a=commitdiff;h=2b59178290335c0691c4a506bffe0e571d1917c6
commit 2b59178290335c0691c4a506bffe0e571d1917c6
Author: Elentir elen...@mailoo.org
Date: Mon Dec 28 21:30:02 2009 +0100
add msgbox to apply the current network config in netconf plugin
diff --git a/src/plugins/configsource.c b/src/plugins/configsource.c
index 132a50f..fad681d 100644
--- a/src/plugins/configsource.c
+++ b/src/plugins/configsource.c
@@ -55,7 +55,7 @@ static GtkWidget *viewserver = NULL;
extern GtkWidget *assistant;
-int run_net_config();
+int run_net_config(GList **config);
int is_connected(char *host, int port, int timeouttime);
enum
@@ -319,7 +319,7 @@ int prerun(GList **config)
switch(fwife_question(_(You need an active internet connection ,\n do you want
to configure your network now?)))
{
case GTK_RESPONSE_YES:
- while(run_net_config() == -1) {}
+ while(run_net_config(config) == -1) {}
break;
case GTK_RESPONSE_NO:
break;
@@ -997,9 +997,7 @@ int post_net_config(fwnet_profile_t *newprofile,
fwnet_interface_t *interface)
char *host = strdup(frugalware);
fwnet_writeconfig(newprofile, host);
- free(host);
- free(newprofile);
- free(interface);
+ free(host);
system(netconfig start);
@@ -1098,7 +1096,7 @@ int select_interface(fwnet_interface_t *interface)
return 0;
}
-int run_net_config()
+int run_net_config(GList **config)
{
char *nettype = NULL;
char *ptr = NULL;
@@ -1119,8 +1117,11 @@ int run_net_config()
return -1;
nettype = ask_nettype();
- if(nettype == NULL)
+ if(nettype == NULL) {
+ free(newprofile);
+ free(newinterface);
return -1;
+ }
if(fwnet_is_wireless_device(newinterface-name)) {
switch(fwife_question(_(It seems that this network card has a wireless
extension.\n\nConfigure your wireless now?)))
@@ -1149,11 +1150,19 @@ int run_net_config()
} else if(!strcmp(nettype, static)) {
configure_static(newinterface);
} else {
+ free(newprofile);
+ free(newinterface);
return -1;
}
- if(post_net_config(newprofile, newinterface) == -1)
+ if(post_net_config(newprofile, newinterface) == -1) {
+ free(newprofile);
+ free(newinterface);
return -1;
+ }
+
+ /* save network profile for later usage in netconf*/
+ data_put(config, netprofile, newprofile);
return 0;
}
diff --git a/src/plugins/netconf.c b/src/plugins/netconf.c
index 52afe03..6fc9b1c 100644
--- a/src/plugins/netconf.c
+++ b/src/plugins/netconf.c
@@ -814,6 +814,20 @@ int prerun(GList **config)
GtkWidget *cellview;
GtkTreeIter iter;
+ fwnet_profile_t *oldprofile = (fwnet_profile_t*)data_get(*config,
netprofile);
+ if(oldprofile != NULL) {
+ switch(fwife_question(_(You can now reconfigure your network
if you want to configure others interfaces or just apply current network
configuration.\n\n\
+ Do you want to apply the current configuration ?)))
+ {
+ case GTK_RESPONSE_YES:
+ newprofile = oldprofile;
+ skip_to_next_plugin();
+ return 0;
+ case GTK_RESPONSE_NO:
+ break;
+ }
+ }
+
cellview = gtk_cell_view_new ();
connectimg = gtk_widget_render_icon (cellview, GTK_STOCK_NETWORK,
GTK_ICON_SIZE_BUTTON, NULL);
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] fwife: fix return values of run_net_config function
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fwife.git;a=commitdiff;h=6dc002426e76f4efe8031290df63320e32e50f36
commit 6dc002426e76f4efe8031290df63320e32e50f36
Author: Elentir elen...@mailoo.org
Date: Mon Dec 28 21:32:57 2009 +0100
fix return values of run_net_config function
diff --git a/src/plugins/configsource.c b/src/plugins/configsource.c
index fad681d..f823ca4 100644
--- a/src/plugins/configsource.c
+++ b/src/plugins/configsource.c
@@ -1106,15 +1106,15 @@ int run_net_config(GList **config)
fwnet_profile_t *newprofile=NULL;
if((newprofile = (fwnet_profile_t*)malloc(sizeof(fwnet_profile_t))) == NULL)
- return -1;
+ return 1;
memset(newprofile, 0, sizeof(fwnet_profile_t));
if((newinterface = (fwnet_interface_t*)malloc(sizeof(fwnet_interface_t))) ==
NULL)
- return -1;
+ return 1;
memset(newinterface, 0, sizeof(fwnet_interface_t));
if(select_interface(newinterface) == -1)
- return -1;
+ return 0;
nettype = ask_nettype();
if(nettype == NULL) {
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] fwife: add netconfig stop if network configuration failed
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fwife.git;a=commitdiff;h=b42573528222ad4bb54bc1d88c4218a63a7bb597
commit b42573528222ad4bb54bc1d88c4218a63a7bb597
Author: Elentir elen...@mailoo.org
Date: Mon Dec 28 21:35:31 2009 +0100
add netconfig stop if network configuration failed
diff --git a/src/plugins/configsource.c b/src/plugins/configsource.c
index f823ca4..724d010 100644
--- a/src/plugins/configsource.c
+++ b/src/plugins/configsource.c
@@ -997,15 +997,15 @@ int post_net_config(fwnet_profile_t *newprofile,
fwnet_interface_t *interface)
char *host = strdup(frugalware);
fwnet_writeconfig(newprofile, host);
+ fw_system_interactive(netconfig start);
free(host);
- system(netconfig start);
-
if(is_connected(www.google.org, 80, 5) 1) {
int ret = fwife_question(_(Fwife cannot connect to internet with this
configuration, do you want to apply this configuration anyway?));
if(ret == GTK_RESPONSE_YES) {
return 0;
} else {
+ fw_system_interactive(netconfig stop);
return -1;
}
}
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] fwife: remove interface name from interface glist
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fwife.git;a=commitdiff;h=a02828ecadb59285c522bc4f9db47ce569dab2be
commit a02828ecadb59285c522bc4f9db47ce569dab2be
Author: Elentir elen...@mailoo.org
Date: Mon Dec 28 22:09:45 2009 +0100
remove interface name from interface glist
(interface name is in fwnet_interface_t struct)
diff --git a/src/plugins/netconf.c b/src/plugins/netconf.c
index 6fc9b1c..5f667eb 100644
--- a/src/plugins/netconf.c
+++ b/src/plugins/netconf.c
@@ -664,14 +664,12 @@ int add_interface(GtkWidget *button, gpointer data)
return 0;
}
- for(i=0;ig_list_length(interfaceslist); i+=2) {
- if(!strcmp((char*)g_list_nth_data(interfaceslist, i), iface)) {
+ for(i=0;ig_list_length(interfaceslist); i++) {
+ if(!strcmp(((fwnet_interface_t*)g_list_nth_data(interfaceslist,
i))-name, iface)) {
int retquest = fwife_question(_(This interface has been already configured! Do
you want to configure it again?));
if(retquest == GTK_RESPONSE_YES) {
free(g_list_nth_data(interfaceslist, i));
- free(g_list_nth_data(interfaceslist, i+1));
- interfaceslist = g_list_delete_link
(interfaceslist, g_list_nth(interfaceslist, i));
- interfaceslist = g_list_delete_link
(interfaceslist, g_list_nth(interfaceslist, i));
+ interfaceslist = g_list_delete_link
(interfaceslist, g_list_nth(interfaceslist, i));
break;
} else {
return -1;
@@ -689,8 +687,7 @@ int add_interface(GtkWidget *button, gpointer data)
if(nettype == NULL)
return -1;
- if(strcmp(nettype, lo)) {
- interfaceslist = g_list_append(interfaceslist, strdup(iface));
+ if(strcmp(nettype, lo)) {
interfaceslist = g_list_append(interfaceslist, newinterface);
}
@@ -732,16 +729,19 @@ int del_interface(GtkWidget *button, gpointer data)
GtkTreeModel *model = NULL;
GtkTreeIter iter;
char *nameif;
+ int i;
GtkTreeSelection *selection =
gtk_tree_view_get_selection(GTK_TREE_VIEW(viewif));
model = gtk_tree_view_get_model(GTK_TREE_VIEW(GTK_TREE_VIEW(viewif)));
if(gtk_tree_selection_get_selected(selection, model, iter)) {
gtk_tree_model_get (model, iter, COLUMN_NET_NAME, nameif, -1);
- GList * elem = g_list_find_custom(interfaceslist,
(gconstpointer) nameif, cmp_str);
- gint i = g_list_position(interfaceslist, elem);
- interfaceslist = g_list_delete_link (interfaceslist,
g_list_nth(interfaceslist, i));
- interfaceslist = g_list_delete_link (interfaceslist,
g_list_nth(interfaceslist, i));
+ for(i = 0;i g_list_length(interfaceslist); i++) {
+
if(!strcmp(((fwnet_interface_t*)g_list_nth_data(interfaceslist, i))-name,
nameif)) {
+ free(g_list_nth_data(interfaceslist, i));
+ interfaceslist = g_list_delete_link
(interfaceslist, g_list_nth(interfaceslist, i));
+ }
+ }
gtk_list_store_set (GTK_LIST_STORE (model), iter, COLUMN_NET_TYPE, , -1);
}
@@ -858,7 +858,7 @@ int run(GList **config)
int i, ret;
sprintf(newprofile-name, default);
- for(i = 1; ig_list_length(interfaceslist); i+=2) {
+ for(i = 0; ig_list_length(interfaceslist); i++) {
newprofile-interfaces = g_list_append(newprofile-interfaces,
(fwnet_interface_t *) g_list_nth_data(interfaceslist, i));
}
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: mathgl-1.10-1-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=837564e7eff8842feda048c298864771c8500d50
commit 837564e7eff8842feda048c298864771c8500d50
Author: Elentir elen...@mailoo.org
Date: Mon Dec 28 23:15:34 2009 +0100
mathgl-1.10-1-i686
* version bump
* move some includes to subpkgs
diff --git a/source/xlib-extra/mathgl/FrugalBuild
b/source/xlib-extra/mathgl/FrugalBuild
index 7191ebc..c05c8c3 100644
--- a/source/xlib-extra/mathgl/FrugalBuild
+++ b/source/xlib-extra/mathgl/FrugalBuild
@@ -2,8 +2,8 @@
# Maintainer: Elentir elen...@mailoo.org
pkgname=mathgl
-pkgver=1.9
-pkgrel=3
+pkgver=1.10
+pkgrel=1
pkgdesc=A library for making high-quality scientific graphics, fast data
plotting and handling of large data arrays
archs=('i686' 'x86_64')
depends=('gsl' 'libjpeg' 'libgif' 'libpng' 'libgomp' 'libgl' 'hdf5')
@@ -16,7 +16,7 @@ _F_archive_grepv=1.9.0.1
Finclude sourceforge python
source=($source mgloctave.install)
Fconfopts=$Fconfopts --enable-fltk --enable-glut --enable-qt --enable-jpeg
--enable-gif --enable-hdf5 --enable-python --enable-octave
-sha1sums=('79c733a50c235c14ba089ef5583985b83383114f' \
+sha1sums=('f0a541c66fefd44336fea183c6ed97346eb15d03' \
'9c9d3b6b62fb8f0dd0e33639d9ad3d160820547e')
subpkgs=('mathgl-qt' 'mathgl-fltk' 'mathgl-glut' 'mathgl-python'
'mathgl-octave')
@@ -41,13 +41,16 @@ build() {
# Qt interface
Fsplit mathgl-qt usr/bin/mgl_qt_example
Fsplit mathgl-qt usr/lib/libmgl-qt.*
+ Fsplit mathgl-qt usr/include/mgl/mgl_qt.h
# Fltk interface
Fsplit mathgl-fltk usr/lib/libmgl-fltk.*
Fsplit mathgl-fltk usr/bin/mgl_fltk_example
Fsplit mathgl-fltk usr/bin/mglview
+ Fsplit mathgl-fltk usr/include/mgl/mgl_fltk.h
# Glut interface
Fsplit mathgl-glut usr/bin/mgl_glut_example
Fsplit mathgl-glut usr/lib/libmgl-glut.*
+ Fsplit mathgl-glut usr/include/mgl/mgl_glut.h
# Python interface
Fsplit mathgl-python usr/lib/python*
# Octave interface
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: udav-0.6-1-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=060d544b6f3a754275d827e3c375882303a67255
commit 060d544b6f3a754275d827e3c375882303a67255
Author: Elentir elen...@mailoo.org
Date: Tue Dec 29 16:13:02 2009 +0100
udav-0.6-1-i686
* version bump
* fix some install paths
diff --git a/source/xapps-extra/udav/FrugalBuild
b/source/xapps-extra/udav/FrugalBuild
index f693f1c..d653bf4 100644
--- a/source/xapps-extra/udav/FrugalBuild
+++ b/source/xapps-extra/udav/FrugalBuild
@@ -2,22 +2,22 @@
# Maintainer: Elentir elen...@mailoo.org
pkgname=udav
-pkgver=0.5.2
-pkgrel=2
+pkgver=0.6
+pkgrel=1
pkgdesc=QT software for data arrays visualization based on MathGL library
archs=('i686' 'x86_64')
groups=('xapps-extra')
-depends=('mathgl-qt' 'hdf5' 'libxdamage')
+depends=('mathgl-qt=1.10' 'hdf5' 'libxdamage')
_F_sourceforge_ext=.tgz
Finclude sourceforge
-sha1sums=('5d857ded986d65613d8a0f5d482ea33baf30f1b1')
+sha1sums=('a10408d03b1c13548ed7e8f06358856614225bf3')
build() {
# fix install path
- Fsed /usr/local/share/doc/udav/ help.path =
$Fdestdir/usr/share/doc/$pkgname-$pkgver/ src/src.pro
- Fsed target.path = /usr/local/bin/ target.path = $Fdestdir/usr/bin/
src/src.pro
+ Fsed /usr/local/share/doc/udav/
$Fdestdir/usr/share/doc/$pkgname-$pkgver/ src/src.pro
+ Fsed /usr/local/ $Fdestdir/usr/ src/src.pro
# use v16 symbols of hdf5 library
- qmake DEFINES *= H5_USE_16_API udav.pro || Fdie
+ qmake DEFINES *= H5_USE_16_API udav.pro || Fdie
Fmakeinstall
}
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: lablgtk2-2.14.0-1-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7b1a43941ac383f99a9978b75a7dba35f03478e9
commit 7b1a43941ac383f99a9978b75a7dba35f03478e9
Author: Elentir elen...@mailoo.org
Date: Tue Dec 29 21:46:48 2009 +0100
lablgtk2-2.14.0-1-i686
* version bump
* remove Fix_HeaderGnome patch (now on upstream)
diff --git a/source/xlib-extra/lablgtk2/Fix_HeaderGnome.diff
b/source/xlib-extra/lablgtk2/Fix_HeaderGnome.diff
deleted file mode 100644
index fa3ad69..000
--- a/source/xlib-extra/lablgtk2/Fix_HeaderGnome.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur lablgtk-2.12.0.orig/src/ml_panel.c lablgtk-2.12.0/src/ml_panel.c
lablgtk-2.12.0.orig/src/ml_panel.c 2007-06-20 08:40:34.0 +0100
-+++ lablgtk-2.12.0/src/ml_panel.c 2009-02-06 11:46:19.0 +
-@@ -23,6 +23,7 @@
- #include string.h
-
- #include libgnomeui/gnome-client.h
-+#include libgnomeui/gnome-ui-init.h
- #include panel-applet.h
-
- #include caml/mlvalues.h
diff --git a/source/xlib-extra/lablgtk2/FrugalBuild
b/source/xlib-extra/lablgtk2/FrugalBuild
index ef31a4c..77a3618 100644
--- a/source/xlib-extra/lablgtk2/FrugalBuild
+++ b/source/xlib-extra/lablgtk2/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: Christian Hamar alias krix kr...@linuxforum.hu
pkgname=lablgtk2
-pkgver=2.12.0
+pkgver=2.14.0
pkgrel=1
pkgdesc=An Objective Caml Interface to gtk2+
url=http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html;
@@ -14,11 +14,9 @@ archs=('i686' 'x86_64')
options=('scriptlet')
up2date=lynx -dump $url |grep lablgtk-|sed -n 's/.*lablgtk-\(.*\)/\1/;1 p' |
sed 's|.tar.gz||'
source=(http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/lablgtk-$pkgver.tar.gz
\
- cflags-as-optflags.patch \
- Fix_HeaderGnome.diff)
-sha1sums=('fe3a6499bf28be21d723e379e2e9a4d7b4798baa' \
- '41dd59f6ea056e64074d076bc46572fe4ec755c8' \
- '5ed52d96ddaeec2c8d0689b1124af145fae77768')
+ cflags-as-optflags.patch)
+sha1sums=('4454747e6056181730e68ec253a1ec0f0a644867' \
+ '41dd59f6ea056e64074d076bc46572fe4ec755c8')
license=LGPL
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: clisp-2.48-1-x86_64
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=58e2715583f38a2adf9ed9437f5dfd038181987d
commit 58e2715583f38a2adf9ed9437f5dfd038181987d
Author: Elentir elen...@mailoo.org
Date: Tue Dec 29 21:58:50 2009 +0100
clisp-2.48-1-x86_64
* added x86_64 to archs
diff --git a/source/devel-extra/clisp/FrugalBuild
b/source/devel-extra/clisp/FrugalBuild
index 1b68271..93b456c 100644
--- a/source/devel-extra/clisp/FrugalBuild
+++ b/source/devel-extra/clisp/FrugalBuild
@@ -9,7 +9,7 @@ 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')
+archs=('i686' 'x86_64')
up2date=Flasttar http://ftp.gnu.org/pub/gnu/clisp/latest/;
Fconfopts=--prefix=/usr --docdir=/usr/share/doc/$pkgname-$pkgver
sha1sums=('dc213ed02194ec4c8b596118c5f92b25d1f540e0')
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] fwife: rewrite partdisk plugin
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fwife.git;a=commitdiff;h=cc111d422fbf5c3b401d57bdb3e9d038acbeb9e9
commit cc111d422fbf5c3b401d57bdb3e9d038acbeb9e9
Author: Elentir elen...@mailoo.org
Date: Wed Dec 30 20:21:39 2009 +0100
rewrite partdisk plugin
* fix this mess a little
* mount mountpoints in the right order
* fix some memleaks
diff --git a/src/plugins/partdisk.c b/src/plugins/partdisk.c
index 1bf54ad..08ec472 100644
--- a/src/plugins/partdisk.c
+++ b/src/plugins/partdisk.c
@@ -1,9 +1,9 @@
/*
* partdisk.c for Fwife
- *
+ *
* Copyright (c) 2005 by Miklos Vajna vmik...@frugalware.org
* Copyright (c) 2008, 2009 by Albar Boris bori...@cegetel.net
- *
+ *
* 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
@@ -16,10 +16,10 @@
*
* 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,
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
* USA.
*/
-
+
#ifdef HAVE_CONFIG_H
#include config.h
#endif
@@ -35,18 +35,27 @@
#include common.h
-//* Lists for preloading partition *//
+/* Lists for preloading partition */
static GList *parts=NULL;
-static GList *allparts=NULL;
+/* A list of list than contain a list of all partitions of a device */
+static GList *allparts_device=NULL;
+/* A list of devices */
static GList *devs=NULL;
-//* Current root partition selected */
-static GList* rootpart = NULL;
+struct fwife_part_info_t {
+ char *dev;
+ char *mount;
+ char *type;
+ char *size;
+};
+
+/* Current root partition selected */
+struct fwife_part_info_t *rootpart_selected = NULL;
static GtkWidget *comboparts = NULL;
static GtkWidget *partview = NULL;
-enum
+enum
{
PIXBUF_COL,
TEXT_COL
@@ -69,7 +78,7 @@ PedExceptionOption peh(PedException* ex)
plugin_t plugin =
{
- formatdisk,
+ formatdisk,
desc,
35,
load_gtk_widget,
@@ -91,14 +100,26 @@ char *desc()
return _(Partitioning the disk drives);
}
+void free_info_part(void *info)
+{
+ struct fwife_part_info_t *infot = (struct fwife_part_info_t*) info;
+ if(infot) {
+ free(infot-mount);
+ free(infot-dev);
+ free(infot-type);
+ free(infot-size);
+ }
+ free(infot);
+}
+
int partdetails(PedPartition *part, int noswap)
{
- char *pname, *ptype, *ptr;
- PedFileSystemType *type;
-
+ char *pname, *ptype, *size;
+ PedFileSystemType *type;
+ struct fwife_part_info_t *partinfo = NULL;
+
if ((type = ped_file_system_probe (part-geom)) == NULL)
- // prevent a nice segfault
- ptype = strdup(unknown);
+ ptype = unknown;
else
ptype = (char*)type-name;
@@ -108,19 +129,22 @@ int partdetails(PedPartition *part, int noswap)
pname = ped_partition_get_path(part);
// remove the unnecessary p-1 suffix from sw raid device names
- if((ptr = strstr(pname, p-1))!=NULL)
- *ptr='\0';
-
- // for dialog menus
- parts = g_list_append(parts, pname);
- ptr = fsize(part-geom.length);
- parts = g_list_append(parts, g_strdup_printf(%s, ptr));
- parts = g_list_append(parts, g_strdup_printf(%s, ptype));
- // used for stock mounts points
- parts = g_list_append(parts, NULL);
-
- FREE(ptr);
-
+ if((size = strstr(pname, p-1))!=NULL)
+ *size='\0';
+
+ size = fsize(part-geom.length);
+
+ partinfo = malloc(sizeof(struct fwife_part_info_t));
+ memset(partinfo, 0, sizeof(struct fwife_part_info_t));
+
+ partinfo-dev = pname;
+ partinfo-size = strdup(size);
+ partinfo-type = strdup(ptype);
+
+ parts = g_list_append(parts, partinfo);
+
+ free(size);
+
return(0);
}
@@ -160,26 +184,23 @@ int detect_raids()
return(1);
}
MALLOC(line, PATH_MAX);
- while(!feof(fp))
- {
+ while(!feof(fp)) {
if(fgets(line, PATH_MAX, fp) == NULL)
break;
- if(strstr(line, md)==line)
- {
+ if(strstr(line, md)==line) {
ptr = line;
while(*ptr!=' ')
ptr++;
*ptr='\0';
dev = ped_device_get(g_strdup_printf(/dev/%s, line));
disk = ped_disk_new_fresh(dev, ped_disk_type_get (loop));
- if(disk)
- {
+ if(disk) {
part=ped_disk_next_partition(disk, NULL);
partdetails(part, 0);
}
}
}
- FREE(line);
+ free(line);
fclose(fp);
return(0);
}
@@ -192,17 +213,15 @@ char *findmount(char *dev, int mode)
char line[PATH_MAX], *ptr;
int i;
- if ((fp = fopen(/proc/mounts, r))== NULL)
- {
+ if ((fp = fopen(/proc/mounts, r))== NULL) {
perror(Could not open /proc/mounts output file for reading);
return(NULL);
}
- while(!feof(fp
[Frugalware-git] fwife: make finish msg in bold
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fwife.git;a=commitdiff;h=b41b51ee113d92c20663b8fe15ed25f3ac396d76
commit b41b51ee113d92c20663b8fe15ed25f3ac396d76
Author: Elentir elen...@mailoo.org
Date: Wed Dec 30 20:57:34 2009 +0100
make finish msg in bold
diff --git a/src/plugins/finish.c b/src/plugins/finish.c
index e93e1a1..2c2342d 100644
--- a/src/plugins/finish.c
+++ b/src/plugins/finish.c
@@ -67,7 +67,8 @@ plugin_t *info()
GtkWidget *load_gtk_widget(GtkWidget *assist)
{
- GtkWidget *widget = gtk_label_new (_(Installation completed! We hope
that you enjoy Frugalware!));
+ GtkWidget *widget = gtk_label_new (NULL);
+ gtk_label_set_markup(GTK_LABEL(widget), _(bInstallation completed!
We hope that you enjoy Frugalware!/b));
return widget;
}
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] fwife: remove use of Courier New font and others typo fix
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwife.git;a=commitdiff;h=805d5f7add61f7e3df3f98020715e029059b4780 commit 805d5f7add61f7e3df3f98020715e029059b4780 Author: Elentir elen...@mailoo.org Date: Wed Dec 30 21:02:41 2009 +0100 remove use of Courier New font and others typo fix diff --git a/src/plugins/grubconf.c b/src/plugins/grubconf.c index 33abe3f..ea7e294 100644 --- a/src/plugins/grubconf.c +++ b/src/plugins/grubconf.c @@ -72,7 +72,7 @@ GtkWidget *load_gtk_widget() GtkWidget *pLabelInfo=gtk_label_new(NULL); /* top info label */ - gtk_label_set_markup(GTK_LABEL(pLabelInfo), _(span face=\Courier New\bInstalling GRUB bootloader/b/span)); + gtk_label_set_markup(GTK_LABEL(pLabelInfo), _(span font=\11\bInstalling GRUB bootloader/b/span)); gtk_box_pack_start(GTK_BOX(pVBox), pLabelInfo, FALSE, FALSE, 6); GtkWidget *pLabel = gtk_label_new(_(Choose install type :)); diff --git a/src/plugins/postconf.c b/src/plugins/postconf.c index 71c7436..645aa72 100644 --- a/src/plugins/postconf.c +++ b/src/plugins/postconf.c @@ -615,7 +615,7 @@ GtkWidget *load_gtk_widget(GtkWidget *assist) pVBox = gtk_vbox_new(FALSE, 0); info = gtk_label_new(NULL); - gtk_label_set_markup(GTK_LABEL(info), _(span face=\Courier New\bYou can configure some parts of your system/b/span)); + gtk_label_set_markup(GTK_LABEL(info), _(span font=\11\bYou can configure some parts of your system/b/span)); gtk_box_pack_start(GTK_BOX(pVBox), info, FALSE, FALSE, 6); pFrame = gtk_frame_new(_(Hardware)); diff --git a/src/plugins/rootconf.c b/src/plugins/rootconf.c index b073b02..5fbc33f 100644 --- a/src/plugins/rootconf.c +++ b/src/plugins/rootconf.c @@ -78,7 +78,7 @@ GtkWidget *load_gtk_widget() vboxp = gtk_vbox_new(FALSE, 5); info = gtk_label_new(NULL); gtk_label_set_justify(GTK_LABEL(info), GTK_JUSTIFY_CENTER); - gtk_label_set_markup(GTK_LABEL(info), _(span face=\Courier New\bYou can set password on the system administrator account (root).\n It is recommended that you set one now so that it is active the first time the machine is rebooted.\n This is especially important if your machine is on an internet connected LAN.\n Is you don't want to set one, keep entry empty and go to the next step./b/span)); + gtk_label_set_markup(GTK_LABEL(info), _(span font=\11\bYou can set password on the system administrator account (root).\n It is recommended that you set one now so that it is active the first time the machine is rebooted.\n This is especially important if your machine is on an internet connected LAN.\n Is you don't want to set one, keep entry empty and go to the next step./b/span)); gtk_box_pack_start (GTK_BOX (vboxp), info, FALSE, FALSE, 10); diff --git a/src/plugins/select.c b/src/plugins/select.c index 9654ef5..4b561e0 100644 --- a/src/plugins/select.c +++ b/src/plugins/select.c @@ -601,8 +601,8 @@ GtkWidget *getExpertModeWidget() //* Two button selecting packages *// GtkWidget *hboxbuttons = gtk_hbox_new(TRUE,5); - GtkWidget *buttonselect = gtk_button_new_with_label(_(Select all this group's packages)); - GtkWidget *buttonunselect = gtk_button_new_with_label(_(Unselect all this group's packages)); + GtkWidget *buttonselect = gtk_button_new_with_label(_(Select all)); + GtkWidget *buttonunselect = gtk_button_new_with_label(_(Unselect all)); g_signal_connect (buttonselect, clicked, G_CALLBACK (allselect_clicked), GINT_TO_POINTER(1)); g_signal_connect (buttonunselect, clicked, G_CALLBACK (allselect_clicked), GINT_TO_POINTER(0)); gtk_box_pack_start(GTK_BOX(hboxbuttons), buttonselect, FALSE, TRUE, 0); diff --git a/src/plugins/usersconf.c b/src/plugins/usersconf.c index caef61d..717dfff 100644 --- a/src/plugins/usersconf.c +++ b/src/plugins/usersconf.c @@ -279,7 +279,7 @@ GtkWidget *load_gtk_widget() /* top info label */ info = gtk_label_new(NULL); - gtk_label_set_markup(GTK_LABEL(info), _(span face=\Courier New\bYou can configure non-root user account. It is strongly recommended to create one./b/span)); + gtk_label_set_markup(GTK_LABEL(info), _(span font=\11\bYou can configure non-root user account. It is strongly recommended to create one./b/span)); store = gtk_list_store_new(6, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, GDK_TYPE_PIXBUF); model = GTK_TREE_MODEL(store); ___ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] fwife: move /dev bind mount before package install
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fwife.git;a=commitdiff;h=01898cbd262ae888b0d18247b8419827e0cde704
commit 01898cbd262ae888b0d18247b8419827e0cde704
Author: Elentir elen...@mailoo.org
Date: Wed Dec 30 21:19:03 2009 +0100
move /dev bind mount before package install
diff --git a/src/plugins/install.c b/src/plugins/install.c
index 382f12c..925dd67 100644
--- a/src/plugins/install.c
+++ b/src/plugins/install.c
@@ -378,6 +378,10 @@ int prerun(GList **config)
long long *compsize = (long long*)data_get(*config,compsizepkg);
if(compsize != NULL)
compressedsize = *compsize;
+
+ char *ptr = g_strdup_printf(mount /dev -o bind %s/dev, TARGETDIR);
+ fw_system(ptr);
+ free(ptr);
if(installpkgs((GList*)data_get(*config, packages)) == -1) {
fwife_error(_(An error occurs during packages installation (see
/var/log/fwife.log for more details)));
@@ -392,9 +396,6 @@ int run(GList **config)
{
char *ptr;
//mount system point to targetdir
- ptr = g_strdup_printf(mount /dev -o bind %s/dev, TARGETDIR);
- fw_system(ptr);
- free(ptr);
ptr = g_strdup_printf(mount /proc -o bind %s/proc, TARGETDIR);
fw_system(ptr);
free(ptr);
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] fwife: umount target directory at exit
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwife.git;a=commitdiff;h=ccad68aa20899291faf8fe9219e9030989dbff89 commit ccad68aa20899291faf8fe9219e9030989dbff89 Author: Elentir elen...@mailoo.org Date: Wed Dec 30 21:22:17 2009 +0100 umount target directory at exit diff --git a/src/fwife.c b/src/fwife.c index 0a0160b..9f1ff98 100644 --- a/src/fwife.c +++ b/src/fwife.c @@ -140,6 +140,9 @@ void fwife_exit() ptr = g_strdup_printf(umount %s/dev, TARGETDIR); fw_system(ptr); free(ptr); + ptr = g_strdup_printf(umount %s, TARGETDIR); + fw_system(ptr); + free(ptr); free(pages); cleanup_plugins(); ___ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] fwife: some fix to partdisk plugin
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fwife.git;a=commitdiff;h=94ce485888b51961634dba3294abd19a3c21dc0d
commit 94ce485888b51961634dba3294abd19a3c21dc0d
Author: Elentir elen...@mailoo.org
Date: Wed Dec 30 22:05:25 2009 +0100
some fix to partdisk plugin
* fix a segfault
* use copy of g_lists in run() to keep the originals without
* modifications (if the user go back)
diff --git a/src/plugins/partdisk.c b/src/plugins/partdisk.c
index 08ec472..decd7b6 100644
--- a/src/plugins/partdisk.c
+++ b/src/plugins/partdisk.c
@@ -786,7 +786,7 @@ void set_root_part(GtkWidget *widget, gpointer data)
if(requestformat(namedev) == -1)
return;
- if(rootpart_selected-mount) {
+ if(rootpart_selected rootpart_selected-mount) {
free(rootpart_selected-mount);
rootpart_selected-mount = NULL;
}
@@ -1095,7 +1095,7 @@ int run(GList **config)
// add all mounts points into fstab from the root to the leafs
for(i=0; ig_list_length(allparts_device); i++) {
partition = (GList*)(((data_t*)g_list_nth_data(allparts_device, i))-data);
- globallist = g_list_concat(globallist, partition);
+ globallist = g_list_concat(globallist, g_list_copy(partition));
}
/* Sorting mountspoints, if a is more close of the root
@@ -1112,7 +1112,9 @@ int run(GList **config)
mountdev(info-dev, info-mount, FALSE, config);
}
}
-
+
+ g_list_free(globallist);
+
// Copy files into new locations
chdir(TARGETDIR);
makepath(g_strdup_printf(%s/%s, TARGETDIR, /etc/profile.d));
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: swi-prolog-5.8.3-1-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=07982f22efb623f71d5dab5e5296f90d78421b0e
commit 07982f22efb623f71d5dab5e5296f90d78421b0e
Author: Elentir elen...@mailoo.org
Date: Mon Jan 18 21:44:09 2010 +0100
swi-prolog-5.8.3-1-i686
* version bump
diff --git a/source/devel-extra/swi-prolog/FrugalBuild
b/source/devel-extra/swi-prolog/FrugalBuild
index 64cf42d..6523a53 100644
--- a/source/devel-extra/swi-prolog/FrugalBuild
+++ b/source/devel-extra/swi-prolog/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: Elentir elen...@mailoo.org
pkgname=swi-prolog
-pkgver=5.8.2
+pkgver=5.8.3
pkgrel=1
pkgdesc=SWI-Prolog is a comprehensive Prolog environment
url=http://www.swi-prolog.org;
@@ -12,6 +12,6 @@ groups=('devel-extra')
_F_archive_name=pl
up2date=Flasttar http://www.swi-prolog.org/download/stable/src/;
source=(http://www.swi-prolog.org/download/stable/src/$_F_archive_name-$pkgver.tar.gz;)
-sha1sums=('1e2d98a7b9f5ffba6c34724c9757d46a662ff4c5')
+sha1sums=('f0bb08d00162165b23fe3372d0b1fd3967cfc311')
# optimization OK
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: networkx-1.0.1-1-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9160a4c3a619d459d07e0649d91a4422c2f18ad6
commit 9160a4c3a619d459d07e0649d91a4422c2f18ad6
Author: Elentir elen...@mailoo.org
Date: Mon Jan 18 21:56:41 2010 +0100
networkx-1.0.1-1-i686
* version bump
diff --git a/source/devel-extra/networkx/FrugalBuild
b/source/devel-extra/networkx/FrugalBuild
index 4e9fdcc..f8c64f7 100644
--- a/source/devel-extra/networkx/FrugalBuild
+++ b/source/devel-extra/networkx/FrugalBuild
@@ -2,8 +2,8 @@
# Maintainer: Elentir elen...@mailoo.org
pkgname=networkx
-pkgver=0.99
-pkgrel=2
+pkgver=1.0.1
+pkgrel=1
pkgdesc='NetworkX is a Python package for the creation, manipulation, and study
of the structure, dynamics, and functions of complex networks.'
groups=('devel-extra')
archs=('i686' 'x86_64')
@@ -12,4 +12,4 @@ depends=('python=2.6')
source=($url/download/$pkgname/$pkgname-$pkgver.tar.gz)
_F_archive_grepv=dev
up2date=Flasttar $url/download/$pkgname/
-sha1sums=('8d1f1da45ac20302d73853e14da9c24cada81a8d')
+sha1sums=('de90076fee23b9d7d1ab03c47871f49a35aefd13')
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: socat-1.7.1.2-1-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=32f77d7ec0226e6f2d11249b52191f30a7a6e77a
commit 32f77d7ec0226e6f2d11249b52191f30a7a6e77a
Author: Elentir elen...@mailoo.org
Date: Mon Jan 18 22:02:04 2010 +0100
socat-1.7.1.2-1-i686
* version bump
diff --git a/source/network-extra/socat/FrugalBuild
b/source/network-extra/socat/FrugalBuild
index 7d99db1..c94130f 100644
--- a/source/network-extra/socat/FrugalBuild
+++ b/source/network-extra/socat/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: Elentir elen...@mailoo.org
pkgname=socat
-pkgver=1.7.1.1
+pkgver=1.7.1.2
pkgrel=1
pkgdesc=Relay for bidirectional data transfer between two independent data
channels
url=http://www.dest-unreach.org/socat/;
@@ -11,6 +11,6 @@ groups=('network-extra')
archs=('i686' 'x86_64')
up2date=lynx -dump $url/download/ | grep -v b | Flasttar
source=($url/download/$pkgname-$pkgver.tar.gz)
-sha1sums=('885f89e52012fd73c35c4dffc47ac917f4fc7268')
+sha1sums=('dbd76e9fdac13ae95c46be9bb8a95ef4258bb466')
# optimization OK
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: cgdb-0.6.5-1-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=729edb58d9f90ba6c7ccc5b07aab37ca5c5edf8d
commit 729edb58d9f90ba6c7ccc5b07aab37ca5c5edf8d
Author: Elentir elen...@mailoo.org
Date: Mon Jan 18 22:09:48 2010 +0100
cgdb-0.6.5-1-i686
* version bump
diff --git a/source/devel-extra/cgdb/FrugalBuild
b/source/devel-extra/cgdb/FrugalBuild
index f7b7c88..e9c6450 100644
--- a/source/devel-extra/cgdb/FrugalBuild
+++ b/source/devel-extra/cgdb/FrugalBuild
@@ -3,7 +3,7 @@
# Contributor: Laszlo Papp djsz...@archlinux.us
pkgname=cgdb
-pkgver=0.6.4
+pkgver=0.6.5
pkgrel=1
pkgdesc=Curses-based interface to the GNU Debugger
url=http://cgdb.sourceforge.net/;
@@ -12,5 +12,6 @@ backup=('etc/colorgcc/colorgccrc')
groups=('devel-extra')
archs=('i686' 'x86_64')
Finclude sourceforge
-sha1sums=('5f1246d151dc419aa08890291175b4b2094e62c9')
+sha1sums=('a47892b3eee5d3520e5f99f207e8ca2bc18ecf43')
+# optimization OK
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: avrdude-5.9-1-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a1ee2312a08bb3a18f672511e04a675299e14b7c
commit a1ee2312a08bb3a18f672511e04a675299e14b7c
Author: Elentir elen...@mailoo.org
Date: Mon Jan 18 22:13:32 2010 +0100
avrdude-5.9-1-i686
* version bump
diff --git a/source/devel-extra/avrdude/FrugalBuild
b/source/devel-extra/avrdude/FrugalBuild
index 2e2d715..7478322 100644
--- a/source/devel-extra/avrdude/FrugalBuild
+++ b/source/devel-extra/avrdude/FrugalBuild
@@ -3,7 +3,7 @@
# Contributor: Laszlo Papp djsz...@archlinux.us
pkgname=avrdude
-pkgver=5.8
+pkgver=5.9
pkgrel=1
pkgdesc=Download/upload/manipulate the ROM and EEPROM contents of AVR
microcontrollers
url=http://www.nongnu.org/avrdude/;
@@ -14,5 +14,6 @@ license=GPL
archs=('i686' 'x86_64')
up2date=Flasttar http://download.savannah.gnu.org/releases/$pkgname;
source=(http://download.savannah.gnu.org/releases/$pkgname/${pkgname}-${pkgver}.tar.gz;)
-sha1sums=('77198df91a7176bbdab19ef4a4caf0bdc5862c94')
+sha1sums=('b66b38e6755d52d81bd9ef1710b373254ffb388d')
+# optimization OK
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: socnetv-0.80-1-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0fa53ed3956de14d2501407f07828e80c43ea43d
commit 0fa53ed3956de14d2501407f07828e80c43ea43d
Author: Elentir elen...@mailoo.org
Date: Mon Jan 18 22:29:47 2010 +0100
socnetv-0.80-1-i686
* new package
diff --git a/source/xapps-extra/socnetv/FrugalBuild
b/source/xapps-extra/socnetv/FrugalBuild
new file mode 100644
index 000..b4e965a
--- /dev/null
+++ b/source/xapps-extra/socnetv/FrugalBuild
@@ -0,0 +1,17 @@
+# Compiling Time: 0.30 SBU
+# Maintainer: Elentir elen...@mailoo.org
+
+pkgname=socnetv
+pkgver=0.80
+pkgrel=1
+pkgdesc=Social Networks Analysis and Visualisation
+archs=('i686' 'x86_64')
+groups=('xapps-extra')
+depends=('libqtwebkit' 'libqtgui' 'libqtscript')
+_F_sourceforge_name=SocNetV
+_F_cd_path=$pkgname-$pkgver
+Finclude sourceforge
+Fconfopts=$Fconfopts --disable-sse
+sha1sums=('01604ac28103660cd60842e7dd0893d7bf8ac180')
+
+# optimization OK
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] fwife: configsource: do not run dsl_config if dhcp is selected
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fwife.git;a=commitdiff;h=12846df60ed6df39f86e56dcc09ff84441cae2c0
commit 12846df60ed6df39f86e56dcc09ff84441cae2c0
Author: Elentir elen...@mailoo.org
Date: Mon Jan 18 22:38:11 2010 +0100
configsource: do not run dsl_config if dhcp is selected
diff --git a/src/plugins/configsource.c b/src/plugins/configsource.c
index 724d010..be55674 100644
--- a/src/plugins/configsource.c
+++ b/src/plugins/configsource.c
@@ -993,7 +993,8 @@ int post_net_config(fwnet_profile_t *newprofile,
fwnet_interface_t *interface)
sprintf(newprofile-name, default);
newprofile-interfaces = g_list_append(newprofile-interfaces, interface);
- while(dsl_config(newprofile, interface) == -2) {}
+ if(fwnet_is_dhcp(interface) == 0)
+ while(dsl_config(newprofile, interface) == -2) {}
char *host = strdup(frugalware);
fwnet_writeconfig(newprofile, host);
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] fwife: configsource: drop wifi access points with bad essid from the list
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fwife.git;a=commitdiff;h=81b7f5d38d6595432f93aca3d151aa5f2fb2831d
commit 81b7f5d38d6595432f93aca3d151aa5f2fb2831d
Author: Elentir elen...@mailoo.org
Date: Mon Jan 18 22:42:08 2010 +0100
configsource: drop wifi access points with bad essid from the list
diff --git a/src/plugins/configsource.c b/src/plugins/configsource.c
index be55674..c2ee6e4 100644
--- a/src/plugins/configsource.c
+++ b/src/plugins/configsource.c
@@ -503,8 +503,10 @@ GList *list_entry_points(char *ifacename)
while (getline(line, len, fp) != -1) {
if((tok = strstr(line, Address: )) != NULL) {
- if(ap != NULL)
+ if(ap != NULL ap-essid != NULL
strcmp(ap-essid, ))
entrys = g_list_append(entrys, ap);
+ else
+ free_wifi_ap(ap);
ap = malloc(sizeof(struct wifi_ap));
memset(ap, 0, sizeof(struct wifi_ap));
@@ -564,8 +566,10 @@ GList *list_entry_points(char *ifacename)
}
}
- if(ap != NULL)
+ if(ap != NULL ap-essid != NULL strcmp(ap-essid, ))
entrys = g_list_append(entrys, ap);
+ else
+ free_wifi_ap(ap);
free(line);
free(command);
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] fwife: configsource: add a scrollbar to APs dialogbox
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwife.git;a=commitdiff;h=26c9ae71e0a2e964493269045ce9d93fa0f821ed commit 26c9ae71e0a2e964493269045ce9d93fa0f821ed Author: Elentir elen...@mailoo.org Date: Mon Jan 18 23:03:25 2010 +0100 configsource: add a scrollbar to APs dialogbox diff --git a/src/plugins/configsource.c b/src/plugins/configsource.c index c2ee6e4..8abbc5a 100644 --- a/src/plugins/configsource.c +++ b/src/plugins/configsource.c @@ -582,6 +582,7 @@ char *select_entry_point(fwnet_interface_t *interface) GtkWidget* pBoite; GtkWidget *viewif; + GtkWidget *pScrollbar; GtkListStore *store; GtkTreeViewColumn *col; GtkCellRenderer *renderer; @@ -589,7 +590,6 @@ char *select_entry_point(fwnet_interface_t *interface) GtkTreeModel *model; GtkTreeSelection *selection; GdkPixbuf *connectimg; - GtkWidget *cellview; int i; char *essidap; @@ -636,9 +636,11 @@ char *select_entry_point(fwnet_interface_t *interface) col = gtk_tree_view_column_new_with_attributes (_(Cypher), renderer, text, 6, NULL); gtk_tree_view_append_column(GTK_TREE_VIEW(viewif), col); - cellview = gtk_cell_view_new (); + pScrollbar = gtk_scrolled_window_new(NULL, NULL); + gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(pScrollbar), viewif); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(pScrollbar), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); - gtk_box_pack_start(GTK_BOX(GTK_DIALOG(pBoite)-vbox), viewif, TRUE, TRUE, 5); + gtk_box_pack_start(GTK_BOX(GTK_DIALOG(pBoite)-vbox), pScrollbar, TRUE, TRUE, 5); gtk_widget_show_all(GTK_DIALOG(pBoite)-vbox); ___ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] fwife: configsource: infer connection type when an active connection is found
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fwife.git;a=commitdiff;h=90660e77129fedc95be49bf316de99ca7f0e7885
commit 90660e77129fedc95be49bf316de99ca7f0e7885
Author: Elentir elen...@mailoo.org
Date: Tue Jan 19 19:52:21 2010 +0100
configsource: infer connection type when an active connection is found
diff --git a/src/plugins/configsource.c b/src/plugins/configsource.c
index 8abbc5a..012c9ad 100644
--- a/src/plugins/configsource.c
+++ b/src/plugins/configsource.c
@@ -314,18 +314,9 @@ int prerun(GList **config)
GtkTreeIter iter;
char *fn, *testurl;
int i;
-
- if(is_connected(www.google.com, 80, 2) 1) {
- switch(fwife_question(_(You need an active internet connection
,\n do you want to configure your network now?)))
- {
- case GTK_RESPONSE_YES:
- while(run_net_config(config) == -1) {}
- break;
- case GTK_RESPONSE_NO:
- break;
- }
- }
-
+
+ while(run_net_config(config) == -1) {}
+
if(mirrorlist == NULL) {
fn = g_strdup_printf(%s/%s, PACCONFPATH, PACCONF);
mirrorlist = getmirrors(fn);
@@ -1107,10 +1098,13 @@ int run_net_config(GList **config)
{
char *nettype = NULL;
char *ptr = NULL;
+ char *lastprof = NULL;
fwnet_interface_t *newinterface = NULL;
+ struct dirent *ent = NULL;
+ DIR *dir;
/* profile used do write configuration */
- fwnet_profile_t *newprofile=NULL;
+ fwnet_profile_t *newprofile = NULL;
if((newprofile = (fwnet_profile_t*)malloc(sizeof(fwnet_profile_t))) == NULL)
return 1;
@@ -1120,6 +1114,54 @@ int run_net_config(GList **config)
return 1;
memset(newinterface, 0, sizeof(fwnet_interface_t));
+ if(is_connected(www.google.com, 80, 2) == 1) {
+ // seems we got a connection, can we infer the origin?
+ // installation from fw? in this case we've got a netconfig
profile
+ lastprof = fwnet_lastprofile();
+ if(lastprof != NULL) {
+ ptr = g_strdup_printf(_(A netconfig profile (\%s\)
seems to have been found from your current installation.\nDo you want to use
it?), lastprof);
+ switch(fwife_question(ptr))
+ {
+ case GTK_RESPONSE_YES:
+ free(newprofile);
+ if(newprofile =
fwnet_parseprofile(lastprof) != NULL) {
+ sprintf(newprofile-name,
default);
+ data_put(config, netprofile,
newprofile);
+ free(ptr);
+ free(lastprof);
+ return 0;
+ }
+ case GTK_RESPONSE_NO:
+ break;
+ }
+ free(ptr);
+ free(lastprof);
+ }
+
+ // maybe a dhcp connection without netconfig, look at generated
resolv.conf
+ dir=opendir(/var/run/dhcpcd/resolv.conf/);
+ while((ent = readdir(dir))) {
+ if(strcmp(ent-d_name, .) strcmp(ent-d_name,
..)) {
+ ptr = g_strdup_printf(_(An active connection
seems to have been found on interface %s using dhcp.\nDo you want to use it?),
ent-d_name);
+ switch(fwife_question(ptr))
+ {
+ case GTK_RESPONSE_YES:
+ newinterface-dhcp_opts[0]='\0';
+ newinterface-options =
g_list_append(newinterface-options, strdup(dhcp));
+ sprintf(newprofile-name,
default);
+ newprofile-interfaces =
g_list_append(newprofile-interfaces, newinterface);
+ data_put(config, netprofile,
newprofile);
+ free(ptr);
+ return 0;
+ case GTK_RESPONSE_NO:
+ break;
+ }
+ free(ptr);
+ }
+ }
+ closedir(dir);
+ }
+
if(select_interface(newinterface) == -1)
return 0;
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] fwife: configsource: use fw_system instead of fw_system_interactive for netconfig
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fwife.git;a=commitdiff;h=323c0c8a08efe5a85305538f21f9b86015fabfaf
commit 323c0c8a08efe5a85305538f21f9b86015fabfaf
Author: Elentir elen...@mailoo.org
Date: Tue Jan 19 19:56:45 2010 +0100
configsource: use fw_system instead of fw_system_interactive for netconfig
diff --git a/src/plugins/configsource.c b/src/plugins/configsource.c
index 012c9ad..c04659b 100644
--- a/src/plugins/configsource.c
+++ b/src/plugins/configsource.c
@@ -995,7 +995,7 @@ int post_net_config(fwnet_profile_t *newprofile,
fwnet_interface_t *interface)
char *host = strdup(frugalware);
fwnet_writeconfig(newprofile, host);
- fw_system_interactive(netconfig start);
+ fw_system(netconfig start);
free(host);
if(is_connected(www.google.org, 80, 5) 1) {
@@ -1003,7 +1003,7 @@ int post_net_config(fwnet_profile_t *newprofile,
fwnet_interface_t *interface)
if(ret == GTK_RESPONSE_YES) {
return 0;
} else {
- fw_system_interactive(netconfig stop);
+ fw_system(netconfig stop);
return -1;
}
}
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] fwife: configsource: fix warning
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fwife.git;a=commitdiff;h=ec08ed28a8b5fcd3f0bd87bcd14e7cc19b523fb6
commit ec08ed28a8b5fcd3f0bd87bcd14e7cc19b523fb6
Author: Elentir elen...@mailoo.org
Date: Tue Jan 19 20:01:51 2010 +0100
configsource: fix warning
diff --git a/src/plugins/configsource.c b/src/plugins/configsource.c
index c04659b..6d26b26 100644
--- a/src/plugins/configsource.c
+++ b/src/plugins/configsource.c
@@ -1124,7 +1124,7 @@ int run_net_config(GList **config)
{
case GTK_RESPONSE_YES:
free(newprofile);
- if(newprofile =
fwnet_parseprofile(lastprof) != NULL) {
+ if((newprofile =
fwnet_parseprofile(lastprof)) != NULL) {
sprintf(newprofile-name, default);
data_put(config, netprofile, newprofile);
free(ptr);
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] fwife: configsource: change order of two columns in main widget
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fwife.git;a=commitdiff;h=82f2eb79a849a5bd52a3e340c677313b14c979a0
commit 82f2eb79a849a5bd52a3e340c677313b14c979a0
Author: Elentir elen...@mailoo.org
Date: Tue Jan 19 22:57:04 2010 +0100
configsource: change order of two columns in main widget
diff --git a/src/plugins/configsource.c b/src/plugins/configsource.c
index 6d26b26..708fff5 100644
--- a/src/plugins/configsource.c
+++ b/src/plugins/configsource.c
@@ -60,8 +60,8 @@ int is_connected(char *host, int port, int timeouttime);
enum
{
- COLUMN_STATUS,
COLUMN_USE,
+ COLUMN_STATUS,
COLUMN_NAME,
COLUMN_FROM,
NUM_COLUMNS
@@ -231,21 +231,21 @@ GtkWidget *mirrorview()
GtkCellRenderer *renderer;
GtkWidget *view;
- store = gtk_list_store_new(NUM_COLUMNS, GDK_TYPE_PIXBUF,
G_TYPE_BOOLEAN, G_TYPE_STRING, G_TYPE_STRING);
+ store = gtk_list_store_new(NUM_COLUMNS, G_TYPE_BOOLEAN,
GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING);
model = GTK_TREE_MODEL(store);
view = gtk_tree_view_new_with_model(model);
g_object_unref (store);
- renderer = gtk_cell_renderer_pixbuf_new();
- col = gtk_tree_view_column_new_with_attributes (_(Status), renderer,
pixbuf, COLUMN_STATUS, NULL);
- gtk_tree_view_append_column(GTK_TREE_VIEW(view), col);
-
renderer = gtk_cell_renderer_toggle_new ();
g_signal_connect (renderer, toggled, G_CALLBACK (fixed_toggled), model);
col = gtk_tree_view_column_new_with_attributes (_(Use), renderer, active,
COLUMN_USE, NULL);
gtk_tree_view_column_set_sizing (GTK_TREE_VIEW_COLUMN (col),
GTK_TREE_VIEW_COLUMN_FIXED);
gtk_tree_view_column_set_fixed_width (GTK_TREE_VIEW_COLUMN (col), 50);
gtk_tree_view_append_column(GTK_TREE_VIEW(view), col);
+
+ renderer = gtk_cell_renderer_pixbuf_new();
+ col = gtk_tree_view_column_new_with_attributes (_(Status), renderer,
pixbuf, COLUMN_STATUS, NULL);
+ gtk_tree_view_append_column(GTK_TREE_VIEW(view), col);
renderer = gtk_cell_renderer_text_new();
col = gtk_tree_view_column_new_with_attributes (_(Mirrors), renderer, text,
COLUMN_NAME, NULL);
@@ -334,16 +334,16 @@ int prerun(GList **config)
if(is_connected(testurl, 80, 1) 1) {
gtk_list_store_set(GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(viewserver))),
iter,
-
COLUMN_STATUS, pixbad,
-
COLUMN_USE, (gboolean)(GPOINTER_TO_INT(g_list_nth_data(mirrorlist,
i+2))),
-
COLUMN_NAME, (gchar*)g_list_nth_data(mirrorlist, i),
-
COLUMN_FROM, (gchar*)g_list_nth_data(mirrorlist, i+1), -1);
+ COLUMN_USE,
(gboolean)(GPOINTER_TO_INT(g_list_nth_data(mirrorlist, i+2))),
+ COLUMN_STATUS,
pixbad,
+ COLUMN_NAME,
(gchar*)g_list_nth_data(mirrorlist, i),
+ COLUMN_FROM,
(gchar*)g_list_nth_data(mirrorlist, i+1), -1);
} else {
gtk_list_store_set(GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(viewserver))),
iter,
-
COLUMN_STATUS, pixgood,
-
COLUMN_USE, (gboolean)(GPOINTER_TO_INT(g_list_nth_data(mirrorlist,
i+2))),
-
COLUMN_NAME, (gchar*)g_list_nth_data(mirrorlist, i),
-
COLUMN_FROM, (gchar*)g_list_nth_data(mirrorlist, i+1), -1);
+ COLUMN_USE,
(gboolean)(GPOINTER_TO_INT(g_list_nth_data(mirrorlist, i+2))),
+ COLUMN_STATUS,
pixgood,
+ COLUMN_NAME,
(gchar*)g_list_nth_data(mirrorlist, i),
+ COLUMN_FROM,
(gchar*)g_list_nth_data(mirrorlist, i+1), -1);
}
free(testurl);
}
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] fwife: configsource: check if entry is not empty (add custom mirror dialogbox)
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fwife.git;a=commitdiff;h=185ba32fdbd34136a461f568ee435ed59f548a27
commit 185ba32fdbd34136a461f568ee435ed59f548a27
Author: Elentir elen...@mailoo.org
Date: Tue Jan 19 23:00:40 2010 +0100
configsource: check if entry is not empty (add custom mirror dialogbox)
diff --git a/src/plugins/configsource.c b/src/plugins/configsource.c
index 708fff5..7aa5d58 100644
--- a/src/plugins/configsource.c
+++ b/src/plugins/configsource.c
@@ -184,7 +184,7 @@ void add_mirror (GtkWidget *button, gpointer data)
sName = fwife_entry(_(Add a custom server),
_(You may specify a custom mirror (eg. LAN) so you can download packages
faster.\nEnter server's address below :)
, NULL);
- if(sName) {
+ if(sName strcmp(sName, )) {
gtk_list_store_append (GTK_LIST_STORE (model), iter);
gtk_list_store_set (GTK_LIST_STORE (model), iter,
COLUMN_USE, TRUE, COLUMN_NAME, sName, COLUMN_FROM, CUSTOM, -1);
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] fwife: configsource: typo fix
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fwife.git;a=commitdiff;h=266d740bf6447d15f939875c1b9e6a40adf4e625
commit 266d740bf6447d15f939875c1b9e6a40adf4e625
Author: Elentir elen...@mailoo.org
Date: Wed Jan 20 20:24:32 2010 +0100
configsource: typo fix
diff --git a/src/plugins/configsource.c b/src/plugins/configsource.c
index 7aa5d58..3e0843f 100644
--- a/src/plugins/configsource.c
+++ b/src/plugins/configsource.c
@@ -1119,7 +1119,7 @@ int run_net_config(GList **config)
// installation from fw? in this case we've got a netconfig profile
lastprof = fwnet_lastprofile();
if(lastprof != NULL) {
- ptr = g_strdup_printf(_(A netconfig profile (\%s\)
seems to have been found from your current installation.\nDo you want to use
it?), lastprof);
+ ptr = g_strdup_printf(_(A netconfig profile (\%s\)
has been found on your current installation.\nDo you want to use it?),
lastprof);
switch(fwife_question(ptr))
{
case GTK_RESPONSE_YES:
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] fwife: select: fix relative size of widgets
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwife.git;a=commitdiff;h=a34ff8ebd475dd0e8b8d6d507d7d56ac28d20896 commit a34ff8ebd475dd0e8b8d6d507d7d56ac28d20896 Author: Elentir elen...@mailoo.org Date: Wed Jan 20 20:25:51 2010 +0100 select: fix relative size of widgets diff --git a/src/plugins/select.c b/src/plugins/select.c index 4b561e0..4666599 100644 --- a/src/plugins/select.c +++ b/src/plugins/select.c @@ -466,7 +466,7 @@ GtkWidget *getpacketlist() pScrollbar = gtk_scrolled_window_new(NULL, NULL); gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(pScrollbar), packetlist); - gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(pScrollbar), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(pScrollbar), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); return pScrollbar; } @@ -569,7 +569,7 @@ GtkWidget *getcategorieslist() pScrollbar = gtk_scrolled_window_new(NULL, NULL); gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(pScrollbar), categories); - gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(pScrollbar), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(pScrollbar), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); return pScrollbar; } @@ -579,7 +579,7 @@ GtkWidget *getExpertModeWidget() GtkWidget *hsepa1, *hsepa2; GtkWidget *image; - GtkWidget *phbox = gtk_hbox_new(FALSE,8); + GtkWidget *phbox = gtk_hbox_new(TRUE,8); //* --- Group list -- *// GtkWidget *pvbox = gtk_vbox_new(FALSE,5); @@ -632,7 +632,7 @@ GtkWidget *getExpertModeWidget() gtk_box_pack_start(GTK_BOX(pvbox), hsepa2, FALSE, FALSE, 0); //* Put the two box into one big *// - gtk_box_pack_start(GTK_BOX(phbox), pvbox, FALSE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(phbox), pvbox, TRUE, TRUE, 0); return phbox; } ___ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] fwife: auto select of current/stable branch
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fwife.git;a=commitdiff;h=03b49af0cca5c80655e430ca0b516015cfeb1ebd
commit 03b49af0cca5c80655e430ca0b516015cfeb1ebd
Author: Elentir elen...@mailoo.org
Date: Thu Jan 21 23:43:34 2010 +0100
auto select of current/stable branch
* replace DEFINE
* fix issues with stable
diff --git a/src/fwife.h b/src/fwife.h
index c3f05b3..224a5f7 100644
--- a/src/fwife.h
+++ b/src/fwife.h
@@ -1,86 +1,80 @@
-/*
- * fwife.h for Fwife
- *
- * Copyright (c) 2005 by Miklos Vajna vmik...@frugalware.org
- * Copyright (c) 2008, 2009 by Albar Boris bori...@cegetel.net
- *
- * 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.
- */
-
-#ifndef FWIFE_H_INCLUDED
-#define FWIFE_H_INCLUDED
-
-#include glib.h
-#include gtk/gtk.h
-#include libintl.h
-#include util.h
-
-#define LOGDEV /dev/tty4
-#define LOGFILE /var/log/fwife.log
-#define SOURCEDIR /mnt/source
-#define TARGETDIR /mnt/target
-
-#define MKSWAP /sbin/mkswap
-#define SWAPON /sbin/swapon
-
-#define PACCONFPATH /etc/pacman-g2/repos/
-
-#ifndef STABLE
-#define PACCONF frugalware-current
-#else
-#define PACCONF frugalware
-#endif
-
-#define EXGRPSUFFIX -extra
-
-#define SHARED_LIB_EXT .so
-
-/* Structure of a plugins */
-
-typedef struct {
- char *name;
- char* (*desc)();
- int priority;
- GtkWidget* (*load_gtk_widget)();
- GtkAssistantPageType type;
- gboolean complete;
- GtkWidget* (*load_help_widget)();
- int (*prerun)(GList **config);
- int (*run)(GList **config);
- void *handle;
-} plugin_t;
-
-
-/* A structure for a plugin page */
-typedef struct {
- GtkWidget *widget;
- gint index;
- const gchar *title;
- GtkAssistantPageType type;
- gboolean complete;
-} PageInfo;
-
-/* Functions to grant/deny next page access */
-void set_page_completed();
+/*
+ * fwife.h for Fwife
+ *
+ * Copyright (c) 2005 by Miklos Vajna vmik...@frugalware.org
+ * Copyright (c) 2008, 2009, 2010 by Albar Boris bori...@cegetel.net
+ *
+ * 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.
+ */
+
+#ifndef FWIFE_H_INCLUDED
+#define FWIFE_H_INCLUDED
+
+#include glib.h
+#include gtk/gtk.h
+#include libintl.h
+#include util.h
+
+#define LOGDEV /dev/tty4
+#define LOGFILE /var/log/fwife.log
+#define SOURCEDIR /mnt/source
+#define TARGETDIR /mnt/target
+
+#define MKSWAP /sbin/mkswap
+#define SWAPON /sbin/swapon
+
+#define PACCONFPATH /etc/pacman-g2/repos/
+
+#define EXGRPSUFFIX -extra
+
+#define SHARED_LIB_EXT .so
+
+/* Structure of a plugins */
+
+typedef struct {
+ char *name;
+ char* (*desc)();
+ int priority;
+ GtkWidget* (*load_gtk_widget)();
+ GtkAssistantPageType type;
+ gboolean complete;
+ GtkWidget* (*load_help_widget)();
+ int (*prerun)(GList **config);
+ int (*run)(GList **config);
+ void *handle;
+} plugin_t;
+
+
+/* A structure for a plugin page */
+typedef struct {
+ GtkWidget *widget;
+ gint index;
+ const gchar *title;
+ GtkAssistantPageType type;
+ gboolean complete;
+} PageInfo;
+
+/* Functions to grant/deny next page access */
+void set_page_completed();
void set_page_incompleted();
/* Force fwife to quit */
-void fwife_exit();
-
-/* Go to next plugin in special case */
+void fwife_exit();
+
+/* Go to next plugin in special case */
int skip_to_next_plugin();
-
-#endif /* FWIFE_H_INCLUDED */
+
+#endif /* FWIFE_H_INCLUDED */
diff --git a/src/plugins/configsource.c b/src/plugins/configsource.c
index 3e0843f..7f0cd8b 100644
--- a/src/plugins/configsource.c
+++ b/src/plugins/configsource.c
@@ -2,7 +2,7
[Frugalware-git] fwife: simplify prepare_pkgdb() function
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fwife.git;a=commitdiff;h=37513d02436fef1e27c652396ce9a6d8f66cc3c8
commit 37513d02436fef1e27c652396ce9a6d8f66cc3c8
Author: Elentir elen...@mailoo.org
Date: Thu Jan 21 23:53:56 2010 +0100
simplify prepare_pkgdb() function
diff --git a/src/plugins/select.c b/src/plugins/select.c
index 02354d9..278a3a1 100644
--- a/src/plugins/select.c
+++ b/src/plugins/select.c
@@ -270,59 +270,28 @@ GList *getcat(PM_DB *db, GList *syncs)
return catlist;
}
-int prepare_pkgdb(char *repo, GList **config, GList **syncs)
+int prepare_pkgdb()
{
- char *pkgdb;
- struct stat sbuf;
+ char *ptr;
int ret;
- //PM_DB *i;
-
- pkgdb = g_strdup_printf(%s/var/lib/pacman-g2/%s, TARGETDIR, repo);
-
- // prepare pkgdb if necessary
- if(stat(pkgdb, sbuf) || S_ISDIR(sbuf.st_mode))
- {
- // pacman can't lock log without these
- makepath(g_strdup_printf(%s/tmp, TARGETDIR));
- makepath(g_strdup_printf(%s/var/log, TARGETDIR));
- LOG(parsing the pacman-g2 configuration file);
- if (pacman_parse_config(/etc/pacman-g2.conf, cb_db_register,
) == -1) {
- LOG(Failed to parse pacman-g2 configuration file
(%s), pacman_strerror(pm_errno));
- return(-1);
- }
-
- LOG(getting the database);
- if (mydatabase == NULL)
- {
- LOG(Could not register '%s' database (%s), PACCONF,
pacman_strerror(pm_errno));
- return(-1);
- }
- else
- {
- LOG(updating the database);
- ret = pacman_db_update(1, mydatabase);
- if(ret == 0) {
- LOG(database update done);
- }
- if (ret == -1) {
- LOG(database update failed);
- if(pm_errno == PM_ERR_DB_SYNC) {
- LOG(Failed to synchronize %s,
PACCONF);
- return(-1);
- } else {
- LOG(Failed to update %s (%s),
PACCONF, pacman_strerror(pm_errno));
- return(-1);
- }
- }
- }
-
- LOG(cleaning up the database);
- pacman_db_unregister(mydatabase);
- mydatabase = NULL;
+ PM_DB *db;
+
+ // pacman can't lock log without these
+ ptr = g_strdup_printf(%s/tmp, TARGETDIR);
+ makepath(ptr);
+ free(ptr);
+ ptr = g_strdup_printf(%s/var/log, TARGETDIR);
+ makepath(ptr);
+ free(ptr);
+
+ if (pacman_parse_config(/etc/pacman-g2.conf, NULL, ) == -1) {
+ LOG(Failed to parse pacman-g2 configuration file (%s),
pacman_strerror(pm_errno));
+ return(-1);
}
+
// register the database
- PM_DB *i = pacman_db_register(PACCONF);
- if(i==NULL)
+ db = pacman_db_register(PACCONF);
+ if(db == NULL)
{
fprintf(stderr, could not register '%s' database (%s)\n,
PACCONF, pacman_strerror(pm_errno));
@@ -330,7 +299,22 @@ int prepare_pkgdb(char *repo, GList **config, GList
**syncs)
}
else
{
- *syncs = g_list_append(*syncs, i);
+ LOG(updating the database);
+ ret = pacman_db_update(1, db);
+ if(ret == 0) {
+ LOG(database update done);
+ }
+ if (ret == -1) {
+ LOG(database update failed);
+ if(pm_errno == PM_ERR_DB_SYNC) {
+ LOG(Failed to synchronize %s, PACCONF);
+ return(-1);
+ } else {
+ LOG(Failed to update %s (%s), PACCONF,
pacman_strerror(pm_errno));
+ return(-1);
+ }
+ }
+ syncs = g_list_append(syncs, db);
}
return(0);
}
@@ -1199,7 +1183,7 @@ int prerun(GList **config)
while (gtk_events_pending())
gtk_main_iteration ();
- if(prepare_pkgdb(PACCONF, config, syncs) == -1)
+ if(prepare_pkgdb() == -1)
{
return(-1);
}
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] fwife: select: rewrite categorysize() and group2pkgs()
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fwife.git;a=commitdiff;h=a8e837acc00a01ed0a71e4167c46507aed39f033
commit a8e837acc00a01ed0a71e4167c46507aed39f033
Author: Elentir elen...@mailoo.org
Date: Fri Jan 22 00:36:48 2010 +0100
select: rewrite categorysize() and group2pkgs()
* just read the database, no need for transactions
* fix a bug when reinstalling on a previous install
diff --git a/src/plugins/select.c b/src/plugins/select.c
index 278a3a1..8a2d61f 100644
--- a/src/plugins/select.c
+++ b/src/plugins/select.c
@@ -93,19 +93,19 @@ void cb_db_register(char *section, PM_DB *db)
mydatabase = db;
}
-GList* group2pkgs(GList *syncs, char *group)
+GList* group2pkgs(char *group)
{
PM_GRP *grp;
- PM_LIST *pmpkgs, *lp, *junk;
- GList *pkgs=NULL;
- GList *list=NULL;
+ PM_PKG *pkg;
+ PM_LIST *pmpkgs, *lp;
+ GList *list = NULL;
int i, optional=0, addpkg=1;
char *ptr, *pkgname, *pkgfullname, *lang;
double size;
// add the core group to the start of the base list
if(!strcmp(group, base))
- list = group2pkgs(syncs, core);
+ list = group2pkgs(core);
// get language suffix
lang = strdup(getenv(LANG));
@@ -115,124 +115,69 @@ GList* group2pkgs(GList *syncs, char *group)
if(strlen(group) = strlen(EXGRPSUFFIX) !strcmp(group + strlen(group) -
strlen(EXGRPSUFFIX), EXGRPSUFFIX))
optional=1;
- for (i=0; ig_list_length(syncs); i++)
- {
+ for (i = 0; i g_list_length(syncs); i++) {
grp = pacman_db_readgrp(g_list_nth_data(syncs, i), group);
- if(grp)
- {
+ if(grp) {
pmpkgs = pacman_grp_getinfo(grp, PM_GRP_PKGNAMES);
- for(lp = pacman_list_first(pmpkgs); lp; lp =
pacman_list_next(lp))
- pkgs = g_list_append(pkgs,
pacman_list_getdata(lp));
+ for(lp = pacman_list_first(pmpkgs); lp; lp =
pacman_list_next(lp)) {
+ pkg = pacman_db_readpkg(g_list_nth_data(syncs,
i), pacman_list_getdata(lp));
+ pkgname = pacman_pkg_getinfo(pkg, PM_PKG_NAME);
+ pkgfullname = g_strdup_printf(%s-%s,
(char*)pacman_pkg_getinfo(pkg, PM_PKG_NAME),
+ (char*)pacman_pkg_getinfo(pkg,
PM_PKG_VERSION));
+
+ // enable by default the packages in the
+ // frugalware repo + enable the
+ // language-specific parts from
+ // locale-extra
+ addpkg = ((strcmp(getenv(LANG), en_US)
+ !strcmp(group, locale-extra)
+ strlen(pkgname) = strlen(lang)
+ !strcmp(pkgname + strlen(pkgname) -
+ strlen(lang), lang)) || !optional);
+
+ // add the package to the list
+ list = g_list_append(list, strdup(pkgname));
+ size = (double)(long)pacman_pkg_getinfo(pkg,
PM_PKG_SIZE);
+ size = (double)(size/1048576.0);
+ if(size 0.1)
+ size=0.1;
+ list = g_list_append(list,
g_strdup_printf(%6.1f MB, size ));
+ list = g_list_append(list,
strdup(pacman_pkg_getinfo(pkg, PM_PKG_DESC)));
+ list = g_list_append(list,
GINT_TO_POINTER(addpkg));
+
+ free(pkgfullname);
+ }
break;
}
}
- if(pacman_trans_init(PM_TRANS_TYPE_SYNC,
PM_TRANS_FLAG_NODEPS|PM_TRANS_FLAG_NOCONFLICTS, NULL, NULL, NULL) == -1)
- {
- fprintf(stderr, failed to init transaction (%s)\n,
- pacman_strerror(pm_errno));
- return(NULL);
- }
- for (i=0; ig_list_length(pkgs); i++)
- if(pacman_trans_addtarget(g_list_nth_data(pkgs, i)))
- {
- fprintf(stderr, failed to add target '%s' (%s)\n,
- (char*)g_list_nth_data(pkgs, i),
pacman_strerror(pm_errno));
- return(NULL);
- }
- if(pacman_trans_prepare(junk) == -1)
- {
- fprintf(stderr, failed to prepare transaction (%s)\n,
- pacman_strerror(pm_errno));
- return(NULL);
- }
- pmpkgs = pacman_trans_getinfo(PM_TRANS_PACKAGES);
- for(lp = pacman_list_first(pmpkgs); lp; lp = pacman_list_next(lp))
- {
- PM_SYNCPKG *sync = pacman_list_getdata(lp);
- PM_PKG *pkg = pacman_sync_getinfo(sync, PM_SYNC_PKG);
-
- pkgname = pacman_pkg_getinfo(pkg, PM_PKG_NAME);
- pkgfullname = g_strdup_printf(%s-%s,
(char
[Frugalware-git] fwife: select: set progressbar text before prepare_pkgdb()
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwife.git;a=commitdiff;h=5cbdcb6b46d6cc9a18c7c2a95dcc3ba696c051ec commit 5cbdcb6b46d6cc9a18c7c2a95dcc3ba696c051ec Author: Elentir elen...@mailoo.org Date: Fri Jan 22 00:45:36 2010 +0100 select: set progressbar text before prepare_pkgdb() diff --git a/src/plugins/select.c b/src/plugins/select.c index 8a2d61f..0f0747e 100644 --- a/src/plugins/select.c +++ b/src/plugins/select.c @@ -1125,6 +1125,7 @@ int prerun(GList **config) syncs = g_list_append(syncs, i); gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR(progress), 0.3); + gtk_progress_bar_set_text(GTK_PROGRESS_BAR(progress), _(Udpate and load database)); while (gtk_events_pending()) gtk_main_iteration (); @@ -1133,8 +1134,7 @@ int prerun(GList **config) return(-1); } - gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR(progress), 0.5); - gtk_progress_bar_set_text(GTK_PROGRESS_BAR(progress), _(Udpate and load database)); + gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR(progress), 0.5); while (gtk_events_pending()) gtk_main_iteration (); ___ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] fwife: select: remove useless parameter from getcat() function
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fwife.git;a=commitdiff;h=bd8c4f000edd4071725ed6b14e14d10d9e1bdc2a
commit bd8c4f000edd4071725ed6b14e14d10d9e1bdc2a
Author: Elentir elen...@mailoo.org
Date: Fri Jan 22 00:47:50 2010 +0100
select: remove useless parameter from getcat() function
diff --git a/src/plugins/select.c b/src/plugins/select.c
index 0f0747e..ba5fbcb 100644
--- a/src/plugins/select.c
+++ b/src/plugins/select.c
@@ -181,7 +181,7 @@ char* categorysize(char *category)
return(g_strdup_printf(%6.1f MB, size));
}
-GList *getcat(PM_DB *db, GList *syncs)
+GList *getcat(PM_DB *db)
{
char *name, *ptr;
GList *catlist=NULL;
@@ -1139,7 +1139,7 @@ int prerun(GList **config)
gtk_main_iteration ();
// load categories of packets
- cats = getcat(g_list_nth_data(syncs, 1), syncs);
+ cats = getcat(g_list_nth_data(syncs, 1));
if(cats == NULL)
{
return(-1);
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] fwife: install: mkdir /dev before mounting dev
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fwife.git;a=commitdiff;h=4ee8066d7978bc2af43b65a172c2396669546b54
commit 4ee8066d7978bc2af43b65a172c2396669546b54
Author: Elentir elen...@mailoo.org
Date: Fri Jan 22 01:23:14 2010 +0100
install: mkdir /dev before mounting dev
diff --git a/src/plugins/install.c b/src/plugins/install.c
index 925dd67..17d3068 100644
--- a/src/plugins/install.c
+++ b/src/plugins/install.c
@@ -378,10 +378,9 @@ int prerun(GList **config)
long long *compsize = (long long*)data_get(*config,compsizepkg);
if(compsize != NULL)
compressedsize = *compsize;
-
- char *ptr = g_strdup_printf(mount /dev -o bind %s/dev, TARGETDIR);
- fw_system(ptr);
- free(ptr);
+
+ makepath(TARGETDIR /dev);
+ fw_system(mount /dev -o bind TARGETDIR /dev);
if(installpkgs((GList*)data_get(*config, packages)) == -1) {
fwife_error(_(An error occurs during packages installation (see
/var/log/fwife.log for more details)));
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] fwife: remove fixed font size from some labels
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwife.git;a=commitdiff;h=d4d5d5317c9d6f92f60ff1f035bd70c861e6e861 commit d4d5d5317c9d6f92f60ff1f035bd70c861e6e861 Author: Elentir elen...@mailoo.org Date: Sat Jan 23 01:11:45 2010 +0100 remove fixed font size from some labels diff --git a/src/plugins/configsource.c b/src/plugins/configsource.c index 7f0cd8b..98bb5d6 100644 --- a/src/plugins/configsource.c +++ b/src/plugins/configsource.c @@ -2,7 +2,7 @@ * configsource.c for Fwife * * Copyright (c) 2005 by Miklos Vajna vmik...@frugalware.org - * Copyright (c) 2008, 2009, 2010 by Albar Boris bori...@cegetel.net + * Copyright (c) 2008,2009,2010 by Albar Boris bori...@cegetel.net * * 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 @@ -272,7 +272,7 @@ GtkWidget *load_gtk_widget() /* top info label */ info = gtk_label_new(NULL); gtk_label_set_markup(GTK_LABEL(info), - _(span font=\11\bYou can choose one or more nearly mirrors to speed up package downloading./b/span)); + _(bYou can choose one or more nearly mirrors to speed up package downloading./b)); gtk_box_pack_start (GTK_BOX (pVBox), info, FALSE, FALSE, 5); diff --git a/src/plugins/greet.c b/src/plugins/greet.c index 255d54d..dc1895e 100644 --- a/src/plugins/greet.c +++ b/src/plugins/greet.c @@ -1,7 +1,7 @@ /* * greet.c for Fwife * - * Copyright (c) 2008, 2009, 2010 by Albar Boris bori...@cegetel.net + * Copyright (c) 2008,2009,2010 by Albar Boris bori...@cegetel.net * * 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 @@ -61,7 +61,7 @@ GtkWidget *load_gtk_widget() gtk_label_set_markup(GTK_LABEL(widget), _(bWelcome among the users of Frugalware!\n\n/b\n The aim of creating Frugalware was to help you to do your work faster and simpler.\n We hope that you will like our product.\n\n - span style=\italic\ font=\10\ foreground=\#FF\The Frugalware Developer Team/span\n)); + span style=\italic\ foreground=\#FF\The Frugalware Developer Team/span\n)); return widget; } diff --git a/src/plugins/grubconf.c b/src/plugins/grubconf.c index ea7e294..edd9b72 100644 --- a/src/plugins/grubconf.c +++ b/src/plugins/grubconf.c @@ -2,7 +2,7 @@ * grubconf.c for Fwife * * Copyright (c) 2005 by Miklos Vajna vmik...@frugalware.org - * Copyright (c) 2008, 2009 by Albar Boris bori...@cegetel.net + * Copyright (c) 2008,2009,2010 by Albar Boris bori...@cegetel.net * * 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 @@ GtkWidget *load_gtk_widget() GtkWidget *pLabelInfo=gtk_label_new(NULL); /* top info label */ - gtk_label_set_markup(GTK_LABEL(pLabelInfo), _(span font=\11\bInstalling GRUB bootloader/b/span)); + gtk_label_set_markup(GTK_LABEL(pLabelInfo), _(bInstalling GRUB bootloader/b)); gtk_box_pack_start(GTK_BOX(pVBox), pLabelInfo, FALSE, FALSE, 6); GtkWidget *pLabel = gtk_label_new(_(Choose install type :)); diff --git a/src/plugins/layout.c b/src/plugins/layout.c index 85b2c4d..1fd22d9 100644 --- a/src/plugins/layout.c +++ b/src/plugins/layout.c @@ -2,7 +2,7 @@ * layout.c for Fwife * * Copyright (c) 2005 by Miklos Vajna vmik...@frugalware.org - * Copyright (c) 2008 by Albar Boris bori...@cegetel.net + * Copyright (c) 2008,2009,2010 by Albar Boris bori...@cegetel.net * * 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 @@ -414,7 +414,7 @@ GtkWidget *load_gtk_widget() /* top info label */ GtkWidget *labelhelp = gtk_label_new(NULL); - gtk_label_set_markup(GTK_LABEL(labelhelp), _(span font=\11\bYou may select one of the following keyboard maps./b/span)); + gtk_label_set_markup(GTK_LABEL(labelhelp), _(bYou may select one of the following keyboard maps./b)); gtk_box_pack_start(GTK_BOX(pvbox), labelhelp, FALSE, FALSE, 6); gtk_box_pack_start(GTK_BOX(pvbox), pScrollbar, TRUE, TRUE, 0); diff --git a/src/plugins/netconf.c b/src/plugins/netconf.c index 5f667eb..988c169 100644 --- a/src/plugins/netconf.c +++ b/src/plugins/netconf.c @@ -1,7 +1,7 @@ /* * netconf.c for Fwife * - * Copyright (c) 2008,2009 by Albar Boris bori...@cegetel.net + * Copyright (c) 2008,2009,2010 by Albar Boris bori...@cegetel.net * * 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 @@ -763,7 +763,7 @@ GtkWidget *load_gtk_widget() hboxview = gtk_hbox_new(FALSE, 0); info = gtk_label_new(NULL); - gtk_label_set_markup(GTK_LABEL(info), _(span font=\11\bYou can configure all network interfaces
[Frugalware-git] fwife: netconf: typo fix
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fwife.git;a=commitdiff;h=3ae7fbaec517e59d42697e63dc0c3f119de980ad
commit 3ae7fbaec517e59d42697e63dc0c3f119de980ad
Author: Elentir elen...@mailoo.org
Date: Sat Jan 23 01:24:08 2010 +0100
netconf: typo fix
diff --git a/src/plugins/netconf.c b/src/plugins/netconf.c
index 988c169..1880131 100644
--- a/src/plugins/netconf.c
+++ b/src/plugins/netconf.c
@@ -817,7 +817,7 @@ int prerun(GList **config)
fwnet_profile_t *oldprofile = (fwnet_profile_t*)data_get(*config, netprofile);
if(oldprofile != NULL) {
switch(fwife_question(_(You can now reconfigure your network if you want to
configure others interfaces or just apply current network configuration.\n\n\
- Do you want to apply the current configuration ?)))
+Do you want to apply the current configuration ?)))
{
case GTK_RESPONSE_YES:
newprofile = oldprofile;
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] fwife: configsource: add msgbox if a connection have been detected
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fwife.git;a=commitdiff;h=a39f65b27fe00c2e3cbc966091364e5040f73f8a
commit a39f65b27fe00c2e3cbc966091364e5040f73f8a
Author: Elentir elen...@mailoo.org
Date: Sat Jan 23 20:03:35 2010 +0100
configsource: add msgbox if a connection have been detected
only if previous connection's type detection have failed
diff --git a/src/plugins/configsource.c b/src/plugins/configsource.c
index 98bb5d6..592466f 100644
--- a/src/plugins/configsource.c
+++ b/src/plugins/configsource.c
@@ -1106,6 +1106,7 @@ int run_net_config(GList **config)
fwnet_interface_t *newinterface = NULL;
struct dirent *ent = NULL;
DIR *dir;
+ int brk = 0;
/* profile used do write configuration */
fwnet_profile_t *newprofile = NULL;
@@ -1136,6 +1137,7 @@ int run_net_config(GList **config)
return 0;
}
case GTK_RESPONSE_NO:
+ brk = 1;
break;
}
free(ptr);
@@ -1158,12 +1160,24 @@ int run_net_config(GList **config)
free(ptr);
return 0;
case GTK_RESPONSE_NO:
+ brk = 1;
break;
}
free(ptr);
}
}
closedir(dir);
+
+ // ask only if previous detection fail
+ if(brk == 0) {
+ switch(fwife_question(_(An active connection seems to
have been found but the connection's type have not been found.\nDo you want to
use it anyway?)))
+ {
+ case GTK_RESPONSE_YES:
+ return 0;
+ case GTK_RESPONSE_NO:
+ break;
+ }
+ }
}
if(select_interface(newinterface) == -1)
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] fwife: configsource: move netconfig stop before interface selection
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fwife.git;a=commitdiff;h=32dd35b7d60a0575f52dd5dd5cd73b8b2eb28148
commit 32dd35b7d60a0575f52dd5dd5cd73b8b2eb28148
Author: Elentir elen...@mailoo.org
Date: Sat Jan 23 20:09:36 2010 +0100
configsource: move netconfig stop before interface selection
diff --git a/src/plugins/configsource.c b/src/plugins/configsource.c
index 592466f..79fe11e 100644
--- a/src/plugins/configsource.c
+++ b/src/plugins/configsource.c
@@ -1007,7 +1007,6 @@ int post_net_config(fwnet_profile_t *newprofile,
fwnet_interface_t *interface)
if(ret == GTK_RESPONSE_YES) {
return 0;
} else {
- fw_system(netconfig stop);
return -1;
}
}
@@ -1180,6 +1179,8 @@ int run_net_config(GList **config)
}
}
+ fw_system(netconfig stop);
+
if(select_interface(newinterface) == -1)
return 0;
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] fwife: configsource: dhcp detection fixes
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fwife.git;a=commitdiff;h=3ad72f3c7d39ea2f9135b6dc817308dde7d28ab5
commit 3ad72f3c7d39ea2f9135b6dc817308dde7d28ab5
Author: Elentir elen...@mailoo.org
Date: Sat Jan 23 20:51:09 2010 +0100
configsource: dhcp detection fixes
* check only for regular files
* add interface name to the interface struct
* move this netconfig stop before post_net_config() call
diff --git a/src/plugins/configsource.c b/src/plugins/configsource.c
index 79fe11e..dc2b7fb 100644
--- a/src/plugins/configsource.c
+++ b/src/plugins/configsource.c
@@ -1104,6 +1104,7 @@ int run_net_config(GList **config)
char *lastprof = NULL;
fwnet_interface_t *newinterface = NULL;
struct dirent *ent = NULL;
+ struct stat info;
DIR *dir;
int brk = 0;
@@ -1147,22 +1148,29 @@ int run_net_config(GList **config)
dir=opendir(/var/run/dhcpcd/resolv.conf/);
while((ent = readdir(dir))) {
if(strcmp(ent-d_name, .) strcmp(ent-d_name, ..)) {
- ptr = g_strdup_printf(_(An active connection
seems to have been found on interface %s using dhcp.\nDo you want to use it?),
ent-d_name);
- switch(fwife_question(ptr))
- {
- case GTK_RESPONSE_YES:
- newinterface-dhcp_opts[0]='\0';
- newinterface-options =
g_list_append(newinterface-options, strdup(dhcp));
- sprintf(newprofile-name,
default);
- newprofile-interfaces =
g_list_append(newprofile-interfaces, newinterface);
- data_put(config, netprofile,
newprofile);
- free(ptr);
- return 0;
- case GTK_RESPONSE_NO:
- brk = 1;
- break;
- }
+ ptr =
g_strdup_printf(/var/run/dhcpcd/resolv.conf/%s, ent-d_name);
+ if(stat(ptr, info))
+ continue;
free(ptr);
+ if(S_ISREG(info.st_mode)) {
+ ptr = g_strdup_printf(_(An active
connection seems to have been found on interface %s using dhcp.\nDo you want to
use it?), ent-d_name);
+ switch(fwife_question(ptr))
+ {
+ case GTK_RESPONSE_YES:
+
snprintf(newinterface-name, IF_NAMESIZE, ent-d_name);
+
newinterface-dhcp_opts[0]='\0';
+ newinterface-options =
g_list_append(newinterface-options, strdup(dhcp));
+
sprintf(newprofile-name, default);
+ newprofile-interfaces
= g_list_append(newprofile-interfaces, newinterface);
+ data_put(config,
netprofile, newprofile);
+ free(ptr);
+ return 0;
+ case GTK_RESPONSE_NO:
+ brk = 1;
+ break;
+ }
+ free(ptr);
+ }
}
}
closedir(dir);
@@ -1179,8 +1187,6 @@ int run_net_config(GList **config)
}
}
- fw_system(netconfig stop);
-
if(select_interface(newinterface) == -1)
return 0;
@@ -1222,7 +1228,8 @@ int run_net_config(GList **config)
free(newinterface);
return -1;
}
-
+
+ fw_system(netconfig stop);
if(post_net_config(newprofile, newinterface) == -1) {
free(newprofile);
free(newinterface);
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] fwife: typo fixes
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fwife.git;a=commitdiff;h=029a5682bd35ce49d169c8e16504bf9d8d713405
commit 029a5682bd35ce49d169c8e16504bf9d8d713405
Author: Elentir elen...@mailoo.org
Date: Sat Jan 23 22:46:58 2010 +0100
typo fixes
diff --git a/src/plugins/configsource.c b/src/plugins/configsource.c
index dc2b7fb..fd67736 100644
--- a/src/plugins/configsource.c
+++ b/src/plugins/configsource.c
@@ -804,7 +804,7 @@ int configure_wireless(fwnet_interface_t *interface)
gtk_box_pack_start(GTK_BOX(phboxtemp), labeltemp, FALSE, FALSE, 5);
GtkWidget *pEntryEssid = gtk_entry_new();
gtk_box_pack_start(GTK_BOX(phboxtemp), pEntryEssid, FALSE, FALSE, 0);
- GtkWidget *butaps = gtk_button_new_with_label(_(Scan for Acess
Points));
+ GtkWidget *butaps = gtk_button_new_with_label(_(Scan Access Points));
gtk_box_pack_start(GTK_BOX(phboxtemp), butaps, FALSE, FALSE, 10);
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(pBoite)-vbox), phboxtemp, FALSE, FALSE,
5);
@@ -920,7 +920,7 @@ int dsl_config(fwnet_profile_t *newprofile,
fwnet_interface_t *interface)
GtkWidget *phboxtemp, *labeltemp;
char *uname, *passwd, *passverify;
char *iface = interface-name;
- char *msgptr = g_strdup_printf(_(Do you want to configure a DSL
connexion associated with the interface %s?), iface);
+ char *msgptr = g_strdup_printf(_(Do you want to configure a DSL
connection associated with the interface %s?), iface);
switch(fwife_question(msgptr))
{
@@ -931,7 +931,7 @@ int dsl_config(fwnet_profile_t *newprofile,
fwnet_interface_t *interface)
}
free(msgptr);
- GtkWidget *pBoite = gtk_dialog_new_with_buttons(_(Configure DSL
connexion),
+ GtkWidget *pBoite = gtk_dialog_new_with_buttons(_(Configure DSL
connection),
GTK_WINDOW(assistant),
GTK_DIALOG_MODAL,
GTK_STOCK_OK,GTK_RESPONSE_OK,
diff --git a/src/plugins/netconf.c b/src/plugins/netconf.c
index 1880131..5f3a8d8 100644
--- a/src/plugins/netconf.c
+++ b/src/plugins/netconf.c
@@ -575,7 +575,7 @@ int dsl_config(GtkWidget *button, gpointer data)
return 0;
}
- switch(fwife_question(g_strdup_printf(_(Do you want to configure a DSL
connexion associated with the interface %s?), iface)))
+ switch(fwife_question(g_strdup_printf(_(Do you want to configure a DSL
connection associated with the interface %s?), iface)))
{
case GTK_RESPONSE_YES:
break;
@@ -583,7 +583,7 @@ int dsl_config(GtkWidget *button, gpointer data)
return 0;
}
- GtkWidget *pBoite = gtk_dialog_new_with_buttons(_(Configure DSL
connexion),
+ GtkWidget *pBoite = gtk_dialog_new_with_buttons(_(Configure DSL
connection),
GTK_WINDOW(assistant),
GTK_DIALOG_MODAL,
GTK_STOCK_OK,GTK_RESPONSE_OK,
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] fwife: update Changelog for version 0.6
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwife.git;a=commitdiff;h=7f0532f49ee5e3b2064328a44b228c1ec41718f7 commit 7f0532f49ee5e3b2064328a44b228c1ec41718f7 Author: Elentir elen...@mailoo.org Date: Sat Jan 23 22:48:50 2010 +0100 update Changelog for version 0.6 diff --git a/ChangeLog b/ChangeLog index 556b419..2fe6450 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,26 +1,34 @@ VERSION DESCRIPTION - -0.5- dhcp research on networks +0.6- scanning wifi access points for wifi devices in network configuration + - detection of active network connection + - add status of mirrors (up or down atm) + - read of packages database improved + - automatic switch between stable and current branch (according to repos enabled in pacman-g2.conf) + - fixed a major bug when reinstalling on a previous install without formatting + - rewrite large parts of code + - some minors fixes (bugs, memleaks, typo) +0.5- dhcp research on networks - improved network configuration plugin - fix unexpected reverse dependencies due to locale packages - minor bug fixes (ext4 formatting, ...) -0.4- new interface for network configuration +0.4- new interface for network configuration - add informations during package downloading (remain total size, speed) - fix conflicts with E17 installation in basic mode - add Entrance for possible login managers - some minor graphical changes and bug fixes -0.3.1 - experimental support of ext4 - - pootle support for translations - - adding e17 desktop to basic package selection - - new automake build system - - some bugs fixes -0.3- new basic selection of packages and improve expert mode - - optimization of package selection plugin - - new layout plugin with preconfigured keyboards - - new postconf plugin to bring together all configuration dialogboxes -0.2.1 - support x86_64 -0.2 - fixed lot of bugs - - new plugin rootconf (separated from usersconf) - - new icons - - improve layout gtk widget -0.1 - initial release +0.3.1 - experimental support of ext4 + - pootle support for translations + - adding e17 desktop to basic package selection + - new automake build system + - some bugs fixes +0.3- new basic selection of packages and improve expert mode + - optimization of package selection plugin + - new layout plugin with preconfigured keyboards + - new postconf plugin to bring together all configuration dialogboxes +0.2.1 - support x86_64 +0.2- fixed lot of bugs + - new plugin rootconf (separated from usersconf) + - new icons + - improve layout gtk widget +0.1- initial release diff --git a/README b/README index 586ae1c..c692db3 100644 --- a/README +++ b/README @@ -1,6 +1,6 @@ Fwife : Frugalware Installer Frontend Readme -- Fwife 0.5 +- Fwife 0.6 Warning : Beta version - Caution - Many bugs, segfaults and memory leaks are possible. diff --git a/configure.ac b/configure.ac index 9f56201..8175639 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ ENV_CFLAGS=$CFLAGS AC_PREREQ([2.63]) -AC_INIT([Fwife], 0.5, [elen...@mailoo.org], fwife) +AC_INIT([Fwife], 0.6, [elen...@mailoo.org], fwife) AC_CONFIG_SRCDIR([src/fwife.c]) AC_LANG(C) AC_CONFIG_HEADERS([config.h]) ___ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: fwife-0.6-1-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=018876783b535b375360fd6b80c9be818aa0d4cd
commit 018876783b535b375360fd6b80c9be818aa0d4cd
Author: Elentir elen...@mailoo.org
Date: Sun Jan 24 00:52:07 2010 +0100
fwife-0.6-1-i686
* version bump
* fix url
diff --git a/source/xapps-extra/fwife/FrugalBuild
b/source/xapps-extra/fwife/FrugalBuild
index 7e52c6f..b9da58b 100644
--- a/source/xapps-extra/fwife/FrugalBuild
+++ b/source/xapps-extra/fwife/FrugalBuild
@@ -2,16 +2,16 @@
# Maintainer: Elentir elen...@mailoo.org
pkgname=fwife
-pkgver=0.5
+pkgver=0.6
pkgrel=1
pkgdesc=Gtk GUI Installer for Frugalware
-url=http://utopia.toile-libre.org/$pkgname/;
+url=http://ftp.frugalware.org/pub/other/$pkgname/;
depends=('gtk+2' 'parted' 'pacman-g2=3.5.5' 'frugalwareutils' 'udev=132')
makedepends=('intltool')
groups=('xapps-extra')
archs=('i686' 'x86_64')
source=($url/$pkgname-$pkgver.tar.gz)
up2date=Flasttar $url
-sha1sums=('c2ff734a038c07811c41171e93087024809f6bad')
+sha1sums=('75eb6eccae23d64a651024d6ce1bb09b4390773a')
unset MAKEFLAGS
# optimization OK
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: pari-2.3.5-1-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0caa261d13b0b0004feb6fe4954b0220c9a9b0d7
commit 0caa261d13b0b0004feb6fe4954b0220c9a9b0d7
Author: Elentir elen...@mailoo.org
Date: Mon Feb 8 23:30:31 2010 +0100
pari-2.3.5-1-i686
* version bump
diff --git a/source/xapps-extra/pari/FrugalBuild
b/source/xapps-extra/pari/FrugalBuild
index 33d1219..b724a96 100644
--- a/source/xapps-extra/pari/FrugalBuild
+++ b/source/xapps-extra/pari/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: Elentir elen...@mailoo.org
pkgname=pari
-pkgver=2.3.4
+pkgver=2.3.5
pkgrel=1
pkgdesc=PARI/GP is a computer algebra system designed for fast computations in
number theory.
url=http://pari.math.u-bordeaux.fr;
@@ -11,7 +11,8 @@ groups=('xapps-extra')
archs=('i686' 'x86_64')
source=($url/pub/$pkgname/unix/$pkgname-$pkgver.tar.gz)
up2date=Flasttar $url/pub/$pkgname/unix/
-sha1sums=('0c97456c5fc7e9fe774ceb44aaf77e9ba9574ae6')
+sha1sums=('f211ccfe42a4b18dbcde832dfd1ece6f477f4966')
+Fconfopts=$Fconfopts --prefix=/usr
build() {
Fcd
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: socnetv-0.81-1-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=505f8b5664af86bdeec535f1212f58be824d11ed
commit 505f8b5664af86bdeec535f1212f58be824d11ed
Author: Elentir elen...@mailoo.org
Date: Mon Feb 8 23:42:50 2010 +0100
socnetv-0.81-1-i686
* version bump
diff --git a/source/xapps-extra/socnetv/FrugalBuild
b/source/xapps-extra/socnetv/FrugalBuild
index b4e965a..04b33d4 100644
--- a/source/xapps-extra/socnetv/FrugalBuild
+++ b/source/xapps-extra/socnetv/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: Elentir elen...@mailoo.org
pkgname=socnetv
-pkgver=0.80
+pkgver=0.81
pkgrel=1
pkgdesc=Social Networks Analysis and Visualisation
archs=('i686' 'x86_64')
@@ -12,6 +12,6 @@ _F_sourceforge_name=SocNetV
_F_cd_path=$pkgname-$pkgver
Finclude sourceforge
Fconfopts=$Fconfopts --disable-sse
-sha1sums=('01604ac28103660cd60842e7dd0893d7bf8ac180')
+sha1sums=('e56620cbe32c0bcbab269465372405d5c79d822d')
# optimization OK
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: chomp-20100125-1-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=07ca79d61225fc509f05b4c19e394de7c1e78bef
commit 07ca79d61225fc509f05b4c19e394de7c1e78bef
Author: Elentir elen...@mailoo.org
Date: Tue Feb 9 00:06:24 2010 +0100
chomp-20100125-1-i686
* version bump
* fix the patch
diff --git a/source/apps-extra/chomp/FrugalBuild
b/source/apps-extra/chomp/FrugalBuild
index 27cec94..08a9699 100644
--- a/source/apps-extra/chomp/FrugalBuild
+++ b/source/apps-extra/chomp/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: Elentir elen...@mailoo.org
pkgname=chomp
-pkgver=20090710
+pkgver=20100125
pkgrel=1
pkgdesc=A software package for homology computations in n-dimensions
url=http://chomp.rutgers.edu;
@@ -12,8 +12,8 @@ depends=('libstdc++')
up2date=lynx -dump $url/advanced/download.php | grep [0-9]*-[0-9]*-[0-9]* |
sed 's/\(.*\)\([0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}\)/\2/g' | sort | tail -1 | sed
's/-//g'
source=('http://chomp.rutgers.edu/download/chomp-full.tar.gz' gcc43-chomp.patch)
_F_cd_path=chomp-full
-sha1sums=('8498da95469801cce50eacd6b98d29523ff39ac1' \
- '2e33504b569d436b6682662c502e8ac3fd8a6caf')
+sha1sums=('317432c7f09a5dbdddbe0d768dc0bf5d558cf497' \
+ '767cfe7f8f60ce227f56daa4f77e28e2e2accc13')
unset MAKEFLAGS
build() {
diff --git a/source/apps-extra/chomp/gcc43-chomp.patch
b/source/apps-extra/chomp/gcc43-chomp.patch
index a249a00..d073e32 100644
--- a/source/apps-extra/chomp/gcc43-chomp.patch
+++ b/source/apps-extra/chomp/gcc43-chomp.patch
@@ -1,17 +1,6 @@
-diff -Naur chomp-full/include/capd/interval/Interval_Op.hpp
chomp-fullnew/include/capd/interval/Interval_Op.hpp
chomp-full/include/capd/interval/Interval_Op.hpp 2009-07-08
14:18:00.0 +0200
-+++ chomp-fullnew/include/capd/interval/Interval_Op.hpp2009-11-15
12:49:39.273724136 +0100
-@@ -23,6 +23,7 @@
-
- #include capd/interval/IntervalError.h
- #include iostream
-+#include cstdio
-
- namespace chomp{
- namespace intervals{
-diff -Naur chomp-full/include/capd/vectalg/Matrix.hpp
chomp-fullnew/include/capd/vectalg/Matrix.hpp
+diff -Naur chomp-full/include/capd/vectalg/Matrix.hpp
chomp-full/include/capd/vectalg/Matrix.hpp
--- chomp-full/include/capd/vectalg/Matrix.hpp 2009-07-08 14:18:02.0
+0200
-+++ chomp-fullnew/include/capd/vectalg/Matrix.hpp 2009-11-15
12:48:44.863586141 +0100
chomp-full/include/capd/vectalg/Matrix.hpp 2009-11-15 12:48:44.863586141
+0100
@@ -18,6 +18,7 @@
#include vector
@@ -20,20 +9,9 @@ diff -Naur chomp-full/include/capd/vectalg/Matrix.hpp
chomp-fullnew/include/capd
#include capd/capd/minmax.h
#include capd/vectalg/Matrix.h
-diff -Naur chomp-full/include/capd/vectalg/Vector.hpp
chomp-fullnew/include/capd/vectalg/Vector.hpp
chomp-full/include/capd/vectalg/Vector.hpp 2008-09-22 20:54:27.0
+0200
-+++ chomp-fullnew/include/capd/vectalg/Vector.hpp 2009-11-15
12:53:43.403485279 +0100
-@@ -19,6 +19,7 @@
- #include cmath
- #include stack
- #include stdexcept
-+#include cstdio
-
- #include capd/capd/minmax.h
- #include capd/capd/power.h
-diff -Naur chomp-full/include/chomp/multiwork/mwdata.h
chomp-fullnew/include/chomp/multiwork/mwdata.h
+diff -Naur chomp-full/include/chomp/multiwork/mwdata.h
chomp-full/include/chomp/multiwork/mwdata.h
--- chomp-full/include/chomp/multiwork/mwdata.h 2009-01-13 21:12:24.0
+0100
-+++ chomp-fullnew/include/chomp/multiwork/mwdata.h 2009-11-15
12:55:59.932384160 +0100
chomp-full/include/chomp/multiwork/mwdata.h2009-11-15
12:55:59.932384160 +0100
@@ -34,6 +34,7 @@
#ifndef _CHOMP_MULTIWORK_MWDATA_H_
#define _CHOMP_MULTIWORK_MWDATA_H_
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: xorg-server-minimal-1.7.4-1-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8a8bc64a500b9a1f4957799ecfbee7b9b5e51d75
commit 8a8bc64a500b9a1f4957799ecfbee7b9b5e51d75
Author: Elentir elen...@mailoo.org
Date: Wed Feb 10 11:08:33 2010 +0100
xorg-server-minimal-1.7.4-1-i686
* new package
diff --git a/source/x11-extra/xorg-server-minimal/FrugalBuild
b/source/x11-extra/xorg-server-minimal/FrugalBuild
new file mode 100644
index 000..247083c
--- /dev/null
+++ b/source/x11-extra/xorg-server-minimal/FrugalBuild
@@ -0,0 +1,36 @@
+# Compiling Time: 6.34 SBU
+# Maintainer: Elentir elen...@mailoo.org
+
+pkgname=xorg-server-minimal
+_F_xorg_name=xorg-server
+pkgver=1.7.4
+pkgrel=1
+pkgdesc=X.Org X Server for Fwife Install CD
+groups=('x11-extra')
+archs=('i686' 'x86_64' )
+depends=('libxfont=1.4.0' 'libx11=1.3' 'xtrans=1.2.3' 'libxau=1.0.4'
'libsm' \
+ 'libxkbfile=1.0.5' 'libxdmcp=1.0.2-2' 'libxrender=0.9.4-3'
'libxext' \
+ 'freetype2' 'xkeyboard-config=1.7' 'pixman=0.16.0'
'libpciaccess=0.10.8')
+makedepends=('randrproto=1.3.0' 'renderproto=0.9.3' 'fixesproto'
'damageproto=1.1.0' 'xproto=7.0.15' \
+ 'xf86dgaproto' 'compositeproto=0.4' 'resourceproto'
'videoproto=2.2.2' 'scrnsaverproto' 'evieext' \
+ 'fontsproto' 'kbproto' 'inputproto=1.5' 'bigreqsproto' 'xcmiscproto'
'xextproto=7.0.99.3' \
+ 'fontcacheproto' 'util-macros=1.2.1')
+conflicts=('xorg-server')
+Finclude xorg
+## fix up2date by grepv'ing the beta and other weird version number
+up2date=lynx -dump $_F_xorg_url | grep -v '1.7.99' | grep -v '902' | grep -v
'901' | Flasttar
+F_cd_path=$_F_xorg_name-$pkgver
+sha1sums=('26de24d7ced735bd717a21c5110d22d662221a58')
+Fconfopts=$Fconfopts --enable-install-setuid \
+ --disable-kdrive --disable-xvfb\
+ --disable-glx --disable-xvmc \
+ --disable-xephyr --disable-config-hal \
+ --disable-dri --disable-dri2 \
+ --disable-ipv6 --disable-xinerama \
+ --disable-dmx --enable-xorg \
+ --disable-screensaver --disable-xres \
+ --disable-composite --with-xkb-output=/var/lib/xkb \
+ --with-xkb-path=/usr/lib/X11/xkb --disable-xnest \
+ --disable-dbe
+
+# optimization OK
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: xorg-server-minimal-1.7.4-2-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8e512edd3e999d1c0ad5028e2665915c507c6742
commit 8e512edd3e999d1c0ad5028e2665915c507c6742
Author: Elentir elen...@mailoo.org
Date: Wed Feb 10 13:39:21 2010 +0100
xorg-server-minimal-1.7.4-2-i686
* move files to avoid file conflicts
* drop conflicts
diff --git a/source/x11-extra/xorg-server-minimal/FrugalBuild
b/source/x11-extra/xorg-server-minimal/FrugalBuild
index 247083c..98fb731 100644
--- a/source/x11-extra/xorg-server-minimal/FrugalBuild
+++ b/source/x11-extra/xorg-server-minimal/FrugalBuild
@@ -4,7 +4,7 @@
pkgname=xorg-server-minimal
_F_xorg_name=xorg-server
pkgver=1.7.4
-pkgrel=1
+pkgrel=2
pkgdesc=X.Org X Server for Fwife Install CD
groups=('x11-extra')
archs=('i686' 'x86_64' )
@@ -15,7 +15,6 @@ makedepends=('randrproto=1.3.0' 'renderproto=0.9.3'
'fixesproto' 'damageproto
'xf86dgaproto' 'compositeproto=0.4' 'resourceproto' 'videoproto=2.2.2'
'scrnsaverproto' 'evieext' \
'fontsproto' 'kbproto' 'inputproto=1.5' 'bigreqsproto' 'xcmiscproto'
'xextproto=7.0.99.3' \
'fontcacheproto' 'util-macros=1.2.1')
-conflicts=('xorg-server')
Finclude xorg
## fix up2date by grepv'ing the beta and other weird version number
up2date=lynx -dump $_F_xorg_url | grep -v '1.7.99' | grep -v '902' | grep -v
'901' | Flasttar
@@ -33,4 +32,14 @@ Fconfopts=$Fconfopts --enable-install-setuid \
--with-xkb-path=/usr/lib/X11/xkb --disable-xnest \
--disable-dbe
+build() {
+ Fbuild
+ # move files to avoid conflicts and the installer can move them back to
/
+ Fmkdir fwifecdbin/
+ Fmv usr fwifecdbin/
+ Fmv var fwifecdbin/
+ Fmkdir usr/lib/
+ Fmv fwifecdbin usr/lib/
+}
+
# optimization OK
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: chomp-20100213-1-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=00f9595f27a4740abcb651985a942cf1c4293258
commit 00f9595f27a4740abcb651985a942cf1c4293258
Author: Elentir elen...@mailoo.org
Date: Mon Feb 15 20:25:33 2010 +0100
chomp-20100213-1-i686
* version bump
diff --git a/source/apps-extra/chomp/FrugalBuild
b/source/apps-extra/chomp/FrugalBuild
index d6563f4..e447650 100644
--- a/source/apps-extra/chomp/FrugalBuild
+++ b/source/apps-extra/chomp/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: Elentir elen...@mailoo.org
pkgname=chomp
-pkgver=20100125
+pkgver=20100213
pkgrel=1
pkgdesc=A software package for homology computations in n-dimensions
url=http://chomp.rutgers.edu;
@@ -12,7 +12,7 @@ depends=('libstdc++')
up2date=lynx -dump $url/advanced/download.php | grep [0-9]*-[0-9]*-[0-9]* |
sed 's/\(.*\)\([0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}\)/\2/g' | sort | tail -1 | sed
's/-//g'
source=('http://chomp.rutgers.edu/download/chomp-full.tar.gz' gcc43-chomp.patch)
_F_cd_path=chomp-full
-sha1sums=('317432c7f09a5dbdddbe0d768dc0bf5d558cf497' \
+sha1sums=('3fae06990b1bbe09ffcaecb0578f60a69113f249' \
'767cfe7f8f60ce227f56daa4f77e28e2e2accc13')
options=('noversrc')
unset MAKEFLAGS
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
[Frugalware-git] frugalware-current: xorg-server-minimal-1.7.4-3-i686
Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0b0aeb5aa0f10c024fdfbfd9dfc8e8e9ec4c3416
commit 0b0aeb5aa0f10c024fdfbfd9dfc8e8e9ec4c3416
Author: Elentir elen...@mailoo.org
Date: Mon Feb 15 20:48:07 2010 +0100
xorg-server-minimal-1.7.4-3-i686
* use -suffix to fix file conflicts
* remove useless files
* thx crazy ;)
diff --git a/source/x11-extra/xorg-server-minimal/FrugalBuild
b/source/x11-extra/xorg-server-minimal/FrugalBuild
index 98fb731..74c3ca0 100644
--- a/source/x11-extra/xorg-server-minimal/FrugalBuild
+++ b/source/x11-extra/xorg-server-minimal/FrugalBuild
@@ -4,7 +4,7 @@
pkgname=xorg-server-minimal
_F_xorg_name=xorg-server
pkgver=1.7.4
-pkgrel=2
+pkgrel=3
pkgdesc=X.Org X Server for Fwife Install CD
groups=('x11-extra')
archs=('i686' 'x86_64' )
@@ -19,7 +19,10 @@ Finclude xorg
## fix up2date by grepv'ing the beta and other weird version number
up2date=lynx -dump $_F_xorg_url | grep -v '1.7.99' | grep -v '902' | grep -v
'901' | Flasttar
F_cd_path=$_F_xorg_name-$pkgver
-sha1sums=('26de24d7ced735bd717a21c5110d22d662221a58')
+options=(nodocs)
+source=($source hack-since-suffix-support-is-half-br0ken.patch)
+sha1sums=('26de24d7ced735bd717a21c5110d22d662221a58' \
+ 'aee256e862e7cae581f155df159843212416e81b')
Fconfopts=$Fconfopts --enable-install-setuid \
--disable-kdrive --disable-xvfb\
--disable-glx --disable-xvmc \
@@ -30,16 +33,22 @@ Fconfopts=$Fconfopts --enable-install-setuid \
--disable-screensaver --disable-xres \
--disable-composite --with-xkb-output=/var/lib/xkb \
--with-xkb-path=/usr/lib/X11/xkb --disable-xnest \
- --disable-dbe
+ --disable-dbe --program-suffix='-fwife'
--with-module-dir=/usr/lib/xorg-fwife/modules
-build() {
- Fbuild
- # move files to avoid conflicts and the installer can move them back to
/
- Fmkdir fwifecdbin/
- Fmv usr fwifecdbin/
- Fmv var fwifecdbin/
- Fmkdir usr/lib/
- Fmv fwifecdbin usr/lib/
-}
+export CFLAGS=`echo $CFLAGS |sed 's|-O2|-Os|g'`
+build()
+{
+ Fcd
+ Fpatchall
+ Fautoreconf
+ Fmake
+ Fmakeinstall
+ Frm usr/include
+ Frm usr/share/{aclocal,man}
+ Frm usr/lib/xorg/protocol.txt
+ Frm var/lib/xkb/README.compiled
+ Frm usr/lib/pkgconfig
+ Frm usr/lib/xorg-fwife/modules/multimedia
+}
# optimization OK
diff --git
a/source/x11-extra/xorg-server-minimal/hack-since-suffix-support-is-half-br0ken.patch
b/source/x11-extra/xorg-server-minimal/hack-since-suffix-support-is-half-br0ken.patch
new file mode 100644
index 000..1d84c6d
--- /dev/null
+++
b/source/x11-extra/xorg-server-minimal/hack-since-suffix-support-is-half-br0ken.patch
@@ -0,0 +1,25 @@
+--- xorg-server-1.7.4/hw/xfree86/Makefile.am 2009-11-30 06:42:31.0
+0100
xorg-server-1.7.4-p/hw/xfree86/Makefile.am 2010-02-10 17:39:45.0
+0100
+@@ -102,10 +102,10 @@
+
+
+ install-exec-local: install-binPROGRAMS
+- (cd $(DESTDIR)$(bindir) rm -f X ln -s Xorg X)
++ (cd $(DESTDIR)$(bindir) rm -f X ln -s Xorg-fwife X-fwife)
+ if INSTALL_SETUID
+- chown root $(DESTDIR)$(bindir)/Xorg
+- chmod u+s $(DESTDIR)$(bindir)/Xorg
++ chown root $(DESTDIR)$(bindir)/Xorg-fwife
++ chmod u+s $(DESTDIR)$(bindir)/Xorg-fwife
+ endif
+
+ CPP_FILES_FLAGS = \
+@@ -114,7 +114,7 @@
+ -DMODULEPATH=\$(DEFAULT_MODULE_PATH)\
+
+ relink:
+- rm -f Xorg $(MAKE) Xorg
++ rm -f Xorg-fwife $(MAKE) Xorg
+
+ xorg.conf.example.pre: xorgconf.cpp
+ cp $(srcdir)/xorgconf.cpp $@
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
