From crazy at frugalware.org Thu Feb 1 00:06:46 2007 From: crazy at frugalware.org (crazy) Date: Thu Feb 1 00:06:52 2007 Subject: [Frugalware-darcs] frugalware-current: evolution-sharp-0.12.2-1-i686 Message-ID: <20070131230646.950844F03C4@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070131230008-f6986-183eed8ed334e69622c6263d4e1c328b8fea5a54.gz; [evolution-sharp-0.12.2-1-i686 crazy **20070131230008 * Version bump ] { hunk ./source/gnome/evolution-sharp/FrugalBuild 5 -pkgver=0.12.1 +pkgver=0.12.2 hunk ./source/gnome/evolution-sharp/FrugalBuild 14 -sha1sums=('f10a8789fd63f6e9d2f9cba973f268afde3f59df') hunk ./source/gnome/evolution-sharp/FrugalBuild 25 +sha1sums=('a630a07e8cb8275ca1f5d18d235857a47bef0863') } From crazy at frugalware.org Thu Feb 1 03:46:15 2007 From: crazy at frugalware.org (crazy) Date: Thu Feb 1 03:46:24 2007 Subject: [Frugalware-darcs] wx: added packages to TODO Message-ID: <20070201024616.26C6D4F03C4@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=wx;a=darcs_commitdiff;h=20070201024322-f6986-d30a3896f18d319663788b0bef9697ccaa5b4515.gz; [added packages to TODO crazy **20070201024322] { hunk ./TODO 1 +amule +audacity +dvdstyler +wxpython +wxpython-u8 +xmule +xchm +wxexamples +codeblocks +wxstedit +wxmaxima +bittorrent-gui +ipodder +drpython +bittornado +tovid +poedit +vlc +wxgtk-u8 } From crazy at frugalware.org Thu Feb 1 03:54:37 2007 From: crazy at frugalware.org (crazy) Date: Thu Feb 1 03:54:46 2007 Subject: [Frugalware-darcs] wx: wxgtk-2.8.0-1-i686 Message-ID: <20070201025438.459574F03C4@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=wx;a=darcs_commitdiff;h=20070201025029-f6986-20e67966c845183a598e0129eb9bc3ba4f046d57.gz; [wxgtk-2.8.0-1-i686 crazy **20070201025029 * Version bump * merged wxgtk and wxgtk-u8 in one build * depends fix ] { adddir ./source/xlib-extra adddir ./source/xlib-extra/wxgtk addfile ./source/xlib-extra/wxgtk/FrugalBuild hunk ./source/xlib-extra/wxgtk/FrugalBuild 1 +# Compiling Time: 15.12 SBU +# Maintainer: crazy +# Contributor: Miklos Nemeth + +pkgname=wxgtk +pkgver=2.8.0 +pkgrel=1 +pkgdesc="GTK+ implementation of wxWidgets API for GUI'" +_F_sourceforge_dirname="wxwindows" +_F_sourceforge_name="wxGTK" +_F_sourceforge_ext=".tar.bz2" +Finclude sourceforge +url="http://www.wxwidgets.org/" +depends=('libdrm' 'sdl' 'gtk+2' 'libgl' 'freetype2' 'libxcb' 'glib2') +groups=('xlib-extra') +archs=('i686' 'x86_64') +options=('force' 'scriptlet') +replaces=('wxgtk-devel') +conflicts=('wxgtk-devel') +VER="2.8" + +subpkgs=("$pkgname-locale" "$pkgname-u8") +subdescs=('Locale files for wxWidgets' "GTK+ implementation of wxWidgets API for GUI (unicode).") +subgroups=('locale-extra' 'xlib-extra') +subdepends=("$pkgname=$pkgver" "$pkgname=$pkgver") +subarchs=('i686 x86_64' 'i686 x86_64') + + +wx_compile() +{ + make || Fdie + Fmakeinstall + cd contrib/src + Fconf + make || Fdie + Fmakeinstall + cd ../.. +} + + +build() +{ + cd $Fsrcdir || Fdie + cp -r wxGTK-$pkgver wxGTK-$pkgver-u8 || Fdie + ## TODO: figure|enable more things + wxconfig="--with-opengl \ + --enable-geometry \ + --enable-sound \ + --with-sdl \ + --enable-mediactrl \ + --enable-display \ + --enable-plugins \ + --enable-compat24" + ## Unicode one + cd wxGTK-$pkgver-u8 + Fconf \ + ${wxconfig} \ + --enable-unicode + wx_compile + Frm usr/lib/wx/${VER} + ## This is still not a solution .. I will change this in 0.7 + Frm usr/include usr/share/aclocal usr/share/bakefile usr/share/locale usr/bin/wx-config usr/bin/wxrc + Fln /usr/lib/wx/config/gtk2-unicode-release-${VER} /usr/bin/wx-config-u8 + Fmv /usr/bin/wxrc-${VER} /usr/bin/wxrc-${VER}-u8 + Fln /usr/bin/wxrc-${VER}-u8 /usr/bin/wxrc-u8 + Fsplit $pkgname-u8 /usr + ## Normal build + cd ../wxGTK-$pkgver + Fconf \ + ${wxconfig} \ + --disable-unicode + wx_compile + Frm usr/bin/wx-config + Fln /usr/lib/wx/config/gtk2-ansi-release-${VER} /usr/bin/wx-config + ## lang stuff ( why is this split anyway ? ) + Fsplit $pkgname-locale usr/share/locale +} + +sha1sums=('56033e3bd32ac0ee72d593ff6a6e67c5488dd8dd') +# optimization OK } From crazy at frugalware.org Thu Feb 1 04:21:14 2007 From: crazy at frugalware.org (crazy) Date: Thu Feb 1 04:21:48 2007 Subject: [Frugalware-darcs] wx: uh uh forgot the include stuff Message-ID: <20070201032118.1F7D44F03C4@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=wx;a=darcs_commitdiff;h=20070201031748-f6986-40e327ec634b2923f5cd97d969453d9b7d3d278b.gz; [uh uh forgot the include stuff crazy **20070201031748] { adddir ./source/include addfile ./source/include/berlios.sh hunk ./source/include/berlios.sh 1 +#!/bin/sh + +# (c) 2005-2006 Miklos Vajna +# (c) 2005-2006 Priyank Gosalia +# berlios.sh for Frugalware +# distributed under GPL License + +# sets url, up2date and source() for a typical berlios project + +if [ -z "$_F_berlios_name" ]; then + _F_berlios_name=$pkgname +fi + +if [ -z "$_F_berlios_ext" ]; then + _F_berlios_ext=".tar.gz" +fi + +if [ -z "$_F_berlios_dirname" ]; then + _F_berlios_dirname="$_F_berlios_name" +fi + +url="http://developer.berlios.de/projects/$_F_berlios_dirname" +up2date="lynx -dump http://developer.berlios.de/project/showfiles.php?group_id=\$(lynx -dump $url| grep -m1 showfiles | sed -e 's/.*id=\(.*\)\&.*/\1/;q') | grep -m1 '$_F_berlios_name-\(.*\)$_F_berlios_ext'| sed 's/.*$_F_berlios_name-\(.*\)$_F_berlios_ext.*/\1/;s/-/_/g'" +source=(http://download.berlios.de/$_F_berlios_dirname/$_F_berlios_name-${pkgver//_/-}$_F_berlios_ext) addfile ./source/include/kde.sh hunk ./source/include/kde.sh 1 +#!/bin/sh + +# (c) 2007 Gabriel Craciunescu +# (c) 2006 Miklos Vajna +# kde.sh for Frugalware +# distributed under GPL License + +# common url, up2date, and source(), and build() for kde packages + +if [ -z "$_F_kde_name" ]; then + _F_kde_name=$pkgname +fi + +if [ -z "$_F_kde_build_debug" ]; then + _F_kde_build_debug=0 +fi + +if [ -z "$_F_cd_path" ]; then + _F_cd_path=$_F_kde_name-$pkgver +fi + +if [ -z "$_F_kde_reconf" ]; then + _F_kde_reconf=0 +fi + +if [ -z "$_F_kde_split_docs" ]; then + _F_kde_split_docs=0 +fi + +if [ -z "$_F_kde_defaults" ]; then + _F_kde_defaults=1 +fi + +## This only works on 'kde core' and conflicts with some _F_sourceforge +## options so allow to disable when isset to 0 , default is enabled +## TODO: add mirror option +if [ "$_F_kde_defaults" -eq 1 ]; then + url="http://www.kde.org" + _F_kde_ver=3.5.6 + pkgurl="ftp://ftp.solnet.ch/mirror/KDE/stable/$_F_kde_ver/src" + up2date="lynx -dump http://www.kde.org/download/|grep '$_F_kde_name'|sed -n '1 p'|sed 's/.*-\([^ ]*\) .*/\1/'" + source=($pkgurl/$_F_kde_name-$pkgver.tar.bz2) +fi +# qt's post_install is essential for kde pkgs +options=(${options[@]} 'scriptlet') +## If someone want to work on this /etc move here is a way to do it. Just add ${kde_config} to Fconfopts +## !!!BIG FAT WARNING!!!: THE WHOLE KDE AND _EVERY DAMN KDE_APP NEED BE REBUILD WITH THIS_. +## KDE{APPS} NEED BE FORCED TO USE THIS BY DEFAULT +## !!! DO NOT EVER REMOVE THIS FROM DEFAULTS ONCE IS ADDED OR KDE BREAKS !!! + +#kde_config="kde_confdir=/etc/kde3/config \ +# kde_kcfgdir=/etc/kde3/config.kcfg" + +Fconfopts="$Fconfopts \ + --disable-dependency-tracking \ + --with-gnu-ld \ + --enable-gcc-hidden-visibility \ + --enable-new-ldflags \ + --disable-finale" + +if [ "$_F_kde_build_debug" -eq 1 ]; then + Fconfopts="$Fconfopts --enable-debug --with-debug" +else + Fconfopts="$Fconfopts --disable-debug --without-debug" +fi + + +## Things for kde apps + +if [ ! -z "$_F_kde_id" ]; then + url="http://www.kde-apps.org/content/show.php?content=$_F_kde_id" + up2date="lynx -dump -nolist $url|grep -m1 'Version:'|sed 's/.*: *\(.*\)$/\1/'" +fi + +if [ ! -z "$_F_kde_id2" ]; then + url="http://www.kde-look.org/content/show.php?content=$_F_kde_id2" + up2date="lynx -dump -nolist $url|grep -m1 'Version:'|sed 's/.*: *\(.*\)$/\1/'" +fi + + +Fbuild_kde_reconf() +{ + if [ "$_F_kde_reconf" -eq 1 ]; then + Fcd + Fpatchall + make -f admin/Makefile.common cvs || Fdie + fi +} + +Fbuild_kde_split_docs() +{ + if [ "$_F_kde_split_docs" -eq 1 ]; then + Fsplit $_F_kde_name-docs usr/share/doc + fi +} + + +Fbuild_kde() +{ + +if [ "$_F_kde_reconf" -eq 1 ]; then + Fbuild_kde_reconf + Fconf \ + DO_NOT_COMPILE="$_F_kde_do_not_compile" + make || Fdie + Fmakeinstall +else + Fbuild \ + DO_NOT_COMPILE="$_F_kde_do_not_compile" +fi + Fbuild_kde_split_docs +} + + +build() +{ + Fbuild_kde +} + addfile ./source/include/sourceforge.sh hunk ./source/include/sourceforge.sh 1 +#!/bin/sh + +# (c) 2005-2006 Miklos Vajna +# sourceforge.sh for Frugalware +# distributed under GPL License + +# sets url, up2date and source() for a typical sf project + +if [ -z "$_F_sourceforge_name" ]; then + _F_sourceforge_name=$pkgname +fi + +if [ -z "$_F_sourceforge_mirror" ]; then + # set our preferred mirror + _F_sourceforge_mirror="heanet" +fi + +if [ -z "$_F_sourceforge_dirname" ]; then + _F_sourceforge_dirname="$_F_sourceforge_name" +fi + +if [ -z "$_F_sourceforge_ext" ]; then + _F_sourceforge_ext=".tar.gz" +fi + +if [ -z "$_F_sourceforge_broken_up2date" ]; then + _F_sourceforge_broken_up2date=0 +fi + +url="http://sourceforge.net/projects/$_F_sourceforge_dirname" +if [ $_F_sourceforge_broken_up2date -eq 0 ]; then + up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=\$(lynx -dump $url|grep showfiles|sed 's/.*=\(.*\)/\1/;q')|grep -m1 'Latest \[.*\]'|sed 's/.*]$_F_sourceforge_prefix\(.*\) \[.*\].*/\1/;s/-/_/g'" +else + up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=\$(lynx -dump $url|grep showfiles|sed 's/.*=\(.*\)/\1/;q')|grep -m1 '$_F_sourceforge_name-\(.*\)$_F_sourceforge_ext'|sed 's/.*$_F_sourceforge_name-\(.*\)$_F_sourceforge_ext.*/\1/;s/-/_/g'" +fi +source=(http://${_F_sourceforge_mirror}.dl.sourceforge.net/sourceforge/$_F_sourceforge_dirname/$_F_sourceforge_name-${pkgver//_/-}$_F_sourceforge_ext) } From crazy at frugalware.org Thu Feb 1 04:33:23 2007 From: crazy at frugalware.org (crazy) Date: Thu Feb 1 04:33:51 2007 Subject: [Frugalware-darcs] wx: forgot this one ;s Message-ID: <20070201033326.1628A4F03C6@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=wx;a=darcs_commitdiff;h=20070201033024-f6986-c117264e5b702cd8f8d459686dabfb5e465110a5.gz; [forgot this one ;s crazy **20070201033024] { addfile ./source/include/util.sh hunk ./source/include/util.sh 1 +#!/bin/sh + +# Copyright (C) 2005-2006 Bence Nagy +# Copyright (C) 2005-2006 Miklos Vajna +# util.sh for Frugalware +# distributed under GPL License + +# Parts of Fsort and Funpack_makeself are: +# Copyright (C) 1999-2005 Gentoo Foundation +# This file can be distributed under the terms of the +# GNU General Public License version 2. + +# general utility functions for FrugalBuilds + +Fsrcdir="$startdir/src" +Fdestdir="$startdir/pkg" +Fprefix="/usr" +Fsysconfdir="/etc" +Flocalstatedir="/var" +Fmenudir="/usr/share/applications" +Fconfopts="--prefix=$Fprefix" +export LDFLAGS="-Wl,--hash-style=both" + +### @defgroup fwmakepkg Common functions + # @{ + # @brief Common functions used by makepkg + ## + +### Prints out a message + # @param message message to display + ## +Fmessage() { + if [ "$USE_COLOR" = "Y" -o "$USE_COLOR" = "y" ]; then + echo -e "\033[1;36m==>\033[1;0m \033[1;1m$1\033[1;0m" >&2 + else + echo "==> $1" >&2 + fi +} + +### Cause makepkg to exit + ## +Fdie() { + exit 2 +} + +### Go to the source directory if it is $Fsrcdir currently + # @param dir optional source directory, default is $pkgname-$pkgver$pkgextraver + ## +Fcd() { + if [ "$Fsrcdir" = `pwd` ]; then + if [ "$#" -eq 1 ]; then + Fmessage "Going to the source directory..." + cd "$Fsrcdir/$1" || Fdie + elif [ "$#" -eq 0 ]; then + if [ -z "$_F_cd_path" ]; then + _F_cd_path="$pkgname-$pkgver$pkgextraver" + fi + Fcd "$_F_cd_path" + fi + fi +} + +### Creates a directory under $Fdestdir + # @param dir name of the directory to create (you can supply more than one) + ## +Fmkdir() { + local i + for i in "$@"; do + if [ ! -d "$Fdestdir/$i" ]; then + Fmessage "Creating directory: $i" + mkdir -p "$Fdestdir/$i" || Fdie + fi + done +} + +### Deletes (rm -rf) a directory stucture under $Fdestdir + # @param path name of the path to rm -rf (you can supply more than one) + ## +Frm() { + local i + for i in "$@"; do + Fmessage "Deleting file(s): $i" + rm -rf "$Fdestdir"/$i || Fdie + done +} + +### Copy file(s) under $Fdestdir + # @param source name of the file(s) + # @param dest path of the destination + ## +Fcp() { + Fmessage "Copying file(s): $1" + cp "$Fdestdir/"$1 "$Fdestdir"/$2 || Fdie +} + +### Copy file(s) to $Fdestdir recursively from $Fsrcdir + # @param source name of the file(s) + # @param dest path of the destination + ## +Fcpr() { + Fmessage "Copying file(s) recursive: $1" + cp -dpR "$Fsrcdir/"$1 "$Fdestdir"/$2 || Fdie +} + +### Copy file(s) to $Fdestdir recursively from the current working dir + # @param source name of the file(s) + # @param dest path of the destination + ## +Fcprrel() { + Fmessage "Copying file(s) recursive: $1" + cp -dpR $1 "$Fdestdir"/$2 || Fdie +} + +### Move file(s) under $Fdestdir + # @param source name of the file(s) + # @param dest path of the destination + ## +Fmv() { + Fmessage "Moving file(s): $1" + mv "$Fdestdir/"$1 "$Fdestdir"/$2 || Fdie +} + +### Install file(s) to $Fdestdir + # @param mode set permission mode (as in chmod) + # @param file(s) to be installed (defaults to `basename $destination`) + # @param destination + ## +Finstallrel() { + if [ "$#" -eq 3 ]; then + Fmessage "Installing file(s): $2" + if [ "`ls -l $2 | wc -l`" -gt 1 ]; then + Fmkdir "$3" + fi + if [ -d "$Fdestdir/$3" -a ! "`ls -l $2 | wc -l`" -gt 1 ]; then + install -D -m "$1" $2 "$Fdestdir/$3/`basename "$2"`" || Fdie + else + install -D -m "$1" $2 "$Fdestdir/$3" || Fdie + fi + elif [ "$#" -eq 2 ]; then + Finstallrel "$1" "`basename "$2"`" "$2" + else + local i + for i in "${@:2:$#-2}"; do + Fmkdir "${@:$#}" + Finstallrel $1 "$i" "${@:$#}/`basename "$i"`" + done + fi +} + +### Install file(s) to $Fdestdir from $Fsrcdir + # @param mode set permission mode (as in chmod) + # @param file(s) to be installed from $Fsrcdir \ + # (defaults to $Fsrcdir/`basename $destination`) + # @param destination + ## +Finstall() { + if [ "$#" -eq 3 ]; then + Finstallrel "$1" "$Fsrcdir/$2" "$3" + elif [ "$#" -eq 2 ]; then + Finstallrel "$1" "$Fsrcdir/`basename "$2"`" "$2" + else + local i + for i in "${@:2:$#-2}"; do + Fmkdir "${@:$#}" + Finstallrel "$1" "$Fsrcdir/$i" "${@:$#}/`basename "$i"`" + done + fi +} + +### Changes the permissions of dirs & subdirs inside $Fdestdir + # @param dir where to start "find" + # @param permission octal mode or [+-][rwxstugo] + ## +Fdirschmod() { + Fmessage "Configure chmod dirs & subdirs inside: $1" + find "$Fdestdir"/$1 -type d |xargs chmod $2 || Fdie +} + +### Changes the permissions of all file(s) inside $Fdestdir + # @param dir to where start "find" + # @param permission octal mode or [+-][rwxstugo] + ## +Ffileschmod() { + Fmessage "Configure chmod all files inside: $1" + find "$Fdestdir"/$1 -type f |xargs chmod $2 || Fdie +} + +### Change the owner and/or group of dirs and subdirs inside $Fdestdir + # @param dir where to start "find" + # @param owner (needed) + # @param group (needed) + ## +Fdirschown() { + Fmessage "Configure chown dirs & subdirs inside: $1" + find "$Fdestdir"/$1 -type d |xargs chown $2:$3 || Fdie +} + +### Change the owner and/or group of all file(s) inside $Fdestdir + # @param dir where to start "find" + # @param owner (needed) + # @param group (needed) + ## +Ffileschown() { + Fmessage "Configure chown all files inside: $1" + find "$Fdestdir"/$1 -type f |xargs chown $2:$3 || Fdie +} + +### Install executable file(s) to $Fdestdir from $Fsrcdir + # @param file(s) to be installed from $Fsrcdir \ + # (defaults to $Fsrcdir/`basename $destination`) + # @param destination + ## +Fexe() { + Finstall 0755 "$@" +} + +### Install executable file(s) to $Fdestdir + # @param file(s) to be installed \ + # (defaults to `basename $destination`) + # @param destination + ## +Fexerel() { + Finstallrel 0755 "$@" +} + +### Install regular file(s) to $Fdestdir from $Fsrcdir + # @param file(s) to be installed from $Fsrcdir \ + # (defaults to $Fsrcdir/`basename $destination`) + # @param destination + ## +Ffile() { + Finstall 0644 "$@" +} + +### Install regular file(s) to $Fdestdir + # @param file(s) to be installed \ + # (defaults to `basename $destination`) + # @param destination + ## +Ffilerel() { + Finstallrel 0644 "$@" +} + +### Install documentation file(s) to $Fdestdir/usr/share/doc/$pkgname-$pkgver \ + # from $Fsrcdir. Also is $file.xx or $file.xx_YY present then it will be \ + # automatically installed, too. + # @param file(s) to be installed from $Fsrcdir \ + # (defaults to $Fsrcdir/`basename $destination`) + ## +Fdoc() { + Fmkdir "/usr/share/doc/$pkgname-$pkgver" + local i + for i in $@ + do + if [ -d "$i" ]; then + Fcpr "$Fsrcdir/$i" "/usr/share/doc/$pkgname-$pkgver/" + else + Ffile "$i" "/usr/share/doc/$pkgname-$pkgver/" + local j + for j in `ls $Fsrcdir|grep "$i\.[a-z_A-Z]\+$"` + do + Ffile "$j" "/usr/share/doc/$pkgname-$pkgver/" + done + fi + done +} + +### Install documentation file(s) to $Fdestdir/usr/share/doc/$pkgname-$pkgver. + # Also is $file.xx or $file.xx_YY present then it will be \ + # automatically installed, too. + # @param file(s) to be installed \ + # (defaults to $Fsrcdir/`basename $destination`) + ## +Fdocrel() { + Fmkdir "/usr/share/doc/$pkgname-$pkgver" + local i + for i in $@ + do + if [ -d "$i" ]; then + Fcprrel "$i" "/usr/share/doc/$pkgname-$pkgver/" + else + Ffilerel "$i" "/usr/share/doc/$pkgname-$pkgver/" + local j + for j in `ls |grep "$i\.[a-z_A-Z]\+$"` + do + Ffilerel "$j" "/usr/share/doc/$pkgname-$pkgver/" + done + fi + done +} + +### Install icon file(s) to $Fdestdir/usr/share/pixmaps \ + # from $Fsrcdir + # @param file(s) to be installed from $Fsrcdir \ + # (defaults to $Fsrcdir/`basename $destination`) + ## +Ficon() { + Fmkdir "/usr/share/pixmaps" + Ffile "$@" "/usr/share/pixmaps/" +} + +### Install icon file(s) to $Fdestdir/usr/share/pixmaps \ + # from $Fsrcdir + # @param file(s) to be installed from $Fsrcdir \ + # (defaults to $Fsrcdir/`basename $destination`) + ## +Ficonrel() { + Fmkdir "/usr/share/pixmaps" + Ffilerel "$@" /usr/share/pixmaps +} + +### Create symlink in $Fdestdir + # @param source (i.e. mysql/libmysqlclient.so) + # @param target (i.e. /usr/lib/) ($target's dir will be created if necessary) + ## +Fln() { + Fmessage "Creating symlink(s): $1" + Fmkdir "`dirname $2`" + ln -sf $1 "$Fdestdir"/$2 || Fdie +} + +### Use sed with file(s) + # @param regexp + # @param replacement (see man sed!) + # @param file(s) to edit in place + ## +Fsed() { + Fcd + for i in ${@:3:$#}; do + Fmessage "Using sed with file: $i" + sed -i -e "s|$1|$2|g" "$i" || Fdie + done +} + +### Strip $Fdestdir from files in $Fdestdir + # @param file(s) to strip + ## +Fdeststrip() { + local i + for i in "$@"; do + Fsed "$Fdestdir" "" $Fdestdir/$i + done +} + +### Apply a patch with -p1 (use the .patch0 suffix for -p0) + # @param Patch to apply. A ".gz" or ".bz2" suffix will be ingored. + ## +Fpatch() { + Fcd + local i level="1" + Fmessage "Using patch: $1" + if [ -n "`echo "$1" | grep '\.\(patch[0-9]*\|diff\)\.gz$'`" ]; then + i=`basename "$1" .gz` + elif [ -n "`echo "$1" | grep '\.\(patch[0-9]*\|diff\)\.bz2$'`" ]; then + i=`basename "$1" .bz2` + else + i=$1 + fi + if patch -Np0 --dry-run -i "$Fsrcdir/$i" >/dev/null && \ + ! patch -Np1 --dry-run -i "$Fsrcdir/$i" >/dev/null; then + level="0" + fi + patch -Np$level --no-backup-if-mismatch -i "$Fsrcdir/$i" || Fdie +} + +### Apply patches from source(). \ + # Allowed suffixes are \.\(patch[0-9]*\|diff\)\(\.\(gz\|bz2\)\|\). \ + # URLs allowed, too. + ## +Fpatchall() { + local archs=('i686' 'x86_64' 'ppc') patch="" patcharch="" + for i in ${source[@]}; do + if [ -n "`echo "$i" | grep \.patch[0-9]*$`" -o -n "`echo "$i" | grep \.diff$`" -o -n "`echo "$i" | grep '\.\(patch[0-9]*\|diff\)\.\(gz\|bz2\)$'`" ]; then + patch=`strip_url "$i"` + patcharch=`echo $patch|sed 's/.*-\([^-]\+\)\.\(diff\|patch0\?\)$/\1/'` + if [ "$patcharch" != "$patch" ] && echo ${archs[@]}|grep -q $patcharch; then + # filter the patch if it's not for the current arch + if [ "$patcharch" == "$CARCH" ]; then + Fpatch $patch + fi + else + Fpatch $patch + fi + fi + done +} + +### A wrapper to ./configure. It will try to run ./configure, Makefile.PL, \ + # extconf.rb and configure.rb, respectively. It will automatically add the \ + # --prefix=$Fprefix (defaults to /usr), \ + # --sysconfdir=$Fsysconfdir (defaults to /etc) and the \ + # --localstatedir=$Flocalstatedir (defaults to /var) switches. The two later \ + # will be added only if the configure script support it. + # If you want to pre-set a switch (i.e. add a switch only on a ceratin \ + # arch or so) apped the $Fconfopts variable. + # @param switch(es) to pass to the configure script + ## +Fconf() { + Fcd + Fmessage "Configuring..." + if [ -z "$_F_conf_configure" ]; then + _F_conf_configure="./configure" + fi + if [ -x $_F_conf_configure ]; then + grep -q sysconfdir $_F_conf_configure && \ + Fconfopts="$Fconfopts --sysconfdir=$Fsysconfdir" + grep -q localstatedir $_F_conf_configure && \ + Fconfopts="$Fconfopts --localstatedir=$Flocalstatedir" + $_F_conf_configure $Fconfopts "$@" || Fdie + elif [ -f Makefile.PL ]; then + if [ -z "$_F_conf_perl_pipefrom" ]; then + perl Makefile.PL DESTDIR=$Fdestdir "$@" || Fdie + else + $_F_conf_perl_pipefrom | perl Makefile.PL DESTDIR=$Fdestdir "$@" || Fdie + fi + unset _F_conf_perl_pipefrom + Fsed `perl -e 'printf "%vd", $^V'` "current" Makefile + elif [ -f extconf.rb ]; then + ruby extconf.rb --prefix="$Fprefix" "$@" || Fdie + elif [ -f configure.rb ]; then + ./configure.rb --prefix="$Fprefix" "$@" || Fdie + fi +} + +### A wrapper to make and "python setup.py build" after calling Fconf() + # @param switch(es) to pass to Fconf() + ## +Fmake() { + Fconf "$@" + Fmessage "Compiling..." + if [ -f GNUmakefile -o -f makefile -o -f Makefile ]; then + make || Fdie + elif [ -f setup.py ]; then + python setup.py build "$@" || Fdie + fi +} + +### A wrapper to nant + # @param build file to use + # @param switch(es) to pass to nant + ## +Fnant() { + Fmessage "Compiling with NAnt..." + if [ ! -f "$1" ]; then + nant $@ -D:debug=false -D:install.prefix=/usr -D:install.destdir=$Fdestdir || Fdie + else + buildfile=$1 + shift + nant -buildfile:${buildfile} $@ -D:debug=false -D:install.prefix=/usr || Fdie + fi +} + +### A wrapper to make install: calls make DESTDIR=$Fdestir or \ + # prefix=$Fdestdir/usr install (which is necessary). \ + # Also handles python's setup.py. \ + # Removes /usr/info/dir and /usr/share/info/dir. + # @param param(s) passed to make/python + ## +Fmakeinstall() { + Fmessage "Installing to the package directory..." + if [ -f GNUmakefile -o -f makefile -o -f Makefile ]; then + if grep -q DESTDIR GNUmakefile makefile Makefile 2>/dev/null; then + make DESTDIR="$Fdestdir" "$@" install || Fdie + else + make prefix="$Fdestdir"/"$Fprefix" "$@" install || Fdie + fi + elif [ -f setup.py ]; then + python setup.py install --prefix "$Fprefix" --root "$Fdestdir" "$@" || Fdie + fi + if [ -e $Fdestdir/usr/info/dir ]; then + Frm /usr/info/dir + fi + if [ -e $Fdestdir/usr/share/info/dir ]; then + Frm /usr/share/info/dir + fi + if [ -d $Fdestdir/usr/lib/perl5/?.?.? ]; then + Fmv '/usr/lib/perl5/?.?.?' /usr/lib/perl5/current + fi + if [ -d $Fdestdir/usr/lib/perl5 ]; then + find $Fdestdir/usr/lib/perl5 -name perllocal.pod -exec rm {} \; + find $Fdestdir/usr/lib/perl5 -name .packlist -exec rm {} \; + fi + if [ -e $Fdestdir/usr/lib/perl5/site_perl/?.?.? ]; then + Fmv '/usr/lib/perl5/site_perl/?.?.?' /usr/lib/perl5/site_perl/current + fi + if [ -d $Fdestdir/usr/lib/perl5/site_perl ]; then + find $Fdestdir/usr/lib/perl5/site_perl -name perllocal.pod -exec rm {} \; + find $Fdestdir/usr/lib/perl5/site_perl -name .packlist -exec rm {} \; + fi + + # rc script + if [ -z "$_F_rcd_name" ]; then + _F_rcd_name=$pkgname + fi + if [ -e $Fsrcdir/rc.$_F_rcd_name ] && \ + grep -q "source /lib/initscripts/functions" $Fsrcdir/rc.$_F_rcd_name; then + Frcd2 $_F_rcd_name + fi +} + +### A default build(): Fpatchall, Fmake, Fmakeinstall + # @param param(s) passed to Fmake + ## +Fbuild() { + Fpatchall + Fmake "$@" + Fmakeinstall + if echo ${source[@]}|grep -q README.Frugalware; then + Fdoc README.Frugalware + fi +} + +### Create an rc.d environment + # @param name of the rc script, defaults to $pkgname + ## +Frcd() { + if [ "$#" -eq 1 ]; then + Fmessage "Creating rc.d environment: $1" + Fexe /etc/rc.d/rc.$1 + Ffile ../messages/* /etc/rc.d/rc.messages/ + else + Frcd "$pkgname" + fi +} + +### Create the new rc.d environment + # @param name of the rc script, defaults to $pkgname + ## +Frcd2() { + local po rc slang + + rc="$pkgname" ; [ -n "$1" ] && rc="$1" + + Fmessage "Creating new rc.d environment: $rc" + Fexe /etc/rc.d/rc.$rc + for po in $Fsrcdir/rc.$rc-*.po ; do + [ ! -f "$po" ] && continue + slang="`basename "$po" .po | sed "s|rc.$rc-||"`" + Fmsgfmt /lib/initscripts/messages $slang $rc `basename $po .po` + done +} + +build() { + Fbuild +} + +### Updates config.sub and config.guess from our automake. + ## +Facu() { + cat /usr/share/automake/config.sub >config.sub + cat /usr/share/automake/config.guess >config.guess +} + +### Similar to sort, but handles versions (i.e. 1.9 vs 1.10 vs 2.0) correctly. \ + # Uses vercmp from pacman. + # @param versions to be sorted + ## +Fsort() { + local i= items= left=0 + items=( `cat|tr '\n' ' '` ) + while [[ ${left} -lt ${#items[@]} ]] ; do + local lowest_idx=${left} + local idx=$(( ${lowest_idx} + 1 )) + while [[ ${idx} -lt ${#items[@]} ]] ; do + i=`vercmp "${items[${lowest_idx}]}" "${items[${idx}]}"` + [[ $i -gt 0 ]] && lowest_idx=${idx} + idx=$(( ${idx} + 1 )) + done + local tmp=${items[${lowest_idx}]} + items[${lowest_idx}]=${items[${left}]} + items[${left}]=${tmp} + left=$(( ${left} + 1 )) + done + echo ${items[@]}|sed 's/ /\n/g' +} + +### Unpack those pesky makeself generated files... \ + # They're shell scripts with the binary package tagged onto \ + # the end of the archive. Loki utilized the format as does \ + # many other game companies. + # @param file to unpack + # @param offset (optional) + # @param tail|dd (optional) + ## +Funpack_makeself() { + local src="$1" + local skip="$2" + local exe="$3" + + local shrtsrc="$(basename "${src}")" + Fmessage "Unpacking ${shrtsrc}" + local dir=${shrtsrc%.*} + mkdir $dir + if [ -z "${skip}" ] + then + local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" + local skip=0 + exe=tail + case ${ver} in + 1.5.*) # Tested 1.5.{3,4,5} ... guessing 1.5.x series is same. + skip=$(grep -a ^skip= "${src}" | cut -d= -f2) + ;; + 2.0|2.0.1) + skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) + ;; + 2.1.1) + skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-) + let skip="skip + 1" + ;; + 2.1.2) + skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1) + let skip="skip + 1" + ;; + 2.1.3) + skip=`grep -a ^offset= "${src}" | awk '{print $3}'` + let skip="skip + 1" + ;; + 2.1.4|2.1.5) + skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) + skip=$(head -n ${skip} "${src}" | wc -c) + exe="dd" + ;; + *) + plain "I'm sorry, but I was unable to support the Makeself file." + plain "Version '${ver}' is not supported." + Fdie + ;; + esac + fi + case ${exe} in + tail) exe="tail -n +${skip} '${src}'";; + dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";; + *) error "makeself can't handle exe '${exe}'" + Fdie + esac + + # Let's grab the first few bytes of the file to figure out what kind of archive it is. + local tmpfile="$(mktemp)" + eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}" + local filetype="$(file -b "${tmpfile}")" + case ${filetype} in + *tar\ archive) + eval ${exe} | tar --no-same-owner -xf - -C $dir + ;; + bzip2*) + eval ${exe} | bzip2 -dc | tar --no-same-owner -xf - -C $dir + ;; + gzip*) + eval ${exe} | tar --no-same-owner -xzf - -C $dir + ;; + compress*) + eval ${exe} | gunzip | tar --no-same-owner -xf - -C $dir + ;; + *) + error "Unknown file type \"${filetype}\"?" + Fdie + ;; + esac +} + +### Our autogen.sh. Runs aclocal, autoheader, autoconf and finally automake. + ## +Fautoconfize() { + Fmessage "Running aclocal autoheader autoconf automake ..." + aclocal || Fdie + autoheader || Fdie + autoconf || Fdie + automake -a -c -f || Fdie +} + +Fautoreconf() { + Fmessage "Running autoreconf -vif ..." + autoreconf -vif || Fdie +} + +### Extracts version from a page's last tar.gz link + ## +Flasttar() +{ + grep tar.gz$|sed -n 's/.*-\(.*\)\.t.*/\1/;$ p' +} + +Flasttgz() +{ + grep tgz$|sed -n 's/.*-\(.*\)\.t.*/\1/;$ p' +} + +Flasttarbz2() +{ + grep tar.bz2$|sed -n 's/.*-\(.*\)\.t.*/\1/;$ p' +} + +### Creates a .desktop file for graphical applications + # example: Fdesktop vmware vmware-workstation.png "System;" \ + # "application/x-vmware-vm;application/x-vmware-team;" + # @param name of the executable binary + # @param icon name from /usr/share/pixmaps + # @param categori(es) (optional) + # You can choose one or more from the followings: + # System;Games;AudioVideo;GNOME;KDE;Network;Development;FileTransfer;GTK; + # @param mimetype(s) (optional) + ## +Fdesktop() +{ + Fmkdir $Fmenudir + Fmessage "Installing desktop file: $pkgname.desktop" + cat > $Fdestdir$Fmenudir/$pkgname.desktop << EOF +[Desktop Entry] +Encoding=UTF-8 +Name=$pkgname +Comment=$pkgdesc +Exec=$1 +Terminal=false +Type=Application +StartupNotify=true +Icon=$2 +Categories=Application;$3 +MimeType=$4 +EOF +} + + +### Creates a .desktop for graphical applications + # A more flexible Fdesktop() + # Options: + # _F_desktop_filename : Name of the .desktop file + # _F_desktop_name : Name of the desktop icon to be displayed + # _F_desktop_desc : Description of the icon + # _F_desktop_icon : Icon to be used from /usr/share/pixmaps + # _F_desktop_exec : Name of the executable file + # _F_desktop_categories : Categories (same as Fdesktop) + # _F_desktop_mime : Mimetypes + # _F_desktop_show_in : Whether the icon should be showed in only a particular DE + # like "XFCE;" for Xfce, "GNOME;" for Gnome, etc. +### +Fdesktop2() +{ + dcategories="Application;" + if [ -z $_F_desktop_filename ] ; then + deskfilename=$pkgname.desktop + else + deskfilename=$_F_desktop_filename.desktop + fi + + if [ ! -n "$_F_desktop_name" ] ; then + dname=$pkgname + else + dname="$_F_desktop_name" + fi + + if [ -z "$_F_desktop_desc" ] ; then + ddesc=$pkgdesc + else + ddesc=$_F_desktop_desc + fi + + if [ ! -z $_F_desktop_icon ] ; then + dicon=$_F_desktop_icon + fi + + if [ ! -z $_F_desktop_exec ] ; then + dexec=$_F_desktop_exec + else + dexec=$pkgname + fi + + if [ ! -z $_F_desktop_categories ] ; then + dcategories="${dcategories[@]}$_F_desktop_categories" + fi + + if [ ! -z $_F_desktop_mimetypes ] ; then + dmime=$_F_desktop_mimetypes + fi + + if [ ! -z $_F_desktop_show_in ] ; then + dshowin=$_F_desktop_show_in + fi + + Fmkdir $Fmenudir + Fmessage "Installing desktop file: $deskfilename" + cat > $Fdestdir$Fmenudir/$pkgname.desktop << EOF +[Desktop Entry] +Encoding=UTF-8 +Name=$dname +Comment=$ddesc +Exec=$dexec +Terminal=false +Type=Application +StartupNotify=true +Icon=$dicon +Categories=$dcategories +MimeType=$dmime +EOF + + if [ ! -z $_F_desktop_show_in ] ; then + echo "OnlyShowIn=$dshowin;" >> $Fdestdir$Fmenudir/$pkgname.desktop + fi +} + +### Creates a wrapper for applications + # example: Fwrapper "python /usr/lib/python/foo.py" foo + # @param wrapper string or command + # @param name of the wrapper file to be installed under /usr/bin + ## +Fwrapper() +{ + local exe=$2 + mkdir -p $startdir/pkg/usr/bin + Fmessage "Creating a wrapper: /usr/bin/$exe" + echo "#!/bin/sh" > $startdir/pkg/usr/bin/$exe + echo "$1" >> $startdir/pkg/usr/bin/$exe + chmod 755 $startdir/pkg/usr/bin/$exe +} + +### Moves a file pattern to a subpackage + # example: Fsplit libmysql /usr/lib + # @param name of the subpackage + # @param pattern of the files to move + ## +Fsplit() +{ + local subpkg=$1 + shift 1 + local i + local dir + local path + for i in $@ + do + # split the / suffix if used + path=`echo $i|sed 's|/$||'` + + Fmessage "Moving $path to subpackage $subpkg" + dir=`echo $path|sed 's|/[^/]*$||'` + mkdir -p $startdir/pkg.$subpkg/$dir/ + mv $Fdestdir/$path $startdir/pkg.$subpkg/$dir/ || Fdie + done +} + +### Check if a logical flag is defined in options() or not + # example: if [ "`check_option DEVEL`" ]; then + # @param: name of the logical flag + ## +check_option() { + local i + for i in ${options[@]}; do + local uc=`echo $i | tr [:lower:] [:upper:]` + local lc=`echo $i | tr [:upper:] [:lower:]` + if [ "$uc" = "$1" -o "$lc" = "$1" ]; then + echo $1 + return + fi + done +} + +### Install gettext po files to binary mo files + # example: Fmsgfmt /usr/share/locale hu file file-hu + # @param path to locale directory (eg /usr/share/locale) + # @param language + # @param name of the mo file, default $pkgname + # @param name of the po file, default $pkgname-$lang + ## +Fmsgfmt() { + local llang mofile pofile slang + + if echo $2|grep -q _ ; then + llang="$2" + slang=`echo $llang|cut -d _ -f 1` + else + llang=${2}_`echo $2|tr [:lower:] [:upper:]` + slang="$2" + fi + + [ -n "$3" ] && mofile="$3.mo" || mofile="$pkgname.mo" + [ -n "$4" ] && pofile="$4.po" || pofile="$pkgname-$slang.po" + + [ -f $Fsrcdir/$pofile ] || Fdie + + Fmkdir $1/$llang/LC_MESSAGES + msgfmt -o $Fdestdir/$1/$llang/LC_MESSAGES/$mofile $Fsrcdir/$pofile || Fdie +} + +### Extract archives + # example: Fextract pacman.tar.gz + # @param: file name to extract + ## +Fextract() { + local cmd file tmp + file="${1}" + tmp="$(echo "${file}" | tr 'A-Z' 'a-z')" + case "${tmp}" in + *.tar.gz|*.tar.z|*.tgz) + cmd="tar --use-compress-program=gzip -xf $file" ;; + *.tar.bz2|*.tbz2) + cmd="tar --use-compress-program=bzip2 -xf $file" ;; + *.tar) + cmd="tar -xf $file" ;; + *.zip) + unziphack=1 + cmd="unzip -qqo $file" ;; + *.cpio.gz) + cmd="bsdtar -x -f $file" ;; + *.cpio.bz2) + cmd="bsdtar -x -f $file" ;; + *.gz) + cmd="gunzip -f $file" ;; + *.bz2) + cmd="bunzip2 -f $file" ;; + *) + cmd="" ;; + esac + if [ "$cmd" != "" ]; then + msg " $cmd" + $cmd + if [ $? -ne 0 ]; then + # unzip will return a 1 as a warning, it is not an error + if [ "$unziphack" != "1" -o $? -ne 1 ]; then + error "Failed to extract ${file}" + msg "Aborting..." + Fdie + fi + fi + fi +} +### @} } From crazy at frugalware.org Thu Feb 1 04:56:58 2007 From: crazy at frugalware.org (crazy) Date: Thu Feb 1 04:57:07 2007 Subject: [Frugalware-darcs] wx: wxgtk-2.8.0-1-i686 Message-ID: <20070201035659.8587A4F03C4@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=wx;a=darcs_commitdiff;h=20070201035313-f6986-45f00cf83c82ef970c87dd0528d0ed2e91139be1.gz; [wxgtk-2.8.0-1-i686 crazy **20070201035313 * remove force ] { hunk ./source/xlib-extra/wxgtk/FrugalBuild 17 -options=('force' 'scriptlet') +options=('scriptlet') } From crazy at frugalware.org Thu Feb 1 06:38:04 2007 From: crazy at frugalware.org (crazy) Date: Thu Feb 1 06:38:29 2007 Subject: [Frugalware-darcs] wx: vlc-0.8.6-3-i686 Message-ID: <20070201053809.E93014F03C4@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=wx;a=darcs_commitdiff;h=20070201052550-f6986-9c3288ce6a23af9d00b861dd5d354fc893a0e65d.gz; [vlc-0.8.6-3-i686 crazy **20070201052550 * rebuild with wxgtk-2.8.0 * added an patch to get it compile with new wxgtk * added libmodplug and vcdimager to depends * enabled skins2 ( and made a patch to fix an weird check ,they chek for share/foo ( yeah without '/' and even with '/share' ? LOL )) * take a look on how skins2 looks like -> http://crazy.dev.frugalware.org/vlc_with_skins2.png * added lirc support ( lirc is make depends only ) * sorted FB and fixed deprecated configure options * added -fno-strict-aliasing to CXXFLAGS ( this is needed now :| ) ] { adddir ./source/xmultimedia-extra adddir ./source/xmultimedia-extra/vlc addfile ./source/xmultimedia-extra/vlc/FrugalBuild hunk ./source/xmultimedia-extra/vlc/FrugalBuild 1 +# Compiling Time: 3.89 SBU +# Maintainer: VMiklos + +pkgname=vlc +pkgver=0.8.6 +pkgextraver=a +pkgrel=3 +pkgdesc="The cross-platform media player and streaming server." +url="http://www.videolan.org/vlc/" +depends=('alsa-lib' 'dbus-glib>=0.71' 'hal>=0.5.7.1-3' 'libxml2' 'libdvdnav' 'libmad' 'libmatroska' \ + 'mpeg2dec' 'ffmpeg' 'fribidi' 'wxgtk-u8>=2.8.0' 'live' 'speex' 'libdca' 'sysfsutils' 'mesa' 'libdvbpsi' \ + 'libxv' 'sdlimage' 'libcdio' 'libid3tag' 'libtheora' 'faad2' 'libmodplug' 'vcdimager' 'libxcb') +makedepends=('firefox' 'samba' 'cvs' 'lirc') +options=('scriptlet') +groups=('xmultimedia-extra') +archs=('i686' 'x86_64') +up2date="lynx -dump $url/download-sources.html|grep -m1 'Latest VLC'|sed 's/.*(\(.*\)).*/\1/;s/$pkgextraver//'" +source=(http://download.videolan.org/pub/videolan/vlc/$pkgver$pkgextraver/$pkgname-$pkgver$pkgextraver.tar.bz2 \ + $pkgname-ffmpeg.diff $pkgname.desktop vlc-0.8.5-libintl.diff \ + wxgtk-2.8.patch fix_not_logical_skins2_check.patch) +sha1sums=('f04cbc5c0db5e27955bb2d0e66e3f756a5de476e'\ + '888a02c9f81331fce1f6ee5f705ce68e5b486ffd'\ + '0c58c35fe47c4d14cd4d4c8c505863dbfc93f5e0'\ + '50bfbc12fc0ad94178b2e08df22a0b26da36c1d5'\ + '94b9696ebfda8f619d191e36e70d44758e35a607'\ + '262d4f06d71983715ec23dacc6cbdd4c3a8d2334') + +build() +{ + Fpatchall + ##We need this for now :| + export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing" + Fsed 'mozilla-config' 'firefox-config' configure.ac + Fsed 'firefox-config\.h' 'mozilla-config\.h' configure.ac + Fsed '/usr/lib/mozilla' '/usr/lib/firefox' configure.ac + Fsed '/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf' \ + '/usr/X11R6/lib/X11/fonts/TTF/VeraBd.ttf' \ + modules/misc/freetype.c + for i in aclocal automake + do + Fsed "=$i" "=$i-" ./bootstrap + done + ./bootstrap || return 1 + Fconf \ + --enable-dvdread \ + --enable-dvdnav \ + --enable-madi \ + --enable-ffmpeg \ + --enable-lirc \ + --disable-rpath \ + --disable-nls \ + --enable-alsa \ + --enable-skins2 \ + --enable-mozilla \ + --enable-v4l \ + --enable-realrtsp \ + --enable-live555 \ + --with-live555-tree=/usr/lib/live \ + --enable-speex \ + --enable-wxwidgets \ + --with-wx-config=wx-config-u8 \ + --enable-dts \ + --with-gnu-ld \ + --enable-dvbpsi \ + --with-dvbpsi=/usr/include/dvbpsi \ + --with-ffmpeg-{mp3lame,faac,dts,vorbis,theora,ogg} + Fsed '%{idldir}' '/usr/share/idl/firefox' mozilla/Makefile + make || return 1 + make DESTDIR=$Fdestdir \ + plugindir=/usr/lib/mozilla/plugins/ \ + vlcintf_xptdir=/usr/lib/mozilla/plugins/ \ + install || Fdie + Frm /usr/share/vlc/{,k,q,g,gnome-}vlc*.{png,xpm,ico} + #Frm /usr/share/vlc/skins2 + for i in 16 32 48 + do + Ffilerel share/vlc${i}x$i.png \ + /usr/share/icons/hicolor/${i}x$i/apps/vlc.png + done + Ffile /usr/share/applications/$pkgname.desktop +} + +# optimization OK addfile ./source/xmultimedia-extra/vlc/fix_not_logical_skins2_check.patch hunk ./source/xmultimedia-extra/vlc/fix_not_logical_skins2_check.patch 1 +diff -Naur vlc-0.8.6a/modules/gui/skins2/x11/x11_factory.cpp vlc-0.8.6a-p/modules/gui/skins2/x11/x11_factory.cpp +--- vlc-0.8.6a/modules/gui/skins2/x11/x11_factory.cpp 2007-01-03 19:27:57.000000000 +0100 ++++ vlc-0.8.6a-p/modules/gui/skins2/x11/x11_factory.cpp 2007-02-01 04:51:06.000000000 +0100 +@@ -73,7 +73,11 @@ + // Initialize the resource path + m_resourcePath.push_back( (string)getIntf()->p_vlc->psz_homedir + + m_dirSep + CONFIG_DIR + "/skins2" ); +- m_resourcePath.push_back( (string)"share/skins2" ); ++ /* uhmm there is _nothing_ like share/foo usr/foo and even 'string' would be '/' *WHO* to hell ++ * installs it in /share/.. this check is just broken and cause VLC to drop weird warning on ++ * switching to skins2 ... ++ */ ++ /* m_resourcePath.push_back( (string)"share/skins2" ); */ + m_resourcePath.push_back( (string)DATA_PATH + "/skins2" ); + + return true; addfile ./source/xmultimedia-extra/vlc/vlc-0.8.5-libintl.diff hunk ./source/xmultimedia-extra/vlc/vlc-0.8.5-libintl.diff 1 +--- vlc-0.8.5/src/misc/charset.c.orig 2006-05-08 11:24:23.000000000 +0200 ++++ vlc-0.8.5/src/misc/charset.c 2006-05-08 11:25:19.000000000 +0200 +@@ -33,6 +33,7 @@ + #include + #include + #include ++#include + + #if !defined WIN32 + # if HAVE_LANGINFO_CODESET addfile ./source/xmultimedia-extra/vlc/vlc-ffmpeg.diff hunk ./source/xmultimedia-extra/vlc/vlc-ffmpeg.diff 1 +diff -Naur vlc-0.8.4.orig/configure.ac vlc-0.8.4/configure.ac +--- vlc-0.8.4.orig/configure.ac 2005-11-26 17:39:58.000000000 +0100 ++++ vlc-0.8.4/configure.ac 2006-02-25 18:41:17.000000000 +0100 +@@ -2204,7 +2204,7 @@ + fi]) + + dnl Trying with pkg-config +- PKG_CHECK_MODULES(FFMPEG,[libavcodec, libavformat], ++ PKG_CHECK_MODULES(FFMPEG,[libavcodec, libavformat, libpostproc], + [ + AC_CHECK_HEADERS(ffmpeg/avcodec.h) + AC_CHECK_HEADERS(postproc/postprocess.h) +diff -Naur vlc-0.8.4.orig/modules/codec/ffmpeg/ffmpeg.c vlc-0.8.4/modules/codec/ffmpeg/ffmpeg.c +--- vlc-0.8.4.orig/modules/codec/ffmpeg/ffmpeg.c 2005-11-26 17:39:53.000000000 +0100 ++++ vlc-0.8.4/modules/codec/ffmpeg/ffmpeg.c 2006-02-25 18:22:18.000000000 +0100 +@@ -46,7 +46,7 @@ + # ifdef HAVE_POSTPROC_POSTPROCESS_H + # include + # else +-# include ++# include + # endif + #endif + +diff -Naur vlc-0.8.4.orig/modules/codec/ffmpeg/postprocess.c vlc-0.8.4/modules/codec/ffmpeg/postprocess.c +--- vlc-0.8.4.orig/modules/codec/ffmpeg/postprocess.c 2005-11-26 17:39:53.000000000 +0100 ++++ vlc-0.8.4/modules/codec/ffmpeg/postprocess.c 2006-02-25 18:22:18.000000000 +0100 +@@ -40,7 +40,7 @@ + #ifdef HAVE_POSTPROC_POSTPROCESS_H + # include + #else +-# include ++# include + #endif + + #ifndef PP_CPU_CAPS_ALTIVEC +diff -Naur vlc-0.8.4.orig/modules/stream_out/switcher.c vlc-0.8.4/modules/stream_out/switcher.c +--- vlc-0.8.4.orig/modules/stream_out/switcher.c 2005-11-26 17:39:51.000000000 +0100 ++++ vlc-0.8.4/modules/stream_out/switcher.c 2006-02-25 18:22:42.000000000 +0100 +@@ -44,7 +44,7 @@ + #ifdef HAVE_POSTPROC_POSTPROCESS_H + # include + #else +-# include ++# include + #endif + + #define SOUT_CFG_PREFIX "sout-switcher-" addfile ./source/xmultimedia-extra/vlc/vlc.desktop hunk ./source/xmultimedia-extra/vlc/vlc.desktop 1 +[Desktop Entry] +Type=Application +Encoding=UTF-8 +Name=VLC Media Player +Comment=VideoLAN Client Media Player +Icon=vlc.png +TryExec=vlc +Exec=vlc +Terminal=false +Categories=AudioVideo;Player; addfile ./source/xmultimedia-extra/vlc/wxgtk-2.8.patch hunk ./source/xmultimedia-extra/vlc/wxgtk-2.8.patch 1 +--- vlc-0.8.6a.orig/modules/gui/wxwidgets/dialogs.cpp ++++ vlc-0.8.6a/modules/gui/wxwidgets/dialogs.cpp +@@ -380,7 +380,7 @@ + { + p_file_generic_dialog->SetMessage( wxU(p_arg->psz_title) ); + p_file_generic_dialog->SetWildcard( wxU(p_arg->psz_extensions) ); +- p_file_generic_dialog->SetStyle( (p_arg->b_save ? wxSAVE : wxOPEN) | ++ p_file_generic_dialog->SetWindowStyle( (p_arg->b_save ? wxSAVE : wxOPEN) | + (p_arg->b_multiple ? wxMULTIPLE:0) ); + } } From vmiklos at frugalware.org Thu Feb 1 13:30:10 2007 From: vmiklos at frugalware.org (VMiklos) Date: Thu Feb 1 13:30:15 2007 Subject: [Frugalware-darcs] frugalware-current: vlc-0.8.6-3-i686 Message-ID: <20070201123011.084D2FA401B@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070201122225-e2957-0ebf2172ee35064c4e52ec954c405a18718dbf3c.gz; [vlc-0.8.6-3-i686 VMiklos **20070201122225 rebuilt with flac-1.1.3 ] { hunk ./source/xmultimedia-extra/vlc/FrugalBuild 7 -pkgrel=2 +pkgrel=3 hunk ./source/xmultimedia-extra/vlc/FrugalBuild 20 - $pkgname-ffmpeg.diff $pkgname.desktop vlc-0.8.5-libintl.diff) + $pkgname-ffmpeg.diff $pkgname.desktop vlc-0.8.5-libintl.diff vlc-0.8.6-flac113.diff) hunk ./source/xmultimedia-extra/vlc/FrugalBuild 56 +sha1sums=('f04cbc5c0db5e27955bb2d0e66e3f756a5de476e'\ + '888a02c9f81331fce1f6ee5f705ce68e5b486ffd'\ + '0c58c35fe47c4d14cd4d4c8c505863dbfc93f5e0'\ + '50bfbc12fc0ad94178b2e08df22a0b26da36c1d5'\ + '801e115ebe29904b668201e23a783a6289dad8e6') hunk ./source/xmultimedia-extra/vlc/FrugalBuild 63 -sha1sums=('f04cbc5c0db5e27955bb2d0e66e3f756a5de476e' \ - '888a02c9f81331fce1f6ee5f705ce68e5b486ffd' \ - '0c58c35fe47c4d14cd4d4c8c505863dbfc93f5e0' \ - '50bfbc12fc0ad94178b2e08df22a0b26da36c1d5') addfile ./source/xmultimedia-extra/vlc/vlc-0.8.6-flac113.diff hunk ./source/xmultimedia-extra/vlc/vlc-0.8.6-flac113.diff 1 +--- vlc-0.8.6-clean/modules/codec/flac.c 2006-12-09 01:12:20.000000000 +0000 ++++ vlc-0.8.6/modules/codec/flac.c 2006-12-24 01:34:54.000000000 +0000 +@@ -40,6 +40,10 @@ + + #define MAX_FLAC_HEADER_SIZE 16 + ++#if defined(FLAC_API_VERSION_CURRENT) && FLAC_API_VERSION_CURRENT >= 8 ++# define USE_NEW_FLAC_API ++#endif ++ + /***************************************************************************** + * decoder_sys_t : FLAC decoder descriptor + *****************************************************************************/ +@@ -225,6 +229,25 @@ + return VLC_EGENERIC; + } + ++#ifdef USE_NEW_FLAC_API ++ if( FLAC__stream_decoder_init_stream( p_sys->p_flac, ++ DecoderReadCallback, ++ NULL, ++ NULL, ++ NULL, ++ NULL, ++ DecoderWriteCallback, ++ DecoderMetadataCallback, ++ DecoderErrorCallback, ++ p_dec ) ++ != FLAC__STREAM_DECODER_INIT_STATUS_OK ) ++ { ++ msg_Err( p_dec, "FLAC__stream_decoder_init_stream() failed" ); ++ FLAC__stream_decoder_delete( p_sys->p_flac ); ++ free( p_sys ); ++ return VLC_EGENERIC; ++ } ++#else + FLAC__stream_decoder_set_read_callback( p_sys->p_flac, + DecoderReadCallback ); + FLAC__stream_decoder_set_write_callback( p_sys->p_flac, +@@ -237,6 +260,7 @@ + + FLAC__stream_decoder_init( p_sys->p_flac ); + #endif ++#endif + + /* Set output properties */ + p_dec->fmt_out.i_cat = AUDIO_ES; +@@ -730,16 +754,27 @@ + case FLAC__STREAM_DECODER_END_OF_STREAM: + msg_Dbg( p_dec, "the decoder has reached the end of the stream." ); + break; ++#ifdef USE_NEW_FLAC_API ++ case FLAC__STREAM_DECODER_OGG_ERROR: ++ msg_Err( p_dec, "error occurred in the Ogg layer." ); ++ break; ++ case FLAC__STREAM_DECODER_SEEK_ERROR: ++ msg_Err( p_dec, "error occurred while seeking." ); ++ break; ++#endif + case FLAC__STREAM_DECODER_ABORTED: + msg_Warn( p_dec, "the decoder was aborted by the read callback." ); + break; ++#ifndef USE_NEW_FLAC_API + case FLAC__STREAM_DECODER_UNPARSEABLE_STREAM: + msg_Warn( p_dec, "the decoder encountered reserved fields in use " + "in the stream." ); + break; ++#endif + case FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR: + msg_Err( p_dec, "error when allocating memory." ); + break; ++#ifndef USE_NEW_FLAC_API + case FLAC__STREAM_DECODER_ALREADY_INITIALIZED: + msg_Err( p_dec, "FLAC__stream_decoder_init() was called when the " + "decoder was already initialized, usually because " +@@ -749,6 +784,7 @@ + msg_Err( p_dec, "FLAC__stream_decoder_init() was called without " + "all callbacks being set." ); + break; ++#endif + case FLAC__STREAM_DECODER_UNINITIALIZED: + msg_Err( p_dec, "decoder in uninitialized state." ); + break; +@@ -1183,7 +1219,12 @@ + p_sys->i_samples_delay = 0; + + /* Create flac encoder */ +- p_sys->p_flac = FLAC__stream_encoder_new(); ++ if( !(p_sys->p_flac = FLAC__stream_encoder_new()) ) ++ { ++ msg_Err( p_enc, "FLAC__stream_encoder_new() failed" ); ++ free( p_sys ); ++ return VLC_EGENERIC; ++ } + + FLAC__stream_encoder_set_streamable_subset( p_sys->p_flac, 1 ); + FLAC__stream_encoder_set_channels( p_sys->p_flac, +@@ -1193,15 +1234,32 @@ + FLAC__stream_encoder_set_bits_per_sample( p_sys->p_flac, 16 ); + p_enc->fmt_in.i_codec = AOUT_FMT_S16_NE; + ++ /* Get and store the STREAMINFO metadata block as a p_extra */ ++ p_sys->p_chain = 0; ++ ++#ifdef USE_NEW_FLAC_API ++ if( FLAC__stream_encoder_init_stream( p_sys->p_flac, ++ EncoderWriteCallback, ++ NULL, ++ NULL, ++ EncoderMetadataCallback, ++ p_enc ) ++ != FLAC__STREAM_ENCODER_INIT_STATUS_OK ) ++ { ++ msg_Err( p_enc, "FLAC__stream_encoder_init_stream() failed" ); ++ FLAC__stream_encoder_delete( p_sys->p_flac ); ++ free( p_sys ); ++ return VLC_EGENERIC; ++ } ++#else + FLAC__stream_encoder_set_write_callback( p_sys->p_flac, + EncoderWriteCallback ); + FLAC__stream_encoder_set_metadata_callback( p_sys->p_flac, + EncoderMetadataCallback ); + FLAC__stream_encoder_set_client_data( p_sys->p_flac, p_enc ); + +- /* Get and store the STREAMINFO metadata block as a p_extra */ +- p_sys->p_chain = 0; + FLAC__stream_encoder_init( p_sys->p_flac ); ++#endif + + return VLC_SUCCESS; + } } From vmiklos at frugalware.org Thu Feb 1 13:45:31 2007 From: vmiklos at frugalware.org (VMiklos) Date: Thu Feb 1 13:45:33 2007 Subject: [Frugalware-darcs] frugalware-current: fuse-2.6.2-1-i686 Message-ID: <20070201124531.B30DCFA401B@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070201124306-e2957-796cd4cf237fc929d664c92a7e9b12b87153793b.gz; [fuse-2.6.2-1-i686 VMiklos **20070201124306 version bump ] { hunk ./source/apps-extra/fuse/FrugalBuild 5 -pkgver=2.6.1 +pkgver=2.6.2 hunk ./source/apps-extra/fuse/FrugalBuild 23 +sha1sums=('a7fa05ec94db6ee49b62aafb34c311cf27318a5d'\ + '83a44b6f6e87d304b42915983a5eff64c9484e07'\ + 'b6077229d093f8c01f002e84068e3ce7e795e479') hunk ./source/apps-extra/fuse/FrugalBuild 28 -sha1sums=('85ec4458d0ab2647b6b43605f0200006d89981ed' \ - '83a44b6f6e87d304b42915983a5eff64c9484e07' \ - 'b6077229d093f8c01f002e84068e3ce7e795e479') } From vmiklos at frugalware.org Thu Feb 1 13:54:48 2007 From: vmiklos at frugalware.org (VMiklos) Date: Thu Feb 1 13:54:51 2007 Subject: [Frugalware-darcs] frugalware-current: tftp-hpa-0.48-1-i686 Message-ID: <20070201125449.12463FA401B@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070201125239-e2957-b1518f4d51ed2f9e51756e8e24aac856ea9ad8ea.gz; [tftp-hpa-0.48-1-i686 VMiklos **20070201125239 version bump ] { hunk ./source/network-extra/tftp-hpa/FrugalBuild 5 -pkgver=0.47 +pkgver=0.48 } From vmiklos at frugalware.org Thu Feb 1 14:06:23 2007 From: vmiklos at frugalware.org (VMiklos) Date: Thu Feb 1 14:06:26 2007 Subject: [Frugalware-darcs] pacman-g2: makepkg: whitespace fixes Message-ID: <20070201130623.7DBECFA4083@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman-g2;a=darcs_commitdiff;h=20070201130135-e2957-790ac98e054d93ea5d44279749df5c9ffd95d77a.gz; [makepkg: whitespace fixes VMiklos **20070201130135] { hunk ./scripts/makepkg 1268 - cd ${startdir} - if [ "`grep -c sha1sums= ${BUILDSCRIPT}`" -gt 1 ]; then - error "${BUILDSCRIPT} contain more than one sha1sums, please update manually" - exit 1 - fi - if grep -q sha1sums= ${BUILDSCRIPT}; then - Fmessage "updating \$sha1sums() in the FrugalBuild." - if grep -q '^sha1sums.*)' ${BUILDSCRIPT}; then - sed -i "/^sha1sums.*)/d" ${BUILDSCRIPT} - else - sed -i "/^sha1sums/,/)/d" ${BUILDSCRIPT} - fi + cd ${startdir} + if [ "`grep -c sha1sums= ${BUILDSCRIPT}`" -gt 1 ]; then + error "${BUILDSCRIPT} contain more than one sha1sums, please update manually" + exit 1 + fi + if grep -q sha1sums= ${BUILDSCRIPT}; then + Fmessage "updating \$sha1sums() in the FrugalBuild." + if grep -q '^sha1sums.*)' ${BUILDSCRIPT}; then + sed -i "/^sha1sums.*)/d" ${BUILDSCRIPT} + else + sed -i "/^sha1sums/,/)/d" ${BUILDSCRIPT} + fi hunk ./scripts/makepkg 1286 - else - error "Initial \$sha1sums() array does not exist, Aborting..." - exit 1 - fi + else + error "Initial \$sha1sums() array does not exist, Aborting..." + exit 1 + fi } From vmiklos at frugalware.org Thu Feb 1 14:06:23 2007 From: vmiklos at frugalware.org (VMiklos) Date: Thu Feb 1 14:06:27 2007 Subject: [Frugalware-darcs] pacman-g2: makepkg: s/error/warning/ if initial sha1sums() array does not exist Message-ID: <20070201130623.138F3FA401B@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman-g2;a=darcs_commitdiff;h=20070201130340-e2957-5fd12365a1e3a2fb8b33e2904ac234cea691ea7b.gz; [makepkg: s/error/warning/ if initial sha1sums() array does not exist VMiklos **20070201130340 for example this is the case when we use signatures() and then the right thing to do is not doing anything, while the error means that we tried to update sha1sums() just we failed (to download source or so) ] { hunk ./scripts/makepkg 1287 - error "Initial \$sha1sums() array does not exist, Aborting..." - exit 1 + warning "Initial \$sha1sums() array does not exist, Aborting..." } From vmiklos at frugalware.org Thu Feb 1 15:55:08 2007 From: vmiklos at frugalware.org (VMiklos) Date: Thu Feb 1 15:55:10 2007 Subject: [Frugalware-darcs] pacman-g2: makepkg: don't run -Syu two times Message-ID: <20070201145508.B102CFA4024@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman-g2;a=darcs_commitdiff;h=20070201145155-e2957-788dfb0037c435a011f50ba12ee70b7d45788ab6.gz; [makepkg: don't run -Syu two times VMiklos **20070201145155 the old method was: -Syu --noconfirm (upgrade all or upgrade pacman only) -Su --noconfirm (do nothing or upgrade all) the new method: -Sy $PACMAN --ask 95 (upgrade pacman if no newer version available) -Su (upgrade all) ] { hunk ./scripts/makepkg 919 - /usr/sbin/chroot "$CHROOTDIR" $PACMAN -Syu --noconfirm && \ + /usr/sbin/chroot "$CHROOTDIR" $PACMAN -Sy $PACMAN --ask 95 && \ } From vmiklos at frugalware.org Thu Feb 1 15:59:54 2007 From: vmiklos at frugalware.org (VMiklos) Date: Thu Feb 1 15:59:56 2007 Subject: [Frugalware-darcs] pacman-g2: makepkg: oops, missing "yes" to the "proceed with upgrade?" question Message-ID: <20070201145954.A1DA8FA401B@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman-g2;a=darcs_commitdiff;h=20070201145804-e2957-554169f639cbdc8aefb0153c1161f5768ab31fec.gz; [makepkg: oops, missing "yes" to the "proceed with upgrade?" question VMiklos **20070201145804] { hunk ./scripts/makepkg 919 - /usr/sbin/chroot "$CHROOTDIR" $PACMAN -Sy $PACMAN --ask 95 && \ + echo | /usr/sbin/chroot "$CHROOTDIR" $PACMAN -Sy $PACMAN --ask 95 && \ } From vmiklos at frugalware.org Thu Feb 1 16:05:20 2007 From: vmiklos at frugalware.org (VMiklos) Date: Thu Feb 1 16:05:31 2007 Subject: [Frugalware-darcs] pacman-g2: makepkg: echo -> yes "" Message-ID: <20070201150522.134B2FA401B@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman-g2;a=darcs_commitdiff;h=20070201150220-e2957-e0f4266dfadf66790b07bcc7846c90182a00905e.gz; [makepkg: echo -> yes "" VMiklos **20070201150220 this should be the same at the moment, but who knows - maybe later we'll have more non-alpm-related questions and then this way we'll not break non-interactive builds (since makepkg is never interactive, everybody assumes) ] { hunk ./scripts/makepkg 919 - echo | /usr/sbin/chroot "$CHROOTDIR" $PACMAN -Sy $PACMAN --ask 95 && \ + yes "" | /usr/sbin/chroot "$CHROOTDIR" $PACMAN -Sy $PACMAN --ask 95 && \ } From vmiklos at frugalware.org Thu Feb 1 16:51:05 2007 From: vmiklos at frugalware.org (VMiklos) Date: Thu Feb 1 16:51:06 2007 Subject: [Frugalware-darcs] setup: madwifi-ng -> madwifi Message-ID: <20070201155105.1BC12FA4024@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=setup;a=darcs_commitdiff;h=20070201154928-e2957-fcded8695014c1c339aa322152e6d4fb6fe25314.gz; [madwifi-ng -> madwifi VMiklos **20070201154928 a simple rename, just forgot to update the setup ] { hunk ./Makefile 423 -madwifi-ng: +madwifi: hunk ./Makefile 425 - mkdir -p madwifi-ng/usr/bin + mkdir -p madwifi/usr/bin hunk ./Makefile 427 - cp -a lib ../madwifi-ng/; \ - cp -a usr/bin/wlanconfig ../madwifi-ng/usr/bin/ + cp -a lib ../madwifi/; \ + cp -a usr/bin/wlanconfig ../madwifi/usr/bin/ hunk ./configure.py 15 - 'readline', 'acx100', 'shadow', 'madwifi-ng', 'rt2500'] + 'readline', 'acx100', 'shadow', 'madwifi', 'rt2500'] } From alex at alex-smith.me.uk Thu Feb 1 17:40:51 2007 From: alex at alex-smith.me.uk (AlexExtreme) Date: Thu Feb 1 17:40:53 2007 Subject: [Frugalware-darcs] frugalware-current: pango-1.15.5-1-i686 Message-ID: <20070201164051.A9998FA401B@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070201163610-46e39-ebad9c435756cc50245229c08229fe849a931ea9.gz; [pango-1.15.5-1-i686 AlexExtreme **20070201163610 * Version bump ] { hunk ./source/gnome/pango/FrugalBuild 5 -pkgver=1.15.3 +pkgver=1.15.5 hunk ./source/gnome/pango/FrugalBuild 9 -depends=('cairo>=1.2.4' 'glib2>=2.12.7' 'libxft') +depends=('cairo>=1.2.4' 'glib2>=2.12.9' 'libxft') hunk ./source/gnome/pango/FrugalBuild 15 -sha1sums=('354ac39eaddd2513cb96b0afdd7ceb56e52180b8') +sha1sums=('f453eeb6bb8614901850627856f6a9a2a00db972') } From vmiklos at frugalware.org Thu Feb 1 17:42:33 2007 From: vmiklos at frugalware.org (VMiklos) Date: Thu Feb 1 17:42:35 2007 Subject: [Frugalware-darcs] pacman-tools: genchangelog: whitespace fixes Message-ID: <20070201164233.59C28FA401B@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman-tools;a=darcs_commitdiff;h=20070201160626-e2957-aa43f04bb5273afac946a332c28a075f40b0c290.gz; [genchangelog: whitespace fixes VMiklos **20070201160626] { hunk ./genchangelog 41 -echo "downloading missing source files..." + echo "downloading missing source files..." hunk ./genchangelog 43 -for i in ${source[@]} ${signatures[@]} -do - [[ "$i" =~ "http://ftp.frugalware.org" ]] && continue - file=`strip_url $i` - if [ ! -e $file ]; then - echo "downloading $file..." - $FTPAGENT $i - fi -done + for i in ${source[@]} ${signatures[@]} + do + [[ "$i" =~ "http://ftp.frugalware.org" ]] && continue + file=`strip_url $i` + if [ ! -e $file ]; then + echo "downloading $file..." + $FTPAGENT $i + fi + done } From vmiklos at frugalware.org Thu Feb 1 17:42:33 2007 From: vmiklos at frugalware.org (VMiklos) Date: Thu Feb 1 17:42:37 2007 Subject: [Frugalware-darcs] pacman-tools: genchangelog: support for options=('nomirror') Message-ID: <20070201164234.00201FA401B@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman-tools;a=darcs_commitdiff;h=20070201160554-e2957-0649894a58712a6f3fb446752fc2c56c3fe6950a.gz; [genchangelog: support for options=('nomirror') VMiklos **20070201160554] { hunk ./genchangelog 40 +if [ ! "`check_option NOMIRROR`" ]; then hunk ./genchangelog 52 +fi } From alex at alex-smith.me.uk Thu Feb 1 18:07:09 2007 From: alex at alex-smith.me.uk (AlexExtreme) Date: Thu Feb 1 18:07:10 2007 Subject: [Frugalware-darcs] frugalware-current: gnome-vfs-2.17.90-1-i686 Message-ID: <20070201170709.60979FA401B@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070201170206-46e39-cec1fb226957e55e5c96cb6b905e5be929ac7966.gz; [gnome-vfs-2.17.90-1-i686 AlexExtreme **20070201170206 * Version bump ] { hunk ./source/gnome/gnome-vfs/FrugalBuild 6 -pkgver=2.17.2 +pkgver=2.17.90 hunk ./source/gnome/gnome-vfs/FrugalBuild 10 -depends=('gconf>=2.14.0-4' 'bzip2' 'hal>=0.5.7.1-3' 'dbus-glib>=0.71' 'gnome-mime-data' 'gamin' \ +depends=('gconf>=2.14.0-4' 'bzip2' 'hal>=0.5.8.1-1' 'dbus-glib>=0.71' 'gnome-mime-data' 'gamin' \ hunk ./source/gnome/gnome-vfs/FrugalBuild 27 -sha1sums=('e7692edabf1431f7436f7174e7ff2b9af5f0e5e8' \ +sha1sums=('73bf8b11efac2eb74a11d20c4a9ece60fd9291da' \ } From alex at alex-smith.me.uk Thu Feb 1 18:47:01 2007 From: alex at alex-smith.me.uk (AlexExtreme) Date: Thu Feb 1 18:47:03 2007 Subject: [Frugalware-darcs] frugalware-current: libbonobo-2.17.90-1-i686 Message-ID: <20070201174701.693C6FA4024@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070201174343-46e39-4876317b5e72114ce879332fee69734e3e59d2aa.gz; [libbonobo-2.17.90-1-i686 AlexExtreme **20070201174343 * Version bump ] { hunk ./source/gnome/libbonobo/FrugalBuild 5 -pkgver=2.16.0 +pkgver=2.17.90 hunk ./source/gnome/libbonobo/FrugalBuild 16 -sha1sums=('8cafcd9ef92f7b81e7cc1868814add3b6794af0a' \ +sha1sums=('13d765b9adca3ba41a6db9b003dc08ed0561b379' \ } From crazy at frugalware.org Thu Feb 1 19:42:04 2007 From: crazy at frugalware.org (crazy) Date: Thu Feb 1 19:42:07 2007 Subject: [Frugalware-darcs] frugalware-current: apollon-1.0.2.1-1-i686 Message-ID: <20070201184205.14826FA401B@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070201183803-f6986-fc92be0d53af3862f1785a65f99531a922b9f9d8.gz; [apollon-1.0.2.1-1-i686 crazy **20070201183803 * Fix Finclude kde ] { hunk ./source/kde-extra/apollon/FrugalBuild 12 -Finclude sourceforge kdeapps +_F_kde_defaults=0 +Finclude sourceforge kde } From crazy at frugalware.org Thu Feb 1 23:06:25 2007 From: crazy at frugalware.org (crazy) Date: Thu Feb 1 23:06:29 2007 Subject: [Frugalware-darcs] frugalware-current: gnupg2-2.0.2-1-i686 Message-ID: <20070201220625.AA747FA401B@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070201220152-f6986-6ca0fd82c0d9ea51f61d66742b2b90bb68672013.gz; [gnupg2-2.0.2-1-i686 crazy **20070201220152 * Version bump ] { hunk ./source/apps/gnupg2/CVE-2006-6235.patch 1 -diff -Naur gnupg-2.0.1/g10/encr-data.c gnupg-2.0.1-sec/g10/encr-data.c ---- gnupg-2.0.1/g10/encr-data.c 2006-10-02 12:50:13.000000000 +0200 -+++ gnupg-2.0.1-sec/g10/encr-data.c 2007-01-04 02:25:11.000000000 +0100 -@@ -39,14 +39,35 @@ - static int decode_filter ( void *opaque, int control, IOBUF a, - byte *buf, size_t *ret_len); - --typedef struct -+typedef struct decode_filter_context_s - { - gcry_cipher_hd_t cipher_hd; - gcry_md_hd_t mdc_hash; - char defer[22]; - int defer_filled; - int eof_seen; --} decode_filter_ctx_t; -+ int refcount; -+} *decode_filter_ctx_t; -+ -+ -+/* Helper to release the decode context. */ -+static void -+release_dfx_context (decode_filter_ctx_t dfx) -+{ -+ if (!dfx) -+ return; -+ -+ assert (dfx->refcount); -+ if ( !--dfx->refcount ) -+ { -+ gcry_cipher_close (dfx->cipher_hd); -+ dfx->cipher_hd = NULL; -+ gcry_md_close (dfx->mdc_hash); -+ dfx->mdc_hash = NULL; -+ xfree (dfx); -+ } -+} -+ - - - /**************** -@@ -62,7 +83,11 @@ - unsigned blocksize; - unsigned nprefix; - -- memset( &dfx, 0, sizeof dfx ); -+ dfx = xtrycalloc (1, sizeof *dfx); -+ if (!dfx) -+ return gpg_error_from_syserror (); -+ dfx->refcount = 1; -+ - if ( opt.verbose && !dek->algo_info_printed ) - { - const char *s = gcry_cipher_algo_name (dek->algo); -@@ -77,20 +102,20 @@ - goto leave; - blocksize = gcry_cipher_get_algo_blklen (dek->algo); - if ( !blocksize || blocksize > 16 ) -- log_fatal("unsupported blocksize %u\n", blocksize ); -+ log_fatal ("unsupported blocksize %u\n", blocksize ); - nprefix = blocksize; - if ( ed->len && ed->len < (nprefix+2) ) - BUG(); - - if ( ed->mdc_method ) - { -- if (gcry_md_open (&dfx.mdc_hash, ed->mdc_method, 0 )) -+ if (gcry_md_open (&dfx->mdc_hash, ed->mdc_method, 0 )) - BUG (); - if ( DBG_HASHING ) -- gcry_md_start_debug (dfx.mdc_hash, "checkmdc"); -+ gcry_md_start_debug (dfx->mdc_hash, "checkmdc"); - } - -- rc = gcry_cipher_open (&dfx.cipher_hd, dek->algo, -+ rc = gcry_cipher_open (&dfx->cipher_hd, dek->algo, - GCRY_CIPHER_MODE_CFB, - (GCRY_CIPHER_SECURE - | ((ed->mdc_method || dek->algo >= 100)? -@@ -104,7 +129,7 @@ - - - /* log_hexdump( "thekey", dek->key, dek->keylen );*/ -- rc = gcry_cipher_setkey (dfx.cipher_hd, dek->key, dek->keylen); -+ rc = gcry_cipher_setkey (dfx->cipher_hd, dek->key, dek->keylen); - if ( gpg_err_code (rc) == GPG_ERR_WEAK_KEY ) - { - log_info(_("WARNING: message was encrypted with" -@@ -123,7 +148,7 @@ - goto leave; - } - -- gcry_cipher_setiv (dfx.cipher_hd, NULL, 0); -+ gcry_cipher_setiv (dfx->cipher_hd, NULL, 0); - - if ( ed->len ) - { -@@ -144,8 +169,8 @@ - temp[i] = c; - } - -- gcry_cipher_decrypt (dfx.cipher_hd, temp, nprefix+2, NULL, 0); -- gcry_cipher_sync (dfx.cipher_hd); -+ gcry_cipher_decrypt (dfx->cipher_hd, temp, nprefix+2, NULL, 0); -+ gcry_cipher_sync (dfx->cipher_hd); - p = temp; - /* log_hexdump( "prefix", temp, nprefix+2 ); */ - if (dek->symmetric -@@ -155,17 +180,18 @@ - goto leave; - } - -- if ( dfx.mdc_hash ) -- gcry_md_write (dfx.mdc_hash, temp, nprefix+2); -- -+ if ( dfx->mdc_hash ) -+ gcry_md_write (dfx->mdc_hash, temp, nprefix+2); -+ -+ dfx->refcount++; - if ( ed->mdc_method ) -- iobuf_push_filter( ed->buf, mdc_decode_filter, &dfx ); -+ iobuf_push_filter ( ed->buf, mdc_decode_filter, dfx ); - else -- iobuf_push_filter( ed->buf, decode_filter, &dfx ); -+ iobuf_push_filter ( ed->buf, decode_filter, dfx ); - - proc_packets ( procctx, ed->buf ); - ed->buf = NULL; -- if ( ed->mdc_method && dfx.eof_seen == 2 ) -+ if ( ed->mdc_method && dfx->eof_seen == 2 ) - rc = gpg_error (GPG_ERR_INV_PACKET); - else if ( ed->mdc_method ) - { -@@ -184,26 +210,28 @@ - bytes are appended. */ - int datalen = gcry_md_get_algo_dlen (ed->mdc_method); - -- gcry_cipher_decrypt (dfx.cipher_hd, dfx.defer, 22, NULL, 0); -- gcry_md_write (dfx.mdc_hash, dfx.defer, 2); -- gcry_md_final (dfx.mdc_hash); -+ assert (dfx->cipher_hd); -+ assert (dfx->mdc_hash); -+ gcry_cipher_decrypt (dfx->cipher_hd, dfx->defer, 22, NULL, 0); -+ gcry_md_write (dfx->mdc_hash, dfx->defer, 2); -+ gcry_md_final (dfx->mdc_hash); - -- if (dfx.defer[0] != '\xd3' || dfx.defer[1] != '\x14' ) -+ if (dfx->defer[0] != '\xd3' || dfx->defer[1] != '\x14' ) - { - log_error("mdc_packet with invalid encoding\n"); - rc = gpg_error (GPG_ERR_INV_PACKET); - } - else if (datalen != 20 -- || memcmp (gcry_md_read (dfx.mdc_hash, 0),dfx.defer+2,datalen)) -+ || memcmp (gcry_md_read (dfx->mdc_hash, 0), -+ dfx->defer+2,datalen )) - rc = gpg_error (GPG_ERR_BAD_SIGNATURE); -- /* log_printhex("MDC message:", dfx.defer, 22); */ -- /* log_printhex("MDC calc:", gcry_md_read (dfx.mdc_hash,0), datalen); */ -+ /* log_printhex("MDC message:", dfx->defer, 22); */ -+ /* log_printhex("MDC calc:", gcry_md_read (dfx->mdc_hash,0), datalen); */ - } - - - leave: -- gcry_cipher_close (dfx.cipher_hd); -- gcry_md_close (dfx.mdc_hash); -+ release_dfx_context (dfx); - return rc; - } - -@@ -214,7 +242,7 @@ - mdc_decode_filter (void *opaque, int control, IOBUF a, - byte *buf, size_t *ret_len) - { -- decode_filter_ctx_t *dfx = opaque; -+ decode_filter_ctx_t dfx = opaque; - size_t n, size = *ret_len; - int rc = 0; - int c; -@@ -226,11 +254,11 @@ - } - else if( control == IOBUFCTRL_UNDERFLOW ) - { -- assert(a); -- assert( size > 44 ); -+ assert (a); -+ assert ( size > 44 ); - - /* Get at least 22 bytes and put it somewhere ahead in the buffer. */ -- for(n=22; n < 44 ; n++ ) -+ for (n=22; n < 44 ; n++ ) - { - if( (c = iobuf_get(a)) == -1 ) - break; -@@ -279,8 +307,10 @@ - - if ( n ) - { -- gcry_cipher_decrypt (dfx->cipher_hd, buf, n, NULL, 0); -- gcry_md_write (dfx->mdc_hash, buf, n); -+ if ( dfx->cipher_hd ) -+ gcry_cipher_decrypt (dfx->cipher_hd, buf, n, NULL, 0); -+ if ( dfx->mdc_hash ) -+ gcry_md_write (dfx->mdc_hash, buf, n); - } - else - { -@@ -289,6 +319,10 @@ - } - *ret_len = n; - } -+ else if ( control == IOBUFCTRL_FREE ) -+ { -+ release_dfx_context (dfx); -+ } - else if ( control == IOBUFCTRL_DESC ) - { - *(char**)buf = "mdc_decode_filter"; -@@ -300,7 +334,7 @@ - static int - decode_filter( void *opaque, int control, IOBUF a, byte *buf, size_t *ret_len) - { -- decode_filter_ctx_t *fc = opaque; -+ decode_filter_ctx_t fc = opaque; - size_t n, size = *ret_len; - int rc = 0; - -@@ -311,11 +345,18 @@ - if ( n == -1 ) - n = 0; - if ( n ) -- gcry_cipher_decrypt (fc->cipher_hd, buf, n, NULL, 0); -+ { -+ if (fc->cipher_hd) -+ gcry_cipher_decrypt (fc->cipher_hd, buf, n, NULL, 0); -+ } - else - rc = -1; /* EOF */ - *ret_len = n; - } -+ else if ( control == IOBUFCTRL_FREE ) -+ { -+ release_dfx_context (fc); -+ } - else if ( control == IOBUFCTRL_DESC ) - { - *(char**)buf = "decode_filter"; rmfile ./source/apps/gnupg2/CVE-2006-6235.patch hunk ./source/apps/gnupg2/FrugalBuild 6 -pkgver=2.0.1 -pkgrel=2 +pkgver=2.0.2 +pkgrel=1 hunk ./source/apps/gnupg2/FrugalBuild 16 -source=(ftp://ftp.gnupg.org/gcrypt/$origname/$origname-$pkgver.tar.bz2 \ - CVE-2006-6235.patch) -sha1sums=('ec84ffb1d2ac013dc0afb5bdf8b9df2c838673e9' \ - '7819a22fa03c8d6011132c5fd6c87b9499691c46') +source=(ftp://ftp.gnupg.org/gcrypt/$origname/$origname-$pkgver.tar.bz2) hunk ./source/apps/gnupg2/FrugalBuild 43 +sha1sums=('1a3165c5b601f3244b8885143d02bea4210495e3') } From vmiklos at frugalware.org Fri Feb 2 00:15:14 2007 From: vmiklos at frugalware.org (VMiklos) Date: Fri Feb 2 00:15:19 2007 Subject: [Frugalware-darcs] frugalware-current: 915resolution-0.5.2-1-x86_64 Message-ID: <20070201231514.D2AE2FA401B@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070201231420-e2957-5c480a33293077c480fe4ffd7fc04c90821cb108.gz; [915resolution-0.5.2-1-x86_64 VMiklos **20070201231420 added x86_64 to archs() ] { hunk ./source/apps-extra/915resolution/FrugalBuild 12 -archs=('i686') +archs=('i686' 'x86_64') } From vmiklos at frugalware.org Fri Feb 2 00:23:29 2007 From: vmiklos at frugalware.org (VMiklos) Date: Fri Feb 2 00:23:32 2007 Subject: [Frugalware-darcs] frugalware-current: acoc-0.7.1-1-x86_64 Message-ID: <20070201232329.AB9DAFA401B@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070201232212-e2957-5bc5fc2aa449d2a6e3db01d4089998c54803d6ee.gz; [acoc-0.7.1-1-x86_64 VMiklos **20070201232212 added x86_64 to archs() ] { hunk ./source/apps-extra/acoc/FrugalBuild 12 -archs=('i686') +archs=('i686' 'x86_64') } From vmiklos at frugalware.org Fri Feb 2 00:30:02 2007 From: vmiklos at frugalware.org (VMiklos) Date: Fri Feb 2 00:30:22 2007 Subject: [Frugalware-darcs] frugalware-current: cdrkit-1.1.2-2-x86_64 Message-ID: <20070201233003.E3FEDFA401B@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070201233001-e2957-c06a1a1d55fbe0626ac9f568efa1761d8a087386.gz; [cdrkit-1.1.2-2-x86_64 VMiklos **20070201233001 added x86_64 to archs() ] { hunk ./source/apps-extra/cdrkit/FrugalBuild 12 -archs=('i686') +archs=('i686' 'x86_64') } From vmiklos at frugalware.org Fri Feb 2 00:35:03 2007 From: vmiklos at frugalware.org (VMiklos) Date: Fri Feb 2 00:35:06 2007 Subject: [Frugalware-darcs] frugalware-current: sub2srt-0.5.3-1-x86_64 Message-ID: <20070201233503.DCBA6FA4083@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070201233450-e2957-93146cd840e2eefd4607ac9a97321c38891b4b18.gz; [sub2srt-0.5.3-1-x86_64 VMiklos **20070201233450 added x86_64 to archs() ] { hunk ./source/apps-extra/sub2srt/FrugalBuild 12 -archs=('i686') +archs=('i686' 'x86_64') } From vmiklos at frugalware.org Fri Feb 2 00:38:24 2007 From: vmiklos at frugalware.org (VMiklos) Date: Fri Feb 2 00:38:26 2007 Subject: [Frugalware-darcs] frugalware-current: tpctl-4.17-1-x86_64 Message-ID: <20070201233824.CB593FA4024@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070201233846-e2957-b05925a9ce42bbd271b9164c3005bb3d1cdd9ee7.gz; [tpctl-4.17-1-x86_64 VMiklos **20070201233846 added x86_64 to archs() ] { hunk ./source/apps-extra/tpctl/FrugalBuild 12 -archs=('i686') +archs=('i686' 'x86_64') } From vmiklos at frugalware.org Fri Feb 2 00:47:10 2007 From: vmiklos at frugalware.org (VMiklos) Date: Fri Feb 2 00:47:20 2007 Subject: [Frugalware-darcs] frugalware-current: truecrypt-4.2a-2-x86_64 Message-ID: <20070201234710.547C8FA401B@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070201234555-e2957-ad16d94fda1343941037f2e6599ddd239fdcbc04.gz; [truecrypt-4.2a-2-x86_64 VMiklos **20070201234555 added x86_64 to archs() ] { hunk ./source/apps-extra/truecrypt/FrugalBuild 12 -archs=('i686') +archs=('i686' 'x86_64') } From vmiklos at frugalware.org Fri Feb 2 00:51:44 2007 From: vmiklos at frugalware.org (VMiklos) Date: Fri Feb 2 00:51:45 2007 Subject: [Frugalware-darcs] frugalware-current: unrtf-0.20.2-1-x86_64 Message-ID: <20070201235144.B47D1FA4024@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070201235210-e2957-1d3732cef82b85a15f9634c8a3d9e354147c63a3.gz; [unrtf-0.20.2-1-x86_64 VMiklos **20070201235210 added x86_64 to archs() ] { hunk ./source/apps-extra/unrtf/FrugalBuild 12 -archs=('i686') +archs=('i686' 'x86_64') } From crazy at frugalware.org Fri Feb 2 00:55:58 2007 From: crazy at frugalware.org (crazy) Date: Fri Feb 2 00:56:00 2007 Subject: [Frugalware-darcs] frugalware-current: new m8r Message-ID: <20070201235558.99816FA401B@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070201234926-f6986-98d3cbbac101671aefaa7d0ed142cbe3a02fb4d6.gz; [new m8r crazy **20070201234926 * changed m8r to myself in 24 packages from slin * ( lib*,kde*,apps*,devel*,base* ) ] { hunk ./source/apps/dosemu/FrugalBuild 2 -# Maintainer: Karoly CZOVEK +# Maintainer: crazy hunk ./source/apps-extra/bastet/FrugalBuild 2 -# Maintainer: Karoly CZOVEK +# Maintainer: crazy hunk ./source/apps-extra/logwatch/FrugalBuild 2 -# Maintainer: Karoly CZOVEK +# Maintainer: crazy hunk ./source/devel/expect/FrugalBuild 2 -# Maintainer: Karoly CZOVEK +# Maintainer: crazy hunk ./source/devel/perl-convert-tnef/FrugalBuild 2 -# Maintainer: Karoly CZOVEK +# Maintainer: crazy hunk ./source/devel/perl-html-template/FrugalBuild 2 -# Maintainer: Karoly CZOVEK +# Maintainer: crazy hunk ./source/devel/perl-io-zlib/FrugalBuild 2 -# Maintainer: Karoly CZOVEK +# Maintainer: crazy hunk ./source/devel/perl-net-server/FrugalBuild 2 -# Maintainer: Karoly CZOVEK +# Maintainer: crazy hunk ./source/devel-extra/perl-archive-tar/FrugalBuild 2 -# Maintainer: Karoly CZOVEK +# Maintainer: crazy hunk ./source/devel-extra/perl-berkeleydb/FrugalBuild 2 -# Maintainer: Karoly CZOVEK +# Maintainer: crazy hunk ./source/devel-extra/perl-convert-uulib/FrugalBuild 2 -# Maintainer: Karoly CZOVEK +# Maintainer: crazy hunk ./source/devel-extra/perl-freezethaw/FrugalBuild 2 -# Maintainer: Karoly CZOVEK +# Maintainer: crazy hunk ./source/devel-extra/perl-io-stringy/FrugalBuild 2 -# Maintainer: Karoly CZOVEK +# Maintainer: crazy hunk ./source/devel-extra/perl-mailtools/FrugalBuild 2 -# Maintainer: Karoly CZOVEK +# Maintainer: crazy hunk ./source/devel-extra/perl-mime-tools/FrugalBuild 2 -# Maintainer: Karoly CZOVEK +# Maintainer: crazy hunk ./source/devel-extra/perl-mldbm/FrugalBuild 2 -# Maintainer: Karoly CZOVEK +# Maintainer: crazy hunk ./source/devel-extra/perl-pod-escapes/FrugalBuild 2 -# Maintainer: Karoly CZOVEK +# Maintainer: crazy hunk ./source/devel-extra/perl-pod-simple/FrugalBuild 2 -# Maintainer: Karoly CZOVEK +# Maintainer: crazy hunk ./source/devel-extra/perl-test-builder-tester/FrugalBuild 2 -# Maintainer: Karoly CZOVEK +# Maintainer: crazy hunk ./source/devel-extra/perl-test-pod/FrugalBuild 2 -# Maintainer: Karoly CZOVEK +# Maintainer: crazy hunk ./source/devel-extra/perl-unix-syslog/FrugalBuild 2 -# Maintainer: Karoly CZOVEK +# Maintainer: crazy hunk ./source/kde-extra/kvirc/FrugalBuild 2 -# Maintainer: Karoly CZOVEK +# Maintainer: crazy hunk ./source/lib/cgilib/FrugalBuild 2 -# Maintainer: Karoly CZOVEK +# Maintainer: crazy hunk ./source/lib/gd/FrugalBuild 2 -# Maintainer: Karoly CZOVEK +# Maintainer: crazy } From vmiklos at frugalware.org Fri Feb 2 01:01:22 2007 From: vmiklos at frugalware.org (VMiklos) Date: Fri Feb 2 01:01:37 2007 Subject: [Frugalware-darcs] frugalware-current: nvi-1.79-1-x86_64 Message-ID: <20070202000123.1196DFA4083@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070202000034-e2957-24f813d580d195268cf14f25bfb969590612c2ea.gz; [nvi-1.79-1-x86_64 VMiklos **20070202000034 added x86_64 to archs() ] { hunk ./source/base/nvi/FrugalBuild 11 -archs=('i686') +archs=('i686' 'x86_64') } From vmiklos at frugalware.org Fri Feb 2 02:07:09 2007 From: vmiklos at frugalware.org (VMiklos) Date: Fri Feb 2 02:07:12 2007 Subject: [Frugalware-darcs] frugalware-current: xmlto-0.0.18-1-x86_64 Message-ID: <20070202010709.A49DBFA401B@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070202010426-e2957-01e96362e2a0e4a87c617fff090baae63573cae4.gz; [xmlto-0.0.18-1-x86_64 VMiklos **20070202010426 added x86_64 to archs() fixed chroot build(), thx crazy ] { hunk ./source/apps-extra/xmlto/FrugalBuild 10 +makedepends=('docbook-xml' 'docbook-xsl' 'sgml-common') hunk ./source/apps-extra/xmlto/FrugalBuild 12 -archs=('i686') +archs=('i686' 'x86_64') hunk ./source/apps-extra/xmlto/FrugalBuild 15 +options=('scriptlet') hunk ./source/apps-extra/xmlto/FrugalBuild 17 - -# TODO: build fails in chroot - } From vmiklos at frugalware.org Fri Feb 2 02:23:34 2007 From: vmiklos at frugalware.org (VMiklos) Date: Fri Feb 2 02:23:36 2007 Subject: [Frugalware-darcs] frugalware-current: perl-enum-1.016-1-x86_64 Message-ID: <20070202012334.DAA60FA401B@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070202011845-e2957-5560e398fdcb1546eff946c46c9728c9125e1c6d.gz; [perl-enum-1.016-1-x86_64 VMiklos **20070202011845 added x86_64 to archs() ] { hunk ./source/devel/perl-enum/FrugalBuild 12 +archs=('i686' 'x86_64') } From crazy at frugalware.org Fri Feb 2 02:51:20 2007 From: crazy at frugalware.org (crazy) Date: Fri Feb 2 02:51:21 2007 Subject: [Frugalware-darcs] frugalware-current: perl-html-template-2.9-1-i686 Message-ID: <20070202015120.5032EFA401B@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070202014718-f6986-c47961dd25cfa2b93a5d9a66c27dd16523fc392c.gz; [perl-html-template-2.9-1-i686 crazy **20070202014718 * Version bump ] { hunk ./source/devel/perl-html-template/FrugalBuild 6 -pkgver=2.8 +pkgver=2.9 hunk ./source/devel/perl-html-template/FrugalBuild 11 -sha1sums=('b0e319634a1538c0915f4deaa7a42c2f5365362f') hunk ./source/devel/perl-html-template/FrugalBuild 12 +sha1sums=('e4017deb1e41f34bb578f0a401301b4825e5434c') } From crazy at frugalware.org Fri Feb 2 03:00:57 2007 From: crazy at frugalware.org (crazy) Date: Fri Feb 2 03:01:07 2007 Subject: [Frugalware-darcs] frugalware-current: kiwi-1.9.13-1-i686 Message-ID: <20070202020057.B8365FA401B@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070202015555-f6986-f433e6e13dd6b745fc36606a1f33857c7593f6da.gz; [kiwi-1.9.13-1-i686 crazy **20070202015555 * Version bump ] { hunk ./source/xlib-extra/kiwi/FrugalBuild 6 -pkgver=1.9.12 +pkgver=1.9.13 hunk ./source/xlib-extra/kiwi/FrugalBuild 15 -sha1sums=('199e90bff13c9cdbfe6df4b3fadee52590eddce2') +sha1sums=('f5c5dc47924415cc4596b92ed9d218260b4b726a') } From crazy at frugalware.org Fri Feb 2 03:03:20 2007 From: crazy at frugalware.org (crazy) Date: Fri Feb 2 03:03:25 2007 Subject: [Frugalware-darcs] wx: vlc-0.8.6-4-i686 Message-ID: <20070202020321.5BE38FA401B@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=wx;a=darcs_commitdiff;h=20070202015954-f6986-d2b318717947522aa210871324e24abe46530e85.gz; [vlc-0.8.6-4-i686 crazy **20070202015954 * synced with -current changes * s/sha1sums/signatures/ :) ] { addfile ./source/xmultimedia-extra/vlc/vlc-0.8.6-flac113.diff hunk ./source/xmultimedia-extra/vlc/FrugalBuild 7 -pkgrel=3 +pkgrel=4 hunk ./source/xmultimedia-extra/vlc/FrugalBuild 12 - 'libxv' 'sdlimage' 'libcdio' 'libid3tag' 'libtheora' 'faad2' 'libmodplug' 'vcdimager' 'libxcb') + 'libxv' 'sdlimage' 'libcdio' 'libid3tag' 'libtheora' 'faad2' 'libmodplug' 'vcdimager' 'libxcb' 'flac>=1.1.3') hunk ./source/xmultimedia-extra/vlc/FrugalBuild 20 - wxgtk-2.8.patch fix_not_logical_skins2_check.patch) -sha1sums=('f04cbc5c0db5e27955bb2d0e66e3f756a5de476e'\ - '888a02c9f81331fce1f6ee5f705ce68e5b486ffd'\ - '0c58c35fe47c4d14cd4d4c8c505863dbfc93f5e0'\ - '50bfbc12fc0ad94178b2e08df22a0b26da36c1d5'\ - '94b9696ebfda8f619d191e36e70d44758e35a607'\ - '262d4f06d71983715ec23dacc6cbdd4c3a8d2334') + wxgtk-2.8.patch fix_not_logical_skins2_check.patch vlc-0.8.6-flac113.diff) +signatures=("${source[0]}.asc" '' '' '' '' '' '') hunk ./source/xmultimedia-extra/vlc/vlc-0.8.6-flac113.diff 1 +--- vlc-0.8.6-clean/modules/codec/flac.c 2006-12-09 01:12:20.000000000 +0000 ++++ vlc-0.8.6/modules/codec/flac.c 2006-12-24 01:34:54.000000000 +0000 +@@ -40,6 +40,10 @@ + + #define MAX_FLAC_HEADER_SIZE 16 + ++#if defined(FLAC_API_VERSION_CURRENT) && FLAC_API_VERSION_CURRENT >= 8 ++# define USE_NEW_FLAC_API ++#endif ++ + /***************************************************************************** + * decoder_sys_t : FLAC decoder descriptor + *****************************************************************************/ +@@ -225,6 +229,25 @@ + return VLC_EGENERIC; + } + ++#ifdef USE_NEW_FLAC_API ++ if( FLAC__stream_decoder_init_stream( p_sys->p_flac, ++ DecoderReadCallback, ++ NULL, ++ NULL, ++ NULL, ++ NULL, ++ DecoderWriteCallback, ++ DecoderMetadataCallback, ++ DecoderErrorCallback, ++ p_dec ) ++ != FLAC__STREAM_DECODER_INIT_STATUS_OK ) ++ { ++ msg_Err( p_dec, "FLAC__stream_decoder_init_stream() failed" ); ++ FLAC__stream_decoder_delete( p_sys->p_flac ); ++ free( p_sys ); ++ return VLC_EGENERIC; ++ } ++#else + FLAC__stream_decoder_set_read_callback( p_sys->p_flac, + DecoderReadCallback ); + FLAC__stream_decoder_set_write_callback( p_sys->p_flac, +@@ -237,6 +260,7 @@ + + FLAC__stream_decoder_init( p_sys->p_flac ); + #endif ++#endif + + /* Set output properties */ + p_dec->fmt_out.i_cat = AUDIO_ES; +@@ -730,16 +754,27 @@ + case FLAC__STREAM_DECODER_END_OF_STREAM: + msg_Dbg( p_dec, "the decoder has reached the end of the stream." ); + break; ++#ifdef USE_NEW_FLAC_API ++ case FLAC__STREAM_DECODER_OGG_ERROR: ++ msg_Err( p_dec, "error occurred in the Ogg layer." ); ++ break; ++ case FLAC__STREAM_DECODER_SEEK_ERROR: ++ msg_Err( p_dec, "error occurred while seeking." ); ++ break; ++#endif + case FLAC__STREAM_DECODER_ABORTED: + msg_Warn( p_dec, "the decoder was aborted by the read callback." ); + break; ++#ifndef USE_NEW_FLAC_API + case FLAC__STREAM_DECODER_UNPARSEABLE_STREAM: + msg_Warn( p_dec, "the decoder encountered reserved fields in use " + "in the stream." ); + break; ++#endif + case FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR: + msg_Err( p_dec, "error when allocating memory." ); + break; ++#ifndef USE_NEW_FLAC_API + case FLAC__STREAM_DECODER_ALREADY_INITIALIZED: + msg_Err( p_dec, "FLAC__stream_decoder_init() was called when the " + "decoder was already initialized, usually because " +@@ -749,6 +784,7 @@ + msg_Err( p_dec, "FLAC__stream_decoder_init() was called without " + "all callbacks being set." ); + break; ++#endif + case FLAC__STREAM_DECODER_UNINITIALIZED: + msg_Err( p_dec, "decoder in uninitialized state." ); + break; +@@ -1183,7 +1219,12 @@ + p_sys->i_samples_delay = 0; + + /* Create flac encoder */ +- p_sys->p_flac = FLAC__stream_encoder_new(); ++ if( !(p_sys->p_flac = FLAC__stream_encoder_new()) ) ++ { ++ msg_Err( p_enc, "FLAC__stream_encoder_new() failed" ); ++ free( p_sys ); ++ return VLC_EGENERIC; ++ } + + FLAC__stream_encoder_set_streamable_subset( p_sys->p_flac, 1 ); + FLAC__stream_encoder_set_channels( p_sys->p_flac, +@@ -1193,15 +1234,32 @@ + FLAC__stream_encoder_set_bits_per_sample( p_sys->p_flac, 16 ); + p_enc->fmt_in.i_codec = AOUT_FMT_S16_NE; + ++ /* Get and store the STREAMINFO metadata block as a p_extra */ ++ p_sys->p_chain = 0; ++ ++#ifdef USE_NEW_FLAC_API ++ if( FLAC__stream_encoder_init_stream( p_sys->p_flac, ++ EncoderWriteCallback, ++ NULL, ++ NULL, ++ EncoderMetadataCallback, ++ p_enc ) ++ != FLAC__STREAM_ENCODER_INIT_STATUS_OK ) ++ { ++ msg_Err( p_enc, "FLAC__stream_encoder_init_stream() failed" ); ++ FLAC__stream_encoder_delete( p_sys->p_flac ); ++ free( p_sys ); ++ return VLC_EGENERIC; ++ } ++#else + FLAC__stream_encoder_set_write_callback( p_sys->p_flac, + EncoderWriteCallback ); + FLAC__stream_encoder_set_metadata_callback( p_sys->p_flac, + EncoderMetadataCallback ); + FLAC__stream_encoder_set_client_data( p_sys->p_flac, p_enc ); + +- /* Get and store the STREAMINFO metadata block as a p_extra */ +- p_sys->p_chain = 0; + FLAC__stream_encoder_init( p_sys->p_flac ); ++#endif + + return VLC_SUCCESS; + } } From crazy at frugalware.org Fri Feb 2 03:06:48 2007 From: crazy at frugalware.org (crazy) Date: Fri Feb 2 03:06:51 2007 Subject: [Frugalware-darcs] wx: TODO Message-ID: <20070202020649.17F22FA401B@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=wx;a=darcs_commitdiff;h=20070202020337-f6986-aa547fc5264d75b5bc722d2a54c85b9dbeb56941.gz; [TODO crazy **20070202020337 * removed wxgtk-u8 and vlc ] { hunk ./TODO 18 -vlc -wxgtk-u8 + } From crazy at frugalware.org Fri Feb 2 03:08:19 2007 From: crazy at frugalware.org (crazy) Date: Fri Feb 2 03:08:21 2007 Subject: [Frugalware-darcs] frugalware-current: dejavu-ttf-2.14-1-i686 Message-ID: <20070202020820.00B69FA4024@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070202020210-f6986-6f0c2658ab47713ca7117decb4173b06e4aeb7e6.gz; [dejavu-ttf-2.14-1-i686 crazy **20070202020210 * up2date fix ] { hunk ./source/x11/dejavu-ttf/FrugalBuild 14 +up2date="lynx -dump http://dejavu.sourceforge.net/wiki/index.php/Download|grep -om1 'dejavu-ttf-\(.*\).tar.bz2'|sed 's/.*f-\(.*\).t.*/\1/'" } From crazy at frugalware.org Fri Feb 2 03:11:33 2007 From: crazy at frugalware.org (crazy) Date: Fri Feb 2 03:11:35 2007 Subject: [Frugalware-darcs] frugalware-current: rebuild.txt Message-ID: <20070202021133.2BF74FA4024@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070202020717-f6986-f99e8347ef0b6d3ff8b8b867e455530bc14e07c7.gz; [rebuild.txt crazy **20070202020717 * added asterisk-addons asterisk koffice to libpqxx ] { hunk ./docs/tech/rebuild.txt 188 +asterisk-addons +asterisk +koffice } From crazy at frugalware.org Fri Feb 2 03:17:35 2007 From: crazy at frugalware.org (crazy) Date: Fri Feb 2 03:17:37 2007 Subject: [Frugalware-darcs] frugalware-current: libpqxx-2.6.9-1-i686 Message-ID: <20070202021735.C0BBEFA4022@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070202021424-f6986-91473193ce9bf6209b615154c453f0d7a9bb9a40.gz; [libpqxx-2.6.9-1-i686 crazy **20070202021424 * Version bump ] { hunk ./source/lib-extra/libpqxx/FrugalBuild 5 -pkgver=2.6.8 -pkgrel=3 +pkgver=2.6.9 +pkgrel=1 hunk ./source/lib-extra/libpqxx/FrugalBuild 16 -sha1sums=('2f963c98b8a79675d537daadc3ba6c313c35f59d') hunk ./source/lib-extra/libpqxx/FrugalBuild 17 +sha1sums=('8be9dcd0375337b170d5c94370fa896911d361f1') } From crazy at frugalware.org Fri Feb 2 03:27:56 2007 From: crazy at frugalware.org (crazy) Date: Fri Feb 2 03:28:00 2007 Subject: [Frugalware-darcs] frugalware-current: koffice-1.6.1-4-i686 Message-ID: <20070202022756.91478FA401B@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070202022302-f6986-161e17b3ba7c8e479a70897051f5f0686a3c2b9a.gz; [koffice-1.6.1-4-i686 crazy **20070202022302 * relbump * readded libpqxx= depends * /me gives some ccache cookies to syncpkgd :P ] { hunk ./source/kde-extra/koffice/FrugalBuild 7 -pkgrel=3 +pkgrel=4 hunk ./source/kde-extra/koffice/FrugalBuild 10 -depends=('libkexif' 'pkgconfig' 'kdebase>=3.5.5' 'libpqxx>=2.6.8-2' 'wv2' 'libmysqlclient' 'libwpd' \ +depends=('libkexif' 'pkgconfig' 'kdebase>=3.5.6' 'libpqxx=2.6.9' 'wv2' 'libmysqlclient' 'libwpd' \ hunk ./source/kde-extra/koffice/FrugalBuild 12 -makedepends=('doxygen' 'qt-docs>=3.3.6' 'kdebindings' 'mysql') +makedepends=('doxygen' 'qt-docs>=3.3.6' 'kdebindings>=3.5.6' 'mysql') hunk ./source/kde-extra/koffice/FrugalBuild 33 +export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing" } From crazy at frugalware.org Fri Feb 2 05:56:24 2007 From: crazy at frugalware.org (crazy) Date: Fri Feb 2 05:56:27 2007 Subject: [Frugalware-darcs] frugalware-current: kpogre-1.5.4-4-i686 Message-ID: <20070202045624.C5FEDFA401B@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070202044955-f6986-3609ec4e62ecadf4fbfbe248379cb612552c37be.gz; [kpogre-1.5.4-4-i686 crazy **20070202044955 * rebuild with libpqxx * added patches to fix the cosmetic 'API' changes like : * foo.h -> foo , Foo -> foo , brrr WTF .. but ohh wellwe do *love* 'backprint and backprint like devels :P' ] { addfile ./source/kde-extra/kpogre/libpqxx-2.6.9-headers.patch addfile ./source/kde-extra/kpogre/libpqxx-2.6.9-API.patch hunk ./source/kde-extra/kpogre/FrugalBuild 6 -pkgrel=3 +pkgrel=4 hunk ./source/kde-extra/kpogre/FrugalBuild 8 -depends=('kdelibs>=3.5.5' 'libpqxx>=2.6.8-3') +depends=('kdelibs>=3.5.6' 'libpqxx=2.6.9') hunk ./source/kde-extra/kpogre/FrugalBuild 11 -Finclude sourceforge kdeapps -source=(${source[@]} desktop_file.patch) -sha1sums=('91579425c21be6e95d037a3e8bf443b89e8168cf' \ - '7e714b084a7a1db28c9935070a0d5c8d7ccb95e3') +_F_kde_defaults=0 +Finclude sourceforge kde +source=(${source[@]} desktop_file.patch libpqxx-2.6.9-API.patch libpqxx-2.6.9-headers.patch) +sha1sums=('91579425c21be6e95d037a3e8bf443b89e8168cf'\ + '7e714b084a7a1db28c9935070a0d5c8d7ccb95e3'\ + '5d6226b750d782ced6029953a3e794b3eb477f2b'\ + 'c9e29ae4474bf42baa2118c8ac1a392a6523351a') hunk ./source/kde-extra/kpogre/libpqxx-2.6.9-API.patch 1 +diff -Naur kpogre-1.5.4/kpogre/DataTable/kpgdatatable.cpp kpogre-1.5.4-p/kpogre/DataTable/kpgdatatable.cpp +--- kpogre-1.5.4/kpogre/DataTable/kpgdatatable.cpp 2006-12-15 13:47:44.000000000 +0100 ++++ kpogre-1.5.4-p/kpogre/DataTable/kpgdatatable.cpp 2007-02-02 05:19:15.000000000 +0100 +@@ -894,7 +894,7 @@ + + try + { +- pqxx::result pqxxResult = pqxxXaction.Exec((std::string) strSql); ++ pqxx::result pqxxResult = pqxxXaction.exec((std::string) strSql); + + if(pqxxResult.size() != 1) + { +@@ -934,7 +934,7 @@ + + try + { +- pqxx::result pqxxResult = pqxxXaction.Exec((std::string) strSql); ++ pqxx::result pqxxResult = pqxxXaction.exec((std::string) strSql); + + if(pqxxResult.size() != 1) + { +diff -Naur kpogre-1.5.4/kpogre/DbObjects/kpgaggregatesfolder.cpp kpogre-1.5.4-p/kpogre/DbObjects/kpgaggregatesfolder.cpp +--- kpogre-1.5.4/kpogre/DbObjects/kpgaggregatesfolder.cpp 2006-12-27 21:35:12.000000000 +0100 ++++ kpogre-1.5.4-p/kpogre/DbObjects/kpgaggregatesfolder.cpp 2007-02-02 05:19:15.000000000 +0100 +@@ -61,7 +61,7 @@ + + try + { +- m_pqxxResultAggregates = pqxxXaction.Exec(strQuery.latin1()); ++ m_pqxxResultAggregates = pqxxXaction.exec(strQuery.latin1()); + + KPGAggregate *pAggregate = 0; + +diff -Naur kpogre-1.5.4/kpogre/DbObjects/kpgcastsfolder.cpp kpogre-1.5.4-p/kpogre/DbObjects/kpgcastsfolder.cpp +--- kpogre-1.5.4/kpogre/DbObjects/kpgcastsfolder.cpp 2006-12-27 21:35:12.000000000 +0100 ++++ kpogre-1.5.4-p/kpogre/DbObjects/kpgcastsfolder.cpp 2007-02-02 05:19:15.000000000 +0100 +@@ -53,7 +53,7 @@ + + try + { +- m_pqxxResultCasts = pqxxXaction.Exec(strQuery.latin1()); ++ m_pqxxResultCasts = pqxxXaction.exec(strQuery.latin1()); + + KPGCast *pCast = 0; + +diff -Naur kpogre-1.5.4/kpogre/DbObjects/kpgconnection.cpp kpogre-1.5.4-p/kpogre/DbObjects/kpgconnection.cpp +--- kpogre-1.5.4/kpogre/DbObjects/kpgconnection.cpp 2006-09-12 14:07:52.000000000 +0200 ++++ kpogre-1.5.4-p/kpogre/DbObjects/kpgconnection.cpp 2007-02-02 05:18:25.000000000 +0100 +@@ -91,11 +91,14 @@ + // Run SQL statement, make conversion regard connection encoding + pqxx::result KPGConnection::runQuery(const QString& strQuery, eTransType transType) + { ++ QCString cstrDecodedQuery(m_pTextCodec->fromUnicode(strQuery)); ++ QString strDecodedQuery(cstrDecodedQuery); ++ + // run query + if(transType == eTransNormal) + { + work pqxxXaction(*this, "runQuery"); +- result R(pqxxXaction.exec(m_pTextCodec->fromUnicode(strQuery))); ++ result R(pqxxXaction.exec(strDecodedQuery)); + pqxxXaction.commit(); + return R; + } +@@ -104,14 +107,14 @@ + if(transType == eTransNone) + { + pqxx::nontransaction pqxxXaction(*this, "runQuery"); +- result R(pqxxXaction.exec(m_pTextCodec->fromUnicode(strQuery))); ++ result R(pqxxXaction.exec(strDecodedQuery)); + return R; + } + } + + // eTransRobust: + pqxx::robusttransaction<> pqxxXaction(*this, "runQuery"); +- result R(pqxxXaction.exec(m_pTextCodec->fromUnicode(strQuery))); ++ result R(pqxxXaction.exec(strDecodedQuery)); + pqxxXaction.commit(); + return R; + } +diff -Naur kpogre-1.5.4/kpogre/DbObjects/kpgconversionsfolder.cpp kpogre-1.5.4-p/kpogre/DbObjects/kpgconversionsfolder.cpp +--- kpogre-1.5.4/kpogre/DbObjects/kpgconversionsfolder.cpp 2006-12-27 21:35:12.000000000 +0100 ++++ kpogre-1.5.4-p/kpogre/DbObjects/kpgconversionsfolder.cpp 2007-02-02 05:19:15.000000000 +0100 +@@ -52,7 +52,7 @@ + + try + { +- m_pqxxResultConversions = pqxxXaction.Exec(strQuery.latin1()); ++ m_pqxxResultConversions = pqxxXaction.exec(strQuery.latin1()); + + KPGConversion *pConversion = 0; + +diff -Naur kpogre-1.5.4/kpogre/DbObjects/kpgdatabase.cpp kpogre-1.5.4-p/kpogre/DbObjects/kpgdatabase.cpp +--- kpogre-1.5.4/kpogre/DbObjects/kpgdatabase.cpp 2006-12-28 11:39:51.000000000 +0100 ++++ kpogre-1.5.4-p/kpogre/DbObjects/kpgdatabase.cpp 2007-02-02 05:19:16.000000000 +0100 +@@ -202,7 +202,7 @@ + { + work pqxxXaction(*m_pDbConnection, "refreshSchemasList"); + +- m_pqxxResultSchemas = pqxxXaction.Exec(strQuery.latin1()); ++ m_pqxxResultSchemas = pqxxXaction.exec(strQuery.latin1()); + KPGSchema *pSchema = 0; + + for (result::size_type i = 0; i != m_pqxxResultSchemas.size(); ++i) +@@ -301,7 +301,7 @@ + + try + { +- pqxx::result pqxxResultDatabases = pqxxXaction.Exec(strQuery.latin1()); ++ pqxx::result pqxxResultDatabases = pqxxXaction.exec(strQuery.latin1()); + + if(pqxxResultDatabases.size() != 1) + { +@@ -529,7 +529,7 @@ + { + work pqxxXaction(*m_pDbConnection, "statistics"); + +- result pqxxResult = pqxxXaction.Exec(strQuery.latin1()); ++ result pqxxResult = pqxxXaction.exec(strQuery.latin1()); + + if(pqxxResult.size() == 1) + { +@@ -742,7 +742,7 @@ + try + { + pqxx::work pqxxXaction(*m_pDbConnection, "displayExtendedStatistics"); +- pqxx::result pqxxResultStatistics = pqxxXaction.Exec(strQuery.latin1()); ++ pqxx::result pqxxResultStatistics = pqxxXaction.exec(strQuery.latin1()); + + // fill properties table with result data + int nTableCols = fillPropertiesTable(pqxxResultStatistics, pTableStatistics, false); +@@ -806,7 +806,7 @@ + try + { + pqxx::work pqxxXaction(*m_pDbConnection, "displayDiskUsage"); +- pqxx::result pqxxResult = pqxxXaction.Exec(strQuery.latin1()); ++ pqxx::result pqxxResult = pqxxXaction.exec(strQuery.latin1()); + + // fill properties table with result data + int nTableCols = fillPropertiesTable(pqxxResult, pTableDiskUsage, false); +diff -Naur kpogre-1.5.4/kpogre/DbObjects/kpgdomainsfolder.cpp kpogre-1.5.4-p/kpogre/DbObjects/kpgdomainsfolder.cpp +--- kpogre-1.5.4/kpogre/DbObjects/kpgdomainsfolder.cpp 2006-12-27 21:35:12.000000000 +0100 ++++ kpogre-1.5.4-p/kpogre/DbObjects/kpgdomainsfolder.cpp 2007-02-02 05:19:16.000000000 +0100 +@@ -52,7 +52,7 @@ + + try + { +- m_pqxxResultDomains = pqxxXaction.Exec(strQuery.latin1()); ++ m_pqxxResultDomains = pqxxXaction.exec(strQuery.latin1()); + + KPGDomain *pDomain = 0; + +diff -Naur kpogre-1.5.4/kpogre/DbObjects/kpgfunction.cpp kpogre-1.5.4-p/kpogre/DbObjects/kpgfunction.cpp +--- kpogre-1.5.4/kpogre/DbObjects/kpgfunction.cpp 2006-12-27 22:11:20.000000000 +0100 ++++ kpogre-1.5.4-p/kpogre/DbObjects/kpgfunction.cpp 2007-02-02 05:19:16.000000000 +0100 +@@ -148,7 +148,7 @@ + + try + { +- pqxx::result pqxxResult = pqxxXaction.Exec(strQuery.latin1()); ++ pqxx::result pqxxResult = pqxxXaction.exec(strQuery.latin1()); + + if(pqxxResult.size() != 1) + { +@@ -340,7 +340,7 @@ + + try + { +- pqxx::result pqxxResult = pqxxXaction.Exec(strQuery.latin1()); ++ pqxx::result pqxxResult = pqxxXaction.exec(strQuery.latin1()); + + if(pqxxResult.size() != 1) + { +diff -Naur kpogre-1.5.4/kpogre/DbObjects/kpgfunctionsfolder.cpp kpogre-1.5.4-p/kpogre/DbObjects/kpgfunctionsfolder.cpp +--- kpogre-1.5.4/kpogre/DbObjects/kpgfunctionsfolder.cpp 2006-12-27 22:11:20.000000000 +0100 ++++ kpogre-1.5.4-p/kpogre/DbObjects/kpgfunctionsfolder.cpp 2007-02-02 05:19:16.000000000 +0100 +@@ -70,7 +70,7 @@ + + try + { +- m_pqxxResultFunctions = pqxxXaction.Exec(strQuery.latin1()); ++ m_pqxxResultFunctions = pqxxXaction.exec(strQuery.latin1()); + + KPGFunction *pFunction = 0; + +diff -Naur kpogre-1.5.4/kpogre/DbObjects/kpggroupsfolder.cpp kpogre-1.5.4-p/kpogre/DbObjects/kpggroupsfolder.cpp +--- kpogre-1.5.4/kpogre/DbObjects/kpggroupsfolder.cpp 2006-12-27 22:11:21.000000000 +0100 ++++ kpogre-1.5.4-p/kpogre/DbObjects/kpggroupsfolder.cpp 2007-02-02 05:19:16.000000000 +0100 +@@ -46,7 +46,7 @@ + + try + { +- m_pqxxResultGroups = pqxxXaction.Exec(strQuery.latin1()); ++ m_pqxxResultGroups = pqxxXaction.exec(strQuery.latin1()); + + KPGGroup *pGroup = 0; + +diff -Naur kpogre-1.5.4/kpogre/DbObjects/kpglanguage.cpp kpogre-1.5.4-p/kpogre/DbObjects/kpglanguage.cpp +--- kpogre-1.5.4/kpogre/DbObjects/kpglanguage.cpp 2006-12-27 22:11:21.000000000 +0100 ++++ kpogre-1.5.4-p/kpogre/DbObjects/kpglanguage.cpp 2007-02-02 05:19:16.000000000 +0100 +@@ -130,7 +130,7 @@ + + try + { +- pqxx::result pqxxResultLanguages = pqxxXaction.Exec(strQuery.latin1()); ++ pqxx::result pqxxResultLanguages = pqxxXaction.exec(strQuery.latin1()); + + if(pqxxResultLanguages.size() != 1) + { +diff -Naur kpogre-1.5.4/kpogre/DbObjects/kpglanguagesfolder.cpp kpogre-1.5.4-p/kpogre/DbObjects/kpglanguagesfolder.cpp +--- kpogre-1.5.4/kpogre/DbObjects/kpglanguagesfolder.cpp 2006-12-27 22:11:21.000000000 +0100 ++++ kpogre-1.5.4-p/kpogre/DbObjects/kpglanguagesfolder.cpp 2007-02-02 05:19:16.000000000 +0100 +@@ -50,7 +50,7 @@ + + try + { +- m_pqxxResultLanguages = pqxxXaction.Exec(strQuery.latin1()); ++ m_pqxxResultLanguages = pqxxXaction.exec(strQuery.latin1()); + + KPGLanguage *pLanguage = 0; + +diff -Naur kpogre-1.5.4/kpogre/DbObjects/kpgoperatorclassesfolder.cpp kpogre-1.5.4-p/kpogre/DbObjects/kpgoperatorclassesfolder.cpp +--- kpogre-1.5.4/kpogre/DbObjects/kpgoperatorclassesfolder.cpp 2006-12-28 10:33:28.000000000 +0100 ++++ kpogre-1.5.4-p/kpogre/DbObjects/kpgoperatorclassesfolder.cpp 2007-02-02 05:19:16.000000000 +0100 +@@ -54,7 +54,7 @@ + + try + { +- m_pqxxResultOperatorClasses = pqxxXaction.Exec(strQuery.latin1()); ++ m_pqxxResultOperatorClasses = pqxxXaction.exec(strQuery.latin1()); + + KPGOperatorClass *pOperatorClass = 0; + +diff -Naur kpogre-1.5.4/kpogre/DbObjects/kpgoperatorsfolder.cpp kpogre-1.5.4-p/kpogre/DbObjects/kpgoperatorsfolder.cpp +--- kpogre-1.5.4/kpogre/DbObjects/kpgoperatorsfolder.cpp 2006-12-28 10:33:28.000000000 +0100 ++++ kpogre-1.5.4-p/kpogre/DbObjects/kpgoperatorsfolder.cpp 2007-02-02 05:19:16.000000000 +0100 +@@ -64,7 +64,7 @@ + + try + { +- m_pqxxResultOperators = pqxxXaction.Exec(strQuery.latin1()); ++ m_pqxxResultOperators = pqxxXaction.exec(strQuery.latin1()); + + KPGOperator *pOperator = 0; + +diff -Naur kpogre-1.5.4/kpogre/DbObjects/kpgrule.cpp kpogre-1.5.4-p/kpogre/DbObjects/kpgrule.cpp +--- kpogre-1.5.4/kpogre/DbObjects/kpgrule.cpp 2006-12-28 11:39:51.000000000 +0100 ++++ kpogre-1.5.4-p/kpogre/DbObjects/kpgrule.cpp 2007-02-02 05:19:16.000000000 +0100 +@@ -61,7 +61,7 @@ + + try + { +- pqxx::result pqxxResultRules = pqxxXaction.Exec(strQuery.latin1()); ++ pqxx::result pqxxResultRules = pqxxXaction.exec(strQuery.latin1()); + + if(pqxxResultRules.size() != 1) + { +diff -Naur kpogre-1.5.4/kpogre/DbObjects/kpgschema.cpp kpogre-1.5.4-p/kpogre/DbObjects/kpgschema.cpp +--- kpogre-1.5.4/kpogre/DbObjects/kpgschema.cpp 2006-12-28 11:39:51.000000000 +0100 ++++ kpogre-1.5.4-p/kpogre/DbObjects/kpgschema.cpp 2007-02-02 05:19:16.000000000 +0100 +@@ -171,7 +171,7 @@ + { + work pqxxXaction(*pDatabase->connection(), "refreshItem"); + +- pqxx::result pqxxResultSchemas = pqxxXaction.Exec(strQuery.latin1()); ++ pqxx::result pqxxResultSchemas = pqxxXaction.exec(strQuery.latin1()); + + if(pqxxResultSchemas.size() != 1) + { +diff -Naur kpogre-1.5.4/kpogre/DbObjects/kpgsequence.cpp kpogre-1.5.4-p/kpogre/DbObjects/kpgsequence.cpp +--- kpogre-1.5.4/kpogre/DbObjects/kpgsequence.cpp 2006-12-28 11:39:51.000000000 +0100 ++++ kpogre-1.5.4-p/kpogre/DbObjects/kpgsequence.cpp 2007-02-02 05:19:16.000000000 +0100 +@@ -192,7 +192,7 @@ + { + KPGConnection *pDbConnection = connection(); + pqxx::work pqxxXaction(*pDbConnection, "refresh sequence statistics"); +- pqxx::result pqxxResultStatistics = pqxxXaction.Exec(strQuery.latin1()); ++ pqxx::result pqxxResultStatistics = pqxxXaction.exec(strQuery.latin1()); + + if(pqxxResultStatistics.size() != 1) + { +@@ -257,7 +257,7 @@ + + try + { +- pqxx::result pqxxResultSequences = pqxxXaction.Exec(strQuery.latin1()); ++ pqxx::result pqxxResultSequences = pqxxXaction.exec(strQuery.latin1()); + + if(pqxxResultSequences.size() != 1) + { +diff -Naur kpogre-1.5.4/kpogre/DbObjects/kpgsequencesfolder.cpp kpogre-1.5.4-p/kpogre/DbObjects/kpgsequencesfolder.cpp +--- kpogre-1.5.4/kpogre/DbObjects/kpgsequencesfolder.cpp 2006-12-28 11:39:51.000000000 +0100 ++++ kpogre-1.5.4-p/kpogre/DbObjects/kpgsequencesfolder.cpp 2007-02-02 05:19:16.000000000 +0100 +@@ -67,7 +67,7 @@ + + try + { +- m_pqxxResultSequences = pqxxXaction.Exec(strQuery.latin1()); ++ m_pqxxResultSequences = pqxxXaction.exec(strQuery.latin1()); + + KPGSequence *pSequence = 0; + +diff -Naur kpogre-1.5.4/kpogre/DbObjects/kpgserver.cpp kpogre-1.5.4-p/kpogre/DbObjects/kpgserver.cpp +--- kpogre-1.5.4/kpogre/DbObjects/kpgserver.cpp 2006-12-22 00:28:48.000000000 +0100 ++++ kpogre-1.5.4-p/kpogre/DbObjects/kpgserver.cpp 2007-02-02 05:19:16.000000000 +0100 +@@ -147,7 +147,7 @@ + pqxx::result pqxxResult; + try + { +- pqxxResult = pqxxXaction.Exec(strQuery.latin1()); ++ pqxxResult = pqxxXaction.exec(strQuery.latin1()); + } + catch (const std::exception &e) + { +@@ -214,7 +214,7 @@ + pqxx::result pqxxResult; + try + { +- pqxxResult = pqxxXaction.Exec(strQuery.latin1()); ++ pqxxResult = pqxxXaction.exec(strQuery.latin1()); + } + catch (const std::exception &e) + { +@@ -242,7 +242,7 @@ + pqxx::result pqxxResult; + try + { +- pqxxResult = pqxxXaction.Exec(strQuery.latin1()); ++ pqxxResult = pqxxXaction.exec(strQuery.latin1()); + } + catch (const std::exception &e) + { +@@ -270,7 +270,7 @@ + pqxx::result pqxxResult; + try + { +- pqxxResult = pqxxXaction.Exec(strQuery.latin1()); ++ pqxxResult = pqxxXaction.exec(strQuery.latin1()); + } + catch (const std::exception &e) + { +@@ -336,7 +336,7 @@ + + try + { +- m_pqxxResultDatabases = pqxxXaction.Exec(strQuery.latin1()); ++ m_pqxxResultDatabases = pqxxXaction.exec(strQuery.latin1()); + } + catch (const std::exception &e) + { +@@ -515,7 +515,7 @@ + try + { + pqxx::work pqxxXaction(*m_pDbConnection, "refresh server activity"); +- pqxx::result pqxxResultActivity = pqxxXaction.Exec(strQuery.latin1()); ++ pqxx::result pqxxResultActivity = pqxxXaction.exec(strQuery.latin1()); + + // fill properties table with result data + int nTableCols = fillPropertiesTable(pqxxResultActivity, pTableActivity); +diff -Naur kpogre-1.5.4/kpogre/DbObjects/kpgtablecolumn.cpp kpogre-1.5.4-p/kpogre/DbObjects/kpgtablecolumn.cpp +--- kpogre-1.5.4/kpogre/DbObjects/kpgtablecolumn.cpp 2006-12-28 11:39:51.000000000 +0100 ++++ kpogre-1.5.4-p/kpogre/DbObjects/kpgtablecolumn.cpp 2007-02-02 05:19:16.000000000 +0100 +@@ -75,7 +75,7 @@ + + try + { +- pqxx::result pqxxResultColumns = pqxxXaction.Exec(strQuery.latin1()); ++ pqxx::result pqxxResultColumns = pqxxXaction.exec(strQuery.latin1()); + + if(pqxxResultColumns.size() != 1) + { +diff -Naur kpogre-1.5.4/kpogre/DbObjects/kpgtableconstraint.cpp kpogre-1.5.4-p/kpogre/DbObjects/kpgtableconstraint.cpp +--- kpogre-1.5.4/kpogre/DbObjects/kpgtableconstraint.cpp 2006-12-28 15:03:30.000000000 +0100 ++++ kpogre-1.5.4-p/kpogre/DbObjects/kpgtableconstraint.cpp 2007-02-02 05:19:16.000000000 +0100 +@@ -58,7 +58,7 @@ + + try + { +- pqxx::result pqxxResultConstraints = pqxxXaction.Exec(strQuery.latin1()); ++ pqxx::result pqxxResultConstraints = pqxxXaction.exec(strQuery.latin1()); + + if(pqxxResultConstraints.size() != 1) + { +diff -Naur kpogre-1.5.4/kpogre/DbObjects/kpgtable.cpp kpogre-1.5.4-p/kpogre/DbObjects/kpgtable.cpp +--- kpogre-1.5.4/kpogre/DbObjects/kpgtable.cpp 2006-12-28 19:51:34.000000000 +0100 ++++ kpogre-1.5.4-p/kpogre/DbObjects/kpgtable.cpp 2007-02-02 05:19:16.000000000 +0100 +@@ -171,7 +171,7 @@ + + try + { +- pqxx::result pqxxResultTables = pqxxXaction.Exec(strQuery.latin1()); ++ pqxx::result pqxxResultTables = pqxxXaction.exec(strQuery.latin1()); + + if(pqxxResultTables.size() != 1) + { +@@ -564,7 +564,7 @@ + { + KPGConnection *pDbConnection = connection(); + pqxx::work pqxxXaction(*pDbConnection, "refresh table statistics"); +- pqxx::result pqxxResultStatistics = pqxxXaction.Exec(strQuery.latin1()); ++ pqxx::result pqxxResultStatistics = pqxxXaction.exec(strQuery.latin1()); + + if(pqxxResultStatistics.size() != 1) + { +@@ -654,7 +654,7 @@ + { + KPGConnection *pDbConnection = connection(); + pqxx::work pqxxXaction(*pDbConnection, "refresh table statistics"); +- pqxx::result pqxxResultStatistics = pqxxXaction.Exec(strQuery.latin1()); ++ pqxx::result pqxxResultStatistics = pqxxXaction.exec(strQuery.latin1()); + + if(pqxxResultStatistics.size() != 1) // querying pq_xactloct return no rows... Why ? + { +diff -Naur kpogre-1.5.4/kpogre/DbObjects/kpgtableindex.cpp kpogre-1.5.4-p/kpogre/DbObjects/kpgtableindex.cpp +--- kpogre-1.5.4/kpogre/DbObjects/kpgtableindex.cpp 2006-12-22 20:27:08.000000000 +0100 ++++ kpogre-1.5.4-p/kpogre/DbObjects/kpgtableindex.cpp 2007-02-02 05:19:16.000000000 +0100 +@@ -95,7 +95,7 @@ + + try + { +- pqxx::result pqxxResultIndexes = pqxxXaction.Exec(strQuery.latin1()); ++ pqxx::result pqxxResultIndexes = pqxxXaction.exec(strQuery.latin1()); + + if(pqxxResultIndexes.size() != 1) + { +@@ -203,7 +203,7 @@ + { + KPGConnection *pDbConnection = connection(); + pqxx::work pqxxXaction(*pDbConnection, "refresh table statistics"); +- pqxx::result pqxxResultStatistics = pqxxXaction.Exec(strQuery.latin1()); ++ pqxx::result pqxxResultStatistics = pqxxXaction.exec(strQuery.latin1()); + + if(pqxxResultStatistics.size() != 1) + { +@@ -264,7 +264,7 @@ + { + KPGConnection *pDbConnection = connection(); + pqxx::work pqxxXaction(*pDbConnection, "refresh table statistics"); +- pqxx::result pqxxResultStatistics = pqxxXaction.Exec(strQuery.latin1()); ++ pqxx::result pqxxResultStatistics = pqxxXaction.exec(strQuery.latin1()); + + if(pqxxResultStatistics.size() != 1) + { +diff -Naur kpogre-1.5.4/kpogre/DbObjects/kpgtablesfolder.cpp kpogre-1.5.4-p/kpogre/DbObjects/kpgtablesfolder.cpp +--- kpogre-1.5.4/kpogre/DbObjects/kpgtablesfolder.cpp 2006-12-28 19:51:34.000000000 +0100 ++++ kpogre-1.5.4-p/kpogre/DbObjects/kpgtablesfolder.cpp 2007-02-02 05:19:16.000000000 +0100 +@@ -95,7 +95,7 @@ + + try + { +- m_pqxxResultTables = pqxxXaction.Exec(strQuery.latin1()); ++ m_pqxxResultTables = pqxxXaction.exec(strQuery.latin1()); + + KPGTable *pTable = 0; + +diff -Naur kpogre-1.5.4/kpogre/DbObjects/kpgtablespace.cpp kpogre-1.5.4-p/kpogre/DbObjects/kpgtablespace.cpp +--- kpogre-1.5.4/kpogre/DbObjects/kpgtablespace.cpp 2006-12-21 22:36:14.000000000 +0100 ++++ kpogre-1.5.4-p/kpogre/DbObjects/kpgtablespace.cpp 2007-02-02 05:19:16.000000000 +0100 +@@ -167,7 +167,7 @@ + + try + { +- pqxx::result pqxxResultTablespaces = pqxxXaction.Exec(strQuery.latin1()); ++ pqxx::result pqxxResultTablespaces = pqxxXaction.exec(strQuery.latin1()); + + setProperties(pqxxResultTablespaces[0], bVersion81_OrNewer); + } +diff -Naur kpogre-1.5.4/kpogre/DbObjects/kpgtablespacesfolder.cpp kpogre-1.5.4-p/kpogre/DbObjects/kpgtablespacesfolder.cpp +--- kpogre-1.5.4/kpogre/DbObjects/kpgtablespacesfolder.cpp 2006-12-22 20:27:08.000000000 +0100 ++++ kpogre-1.5.4-p/kpogre/DbObjects/kpgtablespacesfolder.cpp 2007-02-02 05:19:16.000000000 +0100 +@@ -57,7 +57,7 @@ + + try + { +- m_pqxxResultTablespaces = pqxxXaction.Exec(strQuery.latin1()); ++ m_pqxxResultTablespaces = pqxxXaction.exec(strQuery.latin1()); + + KPGTablespace *pTablespace = 0; + +diff -Naur kpogre-1.5.4/kpogre/DbObjects/kpgtrigger.cpp kpogre-1.5.4-p/kpogre/DbObjects/kpgtrigger.cpp +--- kpogre-1.5.4/kpogre/DbObjects/kpgtrigger.cpp 2006-12-28 15:03:30.000000000 +0100 ++++ kpogre-1.5.4-p/kpogre/DbObjects/kpgtrigger.cpp 2007-02-02 05:19:16.000000000 +0100 +@@ -64,7 +64,7 @@ + + try + { +- pqxx::result pqxxResultTriggers = pqxxXaction.Exec(strQuery.latin1()); ++ pqxx::result pqxxResultTriggers = pqxxXaction.exec(strQuery.latin1()); + + if(pqxxResultTriggers.size() != 1) + { +diff -Naur kpogre-1.5.4/kpogre/DbObjects/kpgtype.cpp kpogre-1.5.4-p/kpogre/DbObjects/kpgtype.cpp +--- kpogre-1.5.4/kpogre/DbObjects/kpgtype.cpp 2006-12-28 15:03:30.000000000 +0100 ++++ kpogre-1.5.4-p/kpogre/DbObjects/kpgtype.cpp 2007-02-02 05:19:16.000000000 +0100 +@@ -240,7 +240,7 @@ + + try + { +- pqxx::result pqxxResultTypes = pqxxXaction.Exec(strQuery.latin1()); ++ pqxx::result pqxxResultTypes = pqxxXaction.exec(strQuery.latin1()); + + if(pqxxResultTypes.size() != 1) + { +diff -Naur kpogre-1.5.4/kpogre/DbObjects/kpgtypesfolder.cpp kpogre-1.5.4-p/kpogre/DbObjects/kpgtypesfolder.cpp +--- kpogre-1.5.4/kpogre/DbObjects/kpgtypesfolder.cpp 2006-12-28 15:03:30.000000000 +0100 ++++ kpogre-1.5.4-p/kpogre/DbObjects/kpgtypesfolder.cpp 2007-02-02 05:19:16.000000000 +0100 +@@ -52,7 +52,7 @@ + + try + { +- m_pqxxResultTypes = pqxxXaction.Exec(strQuery.latin1()); ++ m_pqxxResultTypes = pqxxXaction.exec(strQuery.latin1()); + + KPGType *pType = 0; + +diff -Naur kpogre-1.5.4/kpogre/DbObjects/kpgusersfolder.cpp kpogre-1.5.4-p/kpogre/DbObjects/kpgusersfolder.cpp +--- kpogre-1.5.4/kpogre/DbObjects/kpgusersfolder.cpp 2006-12-28 15:03:30.000000000 +0100 ++++ kpogre-1.5.4-p/kpogre/DbObjects/kpgusersfolder.cpp 2007-02-02 05:19:16.000000000 +0100 +@@ -48,7 +48,7 @@ + + try + { +- m_pqxxResultUsers = pqxxXaction.Exec(strQuery.latin1()); ++ m_pqxxResultUsers = pqxxXaction.exec(strQuery.latin1()); + + KPGUser *pUser = 0; + +diff -Naur kpogre-1.5.4/kpogre/DbObjects/kpgview.cpp kpogre-1.5.4-p/kpogre/DbObjects/kpgview.cpp +--- kpogre-1.5.4/kpogre/DbObjects/kpgview.cpp 2006-08-20 14:18:28.000000000 +0200 ++++ kpogre-1.5.4-p/kpogre/DbObjects/kpgview.cpp 2007-02-02 05:19:16.000000000 +0100 +@@ -127,7 +127,7 @@ + + try + { +- pqxx::result pqxxResultViews = pqxxXaction.Exec(strQuery.latin1()); ++ pqxx::result pqxxResultViews = pqxxXaction.exec(strQuery.latin1()); + + if(pqxxResultViews.size() != 1) + { +diff -Naur kpogre-1.5.4/kpogre/DbObjects/kpgviewsfolder.cpp kpogre-1.5.4-p/kpogre/DbObjects/kpgviewsfolder.cpp +--- kpogre-1.5.4/kpogre/DbObjects/kpgviewsfolder.cpp 2006-08-20 14:18:28.000000000 +0200 ++++ kpogre-1.5.4-p/kpogre/DbObjects/kpgviewsfolder.cpp 2007-02-02 05:19:16.000000000 +0100 +@@ -57,7 +57,7 @@ + + try + { +- m_pqxxResultViews = pqxxXaction.Exec(strQuery.latin1()); ++ m_pqxxResultViews = pqxxXaction.exec(strQuery.latin1()); + + KPGView *pgView = 0; + hunk ./source/kde-extra/kpogre/libpqxx-2.6.9-headers.patch 1 +diff -Naur kpogre-1.5.4/kpogre/DbObjects/kpgconnection.cpp kpogre-1.5.4-p/kpogre/DbObjects/kpgconnection.cpp +--- kpogre-1.5.4/kpogre/DbObjects/kpgconnection.cpp 2006-09-12 14:07:52.000000000 +0200 ++++ kpogre-1.5.4-p/kpogre/DbObjects/kpgconnection.cpp 2007-02-02 04:16:58.000000000 +0100 +@@ -19,8 +19,8 @@ + + + // include files for libpgxx +-#include +-#include ++#include ++#include + + // include files for Qt + #include +diff -Naur kpogre-1.5.4/kpogre/DbObjects/kpgconnection.h kpogre-1.5.4-p/kpogre/DbObjects/kpgconnection.h +--- kpogre-1.5.4/kpogre/DbObjects/kpgconnection.h 2006-09-22 12:10:05.000000000 +0200 ++++ kpogre-1.5.4-p/kpogre/DbObjects/kpgconnection.h 2007-02-02 04:16:58.000000000 +0100 +@@ -22,7 +22,7 @@ + #define QT_NO_ASCII_CAST + + // include files for libpgxx +-#include ++#include + + #include "kpgfunction.h" + +diff -Naur kpogre-1.5.4/kpogre/DbObjects/kpgtreeitem.h kpogre-1.5.4-p/kpogre/DbObjects/kpgtreeitem.h +--- kpogre-1.5.4/kpogre/DbObjects/kpgtreeitem.h 2006-12-28 16:11:29.000000000 +0100 ++++ kpogre-1.5.4-p/kpogre/DbObjects/kpgtreeitem.h 2007-02-02 04:16:58.000000000 +0100 +@@ -24,8 +24,8 @@ + #include + + // include files for libpgxx +-#include +-#include ++#include ++#include + + class KPGConnection; + class QTable; +diff -Naur kpogre-1.5.4/kpogre/kpglinklabel.h kpogre-1.5.4-p/kpogre/kpglinklabel.h +--- kpogre-1.5.4/kpogre/kpglinklabel.h 2006-09-15 14:44:09.000000000 +0200 ++++ kpogre-1.5.4-p/kpogre/kpglinklabel.h 2007-02-02 04:16:58.000000000 +0100 +@@ -13,7 +13,7 @@ + #define KPGLINKLABEL_H + + // include files for libpgxx +-#include ++#include + + #include + //#include +diff -Naur kpogre-1.5.4/kpogre/kpogreview.cpp kpogre-1.5.4-p/kpogre/kpogreview.cpp +--- kpogre-1.5.4/kpogre/kpogreview.cpp 2006-12-28 20:27:31.000000000 +0100 ++++ kpogre-1.5.4-p/kpogre/kpogreview.cpp 2007-02-02 04:16:58.000000000 +0100 +@@ -15,7 +15,7 @@ + * * + ***************************************************************************/ + +-#include ++#include + + // include files for Qt + #include +diff -Naur kpogre-1.5.4/kpogre/kpogreview.h kpogre-1.5.4-p/kpogre/kpogreview.h +--- kpogre-1.5.4/kpogre/kpogreview.h 2006-12-14 10:31:58.000000000 +0100 ++++ kpogre-1.5.4-p/kpogre/kpogreview.h 2007-02-02 04:16:58.000000000 +0100 +@@ -23,7 +23,7 @@ + #endif + + // include files for libpgxx +-#include ++#include + + // include files for Qt + #include +diff -Naur kpogre-1.5.4/kpogre/PropertyPages/kpgaggregateproppage.h kpogre-1.5.4-p/kpogre/PropertyPages/kpgaggregateproppage.h +--- kpogre-1.5.4/kpogre/PropertyPages/kpgaggregateproppage.h 2006-09-15 13:24:30.000000000 +0200 ++++ kpogre-1.5.4-p/kpogre/PropertyPages/kpgaggregateproppage.h 2007-02-02 04:16:58.000000000 +0100 +@@ -18,7 +18,7 @@ + #include "kpgabstractpropertypage.h" + + // include files for libpgxx +-#include ++#include + + /** + Aggregate properties +diff -Naur kpogre-1.5.4/kpogre/PropertyPages/kpgcastproppage.h kpogre-1.5.4-p/kpogre/PropertyPages/kpgcastproppage.h +--- kpogre-1.5.4/kpogre/PropertyPages/kpgcastproppage.h 2006-09-15 13:24:30.000000000 +0200 ++++ kpogre-1.5.4-p/kpogre/PropertyPages/kpgcastproppage.h 2007-02-02 04:16:58.000000000 +0100 +@@ -18,7 +18,7 @@ + #include "kpgabstractpropertypage.h" + + // include files for libpgxx +-#include ++#include + + /** + Cast properties +diff -Naur kpogre-1.5.4/kpogre/PropertyPages/kpgcheckconstrproppage.h kpogre-1.5.4-p/kpogre/PropertyPages/kpgcheckconstrproppage.h +--- kpogre-1.5.4/kpogre/PropertyPages/kpgcheckconstrproppage.h 2006-09-15 13:24:30.000000000 +0200 ++++ kpogre-1.5.4-p/kpogre/PropertyPages/kpgcheckconstrproppage.h 2007-02-02 04:16:59.000000000 +0100 +@@ -18,7 +18,7 @@ + #include "kpgabstractpropertypage.h" + + // include files for libpgxx +-#include ++#include + + /** + Check Constraint properties +diff -Naur kpogre-1.5.4/kpogre/PropertyPages/kpgconversionproppage.h kpogre-1.5.4-p/kpogre/PropertyPages/kpgconversionproppage.h +--- kpogre-1.5.4/kpogre/PropertyPages/kpgconversionproppage.h 2006-09-15 13:24:30.000000000 +0200 ++++ kpogre-1.5.4-p/kpogre/PropertyPages/kpgconversionproppage.h 2007-02-02 04:16:59.000000000 +0100 +@@ -18,7 +18,7 @@ + #include "kpgabstractpropertypage.h" + + // include files for libpgxx +-#include ++#include + + /** + Conversion properties +diff -Naur kpogre-1.5.4/kpogre/PropertyPages/kpgdatabaseproppage.h kpogre-1.5.4-p/kpogre/PropertyPages/kpgdatabaseproppage.h +--- kpogre-1.5.4/kpogre/PropertyPages/kpgdatabaseproppage.h 2006-12-26 23:06:48.000000000 +0100 ++++ kpogre-1.5.4-p/kpogre/PropertyPages/kpgdatabaseproppage.h 2007-02-02 04:16:58.000000000 +0100 +@@ -19,7 +19,7 @@ + + #include "kpgdatabaseproppagebase.h" + +-#include ++#include + + // application specific includes + #include "kpgabstractpropertypage.h" +diff -Naur kpogre-1.5.4/kpogre/PropertyPages/kpgdomainconstrproppage.h kpogre-1.5.4-p/kpogre/PropertyPages/kpgdomainconstrproppage.h +--- kpogre-1.5.4/kpogre/PropertyPages/kpgdomainconstrproppage.h 2006-09-15 13:24:30.000000000 +0200 ++++ kpogre-1.5.4-p/kpogre/PropertyPages/kpgdomainconstrproppage.h 2007-02-02 04:16:58.000000000 +0100 +@@ -18,7 +18,7 @@ + #include "kpgabstractpropertypage.h" + + // include files for libpgxx +-#include ++#include + + /** + Domain check constraint properties +diff -Naur kpogre-1.5.4/kpogre/PropertyPages/kpgdomainproppage.h kpogre-1.5.4-p/kpogre/PropertyPages/kpgdomainproppage.h +--- kpogre-1.5.4/kpogre/PropertyPages/kpgdomainproppage.h 2006-09-18 14:03:22.000000000 +0200 ++++ kpogre-1.5.4-p/kpogre/PropertyPages/kpgdomainproppage.h 2007-02-02 04:16:58.000000000 +0100 +@@ -18,7 +18,7 @@ + #include "kpgabstractpropertypage.h" + + // include files for libpgxx +-#include ++#include + + /** + Domain properties +diff -Naur kpogre-1.5.4/kpogre/PropertyPages/kpgforeignkeyconstrproppage.h kpogre-1.5.4-p/kpogre/PropertyPages/kpgforeignkeyconstrproppage.h +--- kpogre-1.5.4/kpogre/PropertyPages/kpgforeignkeyconstrproppage.h 2006-09-15 13:24:30.000000000 +0200 ++++ kpogre-1.5.4-p/kpogre/PropertyPages/kpgforeignkeyconstrproppage.h 2007-02-02 04:16:59.000000000 +0100 +@@ -18,7 +18,7 @@ + #include "kpgabstractpropertypage.h" + + // include files for libpgxx +-#include ++#include + + /** + Foreign Key Constraint properties +diff -Naur kpogre-1.5.4/kpogre/PropertyPages/kpgfunctionproppage.h kpogre-1.5.4-p/kpogre/PropertyPages/kpgfunctionproppage.h +--- kpogre-1.5.4/kpogre/PropertyPages/kpgfunctionproppage.h 2006-09-15 13:24:30.000000000 +0200 ++++ kpogre-1.5.4-p/kpogre/PropertyPages/kpgfunctionproppage.h 2007-02-02 04:16:58.000000000 +0100 +@@ -15,7 +15,7 @@ + #include "kpgfunctionproppagebase.h" + + // include files for libpgxx +-#include ++#include + + // application specific includes + #include "kpgabstractpropertypage.h" +diff -Naur kpogre-1.5.4/kpogre/PropertyPages/kpggroupproppage.h kpogre-1.5.4-p/kpogre/PropertyPages/kpggroupproppage.h +--- kpogre-1.5.4/kpogre/PropertyPages/kpggroupproppage.h 2006-09-15 13:24:30.000000000 +0200 ++++ kpogre-1.5.4-p/kpogre/PropertyPages/kpggroupproppage.h 2007-02-02 04:16:59.000000000 +0100 +@@ -18,7 +18,7 @@ + #include "kpgabstractpropertypage.h" + + // include files for libpgxx +-#include ++#include + + /** + User properties +diff -Naur kpogre-1.5.4/kpogre/PropertyPages/kpgindexproppage.h kpogre-1.5.4-p/kpogre/PropertyPages/kpgindexproppage.h +--- kpogre-1.5.4/kpogre/PropertyPages/kpgindexproppage.h 2006-09-15 13:24:30.000000000 +0200 ++++ kpogre-1.5.4-p/kpogre/PropertyPages/kpgindexproppage.h 2007-02-02 04:16:58.000000000 +0100 +@@ -18,7 +18,7 @@ + #include "kpgabstractpropertypage.h" + + // include files for libpgxx +-#include ++#include + + class KPGSyntaxHighlighter; + class KPGIndex; +diff -Naur kpogre-1.5.4/kpogre/PropertyPages/kpglanguageproppage.h kpogre-1.5.4-p/kpogre/PropertyPages/kpglanguageproppage.h +--- kpogre-1.5.4/kpogre/PropertyPages/kpglanguageproppage.h 2006-09-15 13:24:30.000000000 +0200 ++++ kpogre-1.5.4-p/kpogre/PropertyPages/kpglanguageproppage.h 2007-02-02 04:16:58.000000000 +0100 +@@ -15,7 +15,7 @@ + #include "kpglanguageproppagebase.h" + + // include files for libpgxx +-#include ++#include + + // application specific includes + #include "kpgabstractpropertypage.h" +diff -Naur kpogre-1.5.4/kpogre/PropertyPages/kpgoperatorclassproppage.h kpogre-1.5.4-p/kpogre/PropertyPages/kpgoperatorclassproppage.h +--- kpogre-1.5.4/kpogre/PropertyPages/kpgoperatorclassproppage.h 2006-09-15 13:24:30.000000000 +0200 ++++ kpogre-1.5.4-p/kpogre/PropertyPages/kpgoperatorclassproppage.h 2007-02-02 04:16:59.000000000 +0100 +@@ -18,7 +18,7 @@ + #include "kpgabstractpropertypage.h" + + // include files for libpgxx +-#include ++#include + + /** + Operator Class properties +diff -Naur kpogre-1.5.4/kpogre/PropertyPages/kpgoperatorproppage.h kpogre-1.5.4-p/kpogre/PropertyPages/kpgoperatorproppage.h +--- kpogre-1.5.4/kpogre/PropertyPages/kpgoperatorproppage.h 2006-09-15 13:24:30.000000000 +0200 ++++ kpogre-1.5.4-p/kpogre/PropertyPages/kpgoperatorproppage.h 2007-02-02 04:16:58.000000000 +0100 +@@ -18,7 +18,7 @@ + #include "kpgabstractpropertypage.h" + + // include files for libpgxx +-#include ++#include + + /** + Operator properties +diff -Naur kpogre-1.5.4/kpogre/PropertyPages/kpgprimarykeyconstrproppage.h kpogre-1.5.4-p/kpogre/PropertyPages/kpgprimarykeyconstrproppage.h +--- kpogre-1.5.4/kpogre/PropertyPages/kpgprimarykeyconstrproppage.h 2006-09-15 13:24:30.000000000 +0200 ++++ kpogre-1.5.4-p/kpogre/PropertyPages/kpgprimarykeyconstrproppage.h 2007-02-02 04:16:59.000000000 +0100 +@@ -18,7 +18,7 @@ + #include "kpgabstractpropertypage.h" + + // include files for libpgxx +-#include ++#include + + /** + Primary Key Constraint properties +diff -Naur kpogre-1.5.4/kpogre/PropertyPages/kpgprimarykeyproppage.h kpogre-1.5.4-p/kpogre/PropertyPages/kpgprimarykeyproppage.h +--- kpogre-1.5.4/kpogre/PropertyPages/kpgprimarykeyproppage.h 2006-09-15 13:24:30.000000000 +0200 ++++ kpogre-1.5.4-p/kpogre/PropertyPages/kpgprimarykeyproppage.h 2007-02-02 04:16:58.000000000 +0100 +@@ -18,7 +18,7 @@ + #include "kpgabstractpropertypage.h" + + // include files for libpgxx +-#include ++#include + + class KPGSyntaxHighlighter; + class KPGPrimaryKey; +diff -Naur kpogre-1.5.4/kpogre/PropertyPages/kpgpropertypage.h kpogre-1.5.4-p/kpogre/PropertyPages/kpgpropertypage.h +--- kpogre-1.5.4/kpogre/PropertyPages/kpgpropertypage.h 2006-09-15 13:24:30.000000000 +0200 ++++ kpogre-1.5.4-p/kpogre/PropertyPages/kpgpropertypage.h 2007-02-02 04:16:58.000000000 +0100 +@@ -18,7 +18,7 @@ + #include "kpgabstractpropertypage.h" + + // include files for libpgxx +-#include ++#include + + + /** +diff -Naur kpogre-1.5.4/kpogre/PropertyPages/kpgschemaproppage.h kpogre-1.5.4-p/kpogre/PropertyPages/kpgschemaproppage.h +--- kpogre-1.5.4/kpogre/PropertyPages/kpgschemaproppage.h 2006-09-15 14:44:09.000000000 +0200 ++++ kpogre-1.5.4-p/kpogre/PropertyPages/kpgschemaproppage.h 2007-02-02 04:16:58.000000000 +0100 +@@ -15,7 +15,7 @@ + #include "kpgschemaproppagebase.h" + + // include files for libpgxx +-#include ++#include + + // application specific includes + #include "kpgabstractpropertypage.h" +diff -Naur kpogre-1.5.4/kpogre/PropertyPages/kpgsequenceproppage.h kpogre-1.5.4-p/kpogre/PropertyPages/kpgsequenceproppage.h +--- kpogre-1.5.4/kpogre/PropertyPages/kpgsequenceproppage.h 2006-09-15 13:24:30.000000000 +0200 ++++ kpogre-1.5.4-p/kpogre/PropertyPages/kpgsequenceproppage.h 2007-02-02 04:16:59.000000000 +0100 +@@ -15,7 +15,7 @@ + #include "kpgsequenceproppagebase.h" + + // include files for libpgxx +-#include ++#include + + // application specific includes + #include "kpgabstractpropertypage.h" +diff -Naur kpogre-1.5.4/kpogre/PropertyPages/kpgserverproppage.h kpogre-1.5.4-p/kpogre/PropertyPages/kpgserverproppage.h +--- kpogre-1.5.4/kpogre/PropertyPages/kpgserverproppage.h 2006-12-21 10:47:27.000000000 +0100 ++++ kpogre-1.5.4-p/kpogre/PropertyPages/kpgserverproppage.h 2007-02-02 04:16:58.000000000 +0100 +@@ -23,7 +23,7 @@ + #include "kpgabstractpropertypage.h" + + // include files for libpgxx +-#include ++#include + + class KPGServer; + +diff -Naur kpogre-1.5.4/kpogre/PropertyPages/kpgtablecolumnproppage.h kpogre-1.5.4-p/kpogre/PropertyPages/kpgtablecolumnproppage.h +--- kpogre-1.5.4/kpogre/PropertyPages/kpgtablecolumnproppage.h 2006-09-15 13:24:30.000000000 +0200 ++++ kpogre-1.5.4-p/kpogre/PropertyPages/kpgtablecolumnproppage.h 2007-02-02 04:16:59.000000000 +0100 +@@ -23,7 +23,7 @@ + #include "kpgabstractpropertypage.h" + + // include files for libpgxx +-#include ++#include + + /** + Table column property page +diff -Naur kpogre-1.5.4/kpogre/PropertyPages/kpgtableproppage.h kpogre-1.5.4-p/kpogre/PropertyPages/kpgtableproppage.h +--- kpogre-1.5.4/kpogre/PropertyPages/kpgtableproppage.h 2006-09-15 14:44:09.000000000 +0200 ++++ kpogre-1.5.4-p/kpogre/PropertyPages/kpgtableproppage.h 2007-02-02 04:16:59.000000000 +0100 +@@ -20,7 +20,7 @@ + #include "kpgtableproppagebase.h" + + // include files for libpgxx +-#include ++#include + + // application specific includes + #include "kpgabstractpropertypage.h" +diff -Naur kpogre-1.5.4/kpogre/PropertyPages/kpgtablespaceproppage.h kpogre-1.5.4-p/kpogre/PropertyPages/kpgtablespaceproppage.h +--- kpogre-1.5.4/kpogre/PropertyPages/kpgtablespaceproppage.h 2006-09-15 13:24:31.000000000 +0200 ++++ kpogre-1.5.4-p/kpogre/PropertyPages/kpgtablespaceproppage.h 2007-02-02 04:16:58.000000000 +0100 +@@ -15,7 +15,7 @@ + #include "kpgtablespaceproppagebase.h" + + // include files for libpgxx +-#include ++#include + + // application specific includes + #include "kpgabstractpropertypage.h" +diff -Naur kpogre-1.5.4/kpogre/PropertyPages/kpgtriggerproppage.h kpogre-1.5.4-p/kpogre/PropertyPages/kpgtriggerproppage.h +--- kpogre-1.5.4/kpogre/PropertyPages/kpgtriggerproppage.h 2006-09-15 13:24:31.000000000 +0200 ++++ kpogre-1.5.4-p/kpogre/PropertyPages/kpgtriggerproppage.h 2007-02-02 04:16:58.000000000 +0100 +@@ -18,7 +18,7 @@ + #include "kpgabstractpropertypage.h" + + // include files for libpgxx +-#include ++#include + + /** + Table trigger property page +diff -Naur kpogre-1.5.4/kpogre/PropertyPages/kpgtypeproppage.h kpogre-1.5.4-p/kpogre/PropertyPages/kpgtypeproppage.h +--- kpogre-1.5.4/kpogre/PropertyPages/kpgtypeproppage.h 2006-09-15 13:24:31.000000000 +0200 ++++ kpogre-1.5.4-p/kpogre/PropertyPages/kpgtypeproppage.h 2007-02-02 04:16:58.000000000 +0100 +@@ -18,7 +18,7 @@ + #include "kpgabstractpropertypage.h" + + // include files for libpgxx +-#include ++#include + + /** + Data type properties +diff -Naur kpogre-1.5.4/kpogre/PropertyPages/kpguniqueconstrproppage.h kpogre-1.5.4-p/kpogre/PropertyPages/kpguniqueconstrproppage.h +--- kpogre-1.5.4/kpogre/PropertyPages/kpguniqueconstrproppage.h 2006-09-15 13:24:31.000000000 +0200 ++++ kpogre-1.5.4-p/kpogre/PropertyPages/kpguniqueconstrproppage.h 2007-02-02 04:16:59.000000000 +0100 +@@ -18,7 +18,7 @@ + #include "kpgabstractpropertypage.h" + + // include files for libpgxx +-#include ++#include + + /** + Unique Constraint properties +diff -Naur kpogre-1.5.4/kpogre/PropertyPages/kpguserproppage.h kpogre-1.5.4-p/kpogre/PropertyPages/kpguserproppage.h +--- kpogre-1.5.4/kpogre/PropertyPages/kpguserproppage.h 2006-09-15 13:24:31.000000000 +0200 ++++ kpogre-1.5.4-p/kpogre/PropertyPages/kpguserproppage.h 2007-02-02 04:16:58.000000000 +0100 +@@ -18,7 +18,7 @@ + #include "kpgabstractpropertypage.h" + + // include files for libpgxx +-#include ++#include + + /** + User properties +diff -Naur kpogre-1.5.4/kpogre/PropertyPages/kpgviewproppage.h kpogre-1.5.4-p/kpogre/PropertyPages/kpgviewproppage.h +--- kpogre-1.5.4/kpogre/PropertyPages/kpgviewproppage.h 2006-09-15 13:24:31.000000000 +0200 ++++ kpogre-1.5.4-p/kpogre/PropertyPages/kpgviewproppage.h 2007-02-02 04:16:58.000000000 +0100 +@@ -15,7 +15,7 @@ + #include "kpgviewproppagebase.h" + + // include files for libpgxx +-#include ++#include + + // application specific includes + #include "kpgabstractpropertypage.h" +diff -Naur kpogre-1.5.4/kpogre/Wizards/kpgmodifyviewwidget1.h kpogre-1.5.4-p/kpogre/Wizards/kpgmodifyviewwidget1.h +--- kpogre-1.5.4/kpogre/Wizards/kpgmodifyviewwidget1.h 2004-12-19 22:01:11.000000000 +0100 ++++ kpogre-1.5.4-p/kpogre/Wizards/kpgmodifyviewwidget1.h 2007-02-02 04:16:59.000000000 +0100 +@@ -15,8 +15,8 @@ + #include "kpgmodifyviewwidget1base.h" + + // include files for libpgxx +-#include +-#include ++#include ++#include + + class KPGDatabase; + class KPGSyntaxHighlighter; } From crazy at frugalware.org Fri Feb 2 05:57:45 2007 From: crazy at frugalware.org (crazy) Date: Fri Feb 2 05:57:47 2007 Subject: [Frugalware-darcs] wx: python.sh Message-ID: <20070202045745.D6814FA4083@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=wx;a=darcs_commitdiff;h=20070202044822-f6986-7b666d9612e607b190cfe856e3882337c5b57fb6.gz; [python.sh crazy **20070202044822] { addfile ./source/include/python.sh hunk ./source/include/python.sh 1 +#!/bin/sh + +# (c) 2006 Miklos Vajna +# python.sh for Frugalware +# distributed under GPL License + +# common variables for python packages + +_F_python_libdir=`python -c 'from distutils import sysconfig; print sysconfig.get_python_lib()[1:]'` +_F_python_ver=`python -c 'from distutils import sysconfig; print sysconfig.get_python_version()'` } From crazy at frugalware.org Fri Feb 2 08:38:20 2007 From: crazy at frugalware.org (crazy) Date: Fri Feb 2 08:38:23 2007 Subject: [Frugalware-darcs] wx: foo Message-ID: <20070202073820.AB249FA401B@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=wx;a=darcs_commitdiff;h=20070202073523-f6986-76e538665ba2bb3a0d686e3fe7d8ae09a6d7f6e8.gz; [foo crazy **20070202073523] { adddir ./frugalware-i686 adddir ./source adddir ./source/include addfile ./source/include/berlios.sh hunk ./source/include/berlios.sh 1 +#!/bin/sh + +# (c) 2005-2006 Miklos Vajna +# (c) 2005-2006 Priyank Gosalia +# berlios.sh for Frugalware +# distributed under GPL License + +# sets url, up2date and source() for a typical berlios project + +if [ -z "$_F_berlios_name" ]; then + _F_berlios_name=$pkgname +fi + +if [ -z "$_F_berlios_ext" ]; then + _F_berlios_ext=".tar.gz" +fi + +if [ -z "$_F_berlios_dirname" ]; then + _F_berlios_dirname="$_F_berlios_name" +fi + +url="http://developer.berlios.de/projects/$_F_berlios_dirname" +up2date="lynx -dump http://developer.berlios.de/project/showfiles.php?group_id=\$(lynx -dump $url| grep -m1 showfiles | sed -e 's/.*id=\(.*\)\&.*/\1/;q') | grep -m1 '$_F_berlios_name-\(.*\)$_F_berlios_ext'| sed 's/.*$_F_berlios_name-\(.*\)$_F_berlios_ext.*/\1/;s/-/_/g'" +source=(http://download.berlios.de/$_F_berlios_dirname/$_F_berlios_name-${pkgver//_/-}$_F_berlios_ext) addfile ./source/include/kde.sh hunk ./source/include/kde.sh 1 +#!/bin/sh + +# (c) 2007 Gabriel Craciunescu +# (c) 2006 Miklos Vajna +# kde.sh for Frugalware +# distributed under GPL License + +# common url, up2date, and source(), and build() for kde packages + +if [ -z "$_F_kde_name" ]; then + _F_kde_name=$pkgname +fi + +if [ -z "$_F_kde_build_debug" ]; then + _F_kde_build_debug=0 +fi + +if [ -z "$_F_cd_path" ]; then + _F_cd_path=$_F_kde_name-$pkgver +fi + +if [ -z "$_F_kde_reconf" ]; then + _F_kde_reconf=0 +fi + +if [ -z "$_F_kde_split_docs" ]; then + _F_kde_split_docs=0 +fi + +if [ -z "$_F_kde_defaults" ]; then + _F_kde_defaults=1 +fi + +## This only works on 'kde core' and conflicts with some _F_sourceforge +## options so allow to disable when isset to 0 , default is enabled +## TODO: add mirror option +if [ "$_F_kde_defaults" -eq 1 ]; then + url="http://www.kde.org" + _F_kde_ver=3.5.6 + pkgurl="ftp://ftp.solnet.ch/mirror/KDE/stable/$_F_kde_ver/src" + up2date="lynx -dump http://www.kde.org/download/|grep '$_F_kde_name'|sed -n '1 p'|sed 's/.*-\([^ ]*\) .*/\1/'" + source=($pkgurl/$_F_kde_name-$pkgver.tar.bz2) +fi +# qt's post_install is essential for kde pkgs +options=(${options[@]} 'scriptlet') +## If someone want to work on this /etc move here is a way to do it. Just add ${kde_config} to Fconfopts +## !!!BIG FAT WARNING!!!: THE WHOLE KDE AND _EVERY DAMN KDE_APP NEED BE REBUILD WITH THIS_. +## KDE{APPS} NEED BE FORCED TO USE THIS BY DEFAULT +## !!! DO NOT EVER REMOVE THIS FROM DEFAULTS ONCE IS ADDED OR KDE BREAKS !!! + +#kde_config="kde_confdir=/etc/kde3/config \ +# kde_kcfgdir=/etc/kde3/config.kcfg" + +Fconfopts="$Fconfopts \ + --disable-dependency-tracking \ + --with-gnu-ld \ + --enable-gcc-hidden-visibility \ + --enable-new-ldflags \ + --disable-finale" + +if [ "$_F_kde_build_debug" -eq 1 ]; then + Fconfopts="$Fconfopts --enable-debug --with-debug" +else + Fconfopts="$Fconfopts --disable-debug --without-debug" +fi + + +## Things for kde apps + +if [ ! -z "$_F_kde_id" ]; then + url="http://www.kde-apps.org/content/show.php?content=$_F_kde_id" + up2date="lynx -dump -nolist $url|grep -m1 'Version:'|sed 's/.*: *\(.*\)$/\1/'" +fi + +if [ ! -z "$_F_kde_id2" ]; then + url="http://www.kde-look.org/content/show.php?content=$_F_kde_id2" + up2date="lynx -dump -nolist $url|grep -m1 'Version:'|sed 's/.*: *\(.*\)$/\1/'" +fi + + +Fbuild_kde_reconf() +{ + if [ "$_F_kde_reconf" -eq 1 ]; then + Fcd + Fpatchall + make -f admin/Makefile.common cvs || Fdie + fi +} + +Fbuild_kde_split_docs() +{ + if [ "$_F_kde_split_docs" -eq 1 ]; then + Fsplit $_F_kde_name-docs usr/share/doc + fi +} + + +Fbuild_kde() +{ + +if [ "$_F_kde_reconf" -eq 1 ]; then + Fbuild_kde_reconf + Fconf \ + DO_NOT_COMPILE="$_F_kde_do_not_compile" + make || Fdie + Fmakeinstall +else + Fbuild \ + DO_NOT_COMPILE="$_F_kde_do_not_compile" +fi + Fbuild_kde_split_docs +} + + +build() +{ + Fbuild_kde +} + addfile ./source/include/python.sh hunk ./source/include/python.sh 1 +#!/bin/sh + +# (c) 2006 Miklos Vajna +# python.sh for Frugalware +# distributed under GPL License + +# common variables for python packages + +_F_python_libdir=`python -c 'from distutils import sysconfig; print sysconfig.get_python_lib()[1:]'` +_F_python_ver=`python -c 'from distutils import sysconfig; print sysconfig.get_python_version()'` addfile ./source/include/sourceforge.sh hunk ./source/include/sourceforge.sh 1 +#!/bin/sh + +# (c) 2005-2006 Miklos Vajna +# sourceforge.sh for Frugalware +# distributed under GPL License + +# sets url, up2date and source() for a typical sf project + +if [ -z "$_F_sourceforge_name" ]; then + _F_sourceforge_name=$pkgname +fi + +if [ -z "$_F_sourceforge_mirror" ]; then + # set our preferred mirror + _F_sourceforge_mirror="heanet" +fi + +if [ -z "$_F_sourceforge_dirname" ]; then + _F_sourceforge_dirname="$_F_sourceforge_name" +fi + +if [ -z "$_F_sourceforge_ext" ]; then + _F_sourceforge_ext=".tar.gz" +fi + +if [ -z "$_F_sourceforge_broken_up2date" ]; then + _F_sourceforge_broken_up2date=0 +fi + +url="http://sourceforge.net/projects/$_F_sourceforge_dirname" +if [ $_F_sourceforge_broken_up2date -eq 0 ]; then + up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=\$(lynx -dump $url|grep showfiles|sed 's/.*=\(.*\)/\1/;q')|grep -m1 'Latest \[.*\]'|sed 's/.*]$_F_sourceforge_prefix\(.*\) \[.*\].*/\1/;s/-/_/g'" +else + up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=\$(lynx -dump $url|grep showfiles|sed 's/.*=\(.*\)/\1/;q')|grep -m1 '$_F_sourceforge_name-\(.*\)$_F_sourceforge_ext'|sed 's/.*$_F_sourceforge_name-\(.*\)$_F_sourceforge_ext.*/\1/;s/-/_/g'" +fi +source=(http://${_F_sourceforge_mirror}.dl.sourceforge.net/sourceforge/$_F_sourceforge_dirname/$_F_sourceforge_name-${pkgver//_/-}$_F_sourceforge_ext) addfile ./source/include/util.sh hunk ./source/include/util.sh 1 +#!/bin/sh + +# Copyright (C) 2005-2006 Bence Nagy +# Copyright (C) 2005-2006 Miklos Vajna +# util.sh for Frugalware +# distributed under GPL License + +# Parts of Fsort and Funpack_makeself are: +# Copyright (C) 1999-2005 Gentoo Foundation +# This file can be distributed under the terms of the +# GNU General Public License version 2. + +# general utility functions for FrugalBuilds + +Fsrcdir="$startdir/src" +Fdestdir="$startdir/pkg" +Fprefix="/usr" +Fsysconfdir="/etc" +Flocalstatedir="/var" +Fmenudir="/usr/share/applications" +Fconfopts="--prefix=$Fprefix" +export LDFLAGS="-Wl,--hash-style=both" + +### @defgroup fwmakepkg Common functions + # @{ + # @brief Common functions used by makepkg + ## + +### Prints out a message + # @param message message to display + ## +Fmessage() { + if [ "$USE_COLOR" = "Y" -o "$USE_COLOR" = "y" ]; then + echo -e "\033[1;36m==>\033[1;0m \033[1;1m$1\033[1;0m" >&2 + else + echo "==> $1" >&2 + fi +} + +### Cause makepkg to exit + ## +Fdie() { + exit 2 +} + +### Go to the source directory if it is $Fsrcdir currently + # @param dir optional source directory, default is $pkgname-$pkgver$pkgextraver + ## +Fcd() { + if [ "$Fsrcdir" = `pwd` ]; then + if [ "$#" -eq 1 ]; then + Fmessage "Going to the source directory..." + cd "$Fsrcdir/$1" || Fdie + elif [ "$#" -eq 0 ]; then + if [ -z "$_F_cd_path" ]; then + _F_cd_path="$pkgname-$pkgver$pkgextraver" + fi + Fcd "$_F_cd_path" + fi + fi +} + +### Creates a directory under $Fdestdir + # @param dir name of the directory to create (you can supply more than one) + ## +Fmkdir() { + local i + for i in "$@"; do + if [ ! -d "$Fdestdir/$i" ]; then + Fmessage "Creating directory: $i" + mkdir -p "$Fdestdir/$i" || Fdie + fi + done +} + +### Deletes (rm -rf) a directory stucture under $Fdestdir + # @param path name of the path to rm -rf (you can supply more than one) + ## +Frm() { + local i + for i in "$@"; do + Fmessage "Deleting file(s): $i" + rm -rf "$Fdestdir"/$i || Fdie + done +} + +### Copy file(s) under $Fdestdir + # @param source name of the file(s) + # @param dest path of the destination + ## +Fcp() { + Fmessage "Copying file(s): $1" + cp "$Fdestdir/"$1 "$Fdestdir"/$2 || Fdie +} + +### Copy file(s) to $Fdestdir recursively from $Fsrcdir + # @param source name of the file(s) + # @param dest path of the destination + ## +Fcpr() { + Fmessage "Copying file(s) recursive: $1" + cp -dpR "$Fsrcdir/"$1 "$Fdestdir"/$2 || Fdie +} + +### Copy file(s) to $Fdestdir recursively from the current working dir + # @param source name of the file(s) + # @param dest path of the destination + ## +Fcprrel() { + Fmessage "Copying file(s) recursive: $1" + cp -dpR $1 "$Fdestdir"/$2 || Fdie +} + +### Move file(s) under $Fdestdir + # @param source name of the file(s) + # @param dest path of the destination + ## +Fmv() { + Fmessage "Moving file(s): $1" + mv "$Fdestdir/"$1 "$Fdestdir"/$2 || Fdie +} + +### Install file(s) to $Fdestdir + # @param mode set permission mode (as in chmod) + # @param file(s) to be installed (defaults to `basename $destination`) + # @param destination + ## +Finstallrel() { + if [ "$#" -eq 3 ]; then + Fmessage "Installing file(s): $2" + if [ "`ls -l $2 | wc -l`" -gt 1 ]; then + Fmkdir "$3" + fi + if [ -d "$Fdestdir/$3" -a ! "`ls -l $2 | wc -l`" -gt 1 ]; then + install -D -m "$1" $2 "$Fdestdir/$3/`basename "$2"`" || Fdie + else + install -D -m "$1" $2 "$Fdestdir/$3" || Fdie + fi + elif [ "$#" -eq 2 ]; then + Finstallrel "$1" "`basename "$2"`" "$2" + else + local i + for i in "${@:2:$#-2}"; do + Fmkdir "${@:$#}" + Finstallrel $1 "$i" "${@:$#}/`basename "$i"`" + done + fi +} + +### Install file(s) to $Fdestdir from $Fsrcdir + # @param mode set permission mode (as in chmod) + # @param file(s) to be installed from $Fsrcdir \ + # (defaults to $Fsrcdir/`basename $destination`) + # @param destination + ## +Finstall() { + if [ "$#" -eq 3 ]; then + Finstallrel "$1" "$Fsrcdir/$2" "$3" + elif [ "$#" -eq 2 ]; then + Finstallrel "$1" "$Fsrcdir/`basename "$2"`" "$2" + else + local i + for i in "${@:2:$#-2}"; do + Fmkdir "${@:$#}" + Finstallrel "$1" "$Fsrcdir/$i" "${@:$#}/`basename "$i"`" + done + fi +} + +### Changes the permissions of dirs & subdirs inside $Fdestdir + # @param dir where to start "find" + # @param permission octal mode or [+-][rwxstugo] + ## +Fdirschmod() { + Fmessage "Configure chmod dirs & subdirs inside: $1" + find "$Fdestdir"/$1 -type d |xargs chmod $2 || Fdie +} + +### Changes the permissions of all file(s) inside $Fdestdir + # @param dir to where start "find" + # @param permission octal mode or [+-][rwxstugo] + ## +Ffileschmod() { + Fmessage "Configure chmod all files inside: $1" + find "$Fdestdir"/$1 -type f |xargs chmod $2 || Fdie +} + +### Change the owner and/or group of dirs and subdirs inside $Fdestdir + # @param dir where to start "find" + # @param owner (needed) + # @param group (needed) + ## +Fdirschown() { + Fmessage "Configure chown dirs & subdirs inside: $1" + find "$Fdestdir"/$1 -type d |xargs chown $2:$3 || Fdie +} + +### Change the owner and/or group of all file(s) inside $Fdestdir + # @param dir where to start "find" + # @param owner (needed) + # @param group (needed) + ## +Ffileschown() { + Fmessage "Configure chown all files inside: $1" + find "$Fdestdir"/$1 -type f |xargs chown $2:$3 || Fdie +} + +### Install executable file(s) to $Fdestdir from $Fsrcdir + # @param file(s) to be installed from $Fsrcdir \ + # (defaults to $Fsrcdir/`basename $destination`) + # @param destination + ## +Fexe() { + Finstall 0755 "$@" +} + +### Install executable file(s) to $Fdestdir + # @param file(s) to be installed \ + # (defaults to `basename $destination`) + # @param destination + ## +Fexerel() { + Finstallrel 0755 "$@" +} + +### Install regular file(s) to $Fdestdir from $Fsrcdir + # @param file(s) to be installed from $Fsrcdir \ + # (defaults to $Fsrcdir/`basename $destination`) + # @param destination + ## +Ffile() { + Finstall 0644 "$@" +} + +### Install regular file(s) to $Fdestdir + # @param file(s) to be installed \ + # (defaults to `basename $destination`) + # @param destination + ## +Ffilerel() { + Finstallrel 0644 "$@" +} + +### Install documentation file(s) to $Fdestdir/usr/share/doc/$pkgname-$pkgver \ + # from $Fsrcdir. Also is $file.xx or $file.xx_YY present then it will be \ + # automatically installed, too. + # @param file(s) to be installed from $Fsrcdir \ + # (defaults to $Fsrcdir/`basename $destination`) + ## +Fdoc() { + Fmkdir "/usr/share/doc/$pkgname-$pkgver" + local i + for i in $@ + do + if [ -d "$i" ]; then + Fcpr "$Fsrcdir/$i" "/usr/share/doc/$pkgname-$pkgver/" + else + Ffile "$i" "/usr/share/doc/$pkgname-$pkgver/" + local j + for j in `ls $Fsrcdir|grep "$i\.[a-z_A-Z]\+$"` + do + Ffile "$j" "/usr/share/doc/$pkgname-$pkgver/" + done + fi + done +} + +### Install documentation file(s) to $Fdestdir/usr/share/doc/$pkgname-$pkgver. + # Also is $file.xx or $file.xx_YY present then it will be \ + # automatically installed, too. + # @param file(s) to be installed \ + # (defaults to $Fsrcdir/`basename $destination`) + ## +Fdocrel() { + Fmkdir "/usr/share/doc/$pkgname-$pkgver" + local i + for i in $@ + do + if [ -d "$i" ]; then + Fcprrel "$i" "/usr/share/doc/$pkgname-$pkgver/" + else + Ffilerel "$i" "/usr/share/doc/$pkgname-$pkgver/" + local j + for j in `ls |grep "$i\.[a-z_A-Z]\+$"` + do + Ffilerel "$j" "/usr/share/doc/$pkgname-$pkgver/" + done + fi + done +} + +### Install icon file(s) to $Fdestdir/usr/share/pixmaps \ + # from $Fsrcdir + # @param file(s) to be installed from $Fsrcdir \ + # (defaults to $Fsrcdir/`basename $destination`) + ## +Ficon() { + Fmkdir "/usr/share/pixmaps" + Ffile "$@" "/usr/share/pixmaps/" +} + +### Install icon file(s) to $Fdestdir/usr/share/pixmaps \ + # from $Fsrcdir + # @param file(s) to be installed from $Fsrcdir \ + # (defaults to $Fsrcdir/`basename $destination`) + ## +Ficonrel() { + Fmkdir "/usr/share/pixmaps" + Ffilerel "$@" /usr/share/pixmaps +} + +### Create symlink in $Fdestdir + # @param source (i.e. mysql/libmysqlclient.so) + # @param target (i.e. /usr/lib/) ($target's dir will be created if necessary) + ## +Fln() { + Fmessage "Creating symlink(s): $1" + Fmkdir "`dirname $2`" + ln -sf $1 "$Fdestdir"/$2 || Fdie +} + +### Use sed with file(s) + # @param regexp + # @param replacement (see man sed!) + # @param file(s) to edit in place + ## +Fsed() { + Fcd + for i in ${@:3:$#}; do + Fmessage "Using sed with file: $i" + sed -i -e "s|$1|$2|g" "$i" || Fdie + done +} + +### Strip $Fdestdir from files in $Fdestdir + # @param file(s) to strip + ## +Fdeststrip() { + local i + for i in "$@"; do + Fsed "$Fdestdir" "" $Fdestdir/$i + done +} + +### Apply a patch with -p1 (use the .patch0 suffix for -p0) + # @param Patch to apply. A ".gz" or ".bz2" suffix will be ingored. + ## +Fpatch() { + Fcd + local i level="1" + Fmessage "Using patch: $1" + if [ -n "`echo "$1" | grep '\.\(patch[0-9]*\|diff\)\.gz$'`" ]; then + i=`basename "$1" .gz` + elif [ -n "`echo "$1" | grep '\.\(patch[0-9]*\|diff\)\.bz2$'`" ]; then + i=`basename "$1" .bz2` + else + i=$1 + fi + if patch -Np0 --dry-run -i "$Fsrcdir/$i" >/dev/null && \ + ! patch -Np1 --dry-run -i "$Fsrcdir/$i" >/dev/null; then + level="0" + fi + patch -Np$level --no-backup-if-mismatch -i "$Fsrcdir/$i" || Fdie +} + +### Apply patches from source(). \ + # Allowed suffixes are \.\(patch[0-9]*\|diff\)\(\.\(gz\|bz2\)\|\). \ + # URLs allowed, too. + ## +Fpatchall() { + local archs=('i686' 'x86_64' 'ppc') patch="" patcharch="" + for i in ${source[@]}; do + if [ -n "`echo "$i" | grep \.patch[0-9]*$`" -o -n "`echo "$i" | grep \.diff$`" -o -n "`echo "$i" | grep '\.\(patch[0-9]*\|diff\)\.\(gz\|bz2\)$'`" ]; then + patch=`strip_url "$i"` + patcharch=`echo $patch|sed 's/.*-\([^-]\+\)\.\(diff\|patch0\?\)$/\1/'` + if [ "$patcharch" != "$patch" ] && echo ${archs[@]}|grep -q $patcharch; then + # filter the patch if it's not for the current arch + if [ "$patcharch" == "$CARCH" ]; then + Fpatch $patch + fi + else + Fpatch $patch + fi + fi + done +} + +### A wrapper to ./configure. It will try to run ./configure, Makefile.PL, \ + # extconf.rb and configure.rb, respectively. It will automatically add the \ + # --prefix=$Fprefix (defaults to /usr), \ + # --sysconfdir=$Fsysconfdir (defaults to /etc) and the \ + # --localstatedir=$Flocalstatedir (defaults to /var) switches. The two later \ + # will be added only if the configure script support it. + # If you want to pre-set a switch (i.e. add a switch only on a ceratin \ + # arch or so) apped the $Fconfopts variable. + # @param switch(es) to pass to the configure script + ## +Fconf() { + Fcd + Fmessage "Configuring..." + if [ -z "$_F_conf_configure" ]; then + _F_conf_configure="./configure" + fi + if [ -x $_F_conf_configure ]; then + grep -q sysconfdir $_F_conf_configure && \ + Fconfopts="$Fconfopts --sysconfdir=$Fsysconfdir" + grep -q localstatedir $_F_conf_configure && \ + Fconfopts="$Fconfopts --localstatedir=$Flocalstatedir" + $_F_conf_configure $Fconfopts "$@" || Fdie + elif [ -f Makefile.PL ]; then + if [ -z "$_F_conf_perl_pipefrom" ]; then + perl Makefile.PL DESTDIR=$Fdestdir "$@" || Fdie + else + $_F_conf_perl_pipefrom | perl Makefile.PL DESTDIR=$Fdestdir "$@" || Fdie + fi + unset _F_conf_perl_pipefrom + Fsed `perl -e 'printf "%vd", $^V'` "current" Makefile + elif [ -f extconf.rb ]; then + ruby extconf.rb --prefix="$Fprefix" "$@" || Fdie + elif [ -f configure.rb ]; then + ./configure.rb --prefix="$Fprefix" "$@" || Fdie + fi +} + +### A wrapper to make and "python setup.py build" after calling Fconf() + # @param switch(es) to pass to Fconf() + ## +Fmake() { + Fconf "$@" + Fmessage "Compiling..." + if [ -f GNUmakefile -o -f makefile -o -f Makefile ]; then + make || Fdie + elif [ -f setup.py ]; then + python setup.py build "$@" || Fdie + fi +} + +### A wrapper to nant + # @param build file to use + # @param switch(es) to pass to nant + ## +Fnant() { + Fmessage "Compiling with NAnt..." + if [ ! -f "$1" ]; then + nant $@ -D:debug=false -D:install.prefix=/usr -D:install.destdir=$Fdestdir || Fdie + else + buildfile=$1 + shift + nant -buildfile:${buildfile} $@ -D:debug=false -D:install.prefix=/usr || Fdie + fi +} + +### A wrapper to make install: calls make DESTDIR=$Fdestir or \ + # prefix=$Fdestdir/usr install (which is necessary). \ + # Also handles python's setup.py. \ + # Removes /usr/info/dir and /usr/share/info/dir. + # @param param(s) passed to make/python + ## +Fmakeinstall() { + Fmessage "Installing to the package directory..." + if [ -f GNUmakefile -o -f makefile -o -f Makefile ]; then + if grep -q DESTDIR GNUmakefile makefile Makefile 2>/dev/null; then + make DESTDIR="$Fdestdir" "$@" install || Fdie + else + make prefix="$Fdestdir"/"$Fprefix" "$@" install || Fdie + fi + elif [ -f setup.py ]; then + python setup.py install --prefix "$Fprefix" --root "$Fdestdir" "$@" || Fdie + fi + if [ -e $Fdestdir/usr/info/dir ]; then + Frm /usr/info/dir + fi + if [ -e $Fdestdir/usr/share/info/dir ]; then + Frm /usr/share/info/dir + fi + if [ -d $Fdestdir/usr/lib/perl5/?.?.? ]; then + Fmv '/usr/lib/perl5/?.?.?' /usr/lib/perl5/current + fi + if [ -d $Fdestdir/usr/lib/perl5 ]; then + find $Fdestdir/usr/lib/perl5 -name perllocal.pod -exec rm {} \; + find $Fdestdir/usr/lib/perl5 -name .packlist -exec rm {} \; + fi + if [ -e $Fdestdir/usr/lib/perl5/site_perl/?.?.? ]; then + Fmv '/usr/lib/perl5/site_perl/?.?.?' /usr/lib/perl5/site_perl/current + fi + if [ -d $Fdestdir/usr/lib/perl5/site_perl ]; then + find $Fdestdir/usr/lib/perl5/site_perl -name perllocal.pod -exec rm {} \; + find $Fdestdir/usr/lib/perl5/site_perl -name .packlist -exec rm {} \; + fi + + # rc script + if [ -z "$_F_rcd_name" ]; then + _F_rcd_name=$pkgname + fi + if [ -e $Fsrcdir/rc.$_F_rcd_name ] && \ + grep -q "source /lib/initscripts/functions" $Fsrcdir/rc.$_F_rcd_name; then + Frcd2 $_F_rcd_name + fi +} + +### A default build(): Fpatchall, Fmake, Fmakeinstall + # @param param(s) passed to Fmake + ## +Fbuild() { + Fpatchall + Fmake "$@" + Fmakeinstall + if echo ${source[@]}|grep -q README.Frugalware; then + Fdoc README.Frugalware + fi +} + +### Create an rc.d environment + # @param name of the rc script, defaults to $pkgname + ## +Frcd() { + if [ "$#" -eq 1 ]; then + Fmessage "Creating rc.d environment: $1" + Fexe /etc/rc.d/rc.$1 + Ffile ../messages/* /etc/rc.d/rc.messages/ + else + Frcd "$pkgname" + fi +} + +### Create the new rc.d environment + # @param name of the rc script, defaults to $pkgname + ## +Frcd2() { + local po rc slang + + rc="$pkgname" ; [ -n "$1" ] && rc="$1" + + Fmessage "Creating new rc.d environment: $rc" + Fexe /etc/rc.d/rc.$rc + for po in $Fsrcdir/rc.$rc-*.po ; do + [ ! -f "$po" ] && continue + slang="`basename "$po" .po | sed "s|rc.$rc-||"`" + Fmsgfmt /lib/initscripts/messages $slang $rc `basename $po .po` + done +} + +build() { + Fbuild +} + +### Updates config.sub and config.guess from our automake. + ## +Facu() { + cat /usr/share/automake/config.sub >config.sub + cat /usr/share/automake/config.guess >config.guess +} + +### Similar to sort, but handles versions (i.e. 1.9 vs 1.10 vs 2.0) correctly. \ + # Uses vercmp from pacman. + # @param versions to be sorted + ## +Fsort() { + local i= items= left=0 + items=( `cat|tr '\n' ' '` ) + while [[ ${left} -lt ${#items[@]} ]] ; do + local lowest_idx=${left} + local idx=$(( ${lowest_idx} + 1 )) + while [[ ${idx} -lt ${#items[@]} ]] ; do + i=`vercmp "${items[${lowest_idx}]}" "${items[${idx}]}"` + [[ $i -gt 0 ]] && lowest_idx=${idx} + idx=$(( ${idx} + 1 )) + done + local tmp=${items[${lowest_idx}]} + items[${lowest_idx}]=${items[${left}]} + items[${left}]=${tmp} + left=$(( ${left} + 1 )) + done + echo ${items[@]}|sed 's/ /\n/g' +} + +### Unpack those pesky makeself generated files... \ + # They're shell scripts with the binary package tagged onto \ + # the end of the archive. Loki utilized the format as does \ + # many other game companies. + # @param file to unpack + # @param offset (optional) + # @param tail|dd (optional) + ## +Funpack_makeself() { + local src="$1" + local skip="$2" + local exe="$3" + + local shrtsrc="$(basename "${src}")" + Fmessage "Unpacking ${shrtsrc}" + local dir=${shrtsrc%.*} + mkdir $dir + if [ -z "${skip}" ] + then + local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" + local skip=0 + exe=tail + case ${ver} in + 1.5.*) # Tested 1.5.{3,4,5} ... guessing 1.5.x series is same. + skip=$(grep -a ^skip= "${src}" | cut -d= -f2) + ;; + 2.0|2.0.1) + skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) + ;; + 2.1.1) + skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-) + let skip="skip + 1" + ;; + 2.1.2) + skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1) + let skip="skip + 1" + ;; + 2.1.3) + skip=`grep -a ^offset= "${src}" | awk '{print $3}'` + let skip="skip + 1" + ;; + 2.1.4|2.1.5) + skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) + skip=$(head -n ${skip} "${src}" | wc -c) + exe="dd" + ;; + *) + plain "I'm sorry, but I was unable to support the Makeself file." + plain "Version '${ver}' is not supported." + Fdie + ;; + esac + fi + case ${exe} in + tail) exe="tail -n +${skip} '${src}'";; + dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";; + *) error "makeself can't handle exe '${exe}'" + Fdie + esac + + # Let's grab the first few bytes of the file to figure out what kind of archive it is. + local tmpfile="$(mktemp)" + eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}" + local filetype="$(file -b "${tmpfile}")" + case ${filetype} in + *tar\ archive) + eval ${exe} | tar --no-same-owner -xf - -C $dir + ;; + bzip2*) + eval ${exe} | bzip2 -dc | tar --no-same-owner -xf - -C $dir + ;; + gzip*) + eval ${exe} | tar --no-same-owner -xzf - -C $dir + ;; + compress*) + eval ${exe} | gunzip | tar --no-same-owner -xf - -C $dir + ;; + *) + error "Unknown file type \"${filetype}\"?" + Fdie + ;; + esac +} + +### Our autogen.sh. Runs aclocal, autoheader, autoconf and finally automake. + ## +Fautoconfize() { + Fmessage "Running aclocal autoheader autoconf automake ..." + aclocal || Fdie + autoheader || Fdie + autoconf || Fdie + automake -a -c -f || Fdie +} + +Fautoreconf() { + Fmessage "Running autoreconf -vif ..." + autoreconf -vif || Fdie +} + +### Extracts version from a page's last tar.gz link + ## +Flasttar() +{ + grep tar.gz$|sed -n 's/.*-\(.*\)\.t.*/\1/;$ p' +} + +Flasttgz() +{ + grep tgz$|sed -n 's/.*-\(.*\)\.t.*/\1/;$ p' +} + +Flasttarbz2() +{ + grep tar.bz2$|sed -n 's/.*-\(.*\)\.t.*/\1/;$ p' +} + +### Creates a .desktop file for graphical applications + # example: Fdesktop vmware vmware-workstation.png "System;" \ + # "application/x-vmware-vm;application/x-vmware-team;" + # @param name of the executable binary + # @param icon name from /usr/share/pixmaps + # @param categori(es) (optional) + # You can choose one or more from the followings: + # System;Games;AudioVideo;GNOME;KDE;Network;Development;FileTransfer;GTK; + # @param mimetype(s) (optional) + ## +Fdesktop() +{ + Fmkdir $Fmenudir + Fmessage "Installing desktop file: $pkgname.desktop" + cat > $Fdestdir$Fmenudir/$pkgname.desktop << EOF +[Desktop Entry] +Encoding=UTF-8 +Name=$pkgname +Comment=$pkgdesc +Exec=$1 +Terminal=false +Type=Application +StartupNotify=true +Icon=$2 +Categories=Application;$3 +MimeType=$4 +EOF +} + + +### Creates a .desktop for graphical applications + # A more flexible Fdesktop() + # Options: + # _F_desktop_filename : Name of the .desktop file + # _F_desktop_name : Name of the desktop icon to be displayed + # _F_desktop_desc : Description of the icon + # _F_desktop_icon : Icon to be used from /usr/share/pixmaps + # _F_desktop_exec : Name of the executable file + # _F_desktop_categories : Categories (same as Fdesktop) + # _F_desktop_mime : Mimetypes + # _F_desktop_show_in : Whether the icon should be showed in only a particular DE + # like "XFCE;" for Xfce, "GNOME;" for Gnome, etc. +### +Fdesktop2() +{ + dcategories="Application;" + if [ -z $_F_desktop_filename ] ; then + deskfilename=$pkgname.desktop + else + deskfilename=$_F_desktop_filename.desktop + fi + + if [ ! -n "$_F_desktop_name" ] ; then + dname=$pkgname + else + dname="$_F_desktop_name" + fi + + if [ -z "$_F_desktop_desc" ] ; then + ddesc=$pkgdesc + else + ddesc=$_F_desktop_desc + fi + + if [ ! -z $_F_desktop_icon ] ; then + dicon=$_F_desktop_icon + fi + + if [ ! -z $_F_desktop_exec ] ; then + dexec=$_F_desktop_exec + else + dexec=$pkgname + fi + + if [ ! -z $_F_desktop_categories ] ; then + dcategories="${dcategories[@]}$_F_desktop_categories" + fi + + if [ ! -z $_F_desktop_mimetypes ] ; then + dmime=$_F_desktop_mimetypes + fi + + if [ ! -z $_F_desktop_show_in ] ; then + dshowin=$_F_desktop_show_in + fi + + Fmkdir $Fmenudir + Fmessage "Installing desktop file: $deskfilename" + cat > $Fdestdir$Fmenudir/$pkgname.desktop << EOF +[Desktop Entry] +Encoding=UTF-8 +Name=$dname +Comment=$ddesc +Exec=$dexec +Terminal=false +Type=Application +StartupNotify=true +Icon=$dicon +Categories=$dcategories +MimeType=$dmime +EOF + + if [ ! -z $_F_desktop_show_in ] ; then + echo "OnlyShowIn=$dshowin;" >> $Fdestdir$Fmenudir/$pkgname.desktop + fi +} + +### Creates a wrapper for applications + # example: Fwrapper "python /usr/lib/python/foo.py" foo + # @param wrapper string or command + # @param name of the wrapper file to be installed under /usr/bin + ## +Fwrapper() +{ + local exe=$2 + mkdir -p $startdir/pkg/usr/bin + Fmessage "Creating a wrapper: /usr/bin/$exe" + echo "#!/bin/sh" > $startdir/pkg/usr/bin/$exe + echo "$1" >> $startdir/pkg/usr/bin/$exe + chmod 755 $startdir/pkg/usr/bin/$exe +} + +### Moves a file pattern to a subpackage + # example: Fsplit libmysql /usr/lib + # @param name of the subpackage + # @param pattern of the files to move + ## +Fsplit() +{ + local subpkg=$1 + shift 1 + local i + local dir + local path + for i in $@ + do + # split the / suffix if used + path=`echo $i|sed 's|/$||'` + + Fmessage "Moving $path to subpackage $subpkg" + dir=`echo $path|sed 's|/[^/]*$||'` + mkdir -p $startdir/pkg.$subpkg/$dir/ + mv $Fdestdir/$path $startdir/pkg.$subpkg/$dir/ || Fdie + done +} + +### Check if a logical flag is defined in options() or not + # example: if [ "`check_option DEVEL`" ]; then + # @param: name of the logical flag + ## +check_option() { + local i + for i in ${options[@]}; do + local uc=`echo $i | tr [:lower:] [:upper:]` + local lc=`echo $i | tr [:upper:] [:lower:]` + if [ "$uc" = "$1" -o "$lc" = "$1" ]; then + echo $1 + return + fi + done +} + +### Install gettext po files to binary mo files + # example: Fmsgfmt /usr/share/locale hu file file-hu + # @param path to locale directory (eg /usr/share/locale) + # @param language + # @param name of the mo file, default $pkgname + # @param name of the po file, default $pkgname-$lang + ## +Fmsgfmt() { + local llang mofile pofile slang + + if echo $2|grep -q _ ; then + llang="$2" + slang=`echo $llang|cut -d _ -f 1` + else + llang=${2}_`echo $2|tr [:lower:] [:upper:]` + slang="$2" + fi + + [ -n "$3" ] && mofile="$3.mo" || mofile="$pkgname.mo" + [ -n "$4" ] && pofile="$4.po" || pofile="$pkgname-$slang.po" + + [ -f $Fsrcdir/$pofile ] || Fdie + + Fmkdir $1/$llang/LC_MESSAGES + msgfmt -o $Fdestdir/$1/$llang/LC_MESSAGES/$mofile $Fsrcdir/$pofile || Fdie +} + +### Extract archives + # example: Fextract pacman.tar.gz + # @param: file name to extract + ## +Fextract() { + local cmd file tmp + file="${1}" + tmp="$(echo "${file}" | tr 'A-Z' 'a-z')" + case "${tmp}" in + *.tar.gz|*.tar.z|*.tgz) + cmd="tar --use-compress-program=gzip -xf $file" ;; + *.tar.bz2|*.tbz2) + cmd="tar --use-compress-program=bzip2 -xf $file" ;; + *.tar) + cmd="tar -xf $file" ;; + *.zip) + unziphack=1 + cmd="unzip -qqo $file" ;; + *.cpio.gz) + cmd="bsdtar -x -f $file" ;; + *.cpio.bz2) + cmd="bsdtar -x -f $file" ;; + *.gz) + cmd="gunzip -f $file" ;; + *.bz2) + cmd="bunzip2 -f $file" ;; + *) + cmd="" ;; + esac + if [ "$cmd" != "" ]; then + msg " $cmd" + $cmd + if [ $? -ne 0 ]; then + # unzip will return a 1 as a warning, it is not an error + if [ "$unziphack" != "1" -o $? -ne 1 ]; then + error "Failed to extract ${file}" + msg "Aborting..." + Fdie + fi + fi + fi +} +### @} } From crazy at frugalware.org Fri Feb 2 08:40:18 2007 From: crazy at frugalware.org (crazy) Date: Fri Feb 2 08:40:20 2007 Subject: [Frugalware-darcs] wx: bar Message-ID: <20070202074018.CDAE2FA401B@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=wx;a=darcs_commitdiff;h=20070202073726-f6986-d0a528b22b38c88b434bb86f91732f51077dc103.gz; [bar crazy **20070202073726] { adddir ./source/xlib-extra adddir ./source/xapps-extra } From crazy at frugalware.org Fri Feb 2 08:42:21 2007 From: crazy at frugalware.org (crazy) Date: Fri Feb 2 08:42:24 2007 Subject: [Frugalware-darcs] wx: wxgtk-2.8.0-1-i686 Message-ID: <20070202074221.CF149FA4024@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=wx;a=darcs_commitdiff;h=20070202073903-f6986-0f0077b028e5e02f42e84b9a55188f2db920a86e.gz; [wxgtk-2.8.0-1-i686 crazy **20070202073903 * restore wxgtk ] { adddir ./source/xlib-extra/wxgtk addfile ./source/xlib-extra/wxgtk/FrugalBuild hunk ./source/xlib-extra/wxgtk/FrugalBuild 1 +# Compiling Time: 15.12 SBU +# Maintainer: crazy +# Contributor: Miklos Nemeth + +pkgname=wxgtk +pkgver=2.8.0 +pkgrel=1 +pkgdesc="GTK+ implementation of wxWidgets API for GUI'" +_F_sourceforge_dirname="wxwindows" +_F_sourceforge_name="wxGTK" +_F_sourceforge_ext=".tar.bz2" +Finclude sourceforge +url="http://www.wxwidgets.org/" +depends=('libdrm' 'sdl' 'gtk+2' 'libgl' 'freetype2' 'libxcb' 'glib2') +groups=('xlib-extra') +archs=('i686' 'x86_64') +options=('scriptlet') +replaces=('wxgtk-devel') +conflicts=('wxgtk-devel') +source=($source \ + need-this-while-the-wxpython-devel-is-using-CVS-STUFF-IN-THE_STABLE-RELEASE.patch) +VER="2.8" + +subpkgs=("$pkgname-locale" "$pkgname-u8") +subdescs=('Locale files for wxWidgets' "GTK+ implementation of wxWidgets API for GUI (unicode).") +subgroups=('locale-extra' 'xlib-extra') +subdepends=("$pkgname=$pkgver" "$pkgname=$pkgver") +subarchs=('i686 x86_64' 'i686 x86_64') + + +wx_compile() +{ + make || Fdie + Fmakeinstall + cd contrib/src + Fconf + make || Fdie + Fmakeinstall + cd ../.. +} + + +build() +{ + cd $Fsrcdir || Fdie + cp -r wxGTK-$pkgver wxGTK-$pkgver-u8 || Fdie + ## TODO: figure|enable more things + wxconfig="--with-opengl \ + --enable-geometry \ + --enable-timer \ + --enable-sound \ + --with-sdl \ + --enable-graphics_ctx \ + --enable-mediactrl \ + --enable-display \ + --enable-plugins \ + --enable-compat24" + ## Unicode one + cd wxGTK-$pkgver-u8 + Fpatchall + autoconf || Fdie + Fconf \ + ${wxconfig} \ + --enable-unicode + wx_compile + Frm usr/lib/wx/${VER} + ## This is still not a solution .. I will change this in 0.7 + Frm usr/include usr/share/aclocal usr/share/bakefile usr/share/locale usr/bin/wx-config usr/bin/wxrc + Fln /usr/lib/wx/config/gtk2-unicode-release-${VER} /usr/bin/wx-config-u8 + Fmv /usr/bin/wxrc-${VER} /usr/bin/wxrc-${VER}-u8 + Fln /usr/bin/wxrc-${VER}-u8 /usr/bin/wxrc-u8 + Fsplit $pkgname-u8 /usr + ## Normal build + cd ../wxGTK-$pkgver + Fpatchall + autoconf || Fdie + Fconf \ + ${wxconfig} \ + --disable-unicode + wx_compile + Frm usr/bin/wx-config + Fln /usr/lib/wx/config/gtk2-ansi-release-${VER} /usr/bin/wx-config + ## lang stuff ( why is this split anyway ? ) + Fsplit $pkgname-locale usr/share/locale +} + +sha1sums=('56033e3bd32ac0ee72d593ff6a6e67c5488dd8dd'\ + '67c94aa3bdb1646b6f07d12ec83eafc730e0f641') +# optimization OK addfile ./source/xlib-extra/wxgtk/need-this-while-the-wxpython-devel-is-using-CVS-STUFF-IN-THE_STABLE-RELEASE.patch hunk ./source/xlib-extra/wxgtk/need-this-while-the-wxpython-devel-is-using-CVS-STUFF-IN-THE_STABLE-RELEASE.patch 1 +diff -Naur wxGTK-2.8.0/Makefile.in wxGTK-2.8.0-Damn-Devels-Releasing-STABLE-APPS-DEPENDING-ON-FUCKING-CVS-STUFF/Makefile.in +--- wxGTK-2.8.0/Makefile.in 2006-12-11 22:56:01.000000000 +0100 ++++ wxGTK-2.8.0-Damn-Devels-Releasing-STABLE-APPS-DEPENDING-ON-FUCKING-CVS-STUFF/Makefile.in 2007-02-02 07:10:32.000000000 +0100 +@@ -2157,6 +2157,7 @@ + wx/mac/sound.h \ + wx/mac/spinbutt.h \ + wx/mac/spinctrl.h \ ++ wx/mac/srchctrl.h \ + wx/mac/statbmp.h \ + wx/mac/statbox.h \ + wx/mac/statline.h \ +@@ -2230,6 +2231,9 @@ + wx/mac/carbon/printdlg.h \ + wx/mac/carbon/printmac.h \ + wx/mac/carbon/private.h \ ++ wx/mac/carbon/private/mactext.h \ ++ wx/mac/carbon/private/overlay.h \ ++ wx/mac/carbon/private/print.h \ + wx/mac/carbon/radiobox.h \ + wx/mac/carbon/radiobut.h \ + wx/mac/carbon/region.h \ +@@ -2237,6 +2241,7 @@ + wx/mac/carbon/slider.h \ + wx/mac/carbon/spinbutt.h \ + wx/mac/carbon/spinctrl.h \ ++ wx/mac/carbon/srchctrl.h \ + wx/mac/carbon/statbmp.h \ + wx/mac/carbon/statbox.h \ + wx/mac/carbon/statline.h \ +@@ -2871,6 +2876,7 @@ + wx/generic/scrolwin.h \ + wx/generic/spinctlg.h \ + wx/generic/splitter.h \ ++ wx/generic/srchctlg.h \ + wx/generic/textdlgg.h \ + wx/generic/timer.h \ + wx/generic/treectlg.h \ +@@ -2988,6 +2994,7 @@ + wx/spinbutt.h \ + wx/spinctrl.h \ + wx/splitter.h \ ++ wx/srchctrl.h \ + wx/statline.h \ + wx/tab.h \ + wx/tabctrl.h \ +@@ -3497,6 +3504,7 @@ + monodll_rgncmn.o \ + monodll_settcmn.o \ + monodll_sizer.o \ ++ monodll_srchcmn.o \ + monodll_statbar.o \ + monodll_stockitem.o \ + monodll_tbarbase.o \ +@@ -3532,6 +3540,7 @@ + monodll_selstore.o \ + monodll_spinctlg.o \ + monodll_splitter.o \ ++ monodll_srchctlg.o \ + monodll_textdlgg.o \ + monodll_tipwin.o \ + monodll_toolbkg.o \ +@@ -3670,6 +3679,7 @@ + monodll_rgncmn.o \ + monodll_settcmn.o \ + monodll_sizer.o \ ++ monodll_srchcmn.o \ + monodll_statbar.o \ + monodll_stockitem.o \ + monodll_tbarbase.o \ +@@ -3705,6 +3715,7 @@ + monodll_selstore.o \ + monodll_spinctlg.o \ + monodll_splitter.o \ ++ monodll_srchctlg.o \ + monodll_textdlgg.o \ + monodll_tipwin.o \ + monodll_toolbkg.o \ +@@ -4263,6 +4274,7 @@ + monodll_slider.o \ + monodll_spinbutt.o \ + monodll_spinctrl.o \ ++ monodll_srchctrl.o \ + monodll_statbmp.o \ + monodll_statbox.o \ + monodll_statbrma.o \ +@@ -5271,6 +5283,7 @@ + monolib_rgncmn.o \ + monolib_settcmn.o \ + monolib_sizer.o \ ++ monolib_srchcmn.o \ + monolib_statbar.o \ + monolib_stockitem.o \ + monolib_tbarbase.o \ +@@ -5306,6 +5319,7 @@ + monolib_selstore.o \ + monolib_spinctlg.o \ + monolib_splitter.o \ ++ monolib_srchctlg.o \ + monolib_textdlgg.o \ + monolib_tipwin.o \ + monolib_toolbkg.o \ +@@ -5444,6 +5458,7 @@ + monolib_rgncmn.o \ + monolib_settcmn.o \ + monolib_sizer.o \ ++ monolib_srchcmn.o \ + monolib_statbar.o \ + monolib_stockitem.o \ + monolib_tbarbase.o \ +@@ -5479,6 +5494,7 @@ + monolib_selstore.o \ + monolib_spinctlg.o \ + monolib_splitter.o \ ++ monolib_srchctlg.o \ + monolib_textdlgg.o \ + monolib_tipwin.o \ + monolib_toolbkg.o \ +@@ -6038,6 +6054,7 @@ + monolib_slider.o \ + monolib_spinbutt.o \ + monolib_spinctrl.o \ ++ monolib_srchctrl.o \ + monolib_statbmp.o \ + monolib_statbox.o \ + monolib_statbrma.o \ +@@ -7275,6 +7292,7 @@ + coredll_rgncmn.o \ + coredll_settcmn.o \ + coredll_sizer.o \ ++ coredll_srchcmn.o \ + coredll_statbar.o \ + coredll_stockitem.o \ + coredll_tbarbase.o \ +@@ -7310,6 +7328,7 @@ + coredll_selstore.o \ + coredll_spinctlg.o \ + coredll_splitter.o \ ++ coredll_srchctlg.o \ + coredll_textdlgg.o \ + coredll_tipwin.o \ + coredll_toolbkg.o \ +@@ -7448,6 +7467,7 @@ + coredll_rgncmn.o \ + coredll_settcmn.o \ + coredll_sizer.o \ ++ coredll_srchcmn.o \ + coredll_statbar.o \ + coredll_stockitem.o \ + coredll_tbarbase.o \ +@@ -7483,6 +7503,7 @@ + coredll_selstore.o \ + coredll_spinctlg.o \ + coredll_splitter.o \ ++ coredll_srchctlg.o \ + coredll_textdlgg.o \ + coredll_tipwin.o \ + coredll_toolbkg.o \ +@@ -8042,6 +8063,7 @@ + coredll_slider.o \ + coredll_spinbutt.o \ + coredll_spinctrl.o \ ++ coredll_srchctrl.o \ + coredll_statbmp.o \ + coredll_statbox.o \ + coredll_statbrma.o \ +@@ -8723,6 +8745,7 @@ + corelib_rgncmn.o \ + corelib_settcmn.o \ + corelib_sizer.o \ ++ corelib_srchcmn.o \ + corelib_statbar.o \ + corelib_stockitem.o \ + corelib_tbarbase.o \ +@@ -8758,6 +8781,7 @@ + corelib_selstore.o \ + corelib_spinctlg.o \ + corelib_splitter.o \ ++ corelib_srchctlg.o \ + corelib_textdlgg.o \ + corelib_tipwin.o \ + corelib_toolbkg.o \ +@@ -8896,6 +8920,7 @@ + corelib_rgncmn.o \ + corelib_settcmn.o \ + corelib_sizer.o \ ++ corelib_srchcmn.o \ + corelib_statbar.o \ + corelib_stockitem.o \ + corelib_tbarbase.o \ +@@ -8931,6 +8956,7 @@ + corelib_selstore.o \ + corelib_spinctlg.o \ + corelib_splitter.o \ ++ corelib_srchctlg.o \ + corelib_textdlgg.o \ + corelib_tipwin.o \ + corelib_toolbkg.o \ +@@ -9490,6 +9516,7 @@ + corelib_slider.o \ + corelib_spinbutt.o \ + corelib_spinctrl.o \ ++ corelib_srchctrl.o \ + corelib_statbmp.o \ + corelib_statbox.o \ + corelib_statbrma.o \ +@@ -12852,6 +12879,9 @@ + monodll_printmac.o: $(srcdir)/src/mac/carbon/printmac.cpp $(MONODLL_ODEP) + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mac/carbon/printmac.cpp + ++monodll_srchctrl.o: $(srcdir)/src/mac/carbon/srchctrl.cpp $(MONODLL_ODEP) ++ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mac/carbon/srchctrl.cpp ++ + monodll_statbrma.o: $(srcdir)/src/mac/carbon/statbrma.cpp $(MONODLL_ODEP) + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mac/carbon/statbrma.cpp + +@@ -16224,6 +16254,9 @@ + @COND_USE_GUI_1@monodll_sizer.o: $(srcdir)/src/common/sizer.cpp $(MONODLL_ODEP) + @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/sizer.cpp + ++@COND_USE_GUI_1@monodll_srchcmn.o: $(srcdir)/src/common/srchcmn.cpp $(MONODLL_ODEP) ++@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/srchcmn.cpp ++ + @COND_USE_GUI_1@monodll_statbar.o: $(srcdir)/src/common/statbar.cpp $(MONODLL_ODEP) + @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/statbar.cpp + +@@ -16329,6 +16362,9 @@ + @COND_USE_GUI_1@monodll_splitter.o: $(srcdir)/src/generic/splitter.cpp $(MONODLL_ODEP) + @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/splitter.cpp + ++@COND_USE_GUI_1@monodll_srchctlg.o: $(srcdir)/src/generic/srchctlg.cpp $(MONODLL_ODEP) ++@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/srchctlg.cpp ++ + @COND_USE_GUI_1@monodll_textdlgg.o: $(srcdir)/src/generic/textdlgg.cpp $(MONODLL_ODEP) + @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/textdlgg.cpp + +@@ -16959,6 +16995,9 @@ + monolib_printmac.o: $(srcdir)/src/mac/carbon/printmac.cpp $(MONOLIB_ODEP) + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mac/carbon/printmac.cpp + ++monolib_srchctrl.o: $(srcdir)/src/mac/carbon/srchctrl.cpp $(MONOLIB_ODEP) ++ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mac/carbon/srchctrl.cpp ++ + monolib_statbrma.o: $(srcdir)/src/mac/carbon/statbrma.cpp $(MONOLIB_ODEP) + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mac/carbon/statbrma.cpp + +@@ -20331,6 +20370,9 @@ + @COND_USE_GUI_1@monolib_sizer.o: $(srcdir)/src/common/sizer.cpp $(MONOLIB_ODEP) + @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/sizer.cpp + ++@COND_USE_GUI_1@monolib_srchcmn.o: $(srcdir)/src/common/srchcmn.cpp $(MONOLIB_ODEP) ++@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/srchcmn.cpp ++ + @COND_USE_GUI_1@monolib_statbar.o: $(srcdir)/src/common/statbar.cpp $(MONOLIB_ODEP) + @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/statbar.cpp + +@@ -20436,6 +20478,9 @@ + @COND_USE_GUI_1@monolib_splitter.o: $(srcdir)/src/generic/splitter.cpp $(MONOLIB_ODEP) + @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/splitter.cpp + ++@COND_USE_GUI_1@monolib_srchctlg.o: $(srcdir)/src/generic/srchctlg.cpp $(MONOLIB_ODEP) ++@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/srchctlg.cpp ++ + @COND_USE_GUI_1@monolib_textdlgg.o: $(srcdir)/src/generic/textdlgg.cpp $(MONOLIB_ODEP) + @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/textdlgg.cpp + +@@ -22065,6 +22110,9 @@ + coredll_printmac.o: $(srcdir)/src/mac/carbon/printmac.cpp $(COREDLL_ODEP) + $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mac/carbon/printmac.cpp + ++coredll_srchctrl.o: $(srcdir)/src/mac/carbon/srchctrl.cpp $(COREDLL_ODEP) ++ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mac/carbon/srchctrl.cpp ++ + coredll_statbrma.o: $(srcdir)/src/mac/carbon/statbrma.cpp $(COREDLL_ODEP) + $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mac/carbon/statbrma.cpp + +@@ -24783,6 +24831,9 @@ + @COND_USE_GUI_1@coredll_sizer.o: $(srcdir)/src/common/sizer.cpp $(COREDLL_ODEP) + @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/sizer.cpp + ++@COND_USE_GUI_1@coredll_srchcmn.o: $(srcdir)/src/common/srchcmn.cpp $(COREDLL_ODEP) ++@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/srchcmn.cpp ++ + @COND_USE_GUI_1@coredll_statbar.o: $(srcdir)/src/common/statbar.cpp $(COREDLL_ODEP) + @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/statbar.cpp + +@@ -24888,6 +24939,9 @@ + @COND_USE_GUI_1@coredll_splitter.o: $(srcdir)/src/generic/splitter.cpp $(COREDLL_ODEP) + @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/splitter.cpp + ++@COND_USE_GUI_1@coredll_srchctlg.o: $(srcdir)/src/generic/srchctlg.cpp $(COREDLL_ODEP) ++@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/srchctlg.cpp ++ + @COND_USE_GUI_1@coredll_textdlgg.o: $(srcdir)/src/generic/textdlgg.cpp $(COREDLL_ODEP) + @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/textdlgg.cpp + +@@ -25008,6 +25062,9 @@ + corelib_printmac.o: $(srcdir)/src/mac/carbon/printmac.cpp $(CORELIB_ODEP) + $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mac/carbon/printmac.cpp + ++corelib_srchctrl.o: $(srcdir)/src/mac/carbon/srchctrl.cpp $(CORELIB_ODEP) ++ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mac/carbon/srchctrl.cpp ++ + corelib_statbrma.o: $(srcdir)/src/mac/carbon/statbrma.cpp $(CORELIB_ODEP) + $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mac/carbon/statbrma.cpp + +@@ -27726,6 +27783,9 @@ + @COND_USE_GUI_1@corelib_sizer.o: $(srcdir)/src/common/sizer.cpp $(CORELIB_ODEP) + @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/sizer.cpp + ++@COND_USE_GUI_1@corelib_srchcmn.o: $(srcdir)/src/common/srchcmn.cpp $(CORELIB_ODEP) ++@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/srchcmn.cpp ++ + @COND_USE_GUI_1@corelib_statbar.o: $(srcdir)/src/common/statbar.cpp $(CORELIB_ODEP) + @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/statbar.cpp + +@@ -27831,6 +27891,9 @@ + @COND_USE_GUI_1@corelib_splitter.o: $(srcdir)/src/generic/splitter.cpp $(CORELIB_ODEP) + @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/splitter.cpp + ++@COND_USE_GUI_1@corelib_srchctlg.o: $(srcdir)/src/generic/srchctlg.cpp $(CORELIB_ODEP) ++@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/srchctlg.cpp ++ + @COND_USE_GUI_1@corelib_textdlgg.o: $(srcdir)/src/generic/textdlgg.cpp $(CORELIB_ODEP) + @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/textdlgg.cpp + +diff -Naur wxGTK-2.8.0/build/bakefiles/files.bkl wxGTK-2.8.0-Damn-Devels-Releasing-STABLE-APPS-DEPENDING-ON-FUCKING-CVS-STUFF/build/bakefiles/files.bkl +--- wxGTK-2.8.0/build/bakefiles/files.bkl 2006-12-11 22:55:31.000000000 +0100 ++++ wxGTK-2.8.0-Damn-Devels-Releasing-STABLE-APPS-DEPENDING-ON-FUCKING-CVS-STUFF/build/bakefiles/files.bkl 2007-02-02 07:10:32.000000000 +0100 +@@ -1,5 +1,5 @@ + +- ++ + + + ++ + + + +@@ -22,6 +22,7 @@ + notebook.cpp + odcombobox.cpp + radiobox.cpp ++ searchctrl.cpp + slider.cpp + spinbtn.cpp + static.cpp +diff -Naur wxGTK-2.8.0/setup.h.in wxGTK-2.8.0-Damn-Devels-Releasing-STABLE-APPS-DEPENDING-ON-FUCKING-CVS-STUFF/setup.h.in +--- wxGTK-2.8.0/setup.h.in 2006-12-11 22:55:31.000000000 +0100 ++++ wxGTK-2.8.0-Damn-Devels-Releasing-STABLE-APPS-DEPENDING-ON-FUCKING-CVS-STUFF/setup.h.in 2007-02-02 07:10:32.000000000 +0100 +@@ -332,6 +332,7 @@ + #define wxUSE_RADIOBOX 0 + #define wxUSE_RADIOBTN 0 + #define wxUSE_SCROLLBAR 0 ++#define wxUSE_SEARCHCTRL 0 + #define wxUSE_SLIDER 0 + #define wxUSE_SPINBTN 0 + #define wxUSE_SPINCTRL 0 +diff -Naur wxGTK-2.8.0/src/common/srchcmn.cpp wxGTK-2.8.0-Damn-Devels-Releasing-STABLE-APPS-DEPENDING-ON-FUCKING-CVS-STUFF/src/common/srchcmn.cpp +--- wxGTK-2.8.0/src/common/srchcmn.cpp 1970-01-01 01:00:00.000000000 +0100 ++++ wxGTK-2.8.0-Damn-Devels-Releasing-STABLE-APPS-DEPENDING-ON-FUCKING-CVS-STUFF/src/common/srchcmn.cpp 2007-02-02 07:10:32.000000000 +0100 +@@ -0,0 +1,42 @@ ++///////////////////////////////////////////////////////////////////////////// ++// Name: src/common/srchcmn.cpp ++// Purpose: common (to all ports) bits of wxSearchCtrl ++// Author: Robin Dunn ++// Modified by: ++// Created: 19-Dec-2006 ++// RCS-ID: $Id: srchcmn.cpp,v 1.2 2006/12/11 20:32:03 KO Exp $ ++// Copyright: (c) wxWidgets team ++// Licence: wxWindows licence ++///////////////////////////////////////////////////////////////////////////// ++ ++// ============================================================================ ++// declarations ++// ============================================================================ ++ ++// ---------------------------------------------------------------------------- ++// headers ++// ---------------------------------------------------------------------------- ++ ++// For compilers that support precompilation, includes "wx.h". ++#include "wx/wxprec.h" ++ ++#ifdef __BORLANDC__ ++ #pragma hdrstop ++#endif ++ ++#if wxUSE_SEARCHCTRL ++ ++#include "wx/srchctrl.h" ++ ++#ifndef WX_PRECOMP ++#endif ++ ++// ---------------------------------------------------------------------------- ++ ++const wxChar wxSearchCtrlNameStr[] = wxT("searchCtrl"); ++ ++DEFINE_EVENT_TYPE(wxEVT_COMMAND_SEARCHCTRL_CANCEL_BTN) ++DEFINE_EVENT_TYPE(wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN) ++ ++ ++#endif // wxUSE_SEARCHCTRL +diff -Naur wxGTK-2.8.0/src/generic/srchctlg.cpp wxGTK-2.8.0-Damn-Devels-Releasing-STABLE-APPS-DEPENDING-ON-FUCKING-CVS-STUFF/src/generic/srchctlg.cpp +--- wxGTK-2.8.0/src/generic/srchctlg.cpp 1970-01-01 01:00:00.000000000 +0100 ++++ wxGTK-2.8.0-Damn-Devels-Releasing-STABLE-APPS-DEPENDING-ON-FUCKING-CVS-STUFF/src/generic/srchctlg.cpp 2007-02-02 07:10:32.000000000 +0100 +@@ -0,0 +1,1079 @@ ++/////////////////////////////////////////////////////////////////////////////// ++// Name: src/generic/srchctlg.cpp ++// Purpose: implements wxSearchCtrl as a composite control ++// Author: Vince Harron ++// Created: 2006-02-19 ++// RCS-ID: $Id: srchctlg.cpp,v 1.10 2006/12/12 00:53:47 RD Exp $ ++// Copyright: Vince Harron ++// License: wxWindows licence ++/////////////////////////////////////////////////////////////////////////////// ++ ++// For compilers that support precompilation, includes "wx.h". ++#include "wx/wxprec.h" ++ ++#ifdef __BORLANDC__ ++ #pragma hdrstop ++#endif ++ ++#if wxUSE_SEARCHCTRL ++ ++#include "wx/srchctrl.h" ++ ++#ifndef WX_PRECOMP ++ #include "wx/button.h" ++ #include "wx/dcclient.h" ++ #include "wx/menu.h" ++ #include "wx/dcmemory.h" ++#endif //WX_PRECOMP ++ ++#if !wxUSE_NATIVE_SEARCH_CONTROL ++ ++#include "wx/image.h" ++ ++#define WXMAX(a,b) ((a)>(b)?(a):(b)) ++ ++// ---------------------------------------------------------------------------- ++// constants ++// ---------------------------------------------------------------------------- ++ ++// the margin between the text control and the search/cancel buttons ++static const wxCoord MARGIN = 2; ++ ++// border around all controls to compensate for wxSIMPLE_BORDER ++#if defined(__WXMSW__) ++static const wxCoord BORDER = 0; ++static const wxCoord ICON_MARGIN = 2; ++static const wxCoord ICON_OFFSET = 2; ++#else ++static const wxCoord BORDER = 2; ++static const wxCoord ICON_MARGIN = 0; ++static const wxCoord ICON_OFFSET = 0; ++#endif ++ ++// ---------------------------------------------------------------------------- ++// wxSearchTextCtrl: text control used by search control ++// ---------------------------------------------------------------------------- ++ ++class wxSearchTextCtrl : public wxTextCtrl ++{ ++public: ++ wxSearchTextCtrl(wxSearchCtrl *search, const wxString& value, int style) ++ : wxTextCtrl(search, wxID_ANY, value, wxDefaultPosition, wxDefaultSize, ++ style | wxNO_BORDER) ++ { ++ m_search = search; ++ ++ // remove the default minsize, the searchctrl will have one instead ++ SetSizeHints(wxDefaultCoord,wxDefaultCoord); ++ } ++ ++protected: ++ void OnText(wxCommandEvent& eventText) ++ { ++ wxCommandEvent event(eventText); ++ event.SetEventObject(m_search); ++ event.SetId(m_search->GetId()); ++ ++ m_search->GetEventHandler()->ProcessEvent(event); ++ } ++ ++ void OnTextUrl(wxTextUrlEvent& eventText) ++ { ++ // copy constructor is disabled for some reason? ++ //wxTextUrlEvent event(eventText); ++ wxTextUrlEvent event( ++ m_search->GetId(), ++ eventText.GetMouseEvent(), ++ eventText.GetURLStart(), ++ eventText.GetURLEnd() ++ ); ++ event.SetEventObject(m_search); ++ ++ m_search->GetEventHandler()->ProcessEvent(event); ++ } ++ ++private: ++ wxSearchCtrl* m_search; ++ ++ DECLARE_EVENT_TABLE() ++}; ++ ++BEGIN_EVENT_TABLE(wxSearchTextCtrl, wxTextCtrl) ++ EVT_TEXT(wxID_ANY, wxSearchTextCtrl::OnText) ++ EVT_TEXT_ENTER(wxID_ANY, wxSearchTextCtrl::OnText) ++ EVT_TEXT_URL(wxID_ANY, wxSearchTextCtrl::OnTextUrl) ++ EVT_TEXT_MAXLEN(wxID_ANY, wxSearchTextCtrl::OnText) ++END_EVENT_TABLE() ++ ++// ---------------------------------------------------------------------------- ++// wxSearchButton: search button used by search control ++// ---------------------------------------------------------------------------- ++ ++class wxSearchButton : public wxControl ++{ ++public: ++ wxSearchButton(wxSearchCtrl *search, int eventType, const wxBitmap& bmp) ++ : wxControl(search, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNO_BORDER), ++ m_search(search), ++ m_eventType(eventType), ++ m_bmp(bmp) ++ { } ++ ++ void SetBitmapLabel(const wxBitmap& label) { m_bmp = label; } ++ ++ ++protected: ++ wxSize DoGetBestSize() const ++ { ++ return wxSize(m_bmp.GetWidth(), m_bmp.GetHeight()); ++ } ++ ++ void OnLeftUp(wxMouseEvent&) ++ { ++ wxCommandEvent event(m_eventType, m_search->GetId()); ++ event.SetEventObject(m_search); ++ ++ GetEventHandler()->ProcessEvent(event); ++ ++ m_search->SetFocus(); ++ ++ if ( m_eventType == wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN ) ++ { ++ // this happens automatically, just like on Mac OS X ++ m_search->PopupSearchMenu(); ++ } ++ } ++ ++ void OnPaint(wxPaintEvent&) ++ { ++ wxPaintDC dc(this); ++ dc.DrawBitmap(m_bmp, 0,0, true); ++ } ++ ++ ++private: ++ wxSearchCtrl *m_search; ++ wxEventType m_eventType; ++ wxBitmap m_bmp; ++ ++ DECLARE_EVENT_TABLE() ++}; ++ ++BEGIN_EVENT_TABLE(wxSearchButton, wxControl) ++ EVT_LEFT_UP(wxSearchButton::OnLeftUp) ++ EVT_PAINT(wxSearchButton::OnPaint) ++END_EVENT_TABLE() ++ ++BEGIN_EVENT_TABLE(wxSearchCtrl, wxSearchCtrlBase) ++ EVT_SEARCHCTRL_SEARCH_BTN(wxID_ANY, wxSearchCtrl::OnSearchButton) ++ EVT_SET_FOCUS(wxSearchCtrl::OnSetFocus) ++ EVT_SIZE(wxSearchCtrl::OnSize) ++END_EVENT_TABLE() ++ ++IMPLEMENT_DYNAMIC_CLASS(wxSearchCtrl, wxSearchCtrlBase) ++ ++// ============================================================================ ++// implementation ++// ============================================================================ ++ ++// ---------------------------------------------------------------------------- ++// wxSearchCtrl creation ++// ---------------------------------------------------------------------------- ++ ++// creation ++// -------- ++ ++wxSearchCtrl::wxSearchCtrl() ++{ ++ Init(); ++} ++ ++wxSearchCtrl::wxSearchCtrl(wxWindow *parent, wxWindowID id, ++ const wxString& value, ++ const wxPoint& pos, ++ const wxSize& size, ++ long style, ++ const wxValidator& validator, ++ const wxString& name) ++{ ++ Init(); ++ ++ Create(parent, id, value, pos, size, style, validator, name); ++} ++ ++void wxSearchCtrl::Init() ++{ ++ m_text = 0; ++ m_searchButton = 0; ++ m_cancelButton = 0; ++ m_menu = 0; ++ ++ m_searchButtonVisible = true; ++ m_cancelButtonVisible = false; ++ ++ m_searchMenuBitmapUser = false; ++ m_searchBitmapUser = false; ++ m_cancelBitmapUser = false; ++} ++ ++bool wxSearchCtrl::Create(wxWindow *parent, wxWindowID id, ++ const wxString& value, ++ const wxPoint& pos, ++ const wxSize& size, ++ long style, ++ const wxValidator& validator, ++ const wxString& name) ++{ ++ if ( !wxTextCtrlBase::Create(parent, id, pos, size, wxSIMPLE_BORDER | style, validator, name) ) ++ { ++ return false; ++ } ++ ++ m_text = new wxSearchTextCtrl(this, value, style & ~wxBORDER_MASK); ++ ++ wxSize sizeText = m_text->GetBestSize(); ++ ++ m_searchButton = new wxSearchButton(this,wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN,m_searchBitmap); ++ m_cancelButton = new wxSearchButton(this,wxEVT_COMMAND_SEARCHCTRL_CANCEL_BTN,m_cancelBitmap); ++ ++ SetForegroundColour( m_text->GetForegroundColour() ); ++ m_searchButton->SetForegroundColour( m_text->GetForegroundColour() ); ++ m_cancelButton->SetForegroundColour( m_text->GetForegroundColour() ); ++ ++ SetBackgroundColour( m_text->GetBackgroundColour() ); ++ m_searchButton->SetBackgroundColour( m_text->GetBackgroundColour() ); ++ m_cancelButton->SetBackgroundColour( m_text->GetBackgroundColour() ); ++ ++ RecalcBitmaps(); ++ ++ SetInitialSize(size); ++ Move(pos); ++ return true; ++} ++ ++wxSearchCtrl::~wxSearchCtrl() ++{ ++ delete m_text; ++ delete m_searchButton; ++ delete m_cancelButton; ++ delete m_menu; ++} ++ ++ ++// search control specific interfaces ++void wxSearchCtrl::SetMenu( wxMenu* menu ) ++{ ++ if ( menu == m_menu ) ++ { ++ // no change ++ return; ++ } ++ bool hadMenu = (m_menu != NULL); ++ delete m_menu; ++ m_menu = menu; ++ ++ if ( m_menu && !hadMenu ) ++ { ++ m_searchButton->SetBitmapLabel(m_searchMenuBitmap); ++ m_searchButton->Refresh(); ++ if ( !m_searchButtonVisible ) ++ { ++ // adding the menu will force the search button to be visible ++ wxRect rect = GetRect(); ++ LayoutControls(0, 0, rect.GetWidth(), rect.GetHeight()); ++ } ++ } ++ else if ( !m_menu && hadMenu ) ++ { ++ m_searchButton->SetBitmapLabel(m_searchBitmap); ++ if ( m_searchButtonVisible ) ++ { ++ m_searchButton->Refresh(); ++ } ++ else ++ { ++ wxRect rect = GetRect(); ++ LayoutControls(0, 0, rect.GetWidth(), rect.GetHeight()); ++ } ++ } ++} ++ ++wxMenu* wxSearchCtrl::GetMenu() ++{ ++ return m_menu; ++} ++ ++void wxSearchCtrl::ShowSearchButton( bool show ) ++{ ++ if ( m_searchButtonVisible == show ) ++ { ++ // no change ++ return; ++ } ++ m_searchButtonVisible = show; ++ if ( m_searchButtonVisible ) ++ { ++ RecalcBitmaps(); ++ } ++ ++ wxRect rect = GetRect(); ++ LayoutControls(0, 0, rect.GetWidth(), rect.GetHeight()); ++} ++ ++bool wxSearchCtrl::IsSearchButtonVisible() const ++{ ++ return m_searchButtonVisible; ++} ++ ++ ++void wxSearchCtrl::ShowCancelButton( bool show ) ++{ ++ if ( m_cancelButtonVisible == show ) ++ { ++ // no change ++ return; ++ } ++ m_cancelButtonVisible = show; ++ ++ wxRect rect = GetRect(); ++ LayoutControls(0, 0, rect.GetWidth(), rect.GetHeight()); ++} ++ ++bool wxSearchCtrl::IsCancelButtonVisible() const ++{ ++ return m_cancelButtonVisible; ++} ++ ++ ++// ---------------------------------------------------------------------------- ++// geometry ++// ---------------------------------------------------------------------------- ++ ++wxSize wxSearchCtrl::DoGetBestSize() const ++{ ++ wxSize sizeText = m_text->GetBestSize(); ++ wxSize sizeSearch(0,0); ++ wxSize sizeCancel(0,0); ++ int searchMargin = 0; ++ int cancelMargin = 0; ++ if ( m_searchButtonVisible || m_menu ) ++ { ++ sizeSearch = m_searchButton->GetBestSize(); ++ searchMargin = MARGIN; ++ } ++ if ( m_cancelButtonVisible ) ++ { ++ sizeCancel = m_cancelButton->GetBestSize(); ++ cancelMargin = MARGIN; ++ } ++ ++ int horizontalBorder = 1 + ( sizeText.y - sizeText.y * 14 / 21 ) / 2; ++ ++ // buttons are square and equal to the height of the text control ++ int height = sizeText.y; ++ return wxSize(sizeSearch.x + searchMargin + sizeText.x + cancelMargin + sizeCancel.x + 2*horizontalBorder, ++ height + 2*BORDER); ++} ++ ++void wxSearchCtrl::DoMoveWindow(int x, int y, int width, int height) ++{ ++ wxSearchCtrlBase::DoMoveWindow(x, y, width, height); ++ ++ LayoutControls(0, 0, width, height); ++} ++ ++void wxSearchCtrl::LayoutControls(int x, int y, int width, int height) ++{ ++ if ( !m_text ) ++ return; ++ ++ wxSize sizeText = m_text->GetBestSize(); ++ // make room for the search menu & clear button ++ int horizontalBorder = 1 + ( sizeText.y - sizeText.y * 14 / 21 ) / 2; ++ x += horizontalBorder; ++ y += BORDER; ++ width -= horizontalBorder*2; ++ height -= BORDER*2; ++ ++ wxSize sizeSearch(0,0); ++ wxSize sizeCancel(0,0); ++ int searchMargin = 0; ++ int cancelMargin = 0; ++ if ( m_searchButtonVisible || m_menu ) ++ { ++ sizeSearch = m_searchButton->GetBestSize(); ++ searchMargin = MARGIN; ++ } ++ if ( m_cancelButtonVisible ) ++ { ++ sizeCancel = m_cancelButton->GetBestSize(); ++ cancelMargin = MARGIN; ++ } ++ m_searchButton->Show( m_searchButtonVisible || m_menu ); ++ m_cancelButton->Show( m_cancelButtonVisible ); ++ ++ if ( sizeSearch.x + sizeCancel.x > width ) ++ { ++ sizeSearch.x = width/2; ++ sizeCancel.x = width/2; ++ searchMargin = 0; ++ cancelMargin = 0; ++ } ++ wxCoord textWidth = width - sizeSearch.x - sizeCancel.x - searchMargin - cancelMargin; ++ ++ // position the subcontrols inside the client area ++ ++ m_searchButton->SetSize(x, y + ICON_OFFSET, sizeSearch.x, height); ++ m_text->SetSize(x + sizeSearch.x + searchMargin, y + ICON_OFFSET, textWidth, height); ++ m_cancelButton->SetSize(x + sizeSearch.x + searchMargin + textWidth + cancelMargin, ++ y + ICON_OFFSET, sizeCancel.x, height); ++} ++ ++ ++// accessors ++// --------- ++ ++wxString wxSearchCtrl::GetValue() const ++{ ++ return m_text->GetValue(); ++} ++void wxSearchCtrl::SetValue(const wxString& value) ++{ ++ m_text->SetValue(value); ++} ++ ++wxString wxSearchCtrl::GetRange(long from, long to) const ++{ ++ return m_text->GetRange(from, to); ++} ++ ++int wxSearchCtrl::GetLineLength(long lineNo) const ++{ ++ return m_text->GetLineLength(lineNo); ++} ++wxString wxSearchCtrl::GetLineText(long lineNo) const ++{ ++ return m_text->GetLineText(lineNo); ++} ++int wxSearchCtrl::GetNumberOfLines() const ++{ ++ return m_text->GetNumberOfLines(); ++} ++ ++bool wxSearchCtrl::IsModified() const ++{ ++ return m_text->IsModified(); ++} ++bool wxSearchCtrl::IsEditable() const ++{ ++ return m_text->IsEditable(); ++} ++ ++// more readable flag testing methods ++bool wxSearchCtrl::IsSingleLine() const ++{ ++ return m_text->IsSingleLine(); ++} ++bool wxSearchCtrl::IsMultiLine() const ++{ ++ return m_text->IsMultiLine(); ++} ++ ++// If the return values from and to are the same, there is no selection. ++void wxSearchCtrl::GetSelection(long* from, long* to) const ++{ ++ m_text->GetSelection(from, to); ++} ++ ++wxString wxSearchCtrl::GetStringSelection() const ++{ ++ return m_text->GetStringSelection(); ++} ++ ++// operations ++// ---------- ++ ++// editing ++void wxSearchCtrl::Clear() ++{ ++ m_text->Clear(); ++} ++void wxSearchCtrl::Replace(long from, long to, const wxString& value) ++{ ++ m_text->Replace(from, to, value); ++} ++void wxSearchCtrl::Remove(long from, long to) ++{ ++ m_text->Remove(from, to); ++} ++ ++// load/save the controls contents from/to the file ++bool wxSearchCtrl::LoadFile(const wxString& file) ++{ ++ return m_text->LoadFile(file); ++} ++bool wxSearchCtrl::SaveFile(const wxString& file) ++{ ++ return m_text->SaveFile(file); ++} ++ ++// sets/clears the dirty flag ++void wxSearchCtrl::MarkDirty() ++{ ++ m_text->MarkDirty(); ++} ++void wxSearchCtrl::DiscardEdits() ++{ ++ m_text->DiscardEdits(); ++} ++ ++// set the max number of characters which may be entered in a single line ++// text control ++void wxSearchCtrl::SetMaxLength(unsigned long len) ++{ ++ m_text->SetMaxLength(len); ++} ++ ++// writing text inserts it at the current position, appending always ++// inserts it at the end ++void wxSearchCtrl::WriteText(const wxString& text) ++{ ++ m_text->WriteText(text); ++} ++void wxSearchCtrl::AppendText(const wxString& text) ++{ ++ m_text->AppendText(text); ++} ++ ++// insert the character which would have resulted from this key event, ++// return true if anything has been inserted ++bool wxSearchCtrl::EmulateKeyPress(const wxKeyEvent& event) ++{ ++ return m_text->EmulateKeyPress(event); ++} ++ ++// text control under some platforms supports the text styles: these ++// methods allow to apply the given text style to the given selection or to ++// set/get the style which will be used for all appended text ++bool wxSearchCtrl::SetStyle(long start, long end, const wxTextAttr& style) ++{ ++ return m_text->SetStyle(start, end, style); ++} ++bool wxSearchCtrl::GetStyle(long position, wxTextAttr& style) ++{ ++ return m_text->GetStyle(position, style); ++} ++bool wxSearchCtrl::SetDefaultStyle(const wxTextAttr& style) ++{ ++ return m_text->SetDefaultStyle(style); ++} ++const wxTextAttr& wxSearchCtrl::GetDefaultStyle() const ++{ ++ return m_text->GetDefaultStyle(); ++} ++ ++// translate between the position (which is just an index in the text ctrl ++// considering all its contents as a single strings) and (x, y) coordinates ++// which represent column and line. ++long wxSearchCtrl::XYToPosition(long x, long y) const ++{ ++ return m_text->XYToPosition(x, y); ++} ++bool wxSearchCtrl::PositionToXY(long pos, long *x, long *y) const ++{ ++ return m_text->PositionToXY(pos, x, y); ++} ++ ++void wxSearchCtrl::ShowPosition(long pos) ++{ ++ m_text->ShowPosition(pos); ++} ++ ++// find the character at position given in pixels ++// ++// NB: pt is in device coords (not adjusted for the client area origin nor ++// scrolling) ++wxTextCtrlHitTestResult wxSearchCtrl::HitTest(const wxPoint& pt, long *pos) const ++{ ++ return m_text->HitTest(pt, pos); ++} ++wxTextCtrlHitTestResult wxSearchCtrl::HitTest(const wxPoint& pt, ++ wxTextCoord *col, ++ wxTextCoord *row) const ++{ ++ return m_text->HitTest(pt, col, row); ++} ++ ++// Clipboard operations ++void wxSearchCtrl::Copy() ++{ ++ m_text->Copy(); ++} ++void wxSearchCtrl::Cut() ++{ ++ m_text->Cut(); ++} ++void wxSearchCtrl::Paste() ++{ ++ m_text->Paste(); ++} ++ ++bool wxSearchCtrl::CanCopy() const ++{ ++ return m_text->CanCopy(); ++} ++bool wxSearchCtrl::CanCut() const ++{ ++ return m_text->CanCut(); ++} ++bool wxSearchCtrl::CanPaste() const ++{ ++ return m_text->CanPaste(); ++} ++ ++// Undo/redo ++void wxSearchCtrl::Undo() ++{ ++ m_text->Undo(); ++} ++void wxSearchCtrl::Redo() ++{ ++ m_text->Redo(); ++} ++ ++bool wxSearchCtrl::CanUndo() const ++{ ++ return m_text->CanUndo(); ++} ++bool wxSearchCtrl::CanRedo() const ++{ ++ return m_text->CanRedo(); ++} ++ ++// Insertion point ++void wxSearchCtrl::SetInsertionPoint(long pos) ++{ ++ m_text->SetInsertionPoint(pos); ++} ++void wxSearchCtrl::SetInsertionPointEnd() ++{ ++ m_text->SetInsertionPointEnd(); ++} ++long wxSearchCtrl::GetInsertionPoint() const ++{ ++ return m_text->GetInsertionPoint(); ++} ++wxTextPos wxSearchCtrl::GetLastPosition() const ++{ ++ return m_text->GetLastPosition(); ++} ++ ++void wxSearchCtrl::SetSelection(long from, long to) ++{ ++ m_text->SetSelection(from, to); ++} ++void wxSearchCtrl::SelectAll() ++{ ++ m_text->SelectAll(); ++} ++ ++void wxSearchCtrl::SetEditable(bool editable) ++{ ++ m_text->SetEditable(editable); ++} ++ ++bool wxSearchCtrl::SetFont(const wxFont& font) ++{ ++ bool result = wxSearchCtrlBase::SetFont(font); ++ if ( result && m_text ) ++ { ++ result = m_text->SetFont(font); ++ } ++ RecalcBitmaps(); ++ return result; ++} ++ ++// search control generic only ++void wxSearchCtrl::SetSearchBitmap( const wxBitmap& bitmap ) ++{ ++ m_searchBitmap = bitmap; ++ m_searchBitmapUser = bitmap.Ok(); ++ if ( m_searchBitmapUser ) ++ { ++ if ( m_searchButton && !m_menu ) ++ { ++ m_searchButton->SetBitmapLabel( m_searchBitmap ); ++ } ++ } ++ else ++ { ++ // the user bitmap was just cleared, generate one ++ RecalcBitmaps(); ++ } ++} ++ ++void wxSearchCtrl::SetSearchMenuBitmap( const wxBitmap& bitmap ) ++{ ++ m_searchMenuBitmap = bitmap; ++ m_searchMenuBitmapUser = bitmap.Ok(); ++ if ( m_searchMenuBitmapUser ) ++ { ++ if ( m_searchButton && m_menu ) ++ { ++ m_searchButton->SetBitmapLabel( m_searchMenuBitmap ); ++ } ++ } ++ else ++ { ++ // the user bitmap was just cleared, generate one ++ RecalcBitmaps(); ++ } ++} ++ ++void wxSearchCtrl::SetCancelBitmap( const wxBitmap& bitmap ) ++{ ++ m_cancelBitmap = bitmap; ++ m_cancelBitmapUser = bitmap.Ok(); ++ if ( m_cancelBitmapUser ) ++ { ++ if ( m_cancelButton ) ++ { ++ m_cancelButton->SetBitmapLabel( m_cancelBitmap ); ++ } ++ } ++ else ++ { ++ // the user bitmap was just cleared, generate one ++ RecalcBitmaps(); ++ } ++} ++ ++#if 0 ++ ++// override streambuf method ++#if wxHAS_TEXT_WINDOW_STREAM ++int overflow(int i); ++#endif // wxHAS_TEXT_WINDOW_STREAM ++ ++// stream-like insertion operators: these are always available, whether we ++// were, or not, compiled with streambuf support ++wxTextCtrl& operator<<(const wxString& s); ++wxTextCtrl& operator<<(int i); ++wxTextCtrl& operator<<(long i); ++wxTextCtrl& operator<<(float f); ++wxTextCtrl& operator<<(double d); ++wxTextCtrl& operator<<(const wxChar c); ++#endif ++ ++void wxSearchCtrl::DoSetValue(const wxString& value, int flags) ++{ ++ m_text->ChangeValue( value ); ++ if ( flags & SetValue_SendEvent ) ++ SendTextUpdatedEvent(); ++} ++ ++// do the window-specific processing after processing the update event ++void wxSearchCtrl::DoUpdateWindowUI(wxUpdateUIEvent& event) ++{ ++ wxSearchCtrlBase::DoUpdateWindowUI(event); ++} ++ ++bool wxSearchCtrl::ShouldInheritColours() const ++{ ++ return true; ++} ++ ++// icons are rendered at 3-8 times larger than necessary and downscaled for ++// antialiasing ++static int GetMultiplier() ++{ ++#ifdef __WXWINCE__ ++ // speed up bitmap generation by using a small bitmap ++ return 3; ++#else ++ int depth = ::wxDisplayDepth(); ++ ++ if ( depth >= 24 ) ++ { ++ return 8; ++ } ++ return 6; ++#endif ++} ++ ++wxBitmap wxSearchCtrl::RenderSearchBitmap( int x, int y, bool renderDrop ) ++{ ++ wxColour bg = GetBackgroundColour(); ++ wxColour fg = GetForegroundColour(); ++ ++ //=============================================================================== ++ // begin drawing code ++ //=============================================================================== ++ // image stats ++ ++ // force width:height ratio ++ if ( 14*x > y*20 ) ++ { ++ // x is too big ++ x = y*20/14; ++ } ++ else ++ { ++ // y is too big ++ y = x*14/20; ++ } ++ ++ // glass 11x11, top left corner ++ // handle (9,9)-(13,13) ++ // drop (13,16)-(19,6)-(16,9) ++ ++ int multiplier = GetMultiplier(); ++ int penWidth = multiplier * 2; ++ ++ penWidth = penWidth * x / 20; ++ ++ wxBitmap bitmap( multiplier*x, multiplier*y ); ++ wxMemoryDC mem; ++ mem.SelectObject(bitmap); ++ ++ // clear background ++ mem.SetBrush( wxBrush(bg) ); ++ mem.SetPen( wxPen(bg) ); ++ mem.DrawRectangle(0,0,bitmap.GetWidth(),bitmap.GetHeight()); ++ ++ // draw drop glass ++ mem.SetBrush( wxBrush(fg) ); ++ mem.SetPen( wxPen(fg) ); ++ int glassBase = 5 * x / 20; ++ int glassFactor = 2*glassBase + 1; ++ int radius = multiplier*glassFactor/2; ++ mem.DrawCircle(radius,radius,radius); ++ mem.SetBrush( wxBrush(bg) ); ++ mem.SetPen( wxPen(bg) ); ++ mem.DrawCircle(radius,radius,radius-penWidth); ++ ++ // draw handle ++ int lineStart = radius + (radius-penWidth/2) * 707 / 1000; // 707 / 1000 = 0.707 = 1/sqrt(2); ++ ++ mem.SetPen( wxPen(fg) ); ++ mem.SetBrush( wxBrush(fg) ); ++ int handleCornerShift = penWidth * 707 / 1000 / 2; // 707 / 1000 = 0.707 = 1/sqrt(2); ++ handleCornerShift = WXMAX( handleCornerShift, 1 ); ++ int handleBase = 4 * x / 20; ++ int handleLength = 2*handleBase+1; ++ wxPoint handlePolygon[] = ++ { ++ wxPoint(-handleCornerShift,+handleCornerShift), ++ wxPoint(+handleCornerShift,-handleCornerShift), ++ wxPoint(multiplier*handleLength/2+handleCornerShift,multiplier*handleLength/2-handleCornerShift), ++ wxPoint(multiplier*handleLength/2-handleCornerShift,multiplier*handleLength/2+handleCornerShift), ++ }; ++ mem.DrawPolygon(WXSIZEOF(handlePolygon),handlePolygon,lineStart,lineStart); ++ ++ // draw drop triangle ++ int triangleX = 13 * x / 20; ++ int triangleY = 5 * x / 20; ++ int triangleBase = 3 * x / 20; ++ int triangleFactor = triangleBase*2+1; ++ if ( renderDrop ) ++ { ++ wxPoint dropPolygon[] = ++ { ++ wxPoint(multiplier*0,multiplier*0), // triangle left ++ wxPoint(multiplier*triangleFactor-1,multiplier*0), // triangle right ++ wxPoint(multiplier*triangleFactor/2,multiplier*triangleFactor/2), // triangle bottom ++ }; ++ mem.DrawPolygon(WXSIZEOF(dropPolygon),dropPolygon,multiplier*triangleX,multiplier*triangleY); ++ } ++ ++ //=============================================================================== ++ // end drawing code ++ //=============================================================================== ++ ++ if ( multiplier != 1 ) ++ { ++ wxImage image = bitmap.ConvertToImage(); ++ image.Rescale(x,y); ++ bitmap = wxBitmap( image ); ++ } ++ ++ return bitmap; ++} ++ ++wxBitmap wxSearchCtrl::RenderCancelBitmap( int x, int y ) ++{ ++ wxColour bg = GetBackgroundColour(); ++ wxColour fg = GetForegroundColour(); ++ ++ //=============================================================================== ++ // begin drawing code ++ //=============================================================================== ++ // image stats ++ ++ // total size 14x14 ++ // force 1:1 ratio ++ if ( x > y ) ++ { ++ // x is too big ++ x = y; ++ } ++ else ++ { ++ // y is too big ++ y = x; ++ } ++ ++ // 14x14 circle ++ // cross line starts (4,4)-(10,10) ++ // drop (13,16)-(19,6)-(16,9) ++ ++ int multiplier = GetMultiplier(); ++ ++ int penWidth = multiplier * x / 14; ++ ++ wxBitmap bitmap( multiplier*x, multiplier*y ); ++ wxMemoryDC mem; ++ mem.SelectObject(bitmap); ++ ++ // clear background ++ mem.SetBrush( wxBrush(bg) ); ++ mem.SetPen( wxPen(bg) ); ++ mem.DrawRectangle(0,0,bitmap.GetWidth(),bitmap.GetHeight()); ++ ++ // draw drop glass ++ mem.SetBrush( wxBrush(fg) ); ++ mem.SetPen( wxPen(fg) ); ++ int radius = multiplier*x/2; ++ mem.DrawCircle(radius,radius,radius); ++ ++ // draw cross ++ int lineStartBase = 4 * x / 14; ++ int lineLength = x - 2*lineStartBase; ++ ++ mem.SetPen( wxPen(bg) ); ++ mem.SetBrush( wxBrush(bg) ); ++ int handleCornerShift = penWidth/2; ++ handleCornerShift = WXMAX( handleCornerShift, 1 ); ++ wxPoint handlePolygon[] = ++ { ++ wxPoint(-handleCornerShift,+handleCornerShift), ++ wxPoint(+handleCornerShift,-handleCornerShift), ++ wxPoint(multiplier*lineLength+handleCornerShift,multiplier*lineLength-handleCornerShift), ++ wxPoint(multiplier*lineLength-handleCornerShift,multiplier*lineLength+handleCornerShift), ++ }; ++ mem.DrawPolygon(WXSIZEOF(handlePolygon),handlePolygon,multiplier*lineStartBase,multiplier*lineStartBase); ++ wxPoint handlePolygon2[] = ++ { ++ wxPoint(+handleCornerShift,+handleCornerShift), ++ wxPoint(-handleCornerShift,-handleCornerShift), ++ wxPoint(multiplier*lineLength-handleCornerShift,-multiplier*lineLength-handleCornerShift), ++ wxPoint(multiplier*lineLength+handleCornerShift,-multiplier*lineLength+handleCornerShift), ++ }; ++ mem.DrawPolygon(WXSIZEOF(handlePolygon2),handlePolygon2,multiplier*lineStartBase,multiplier*(x-lineStartBase)); ++ ++ //=============================================================================== ++ // end drawing code ++ //=============================================================================== ++ ++ if ( multiplier != 1 ) ++ { ++ wxImage image = bitmap.ConvertToImage(); ++ image.Rescale(x,y); ++ bitmap = wxBitmap( image ); ++ } ++ ++ return bitmap; ++} ++ ++void wxSearchCtrl::RecalcBitmaps() ++{ ++ if ( !m_text ) ++ { ++ return; ++ } ++ wxSize sizeText = m_text->GetBestSize(); ++ ++ int bitmapHeight = sizeText.y - 2 * ICON_MARGIN; ++ int bitmapWidth = sizeText.y * 20 / 14; ++ ++ if ( !m_searchBitmapUser ) ++ { ++ if ( ++ !m_searchBitmap.Ok() || ++ m_searchBitmap.GetHeight() != bitmapHeight || ++ m_searchBitmap.GetWidth() != bitmapWidth ++ ) ++ { ++ m_searchBitmap = RenderSearchBitmap(bitmapWidth,bitmapHeight,false); ++ if ( !m_menu ) ++ { ++ m_searchButton->SetBitmapLabel(m_searchBitmap); ++ } ++ } ++ // else this bitmap was set by user, don't alter ++ } ++ ++ if ( !m_searchMenuBitmapUser ) ++ { ++ if ( ++ !m_searchMenuBitmap.Ok() || ++ m_searchMenuBitmap.GetHeight() != bitmapHeight || ++ m_searchMenuBitmap.GetWidth() != bitmapWidth ++ ) ++ { ++ m_searchMenuBitmap = RenderSearchBitmap(bitmapWidth,bitmapHeight,true); ++ if ( m_menu ) ++ { ++ m_searchButton->SetBitmapLabel(m_searchMenuBitmap); ++ } ++ } ++ // else this bitmap was set by user, don't alter ++ } ++ ++ if ( !m_cancelBitmapUser ) ++ { ++ if ( ++ !m_cancelBitmap.Ok() || ++ m_cancelBitmap.GetHeight() != bitmapHeight || ++ m_cancelBitmap.GetWidth() != bitmapHeight ++ ) ++ { ++ m_cancelBitmap = RenderCancelBitmap(bitmapHeight-BORDER,bitmapHeight-BORDER); // square ++ m_cancelButton->SetBitmapLabel(m_cancelBitmap); ++ } ++ // else this bitmap was set by user, don't alter ++ } ++} ++ ++void wxSearchCtrl::OnSearchButton( wxCommandEvent& event ) ++{ ++ event.Skip(); ++} ++ ++void wxSearchCtrl::OnSetFocus( wxFocusEvent& /*event*/ ) ++{ ++ if ( m_text ) ++ { ++ m_text->SetFocus(); ++ } ++} ++ ++void wxSearchCtrl::OnSize( wxSizeEvent& event ) ++{ ++ int width, height; ++ GetSize(&width, &height); ++ LayoutControls(0, 0, width, height); ++} ++ ++void wxSearchCtrl::PopupSearchMenu() ++{ ++ if ( m_menu ) ++ { ++ wxSize size = GetSize(); ++ PopupMenu( m_menu, 0, size.y ); ++ } ++} ++ ++#endif // !wxUSE_NATIVE_SEARCH_CONTROL ++ ++#endif // wxUSE_SEARCHCTRL +diff -Naur wxGTK-2.8.0/src/html/htmlfilter.cpp wxGTK-2.8.0-Damn-Devels-Releasing-STABLE-APPS-DEPENDING-ON-FUCKING-CVS-STUFF/src/html/htmlfilter.cpp +--- wxGTK-2.8.0/src/html/htmlfilter.cpp 1970-01-01 01:00:00.000000000 +0100 ++++ wxGTK-2.8.0-Damn-Devels-Releasing-STABLE-APPS-DEPENDING-ON-FUCKING-CVS-STUFF/src/html/htmlfilter.cpp 2007-02-02 07:10:32.000000000 +0100 +@@ -0,0 +1,172 @@ ++///////////////////////////////////////////////////////////////////////////// ++// Name: filter.cpp ++// Purpose: wxHtmlFilter - input filter for translating into HTML format ++// Author: Vaclav Slavik ++// Copyright: (c) 1999 Vaclav Slavik ++// Licence: wxWindows Licence ++///////////////////////////////////////////////////////////////////////////// ++ ++ ++#ifdef __GNUG__ ++#pragma implementation "htmlfilter.h" ++#endif ++ ++#include "wx/wxprec.h" ++ ++#if wxUSE_HTML ++ ++#ifdef __BORDLANDC__ ++#pragma hdrstop ++#endif ++ ++#ifndef WXPRECOMP ++#endif ++ ++#include "wx/html/htmlfilter.h" ++#include "wx/html/htmlwin.h" ++ ++ ++/* ++ ++There is code for several default filters: ++ ++*/ ++ ++IMPLEMENT_ABSTRACT_CLASS(wxHtmlFilter, wxObject) ++ ++//-------------------------------------------------------------------------------- ++// wxHtmlFilterPlainText ++// filter for text/plain or uknown ++//-------------------------------------------------------------------------------- ++ ++IMPLEMENT_DYNAMIC_CLASS(wxHtmlFilterPlainText, wxHtmlFilter) ++ ++bool wxHtmlFilterPlainText::CanRead(const wxFSFile& WXUNUSED(file)) const ++{ ++ return TRUE; ++} ++ ++ ++ ++wxString wxHtmlFilterPlainText::ReadFile(const wxFSFile& file) const ++{ ++ wxInputStream *s = file.GetStream(); ++ char *src; ++ wxString doc, doc2; ++ ++ if (s == NULL) return wxEmptyString; ++ src = new char[s -> GetSize()+1]; ++ src[s -> GetSize()] = 0; ++ s -> Read(src, s -> GetSize()); ++ doc = src; ++ delete [] src; ++ ++ doc.Replace(_T("<"), _T("<"), TRUE); ++ doc.Replace(_T(">"), _T(">"), TRUE); ++ doc2 = _T("
\n") + doc + _T("\n
"); ++ return doc2; ++} ++ ++ ++ ++ ++ ++//-------------------------------------------------------------------------------- ++// wxHtmlFilterImage ++// filter for image/* ++//-------------------------------------------------------------------------------- ++ ++class wxHtmlFilterImage : public wxHtmlFilter ++{ ++ DECLARE_DYNAMIC_CLASS(wxHtmlFilterImage) ++ ++ public: ++ virtual bool CanRead(const wxFSFile& file) const; ++ virtual wxString ReadFile(const wxFSFile& file) const; ++}; ++ ++IMPLEMENT_DYNAMIC_CLASS(wxHtmlFilterImage, wxHtmlFilter) ++ ++ ++ ++bool wxHtmlFilterImage::CanRead(const wxFSFile& file) const ++{ ++ return (file.GetMimeType().Left(6) == "image/"); ++} ++ ++ ++ ++wxString wxHtmlFilterImage::ReadFile(const wxFSFile& file) const ++{ ++ return (""); ++} ++ ++ ++ ++ ++//-------------------------------------------------------------------------------- ++// wxHtmlFilterPlainText ++// filter for text/plain or uknown ++//-------------------------------------------------------------------------------- ++ ++class wxHtmlFilterHTML : public wxHtmlFilter ++{ ++ DECLARE_DYNAMIC_CLASS(wxHtmlFilterHTML) ++ ++ public: ++ virtual bool CanRead(const wxFSFile& file) const; ++ virtual wxString ReadFile(const wxFSFile& file) const; ++}; ++ ++ ++IMPLEMENT_DYNAMIC_CLASS(wxHtmlFilterHTML, wxHtmlFilter) ++ ++bool wxHtmlFilterHTML::CanRead(const wxFSFile& file) const ++{ ++// return (file.GetMimeType() == "text/html"); ++// This is true in most case but some page can return: ++// "text/html; char-encoding=...." ++// So we use Find instead ++ return (file.GetMimeType().Find(_T("text/html")) == 0); ++} ++ ++ ++ ++wxString wxHtmlFilterHTML::ReadFile(const wxFSFile& file) const ++{ ++ wxInputStream *s = file.GetStream(); ++ char *src; ++ wxString doc; ++ ++ if (s == NULL) return wxEmptyString; ++ src = new char[s -> GetSize() + 1]; ++ src[s -> GetSize()] = 0; ++ s -> Read(src, s -> GetSize()); ++ doc = src; ++ delete[] src; ++ ++ return doc; ++} ++ ++ ++ ++ ++///// Module: ++ ++class wxHtmlFilterModule : public wxModule ++{ ++ DECLARE_DYNAMIC_CLASS(wxHtmlFilterModule) ++ ++ public: ++ virtual bool OnInit() ++ { ++ wxHtmlWindow::AddFilter(new wxHtmlFilterHTML); ++ wxHtmlWindow::AddFilter(new wxHtmlFilterImage); ++ return TRUE; ++ } ++ virtual void OnExit() {} ++}; ++ ++IMPLEMENT_DYNAMIC_CLASS(wxHtmlFilterModule, wxModule) ++ ++#endif +diff -Naur wxGTK-2.8.0/src/html/htmlhelp.cpp wxGTK-2.8.0-Damn-Devels-Releasing-STABLE-APPS-DEPENDING-ON-FUCKING-CVS-STUFF/src/html/htmlhelp.cpp +--- wxGTK-2.8.0/src/html/htmlhelp.cpp 1970-01-01 01:00:00.000000000 +0100 ++++ wxGTK-2.8.0-Damn-Devels-Releasing-STABLE-APPS-DEPENDING-ON-FUCKING-CVS-STUFF/src/html/htmlhelp.cpp 2007-02-02 07:10:32.000000000 +0100 +@@ -0,0 +1,839 @@ ++// Name: htmlhelp.cpp ++// Purpose: Help controller ++// Author: Vaclav Slavik ++// Copyright: (c) 1999 Vaclav Slavik ++// Licence: wxWindows Licence ++///////////////////////////////////////////////////////////////////////////// ++ ++#error This file should not be compiled! Update your build system! \ ++(configure users, rerun configure to get a new Makefile) \ ++Instead of htmlhelp[_io], use helpdata, helpfrm and helpctrl. This \ ++file is only left to point out the problem and will be removed r.s.n. ++ ++#ifdef __GNUG__ ++#pragma implementation "htmlhelp.h" ++#endif ++ ++#include "wx/wxprec.h" ++ ++#if wxUSE_HTML ++ ++#ifdef __BORDLANDC__ ++#pragma hdrstop ++#endif ++ ++#ifndef WXPRECOMP ++#endif ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#if !((wxVERSION_NUMBER < 2100) || ((wxVERSION_NUMBER == 2100) && (wxBETA_NUMBER < 7))) ++#include ++#endif ++ ++ ++// Bitmaps: ++ ++#ifndef __WXMSW__ ++ // XPM hack: make the arrays const ++ #define static static const ++ ++ #include "bitmaps/panel.xpm" ++ #include "bitmaps/back.xpm" ++ #include "bitmaps/forward.xpm" ++ #include "bitmaps/book.xpm" ++ #include "bitmaps/folder.xpm" ++ #include "bitmaps/page.xpm" ++ ++ #undef static ++#endif ++ ++#include "search.h" ++ ++ ++ ++ ++#include ++WX_DEFINE_OBJARRAY(HtmlBookRecArray) ++ ++ ++ ++ ++ ++ ++ ++ ++ ++//----------------------------------------------------------------------------- ++// wxHtmlHelpController ++//----------------------------------------------------------------------------- ++ ++ ++IMPLEMENT_DYNAMIC_CLASS(wxHtmlHelpController, wxEvtHandler) ++ ++ ++wxHtmlHelpController::wxHtmlHelpController() : wxEvtHandler() ++{ ++ m_Frame = NULL; ++ m_Config = NULL; ++ m_ConfigRoot = wxEmptyString; ++ m_TitleFormat = _("Help : %s"); ++ m_TempPath = wxEmptyString; ++ ++ m_Cfg.x = m_Cfg.y = 0; ++ m_Cfg.w = 700; m_Cfg.h = 480; ++ m_Cfg.sashpos = 240; ++ m_Cfg.navig_on = TRUE; ++ ++ m_ContentsImageList = new wxImageList(12, 12); ++ m_ContentsImageList -> Add(wxICON(book)); ++ m_ContentsImageList -> Add(wxICON(folder)); ++ m_ContentsImageList -> Add(wxICON(page)); ++ ++ m_Contents = NULL; ++ m_ContentsCnt = 0; ++ m_Index = NULL; ++ m_IndexCnt = 0; ++ ++ m_IndexBox = NULL; ++ m_ContentsBox = NULL; ++ m_SearchList = NULL; ++ m_SearchText = NULL; ++ m_SearchButton = NULL; ++ m_HtmlWin = NULL; ++ m_Splitter = NULL; ++ m_NavigPan = NULL; ++} ++ ++ ++ ++wxHtmlHelpController::~wxHtmlHelpController() ++{ ++ int i; ++ ++ m_BookRecords.Empty(); ++ delete m_ContentsImageList; ++ if (m_Contents) { ++ for (i = 0; i < m_ContentsCnt; i++) { ++ delete[] m_Contents[i].m_Page; ++ delete[] m_Contents[i].m_Name; ++ } ++ free(m_Contents); ++ } ++ if (m_Index) { ++ for (i = 0; i < m_IndexCnt; i++) { ++ delete[] m_Index[i].m_Page; ++ delete[] m_Index[i].m_Name; ++ } ++ free(m_Index); ++ } ++} ++ ++ ++ ++void wxHtmlHelpController::SetTempDir(const wxString& path) ++{ ++ if (path == wxEmptyString) m_TempPath = path; ++ else { ++ if (wxIsAbsolutePath(path)) m_TempPath = path; ++ else m_TempPath = wxGetCwd() + "/" + path; ++ ++ if (m_TempPath[m_TempPath.Length() - 1] != '/') ++ m_TempPath << "/"; ++ } ++} ++ ++ ++ ++ ++// Reads one line, stores it into buf and returns pointer to new line or NULL. ++static char* ReadLine(char *line, char *buf) ++{ ++ char *writeptr = buf, *readptr = line; ++ ++ while (*readptr != 0 && *readptr != '\r' && *readptr != '\n') *(writeptr++) = *(readptr++); ++ *writeptr = 0; ++ while (*readptr == '\r' || *readptr == '\n') readptr++; ++ if (*readptr == 0) return NULL; ++ else return readptr; ++} ++ ++ ++static wxString SafeFileName(const wxString& s) ++{ ++ wxString res = s; ++ res.Replace(_T(":"), _T("_"), TRUE); ++ res.Replace(_T(" "), _T("_"), TRUE); ++ res.Replace(_T("/"), _T("_"), TRUE); ++ res.Replace(_T("\\"), _T("_"), TRUE); ++ res.Replace(_T("#"), _T("_"), TRUE); ++ res.Replace(_T("."), _T("_"), TRUE); ++ return res; ++} ++ ++ ++static int IndexCompareFunc(const void *a, const void *b) ++{ ++ return strcmp(((HtmlContentsItem*)a) -> m_Name, ((HtmlContentsItem*)b) -> m_Name); ++} ++ ++ ++ ++bool wxHtmlHelpController::AddBook(const wxString& book, bool show_wait_msg) ++{ ++ wxFSFile *fi; ++ wxFileSystem fsys; ++ wxInputStream *s; ++ HtmlBookRecord *bookr; ++ wxString bookFull; ++ ++ int sz; ++ char *buff, *lineptr; ++ char linebuf[300]; ++ ++ wxString title = _("noname"), ++ safetitle, ++ start = wxEmptyString, ++ contents = wxEmptyString, index = wxEmptyString; ++ ++ if (wxIsAbsolutePath(book)) bookFull = book; ++ else bookFull = wxGetCwd() + "/" + book; ++ ++ fi = fsys.OpenFile(bookFull); ++ if (fi == NULL) return FALSE; ++ fsys.ChangePathTo(bookFull); ++ s = fi -> GetStream(); ++ sz = s -> GetSize(); ++ buff = new char[sz+1]; ++ buff[sz] = 0; ++ s -> Read(buff, sz); ++ lineptr = buff; ++ delete fi; ++ ++ while ((lineptr = ReadLine(lineptr, linebuf)) != NULL) { ++ if (strstr(linebuf, "Title=") == linebuf) ++ title = linebuf + strlen("Title="); ++ if (strstr(linebuf, "Default topic=") == linebuf) ++ start = linebuf + strlen("Default topic="); ++ if (strstr(linebuf, "Index file=") == linebuf) ++ index = linebuf + strlen("Index file="); ++ if (strstr(linebuf, "Contents file=") == linebuf) ++ contents = linebuf + strlen("Contents file="); ++ } ++ delete[] buff; ++ ++ bookr = new HtmlBookRecord(fsys.GetPath(), title, start); ++ ++ if (m_ContentsCnt % HTML_REALLOC_STEP == 0) ++ m_Contents = (HtmlContentsItem*) realloc(m_Contents, (m_ContentsCnt + HTML_REALLOC_STEP) * sizeof(HtmlContentsItem)); ++ m_Contents[m_ContentsCnt].m_Level = 0; ++ m_Contents[m_ContentsCnt].m_ID = 0; ++ m_Contents[m_ContentsCnt].m_Page = new char[start.Length() + 1]; ++ strcpy(m_Contents[m_ContentsCnt].m_Page, start.c_str()); ++ m_Contents[m_ContentsCnt].m_Name = new char [title.Length() + 1]; ++ strcpy(m_Contents[m_ContentsCnt].m_Name, title.c_str()); ++ m_Contents[m_ContentsCnt].m_Book = bookr; ++ m_ContentsCnt++; ++ ++ // Try to find cached binary versions: ++ safetitle = SafeFileName(title); ++ fi = fsys.OpenFile(safetitle + ".cached"); ++ if (fi == NULL) fi = fsys.OpenFile(m_TempPath + safetitle + ".cached"); ++ if ((fi == NULL) || (m_TempPath == wxEmptyString)) { ++ LoadMSProject(bookr, fsys, index, contents, show_wait_msg); ++ if (m_TempPath != wxEmptyString) { ++ wxFileOutputStream *outs = new wxFileOutputStream(m_TempPath + safetitle + ".cached"); ++ SaveCachedBook(bookr, outs); ++ delete outs; ++ } ++ } ++ else { ++ LoadCachedBook(bookr, fi -> GetStream()); ++ delete fi; ++ } ++ ++ m_BookRecords.Add(bookr); ++ if (m_IndexCnt > 0) ++ qsort(m_Index, m_IndexCnt, sizeof(HtmlContentsItem), IndexCompareFunc); ++ ++ return TRUE; ++} ++ ++ ++ ++ ++void wxHtmlHelpController::Display(const wxString& x) ++{ ++ int cnt; ++ int i; ++ wxFileSystem fsys; ++ wxFSFile *f; ++ ++ CreateHelpWindow(); ++ ++ /* 1. try to open given file: */ ++ ++ cnt = m_BookRecords.GetCount(); ++ for (i = 0; i < cnt; i++) { ++ f = fsys.OpenFile(m_BookRecords[i].GetBasePath() + x); ++ if (f) { ++ m_HtmlWin -> LoadPage(m_BookRecords[i].GetBasePath() + x); ++ delete f; ++ return; ++ } ++ } ++ ++ ++ /* 2. try to find a book: */ ++ ++ for (i = 0; i < cnt; i++) { ++ if (m_BookRecords[i].GetTitle() == x) { ++ m_HtmlWin -> LoadPage(m_BookRecords[i].GetBasePath() + m_BookRecords[i].GetStart()); ++ return; ++ } ++ } ++ ++ /* 3. try to find in contents: */ ++ ++ cnt = m_ContentsCnt; ++ for (i = 0; i < cnt; i++) { ++ if (strcmp(m_Contents[i].m_Name, x) == 0) { ++ m_HtmlWin -> LoadPage(m_Contents[i].m_Book -> GetBasePath() + m_Contents[i].m_Page); ++ return; ++ } ++ } ++ ++ ++ /* 4. try to find in index: */ ++ ++ cnt = m_IndexCnt; ++ for (i = 0; i < cnt; i++) { ++ if (strcmp(m_Index[i].m_Name, x) == 0) { ++ m_HtmlWin -> LoadPage(m_Index[i].m_Book -> GetBasePath() + m_Index[i].m_Page); ++ return; ++ } ++ } ++ ++ ++ /* 5. if everything failed, search the documents: */ ++ ++ KeywordSearch(x); ++} ++ ++ ++ ++void wxHtmlHelpController::Display(const int id) ++{ ++ CreateHelpWindow(); ++ ++ for (int i = 0; i < m_ContentsCnt; i++) { ++ if (m_Contents[i].m_ID == id) { ++ m_HtmlWin -> LoadPage(m_Contents[i].m_Book -> GetBasePath() + m_Contents[i].m_Page); ++ return; ++ } ++ } ++} ++ ++ ++ ++void wxHtmlHelpController::DisplayContents() ++{ ++ CreateHelpWindow(); ++ m_Frame -> Raise(); ++ if (!m_Splitter -> IsSplit()) { ++ m_NavigPan -> Show(TRUE); ++ m_HtmlWin -> Show(TRUE); ++ m_Splitter -> SplitVertically(m_NavigPan, m_HtmlWin, m_Cfg.sashpos); ++ } ++ m_NavigPan -> SetSelection(0); ++} ++ ++ ++ ++void wxHtmlHelpController::DisplayIndex() ++{ ++ CreateHelpWindow(); ++ m_Frame -> Raise(); ++ if (!m_Splitter -> IsSplit()) { ++ m_NavigPan -> Show(TRUE); ++ m_HtmlWin -> Show(TRUE); ++ m_Splitter -> SplitVertically(m_NavigPan, m_HtmlWin, m_Cfg.sashpos); ++ } ++ m_NavigPan -> SetSelection(1); ++} ++ ++ ++ ++ ++#if (wxVERSION_NUMBER < 2100) || ((wxVERSION_NUMBER == 2100) && (wxBETA_NUMBER < 7)) ++ ++class MyProgressDlg : public wxDialog ++{ ++ public: ++ bool m_Canceled; ++ ++ MyProgressDlg(wxWindow *parent) : wxDialog(parent, -1, ++ _("Searching..."), ++ wxPoint(0, 0), ++#ifdef __WXGTK__ ++ wxSize(300, 110) ++#else ++ wxSize(300, 130) ++#endif ++ ) ++ {m_Canceled = FALSE;} ++ void OnCancel(wxCommandEvent& event) {m_Canceled = TRUE;} ++ DECLARE_EVENT_TABLE() ++}; ++BEGIN_EVENT_TABLE(MyProgressDlg, wxDialog) ++ EVT_BUTTON(wxID_CANCEL, MyProgressDlg::OnCancel) ++END_EVENT_TABLE() ++ ++#endif ++ ++ ++bool wxHtmlHelpController::KeywordSearch(const wxString& keyword) ++{ ++ int foundcnt = 0; ++ CreateHelpWindow(); ++ // if these are not set, we can't continue ++ if (! (m_SearchList && m_HtmlWin)) ++ return FALSE; ++ m_Frame -> Raise(); ++ if (m_Splitter && m_NavigPan && m_SearchButton) { ++ if (!m_Splitter -> IsSplit()) { ++ m_NavigPan -> Show(TRUE); ++ m_HtmlWin -> Show(TRUE); ++ m_Splitter -> SplitVertically(m_NavigPan, m_HtmlWin, m_Cfg.sashpos); ++ } ++ m_NavigPan -> SetSelection(2); ++ m_SearchList -> Clear(); ++ m_SearchText -> SetValue(keyword); ++ m_SearchButton -> Enable(FALSE); ++ } ++ { ++ int cnt = m_ContentsCnt; ++ wxSearchEngine engine; ++ wxFileSystem fsys; ++ wxFSFile *file; ++ wxString lastpage = wxEmptyString; ++ wxString foundstr; ++ ++#if (wxVERSION_NUMBER < 2100) || ((wxVERSION_NUMBER == 2100) && (wxBETA_NUMBER < 7)) ++ MyProgressDlg progress(m_Frame); ++ ++ wxStaticText *prompt = new wxStaticText(&progress, -1, "", wxPoint(20, 50), wxSize(260, 25), wxALIGN_CENTER); ++ wxGauge *gauge = new wxGauge(&progress, -1, cnt, wxPoint(20, 20), wxSize(260, 25)); ++ wxButton *btn = new wxButton(&progress, wxID_CANCEL, _("Cancel"), wxPoint(110, 70), wxSize(80, 25)); ++ btn = btn; /* fool compiler :-) */ ++ prompt -> SetLabel(_("No matching page found yet")); ++ ++ progress.Centre(wxBOTH); ++ progress.Show(TRUE); ++#else ++ wxProgressDialog progress(_("Searching..."), _("No matching page found yet"), cnt, m_Frame, wxPD_APP_MODAL | wxPD_CAN_ABORT | wxPD_AUTO_HIDE); ++#endif ++ ++ engine.LookFor(keyword); ++ ++ for (int i = 0; i < cnt; i++) { ++#if (wxVERSION_NUMBER < 2100) || ((wxVERSION_NUMBER == 2100) && (wxBETA_NUMBER < 7)) ++ gauge -> SetValue(i); ++ if (progress.m_Canceled) break; ++#else ++ if (progress.Update(i) == FALSE) break; ++#endif ++ wxYield(); ++ ++ file = fsys.OpenFile(m_Contents[i].m_Book -> GetBasePath() + m_Contents[i].m_Page); ++ if (file) { ++ if (lastpage != file -> GetLocation()) { ++ lastpage = file -> GetLocation(); ++ if (engine.Scan(file -> GetStream())) { ++ foundstr.Printf(_("Found %i matches"), ++foundcnt); ++#if (wxVERSION_NUMBER < 2100) || ((wxVERSION_NUMBER == 2100) && (wxBETA_NUMBER < 7)) ++ prompt -> SetLabel(foundstr); ++#else ++ progress.Update(i, foundstr); ++#endif ++ wxYield(); ++ m_SearchList -> Append(m_Contents[i].m_Name, (char*)(m_Contents + i)); ++ } ++ } ++ delete file; ++ } ++ } ++ ++#if (wxVERSION_NUMBER < 2100) || ((wxVERSION_NUMBER == 2100) && (wxBETA_NUMBER < 7)) ++ progress.Close(TRUE); ++#endif ++ } ++ if (m_SearchButton) ++ m_SearchButton -> Enable(TRUE); ++ if (m_SearchText) { ++ m_SearchText -> SetSelection(0, keyword.Length()); ++ m_SearchText -> SetFocus(); ++ } ++ if (foundcnt) { ++ HtmlContentsItem *it = (HtmlContentsItem*) m_SearchList -> GetClientData(0); ++ if (it) m_HtmlWin -> LoadPage(it -> m_Book -> GetBasePath() + it -> m_Page); ++ } ++ return (foundcnt > 0); ++} ++ ++ ++ ++ ++ ++ ++void wxHtmlHelpController::CreateHelpWindow() ++{ ++ wxBusyCursor cur; ++ wxString oldpath; ++ wxStatusBar *sbar; ++ ++ if (m_Frame) { ++ m_Frame -> Raise(); ++ m_Frame -> Show(TRUE); ++ return; ++ } ++ ++#if wxUSE_BUSYINFO ++ wxBusyInfo busyinfo(_("Preparing help window...")); ++#endif ++ ++ if (m_Config) ReadCustomization(m_Config, m_ConfigRoot); ++ ++ m_Frame = new wxFrame(NULL, -1, "", wxPoint(m_Cfg.x, m_Cfg.y), wxSize(m_Cfg.w, m_Cfg.h)); ++ m_Frame -> PushEventHandler(this); ++ sbar = m_Frame -> CreateStatusBar(); ++ ++ { ++ wxToolBar *toolBar; ++ toolBar = m_Frame -> CreateToolBar(wxNO_BORDER | wxTB_HORIZONTAL | wxTB_FLAT | wxTB_DOCKABLE); ++ toolBar -> SetMargins(2, 2); ++ wxBitmap* toolBarBitmaps[3]; ++ ++#ifdef __WXMSW__ ++ toolBarBitmaps[0] = new wxBitmap("panel"); ++ toolBarBitmaps[1] = new wxBitmap("back"); ++ toolBarBitmaps[2] = new wxBitmap("forward"); ++ int width = 24; ++#else ++ toolBarBitmaps[0] = new wxBitmap(panel_xpm); ++ toolBarBitmaps[1] = new wxBitmap(back_xpm); ++ toolBarBitmaps[2] = new wxBitmap(forward_xpm); ++ int width = 16; ++#endif ++ ++ int currentX = 5; ++ ++ toolBar -> AddTool(wxID_HTML_PANEL, *(toolBarBitmaps[0]), wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, _("Show/hide navigation panel")); ++ currentX += width + 5; ++ toolBar -> AddSeparator(); ++ toolBar -> AddTool(wxID_HTML_BACK, *(toolBarBitmaps[1]), wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, _("Go back to the previous HTML page")); ++ currentX += width + 5; ++ toolBar -> AddTool(wxID_HTML_FORWARD, *(toolBarBitmaps[2]), wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, _("Go forward to the next HTML page")); ++ currentX += width + 5; ++ ++ toolBar -> Realize(); ++ ++ // Can delete the bitmaps since they're reference counted ++ for (int i = 0; i < 3; i++) delete toolBarBitmaps[i]; ++ } ++ ++ ++ { ++ m_Splitter = new wxSplitterWindow(m_Frame); ++ ++ m_HtmlWin = new wxHtmlWindow(m_Splitter); ++ m_HtmlWin -> SetRelatedFrame(m_Frame, m_TitleFormat); ++ m_HtmlWin -> SetRelatedStatusBar(0); ++ if (m_Config) m_HtmlWin -> ReadCustomization(m_Config, m_ConfigRoot); ++ ++ m_NavigPan = new wxNotebook(m_Splitter, wxID_HTML_NOTEBOOK, wxDefaultPosition, wxDefaultSize); ++ { ++ m_ContentsBox = new wxTreeCtrl(m_NavigPan, wxID_HTML_TREECTRL, wxDefaultPosition, wxDefaultSize, wxTR_HAS_BUTTONS | wxSUNKEN_BORDER); ++ m_ContentsBox -> SetImageList(m_ContentsImageList); ++ m_NavigPan -> AddPage(m_ContentsBox, _("Contents")); ++ } ++ ++ { ++ wxWindow *dummy = new wxPanel(m_NavigPan, wxID_HTML_INDEXPAGE); ++ wxLayoutConstraints *b1 = new wxLayoutConstraints; ++ b1 -> top.SameAs (dummy, wxTop, 0); ++ b1 -> left.SameAs (dummy, wxLeft, 0); ++ b1 -> width.PercentOf (dummy, wxWidth, 100); ++ b1 -> bottom.SameAs (dummy, wxBottom, 0); ++ m_IndexBox = new wxListBox(dummy, wxID_HTML_INDEXLIST, wxDefaultPosition, wxDefaultSize, 0); ++ m_IndexBox -> SetConstraints(b1); ++ dummy -> SetAutoLayout(TRUE); ++ m_NavigPan -> AddPage(dummy, _("Index")); ++ } ++ ++ { ++ wxWindow *dummy = new wxPanel(m_NavigPan, wxID_HTML_SEARCHPAGE); ++ ++ wxLayoutConstraints *b1 = new wxLayoutConstraints; ++ m_SearchText = new wxTextCtrl(dummy, wxID_HTML_SEARCHTEXT); ++ b1 -> top.SameAs (dummy, wxTop, 0); ++ b1 -> left.SameAs (dummy, wxLeft, 0); ++ b1 -> right.SameAs (dummy, wxRight, 0); ++ b1 -> height.AsIs(); ++ m_SearchText -> SetConstraints(b1); ++ ++ wxLayoutConstraints *b2 = new wxLayoutConstraints; ++ m_SearchButton = new wxButton(dummy, wxID_HTML_SEARCHBUTTON, _("Search!")); ++ b2 -> top.Below (m_SearchText, 10); ++ b2 -> right.SameAs (dummy, wxRight, 10); ++ b2 -> width.AsIs(); ++ b2 -> height.AsIs(); ++ m_SearchButton -> SetConstraints(b2); ++ ++ wxLayoutConstraints *b3 = new wxLayoutConstraints; ++ m_SearchList = new wxListBox(dummy, wxID_HTML_SEARCHLIST, wxDefaultPosition, wxDefaultSize, 0); ++ b3 -> top.Below (m_SearchButton, 10); ++ b3 -> left.SameAs (dummy, wxLeft, 0); ++ b3 -> right.SameAs (dummy, wxRight, 0); ++ b3 -> bottom.SameAs (dummy, wxBottom, 0); ++ m_SearchList -> SetConstraints(b3); ++ ++ dummy -> SetAutoLayout(TRUE); ++ dummy -> Layout(); ++ m_NavigPan -> AddPage(dummy, _("Search")); ++ } ++ ++ RefreshLists(); ++ m_NavigPan -> Show(TRUE); ++ m_HtmlWin -> Show(TRUE); ++ m_Splitter -> SetMinimumPaneSize(20); ++ m_Splitter -> SplitVertically(m_NavigPan, m_HtmlWin, m_Cfg.sashpos); ++ if (!m_Cfg.navig_on) m_Splitter -> Unsplit(m_NavigPan); ++ wxYield(); ++ } ++ ++ m_Frame -> Show(TRUE); ++ wxYield(); ++} ++ ++ ++ ++#define MAX_ROOTS 64 ++ ++void wxHtmlHelpController::CreateContents() ++{ ++ HtmlContentsItem *it; ++ wxTreeItemId roots[MAX_ROOTS]; ++ bool imaged[MAX_ROOTS]; ++ int count = m_ContentsCnt; ++ ++ m_ContentsBox -> DeleteAllItems(); ++ roots[0] = m_ContentsBox -> AddRoot(_("(Help)")); ++ imaged[0] = TRUE; ++ ++ for (int i = 0; i < count; i++) { ++ it = m_Contents + i; ++ roots[it -> m_Level + 1] = m_ContentsBox -> AppendItem(roots[it -> m_Level], it -> m_Name, IMG_Page, -1, new wxHtmlHelpTreeItemData(it)); ++ if (it -> m_Level == 0) { ++ m_ContentsBox -> SetItemBold(roots[1], TRUE); ++ m_ContentsBox -> SetItemImage(roots[1], IMG_Book); ++ m_ContentsBox -> SetItemSelectedImage(roots[1], IMG_Book); ++ imaged[1] = TRUE; ++ } ++ else imaged[it -> m_Level + 1] = FALSE; ++ ++ if (!imaged[it -> m_Level]) { ++ m_ContentsBox -> SetItemImage(roots[it -> m_Level], IMG_Folder); ++ m_ContentsBox -> SetItemSelectedImage(roots[it -> m_Level], IMG_Folder); ++ imaged[it -> m_Level] = TRUE; ++ } ++ } ++ ++ m_ContentsBox -> Expand(roots[0]); ++} ++ ++ ++ ++ ++void wxHtmlHelpController::CreateIndex() ++{ ++ m_IndexBox -> Clear(); ++ ++ for (int i = 0; i < m_IndexCnt; i++) ++ m_IndexBox -> Append(m_Index[i].m_Name, (char*)(m_Index + i)); ++} ++ ++ ++ ++void wxHtmlHelpController::RefreshLists() ++{ ++ if (m_Frame) { ++ CreateContents(); ++ CreateIndex(); ++ m_SearchList -> Clear(); ++ } ++} ++ ++ ++ ++ ++ ++ ++ ++void wxHtmlHelpController::ReadCustomization(wxConfigBase *cfg, wxString path) ++{ ++ wxString oldpath; ++ wxString tmp; ++ ++ if (path != wxEmptyString) { ++ oldpath = cfg -> GetPath(); ++ cfg -> SetPath(path); ++ } ++ ++ m_Cfg.navig_on = cfg -> Read("hcNavigPanel", m_Cfg.navig_on) != 0; ++ m_Cfg.sashpos = cfg -> Read("hcSashPos", m_Cfg.sashpos); ++ m_Cfg.x = cfg -> Read("hcX", m_Cfg.x); ++ m_Cfg.y = cfg -> Read("hcY", m_Cfg.y); ++ m_Cfg.w = cfg -> Read("hcW", m_Cfg.w); ++ m_Cfg.h = cfg -> Read("hcH", m_Cfg.h); ++ ++ if (path != wxEmptyString) ++ cfg -> SetPath(oldpath); ++} ++ ++ ++ ++void wxHtmlHelpController::WriteCustomization(wxConfigBase *cfg, wxString path) ++{ ++ wxString oldpath; ++ wxString tmp; ++ ++ if (path != wxEmptyString) { ++ oldpath = cfg -> GetPath(); ++ cfg -> SetPath(path); ++ } ++ ++ cfg -> Write("hcNavigPanel", m_Cfg.navig_on); ++ cfg -> Write("hcSashPos", (long)m_Cfg.sashpos); ++ cfg -> Write("hcX", (long)m_Cfg.x); ++ cfg -> Write("hcY", (long)m_Cfg.y); ++ cfg -> Write("hcW", (long)m_Cfg.w); ++ cfg -> Write("hcH", (long)m_Cfg.h); ++ ++ if (path != wxEmptyString) ++ cfg -> SetPath(oldpath); ++} ++ ++ ++ ++ ++ ++/* ++EVENT HANDLING : ++*/ ++ ++ ++void wxHtmlHelpController::OnToolbar(wxCommandEvent& event) ++{ ++ switch (event.GetId()) { ++ case wxID_HTML_BACK : ++ m_HtmlWin -> HistoryBack(); ++ break; ++ case wxID_HTML_FORWARD : ++ m_HtmlWin -> HistoryForward(); ++ break; ++ case wxID_HTML_PANEL : ++ if (m_Splitter -> IsSplit()) { ++ m_Cfg.sashpos = m_Splitter -> GetSashPosition(); ++ m_Splitter -> Unsplit(m_NavigPan); ++ } ++ else { ++ m_NavigPan -> Show(TRUE); ++ m_HtmlWin -> Show(TRUE); ++ m_Splitter -> SplitVertically(m_NavigPan, m_HtmlWin, m_Cfg.sashpos); ++ } ++ break; ++ } ++} ++ ++ ++ ++void wxHtmlHelpController::OnContentsSel(wxTreeEvent& event) ++{ ++ wxHtmlHelpTreeItemData *pg; ++ ++ pg = (wxHtmlHelpTreeItemData*) m_ContentsBox -> GetItemData(event.GetItem()); ++ if (pg) m_HtmlWin -> LoadPage(pg -> GetPage()); ++} ++ ++ ++ ++void wxHtmlHelpController::OnIndexSel(wxCommandEvent& event) ++{ ++ HtmlContentsItem *it = (HtmlContentsItem*) m_IndexBox -> GetClientData(m_IndexBox -> GetSelection()); ++ if (it) m_HtmlWin -> LoadPage(it -> m_Book -> GetBasePath() + it -> m_Page); ++} ++ ++ ++ ++void wxHtmlHelpController::OnSearchSel(wxCommandEvent& event) ++{ ++ HtmlContentsItem *it = (HtmlContentsItem*) m_SearchList -> GetClientData(m_SearchList -> GetSelection()); ++ if (it) m_HtmlWin -> LoadPage(it -> m_Book -> GetBasePath() + it -> m_Page); ++} ++ ++ ++ ++void wxHtmlHelpController::OnCloseWindow(wxCloseEvent& event) ++{ ++ int a, b; ++ ++ m_Cfg.navig_on = m_Splitter -> IsSplit(); ++ if (m_Cfg.navig_on) ++ m_Cfg.sashpos = m_Splitter -> GetSashPosition(); ++ m_Frame -> GetPosition(&a, &b); ++ m_Cfg.x = a, m_Cfg.y = b; ++ m_Frame -> GetSize(&a, &b); ++ m_Cfg.w = a, m_Cfg.h = b; ++ ++ if (m_Config) { ++ WriteCustomization(m_Config, m_ConfigRoot); ++ m_HtmlWin -> WriteCustomization(m_Config, m_ConfigRoot); ++ } ++ m_Frame = NULL; ++ ++ event.Skip(); ++} ++ ++ ++ ++void wxHtmlHelpController::OnSearch(wxCommandEvent& event) ++{ ++ wxString sr = m_SearchText -> GetLineText(0); ++ ++ if (sr != wxEmptyString) KeywordSearch(sr); ++} ++ ++ ++ ++BEGIN_EVENT_TABLE(wxHtmlHelpController, wxEvtHandler) ++ EVT_TOOL_RANGE(wxID_HTML_PANEL, wxID_HTML_FORWARD, wxHtmlHelpController::OnToolbar) ++ EVT_TREE_SEL_CHANGED(wxID_HTML_TREECTRL, wxHtmlHelpController::OnContentsSel) ++ EVT_LISTBOX(wxID_HTML_INDEXLIST, wxHtmlHelpController::OnIndexSel) ++ EVT_LISTBOX(wxID_HTML_SEARCHLIST, wxHtmlHelpController::OnSearchSel) ++ EVT_CLOSE(wxHtmlHelpController::OnCloseWindow) ++ EVT_BUTTON(wxID_HTML_SEARCHBUTTON, wxHtmlHelpController::OnSearch) ++ EVT_TEXT_ENTER(wxID_HTML_SEARCHTEXT, wxHtmlHelpController::OnSearch) ++END_EVENT_TABLE() ++ ++ ++ ++#endif ++ +diff -Naur wxGTK-2.8.0/src/html/search.cpp wxGTK-2.8.0-Damn-Devels-Releasing-STABLE-APPS-DEPENDING-ON-FUCKING-CVS-STUFF/src/html/search.cpp +--- wxGTK-2.8.0/src/html/search.cpp 1970-01-01 01:00:00.000000000 +0100 ++++ wxGTK-2.8.0-Damn-Devels-Releasing-STABLE-APPS-DEPENDING-ON-FUCKING-CVS-STUFF/src/html/search.cpp 2007-02-02 07:10:32.000000000 +0100 +@@ -0,0 +1,72 @@ ++///////////////////////////////////////////////////////////////////////////// ++// Name: search.cpp ++// Purpose: search engine ++// Author: Vaclav Slavik ++// RCS-ID: $Id: search.cpp,v 1.9 2001/07/05 18:48:48 VZ Exp $ ++// Copyright: (c) 1999 Vaclav Slavik ++// Licence: wxWindows Licence ++///////////////////////////////////////////////////////////////////////////// ++ ++ ++ ++#ifdef __GNUG__ ++#pragma implementation ++#endif ++ ++#include "wx/wxprec.h" ++ ++#include "wx/defs.h" ++#if wxUSE_HTML ++ ++#ifdef __BORDLANDC__ ++#pragma hdrstop ++#endif ++ ++#ifndef WXPRECOMP ++#endif ++ ++#include "wx/html/helpdata.h" ++ ++ ++//-------------------------------------------------------------------------------- ++// wxSearchEngine ++//-------------------------------------------------------------------------------- ++ ++void wxSearchEngine::LookFor(const wxString& keyword) ++{ ++ if (m_Keyword) delete[] m_Keyword; ++ m_Keyword = new wxChar[keyword.Length() + 1]; ++ wxStrcpy(m_Keyword, keyword.c_str()); ++ for (int i = wxStrlen(m_Keyword) - 1; i >= 0; i--) ++ if ((m_Keyword[i] >= wxT('A')) && (m_Keyword[i] <= wxT('Z'))) ++ m_Keyword[i] += wxT('a') - wxT('A'); ++} ++ ++ ++ ++bool wxSearchEngine::Scan(wxInputStream *stream) ++{ ++ wxASSERT_MSG(m_Keyword != NULL, _("wxSearchEngine::LookFor must be called before scanning!")); ++ ++ int i, j; ++ int lng = stream ->GetSize(); ++ int wrd = wxStrlen(m_Keyword); ++ bool found = FALSE; ++ char *buf = new char[lng + 1]; ++ stream -> Read(buf, lng); ++ buf[lng] = 0; ++ ++ for (i = 0; i < lng; i++) ++ if ((buf[i] >= 'A') && (buf[i] <= 'Z')) buf[i] += 'a' - 'A'; ++ ++ for (i = 0; i < lng - wrd; i++) { ++ j = 0; ++ while ((j < wrd) && (buf[i + j] == m_Keyword[j])) j++; ++ if (j == wrd) {found = TRUE; break;} ++ } ++ ++ delete[] buf; ++ return found; ++} ++ ++#endif +diff -Naur wxGTK-2.8.0/src/unix/net.cpp wxGTK-2.8.0-Damn-Devels-Releasing-STABLE-APPS-DEPENDING-ON-FUCKING-CVS-STUFF/src/unix/net.cpp +--- wxGTK-2.8.0/src/unix/net.cpp 1970-01-01 01:00:00.000000000 +0100 ++++ wxGTK-2.8.0-Damn-Devels-Releasing-STABLE-APPS-DEPENDING-ON-FUCKING-CVS-STUFF/src/unix/net.cpp 2007-02-02 07:10:32.000000000 +0100 +@@ -0,0 +1,422 @@ ++// -*- c++ -*- /////////////////////////////////////////////////////////////// ++// Name: unix/net.cpp ++// Purpose: Network related wxWindows classes and functions ++// Author: Karsten Ballüder ++// Modified by: ++// Created: 03.10.99 ++// RCS-ID: $Id: net.cpp,v 1.3 1999/10/03 17:26:45 KB Exp $ ++// Copyright: (c) Karsten Ballüder ++// Licence: wxWindows licence ++///////////////////////////////////////////////////////////////////////////// ++ ++#include "wx/setup.h" ++ ++#if wxUSE_DIALUP_MANAGER ++ ++#ifndef WX_PRECOMP ++# include "wx/defs.h" ++#endif // !PCH ++ ++#include "wx/string.h" ++#include "wx/event.h" ++#include "wx/net.h" ++#include "wx/timer.h" ++#include "wx/filefn.h" ++#include "wx/utils.h" ++#include "wx/log.h" ++#include "wx/file.h" ++ ++#include ++#include ++#include ++#include ++#define __STRICT_ANSI__ ++#include ++#include ++#include ++#include ++#include ++#include ++ ++// ---------------------------------------------------------------------------- ++// A class which groups functions dealing with connecting to the network from a ++// workstation using dial-up access to the net. There is at most one instance ++// of this class in the program accessed via GetDialUpManager(). ++// ---------------------------------------------------------------------------- ++ ++/* TODO ++ * ++ * 1. more configurability for Unix: i.e. how to initiate the connection, how ++ * to check for online status, &c. ++ * 2. add a "long Dial(long connectionId = -1)" function which asks the user ++ * about which connection to dial (this may be done using native dialogs ++ * under NT, need generic dialogs for all others) and returns the identifier ++ * of the selected connection (it's opaque to the application) - it may be ++ * reused later to dial the same connection later (or use strings instead of ++ * longs may be?) ++ * 3. add an async version of dialing functions which notify the caller about ++ * the progress (or may be even start another thread to monitor it) ++ * 4. the static creation/accessor functions are not MT-safe - but is this ++ * really crucial? I think we may suppose they're always called from the ++ * main thread? ++ */ ++ ++class WXDLLEXPORT wxDialUpManagerImpl : public wxDialUpManager ++{ ++public: ++ wxDialUpManagerImpl() ++ { ++ m_IsOnline = -1; // unknown ++ m_timer = NULL; ++ m_CanUseIfconfig = -1; // unknown ++ m_BeaconHost = WXDIALUP_MANAGER_DEFAULT_BEACONHOST; ++ m_BeaconPort = 80; ++ } ++ ++ /** Could the dialup manager be initialized correctly? If this function ++ returns FALSE, no other functions will work neither, so it's a good idea ++ to call this function and check its result before calling any other ++ wxDialUpManager methods. ++ */ ++ virtual bool IsOk() const ++ { return TRUE; } ++ ++ /** The simplest way to initiate a dial up: this function dials the given ++ ISP (exact meaning of the parameter depends on the platform), returns ++ TRUE on success or FALSE on failure and logs the appropriate error ++ message in the latter case. ++ @param nameOfISP optional paramater for dial program ++ @param username unused ++ @param password unused ++ */ ++ virtual bool Dial(const wxString& nameOfISP, ++ const wxString& WXUNUSED(username), ++ const wxString& WXUNUSED(password)); ++ ++ /// Hang up the currently active dial up connection. ++ virtual bool HangUp(); ++ ++ // returns TRUE if the computer is connected to the network: under Windows, ++ // this just means that a RAS connection exists, under Unix we check that ++ // the "well-known host" (as specified by SetWellKnownHost) is reachable ++ virtual bool IsOnline() const ++ { ++ if( (! m_timer) // we are not polling, so test now: ++ || m_IsOnline == -1 ++ ) ++ CheckStatus(); ++ return m_IsOnline != 0; ++ } ++ ++ // sometimes the built-in logic for determining the online status may fail, ++ // so, in general, the user should be allowed to override it. This function ++ // allows to forcefully set the online status - whatever our internal ++ // algorithm may think about it. ++ virtual void SetOnlineStatus(bool isOnline = TRUE) ++ { m_IsOnline = isOnline; } ++ ++ // set misc wxDialUpManager options ++ // -------------------------------- ++ ++ // enable automatical checks for the connection status and sending of ++ // wxEVT_DIALUP_CONNECTED/wxEVT_DIALUP_DISCONNECTED events. The interval ++ // parameter is only for Unix where we do the check manually: under ++ // Windows, the notification about the change of connection status is ++ // instantenous. ++ // ++ // Returns FALSE if couldn't set up automatic check for online status. ++ virtual bool EnableAutoCheckOnlineStatus(size_t nSeconds); ++ ++ // disable automatic check for connection status change - notice that the ++ // wxEVT_DIALUP_XXX events won't be sent any more neither. ++ virtual void DisableAutoCheckOnlineStatus(); ++ ++ // under Unix, the value of well-known host is used to check whether we're ++ // connected to the internet. It's unused under Windows, but this function ++ // is always safe to call. The default value is www.yahoo.com. ++ virtual void SetWellKnownHost(const wxString& hostname, ++ int portno = 80); ++ /** Sets the commands to start up the network and to hang up ++ again. Used by the Unix implementations only. ++ */ ++ virtual void SetConnectCommand(const wxString &command, const wxString &hupcmd) ++ { m_ConnectCommand = command; m_HangUpCommand = hupcmd; } ++ ++private: ++ /// -1: don´t know, 0 = no, 1 = yes ++ int m_IsOnline; ++ ++ /// Can we use ifconfig to list active devices? ++ int m_CanUseIfconfig; ++ /// The path to ifconfig ++ wxString m_IfconfigPath; ++ ++ /// beacon host: ++ wxString m_BeaconHost; ++ /// beacon host portnumber for connect: ++ int m_BeaconPort; ++ ++ /// command to connect to network ++ wxString m_ConnectCommand; ++ /// command to hang up ++ wxString m_HangUpCommand; ++ /// name of ISP ++ wxString m_ISPname; ++ /// a timer for regular testing ++ class AutoCheckTimer *m_timer; ++ ++ friend class AutoCheckTimer; ++ /// determine status ++ void CheckStatus(void) const; ++ ++ /// real status check ++ void CheckStatusInternal(void); ++}; ++ ++ ++class AutoCheckTimer : public wxTimer ++{ ++public: ++ AutoCheckTimer(wxDialUpManagerImpl *dupman) ++ { ++ m_dupman = dupman; ++ m_started = FALSE; ++ } ++ ++ virtual bool Start( int millisecs = -1 ) ++ { m_started = TRUE; return wxTimer::Start(millisecs, FALSE); } ++ ++ virtual void Notify() ++ { wxLogTrace("Checking dial up network status."); m_dupman->CheckStatus(); } ++ ++ virtual void Stop() ++ { if ( m_started ) wxTimer::Stop(); } ++public: ++ bool m_started; ++ wxDialUpManagerImpl *m_dupman; ++}; ++ ++bool ++wxDialUpManagerImpl::Dial(const wxString &isp, ++ const wxString & WXUNUSED(username), ++ const wxString & WXUNUSED(password)) ++{ ++ if(m_IsOnline == 1) ++ return FALSE; ++ m_IsOnline = -1; ++ m_ISPname = isp; ++ wxString cmd; ++ if(m_ConnectCommand.Find("%s")) ++ cmd.Printf(m_ConnectCommand,m_ISPname.c_str()); ++ else ++ cmd = m_ConnectCommand; ++ return wxExecute(cmd, /* sync */ TRUE) == 0; ++} ++ ++bool ++wxDialUpManagerImpl::HangUp(void) ++{ ++ if(m_IsOnline == 0) ++ return FALSE; ++ m_IsOnline = -1; ++ wxString cmd; ++ if(m_HangUpCommand.Find("%s")) ++ cmd.Printf(m_HangUpCommand,m_ISPname.c_str()); ++ else ++ cmd = m_HangUpCommand; ++ return wxExecute(cmd, /* sync */ TRUE) == 0; ++} ++ ++ ++bool ++wxDialUpManagerImpl::EnableAutoCheckOnlineStatus(size_t nSeconds) ++{ ++ wxASSERT(m_timer == NULL); ++ m_timer = new AutoCheckTimer(this); ++ bool rc = m_timer->Start(nSeconds*1000); ++ if(! rc) ++ { ++ delete m_timer; ++ m_timer = NULL; ++ } ++ return rc; ++} ++ ++void ++wxDialUpManagerImpl::DisableAutoCheckOnlineStatus() ++{ ++ wxASSERT(m_timer != NULL); ++ m_timer->Stop(); ++ delete m_timer; ++ m_timer = NULL; ++} ++ ++ ++void ++wxDialUpManagerImpl::SetWellKnownHost(const wxString& hostname, int portno) ++{ ++ /// does hostname contain a port number? ++ wxString port = hostname.After(':'); ++ if(port.Length()) ++ { ++ m_BeaconHost = hostname.Before(':'); ++ m_BeaconPort = atoi(port); ++ } ++ else ++ { ++ m_BeaconHost = hostname; ++ m_BeaconPort = portno; ++ } ++} ++ ++ ++void ++wxDialUpManagerImpl::CheckStatus(void) const ++{ ++ // This function calls the CheckStatusInternal() helper function ++ // which is OS - specific and then sends the events. ++ ++ int oldIsOnline = m_IsOnline; ++ ( /* non-const */ (wxDialUpManagerImpl *)this)->CheckStatusInternal(); ++ ++ // now send the events as appropriate: ++ if(m_IsOnline != oldIsOnline) ++ { ++ if(m_IsOnline) ++ ; // send ev ++ else ++ ; // send ev ++ } ++} ++ ++/* ++ We have three methods that we can use: ++ ++ 1. test via /sbin/ifconfig and grep for "sl", "ppp", "pl" ++ --> should be fast enough for regular polling ++ 2. test if we can reach the well known beacon host ++ --> too slow for polling ++ 3. check /proc/net/dev on linux?? ++ This method should be preferred, if possible. Need to do more ++ testing. ++ ++*/ ++ ++void ++wxDialUpManagerImpl::CheckStatusInternal(void) ++{ ++ m_IsOnline = -1; ++ ++ // First time check for ifconfig location. We only use the variant ++ // which does not take arguments, a la GNU. ++ if(m_CanUseIfconfig == -1) // unknown ++ { ++ if(wxFileExists("/sbin/ifconfig")) ++ m_IfconfigPath = "/sbin/ifconfig"; ++ else if(wxFileExists("/usr/sbin/ifconfig")) ++ m_IfconfigPath = "/usr/sbin/ifconfig"; ++ } ++ ++ wxLogNull ln; // suppress all error messages ++ // Let´s try the ifconfig method first, should be fastest: ++ if(m_CanUseIfconfig != 0) // unknown or yes ++ { ++ wxASSERT(m_IfconfigPath.length()); ++ ++ wxString tmpfile = wxGetTempFileName("_wxdialuptest"); ++ wxString cmd = "/bin/sh -c \'"; ++ cmd << m_IfconfigPath << " >" << tmpfile << '\''; ++ /* I tried to add an option to wxExecute() to not close stdout, ++ so we could let ifconfig write directly to the tmpfile, but ++ this does not work. That should be faster, as it doesn´t call ++ the shell first. I have no idea why. :-( (KB) */ ++#if 0 ++ // temporarily redirect stdout/stderr: ++ int ++ new_stdout = dup(STDOUT_FILENO), ++ new_stderr = dup(STDERR_FILENO); ++ close(STDOUT_FILENO); ++ close(STDERR_FILENO); ++ ++ int ++ // new stdout: ++ output_fd = open(tmpfile, O_CREAT|O_TRUNC, S_IRUSR|S_IWUSR), ++ // new stderr: ++ null_fd = open("/dev/null", O_CREAT, S_IRUSR|S_IWUSR); ++ // verify well behaved unix behaviour: ++ wxASSERT(output_fd == STDOUT_FILENO); ++ wxASSERT(null_fd == STDERR_FILENO); ++ int rc = wxExecute(m_IfconfigPath,TRUE /* sync */,NULL ,wxEXECUTE_DONT_CLOSE_FDS); ++ close(null_fd); close(output_fd); ++ // restore old stdout, stderr: ++ int test; ++ test = dup(new_stdout); close(new_stdout); wxASSERT(test == STDOUT_FILENO); ++ test = dup(new_stderr); close(new_stderr); wxASSERT(test == STDERR_FILENO); ++ if(rc == 0) ++#endif ++ if(wxExecute(cmd,TRUE /* sync */) == 0) ++ { ++ m_CanUseIfconfig = 1; ++ wxFile file; ++ if( file.Open(tmpfile) ) ++ { ++ char *output = new char [file.Length()+1]; ++ output[file.Length()] = '\0'; ++ if(file.Read(output,file.Length()) == file.Length()) ++ { ++ if(strstr(output,"ppp") // ppp ++ || strstr(output,"sl") // slip ++ || strstr(output,"pl") // plip ++ ) ++ m_IsOnline = 1; ++ else ++ m_IsOnline = 0; ++ } ++ file.Close(); ++ delete [] output; ++ } ++ // else m_IsOnline remains -1 as we don't know for sure ++ } ++ else // could not run ifconfig correctly ++ m_CanUseIfconfig = 0; // don´t try again ++ (void) wxRemoveFile(tmpfile); ++ if(m_IsOnline != -1) // we are done ++ return; ++ } ++ ++ // second method: try to connect to well known host: ++ // This can be used under Win 9x, too! ++ struct hostent *hp; ++ struct sockaddr_in serv_addr; ++ int sockfd; ++ ++ m_IsOnline = 0; // assume false ++ if((hp = gethostbyname(m_BeaconHost)) == NULL) ++ return; // no DNS no net ++ ++ serv_addr.sin_family = hp->h_addrtype; ++ memcpy(&serv_addr.sin_addr,hp->h_addr, hp->h_length); ++ serv_addr.sin_port = htons(m_BeaconPort); ++ if( ( sockfd = socket(hp->h_addrtype, SOCK_STREAM, 0)) < 0) ++ { ++ // sys_error("cannot create socket for gw"); ++ return; ++ } ++ if( connect(sockfd, (struct sockaddr *) &serv_addr, sizeof(serv_addr)) < 0) ++ { ++ //sys_error("cannot connect to server"); ++ return; ++ } ++ //connected! ++ close(sockfd); ++} ++ ++ ++/* static */ ++wxDialUpManager * ++wxDialUpManager::wxDialUpManager::Create(void) ++{ ++ return new wxDialUpManagerImpl; ++} ++ ++#endif // wxUSE_DIALUP_MANAGER +diff -Naur wxGTK-2.8.0/utils/wxprop/src/prop.cpp wxGTK-2.8.0-Damn-Devels-Releasing-STABLE-APPS-DEPENDING-ON-FUCKING-CVS-STUFF/utils/wxprop/src/prop.cpp +--- wxGTK-2.8.0/utils/wxprop/src/prop.cpp 1970-01-01 01:00:00.000000000 +0100 ++++ wxGTK-2.8.0-Damn-Devels-Releasing-STABLE-APPS-DEPENDING-ON-FUCKING-CVS-STUFF/utils/wxprop/src/prop.cpp 2007-02-02 07:10:32.000000000 +0100 +@@ -0,0 +1,1119 @@ ++///////////////////////////////////////////////////////////////////////////// ++// Name: prop.cpp ++// Purpose: Propert sheet classes implementation ++// Author: Julian Smart ++// Modified by: ++// Created: 04/01/98 ++// RCS-ID: $Id: prop.cpp,v 1.11 1999/06/28 21:39:49 VZ Exp $ ++// Copyright: (c) Julian Smart ++// Licence: wxWindows license ++///////////////////////////////////////////////////////////////////////////// ++ ++#ifdef __GNUG__ ++#pragma implementation "prop.h" ++#endif ++ ++// For compilers that support precompilation, includes "wx/wx.h". ++#include "wx/wxprec.h" ++ ++#ifdef __BORLANDC__ ++#pragma hdrstop ++#endif ++ ++#ifndef WX_PRECOMP ++#include "wx/wx.h" ++#endif ++ ++#include ++#include ++#include ++#include ++ ++#if wxUSE_IOSTREAMH ++#if defined(__WXMSW__) && !defined(__GNUWIN32__) ++#include ++#else ++#include ++#endif ++#else ++#include ++#endif ++ ++#include "wx/window.h" ++#include "wx/utils.h" ++#include "wx/list.h" ++#include "prop.h" ++ ++IMPLEMENT_DYNAMIC_CLASS(wxPropertyValue, wxObject) ++ ++wxPropertyValue::wxPropertyValue(void) ++{ ++ m_type = wxPropertyValueNull; ++ m_next = NULL; ++ m_last = NULL; ++ m_value.first = NULL; ++ m_clientData = NULL; ++ m_modifiedFlag = FALSE; ++} ++ ++wxPropertyValue::wxPropertyValue(const wxPropertyValue& copyFrom) ++{ ++ m_modifiedFlag = FALSE; ++ Copy((wxPropertyValue& )copyFrom); ++} ++ ++wxPropertyValue::wxPropertyValue(const char *val) ++{ ++ m_modifiedFlag = FALSE; ++ m_type = wxPropertyValueString; ++ ++ m_value.string = copystring(val); ++ m_clientData = NULL; ++ m_next = NULL; ++ m_last = NULL; ++} ++ ++wxPropertyValue::wxPropertyValue(const wxString& val) ++{ ++ m_modifiedFlag = FALSE; ++ m_type = wxPropertyValueString; ++ ++ m_value.string = copystring((const char *)val); ++ m_clientData = NULL; ++ m_next = NULL; ++ m_last = NULL; ++} ++ ++wxPropertyValue::wxPropertyValue(long the_integer) ++{ ++ m_modifiedFlag = FALSE; ++ m_type = wxPropertyValueInteger; ++ m_value.integer = the_integer; ++ m_clientData = NULL; ++ m_next = NULL; ++} ++ ++wxPropertyValue::wxPropertyValue(bool val) ++{ ++ m_modifiedFlag = FALSE; ++ m_type = wxPropertyValuebool; ++ m_value.integer = val; ++ m_clientData = NULL; ++ m_next = NULL; ++} ++ ++wxPropertyValue::wxPropertyValue(float the_real) ++{ ++ m_modifiedFlag = FALSE; ++ m_type = wxPropertyValueReal; ++ m_value.real = the_real; ++ m_clientData = NULL; ++ m_next = NULL; ++} ++ ++wxPropertyValue::wxPropertyValue(double the_real) ++{ ++ m_modifiedFlag = FALSE; ++ m_type = wxPropertyValueReal; ++ m_value.real = (float)the_real; ++ m_clientData = NULL; ++ m_next = NULL; ++} ++ ++// Pointer versions: we have a pointer to the real C++ value. ++wxPropertyValue::wxPropertyValue(char **val) ++{ ++ m_modifiedFlag = FALSE; ++ m_type = wxPropertyValueStringPtr; ++ ++ m_value.stringPtr = val; ++ m_clientData = NULL; ++ m_next = NULL; ++ m_last = NULL; ++} ++ ++wxPropertyValue::wxPropertyValue(long *val) ++{ ++ m_modifiedFlag = FALSE; ++ m_type = wxPropertyValueIntegerPtr; ++ m_value.integerPtr = val; ++ m_clientData = NULL; ++ m_next = NULL; ++} ++ ++wxPropertyValue::wxPropertyValue(bool *val) ++{ ++ m_modifiedFlag = FALSE; ++ m_type = wxPropertyValueboolPtr; ++ m_value.boolPtr = val; ++ m_clientData = NULL; ++ m_next = NULL; ++} ++ ++wxPropertyValue::wxPropertyValue(float *val) ++{ ++ m_modifiedFlag = FALSE; ++ m_type = wxPropertyValueRealPtr; ++ m_value.realPtr = val; ++ m_clientData = NULL; ++ m_next = NULL; ++} ++ ++wxPropertyValue::wxPropertyValue(wxList *the_list) ++{ ++ m_modifiedFlag = FALSE; ++ m_type = wxPropertyValueList; ++ m_clientData = NULL; ++ m_last = NULL; ++ m_value.first = NULL; ++ ++ wxNode *node = the_list->First(); ++ while (node) ++ { ++ wxPropertyValue *expr = (wxPropertyValue *)node->Data(); ++ Append(expr); ++ node = node->Next(); ++ } ++ ++ delete the_list; ++} ++ ++wxPropertyValue::wxPropertyValue(wxStringList *the_list) ++{ ++ m_modifiedFlag = FALSE; ++ m_type = wxPropertyValueList; ++ m_clientData = NULL; ++ m_last = NULL; ++ m_value.first = NULL; ++ ++ wxNode *node = the_list->First(); ++ while (node) ++ { ++ char *s = (char *)node->Data(); ++ Append(new wxPropertyValue(s)); ++ node = node->Next(); ++ } ++ delete the_list; ++} ++ ++wxPropertyValue::~wxPropertyValue(void) ++{ ++ switch (m_type) ++ { ++ case wxPropertyValueInteger: ++ case wxPropertyValuebool: ++ case wxPropertyValueReal: ++ { ++ break; ++ } ++ case wxPropertyValueString: ++ { ++ delete[] m_value.string; ++ break; ++ } ++ case wxPropertyValueList: ++ { ++ wxPropertyValue *expr = m_value.first; ++ while (expr) ++ { ++ wxPropertyValue *expr1 = expr->m_next; ++ ++ delete expr; ++ expr = expr1; ++ } ++ break; ++ } ++ default: ++ case wxPropertyValueNull: break; ++ } ++} ++ ++void wxPropertyValue::Append(wxPropertyValue *expr) ++{ ++ m_modifiedFlag = TRUE; ++ if (!m_value.first) ++ m_value.first = expr; ++ ++ if (m_last) ++ m_last->m_next = expr; ++ m_last = expr; ++} ++ ++void wxPropertyValue::Insert(wxPropertyValue *expr) ++{ ++ m_modifiedFlag = TRUE; ++ expr->m_next = m_value.first; ++ m_value.first = expr; ++ ++ if (!m_last) ++ m_last = expr; ++} ++ ++// Delete from list ++void wxPropertyValue::Delete(wxPropertyValue *node) ++{ ++ wxPropertyValue *expr = GetFirst(); ++ ++ wxPropertyValue *previous = NULL; ++ while (expr && (expr != node)) ++ { ++ previous = expr; ++ expr = expr->GetNext(); ++ } ++ ++ if (expr) ++ { ++ if (previous) ++ previous->m_next = expr->m_next; ++ ++ // If node was the first in the list, ++ // make the list point to the NEXT one. ++ if (GetFirst() == expr) ++ { ++ m_value.first = expr->m_next; ++ } ++ ++ // If node was the last in the list, ++ // make the list 'last' pointer point to the PREVIOUS one. ++ if (GetLast() == expr) ++ { ++ if (previous) ++ m_last = previous; ++ else ++ m_last = NULL; ++ } ++ m_modifiedFlag = TRUE; ++ delete expr; ++ } ++ ++} ++ ++void wxPropertyValue::ClearList(void) ++{ ++ wxPropertyValue *val = GetFirst(); ++ if (val) ++ m_modifiedFlag = TRUE; ++ ++ while (val) ++ { ++ wxPropertyValue *next = val->GetNext(); ++ delete val; ++ val = next; ++ } ++ m_value.first = NULL; ++ m_last = NULL; ++} ++ ++wxPropertyValue *wxPropertyValue::NewCopy(void) const ++{ ++ switch (m_type) ++ { ++ case wxPropertyValueInteger: ++ return new wxPropertyValue(m_value.integer); ++ case wxPropertyValuebool: ++ return new wxPropertyValue((bool) (m_value.integer != 0)); ++ case wxPropertyValueReal: ++ return new wxPropertyValue(m_value.real); ++ case wxPropertyValueString: ++ return new wxPropertyValue(m_value.string); ++ case wxPropertyValueList: ++ { ++ wxPropertyValue *expr = m_value.first; ++ wxPropertyValue *new_list = new wxPropertyValue; ++ new_list->SetType(wxPropertyValueList); ++ while (expr) ++ { ++ wxPropertyValue *expr2 = expr->NewCopy(); ++ new_list->Append(expr2); ++ expr = expr->m_next; ++ } ++ return new_list; ++ } ++ case wxPropertyValueIntegerPtr: ++ return new wxPropertyValue(m_value.integerPtr); ++ case wxPropertyValueRealPtr: ++ return new wxPropertyValue(m_value.realPtr); ++ case wxPropertyValueboolPtr: ++ return new wxPropertyValue(m_value.boolPtr); ++ case wxPropertyValueStringPtr: ++ return new wxPropertyValue(m_value.stringPtr); ++ ++ case wxPropertyValueNull: ++#ifdef __X__ ++ cerr << "Should never get here!\n"; ++#endif ++ break; ++ } ++ return NULL; ++} ++ ++void wxPropertyValue::Copy(wxPropertyValue& copyFrom) ++{ ++ m_type = copyFrom.Type(); ++ ++ switch (m_type) ++ { ++ case wxPropertyValueInteger: ++ (*this) = copyFrom.IntegerValue(); ++ return ; ++ ++ case wxPropertyValueReal: ++ (*this) = copyFrom.RealValue(); ++ return ; ++ ++ case wxPropertyValueString: ++ (*this) = wxString(copyFrom.StringValue()); ++ return ; ++ ++ case wxPropertyValuebool: ++ (*this) = copyFrom.BoolValue(); ++ return ; ++ ++ // Pointers ++ case wxPropertyValueboolPtr: ++ (*this) = copyFrom.BoolValuePtr(); ++ return ; ++ case wxPropertyValueRealPtr: ++ (*this) = copyFrom.RealValuePtr(); ++ return ; ++ case wxPropertyValueIntegerPtr: ++ (*this) = copyFrom.IntegerValuePtr(); ++ return ; ++ case wxPropertyValueStringPtr: ++ { ++ char** s = copyFrom.StringValuePtr(); ++ (*this) = s != 0; ++ return ; ++ } ++ ++ case wxPropertyValueList: ++ { ++ m_value.first = NULL; ++ m_next = NULL; ++ m_last = NULL; ++ wxPropertyValue *expr = copyFrom.m_value.first; ++ while (expr) ++ { ++ wxPropertyValue *expr2 = expr->NewCopy(); ++ Append(expr2); ++ expr = expr->m_next; ++ } ++ return; ++ } ++ case wxPropertyValueNull: ++#ifdef __X__ ++ cerr << "Should never get here!\n"; ++#endif ++ break; ++ } ++} ++ ++// Return nth argument of a clause (starting from 1) ++wxPropertyValue *wxPropertyValue::Arg(wxPropertyValueType type, int arg) const ++{ ++ wxPropertyValue *expr = m_value.first; ++ for (int i = 1; i < arg; i++) ++ if (expr) ++ expr = expr->m_next; ++ ++ if (expr && (expr->m_type == type)) ++ return expr; ++ else ++ return NULL; ++} ++ ++// Return nth argument of a list expression (starting from zero) ++wxPropertyValue *wxPropertyValue::Nth(int arg) const ++{ ++ if (m_type != wxPropertyValueList) ++ return NULL; ++ ++ wxPropertyValue *expr = m_value.first; ++ for (int i = 0; i < arg; i++) ++ if (expr) ++ expr = expr->m_next; ++ else return NULL; ++ ++ if (expr) ++ return expr; ++ else ++ return NULL; ++} ++ ++ // Returns the number of elements in a list expression ++int wxPropertyValue::Number(void) const ++{ ++ if (m_type != wxPropertyValueList) ++ return 0; ++ ++ int i = 0; ++ wxPropertyValue *expr = m_value.first; ++ while (expr) ++ { ++ expr = expr->m_next; ++ i ++; ++ } ++ return i; ++} ++ ++void wxPropertyValue::WritePropertyClause(ostream& stream) // Write this expression as a top-level clause ++{ ++ if (m_type != wxPropertyValueList) ++ return; ++ ++ wxPropertyValue *node = m_value.first; ++ if (node) ++ { ++ node->WritePropertyType(stream); ++ stream << "("; ++ node = node->m_next; ++ bool first = TRUE; ++ while (node) ++ { ++ if (!first) ++ stream << " "; ++ node->WritePropertyType(stream); ++ node = node->m_next; ++ if (node) stream << ",\n"; ++ first = FALSE; ++ } ++ stream << ").\n\n"; ++ } ++} ++ ++void wxPropertyValue::WritePropertyType(ostream& stream) // Write as any other subexpression ++{ ++ switch (m_type) ++ { ++ case wxPropertyValueInteger: ++ { ++ stream << m_value.integer; ++ break; ++ } ++ case wxPropertyValueIntegerPtr: ++ { ++ stream << *m_value.integerPtr; ++ break; ++ } ++ case wxPropertyValuebool: ++ { ++ if (m_value.integer) ++ stream << "True"; ++ else ++ stream << "False"; ++ break; ++ } ++ case wxPropertyValueboolPtr: ++ { ++ if (*m_value.integerPtr) ++ stream << "True"; ++ else ++ stream << "False"; ++ break; ++ } ++ case wxPropertyValueReal: ++ { ++ float f = m_value.real; ++ sprintf(wxBuffer, "%.6g", (double)f); ++ stream << wxBuffer; ++ break; ++ } ++ case wxPropertyValueRealPtr: ++ { ++ float f = *m_value.realPtr; ++/* Now the parser can cope with this. ++ // Prevent printing in 'e' notation. Any better way? ++ if (fabs(f) < 0.00001) ++ f = 0.0; ++*/ ++ sprintf(wxBuffer, "%.6g", f); ++ stream << wxBuffer; ++ break; ++ } ++ case wxPropertyValueString: ++ { ++// stream << "\""; ++ int i; ++ int len = strlen(m_value.string); ++ for (i = 0; i < len; i++) ++ { ++ char ch = m_value.string[i]; ++// if (ch == '"' || ch == '\\') ++// stream << "\\"; ++ stream << ch; ++ } ++ ++// stream << "\""; ++ break; ++ } ++ case wxPropertyValueStringPtr: ++ { ++ int i; ++ int len = strlen(*(m_value.stringPtr)); ++ for (i = 0; i < len; i++) ++ { ++ char ch = *(m_value.stringPtr)[i]; ++ ++ } ++ break; ++ } ++ case wxPropertyValueList: ++ { ++ if (!m_value.first) ++ stream << "[]"; ++ else ++ { ++ wxPropertyValue *expr = m_value.first; ++ ++ stream << "["; ++ while (expr) ++ { ++ expr->WritePropertyType(stream); ++ expr = expr->m_next; ++ if (expr) stream << ", "; ++ } ++ stream << "]"; ++ } ++ break; ++ } ++ case wxPropertyValueNull: break; ++ } ++} ++ ++wxString wxPropertyValue::GetStringRepresentation(void) ++{ ++ char buf[500]; ++ buf[0] = 0; ++ ++ ostrstream str((char *)buf, (int)500, ios::out); ++ WritePropertyType(str); ++ str << '\0'; ++ str.flush(); ++ ++ wxString theString(buf); ++ return theString; ++} ++ ++void wxPropertyValue::operator=(const wxPropertyValue& val) ++{ ++ m_modifiedFlag = TRUE; ++ Copy((wxPropertyValue&)val); ++} ++ ++// void wxPropertyValue::operator=(const char *val) ++void wxPropertyValue::operator=(const wxString& val1) ++{ ++ const char *val = (const char *)val1; ++ ++ m_modifiedFlag = TRUE; ++ if (m_type == wxPropertyValueNull) ++ m_type = wxPropertyValueString; ++ ++ if (m_type == wxPropertyValueString) ++ { ++ if (val) ++ m_value.string = copystring(val); ++ else ++ m_value.string = NULL; ++ } ++ else if (m_type == wxPropertyValueStringPtr) ++ { ++ if (*m_value.stringPtr) ++ delete[] *m_value.stringPtr; ++ if (val) ++ *m_value.stringPtr = copystring(val); ++ else ++ *m_value.stringPtr = NULL; ++ } ++ ++ m_clientData = NULL; ++ m_next = NULL; ++ m_last = NULL; ++ ++} ++ ++void wxPropertyValue::operator=(const long val) ++{ ++ m_modifiedFlag = TRUE; ++ if (m_type == wxPropertyValueNull) ++ m_type = wxPropertyValueInteger; ++ ++ if (m_type == wxPropertyValueInteger) ++ m_value.integer = val; ++ else if (m_type == wxPropertyValueIntegerPtr) ++ *m_value.integerPtr = val; ++ else if (m_type == wxPropertyValueReal) ++ m_value.real = (float)val; ++ else if (m_type == wxPropertyValueRealPtr) ++ *m_value.realPtr = (float)val; ++ ++ m_clientData = NULL; ++ m_next = NULL; ++} ++ ++void wxPropertyValue::operator=(const bool val) ++{ ++ m_modifiedFlag = TRUE; ++ if (m_type == wxPropertyValueNull) ++ m_type = wxPropertyValuebool; ++ ++ if (m_type == wxPropertyValuebool) ++ m_value.integer = (long)val; ++ else if (m_type == wxPropertyValueboolPtr) ++ *m_value.boolPtr = val; ++ ++ m_clientData = NULL; ++ m_next = NULL; ++} ++ ++void wxPropertyValue::operator=(const float val) ++{ ++ m_modifiedFlag = TRUE; ++ if (m_type == wxPropertyValueNull) ++ m_type = wxPropertyValueReal; ++ ++ if (m_type == wxPropertyValueInteger) ++ m_value.integer = (long)val; ++ else if (m_type == wxPropertyValueIntegerPtr) ++ *m_value.integerPtr = (long)val; ++ else if (m_type == wxPropertyValueReal) ++ m_value.real = val; ++ else if (m_type == wxPropertyValueRealPtr) ++ *m_value.realPtr = val; ++ ++ m_clientData = NULL; ++ m_next = NULL; ++} ++ ++void wxPropertyValue::operator=(const char **val) ++{ ++ m_modifiedFlag = TRUE; ++ m_type = wxPropertyValueStringPtr; ++ ++ if (val) ++ m_value.stringPtr = (char **)val; ++ else ++ m_value.stringPtr = NULL; ++ m_clientData = NULL; ++ m_next = NULL; ++ m_last = NULL; ++ ++} ++ ++void wxPropertyValue::operator=(const long *val) ++{ ++ m_modifiedFlag = TRUE; ++ m_type = wxPropertyValueIntegerPtr; ++ m_value.integerPtr = (long *)val; ++ m_clientData = NULL; ++ m_next = NULL; ++} ++ ++void wxPropertyValue::operator=(const bool *val) ++{ ++ m_modifiedFlag = TRUE; ++ m_type = wxPropertyValueboolPtr; ++ m_value.boolPtr = (bool *)val; ++ m_clientData = NULL; ++ m_next = NULL; ++} ++ ++void wxPropertyValue::operator=(const float *val) ++{ ++ m_modifiedFlag = TRUE; ++ m_type = wxPropertyValueRealPtr; ++ m_value.realPtr = (float *)val; ++ m_clientData = NULL; ++ m_next = NULL; ++} ++ ++long wxPropertyValue::IntegerValue(void) const ++ { ++ if (m_type == wxPropertyValueInteger) ++ return m_value.integer; ++ else if (m_type == wxPropertyValueReal) ++ return (long)m_value.real; ++ else if (m_type == wxPropertyValueIntegerPtr) ++ return *m_value.integerPtr; ++ else if (m_type == wxPropertyValueRealPtr) ++ return (long)(*m_value.realPtr); ++ else return 0; ++ } ++ ++long *wxPropertyValue::IntegerValuePtr(void) const ++{ ++ return m_value.integerPtr; ++} ++ ++float wxPropertyValue::RealValue(void) const { ++ if (m_type == wxPropertyValueReal) ++ return m_value.real; ++ else if (m_type == wxPropertyValueRealPtr) ++ return *m_value.realPtr; ++ else if (m_type == wxPropertyValueInteger) ++ return (float)m_value.integer; ++ else if (m_type == wxPropertyValueIntegerPtr) ++ return (float)*(m_value.integerPtr); ++ else return 0.0; ++ } ++ ++float *wxPropertyValue::RealValuePtr(void) const ++{ ++ return m_value.realPtr; ++} ++ ++bool wxPropertyValue::BoolValue(void) const { ++ if (m_type == wxPropertyValueReal) ++ return (m_value.real != 0.0); ++ if (m_type == wxPropertyValueRealPtr) ++ return (*(m_value.realPtr) != 0.0); ++ else if (m_type == wxPropertyValueInteger) ++ return (m_value.integer != 0); ++ else if (m_type == wxPropertyValueIntegerPtr) ++ return (*(m_value.integerPtr) != 0); ++ else if (m_type == wxPropertyValuebool) ++ return (m_value.integer != 0); ++ else if (m_type == wxPropertyValueboolPtr) ++ return (*(m_value.boolPtr) != 0); ++ else return FALSE; ++ } ++ ++bool *wxPropertyValue::BoolValuePtr(void) const ++{ ++ return m_value.boolPtr; ++} ++ ++char *wxPropertyValue::StringValue(void) const { ++ if (m_type == wxPropertyValueString) ++ return m_value.string; ++ else if (m_type == wxPropertyValueStringPtr) ++ return *(m_value.stringPtr); ++ else return NULL; ++ } ++ ++char **wxPropertyValue::StringValuePtr(void) const ++{ ++ return m_value.stringPtr; ++} ++ ++/* ++ * A property (name plus value) ++ */ ++ ++IMPLEMENT_DYNAMIC_CLASS(wxProperty, wxObject) ++ ++wxProperty::wxProperty(void) ++{ ++ m_propertyRole = (char *)NULL; ++ m_propertyValidator = NULL; ++ m_propertyWindow = NULL; ++ m_enabled = TRUE; ++} ++ ++wxProperty::wxProperty(wxProperty& copyFrom) ++{ ++ m_value = copyFrom.GetValue(); ++ m_name = copyFrom.GetName(); ++ m_propertyRole = copyFrom.GetRole(); ++ m_propertyValidator = copyFrom.GetValidator(); ++ m_enabled = copyFrom.IsEnabled(); ++ m_propertyWindow = NULL; ++} ++ ++wxProperty::wxProperty(wxString nm, wxString role, wxPropertyValidator *ed):m_name(nm), m_propertyRole(role) ++{ ++ m_propertyValidator = ed; ++ m_propertyWindow = NULL; ++ m_enabled = TRUE; ++} ++ ++wxProperty::wxProperty(wxString nm, const wxPropertyValue& val, wxString role, wxPropertyValidator *ed): ++ m_name(nm), m_value(val), m_propertyRole(role) ++{ ++ m_propertyValidator = ed; ++ m_propertyWindow = NULL; ++ m_enabled = TRUE; ++} ++ ++wxProperty::~wxProperty(void) ++{ ++ if (m_propertyValidator) ++ delete m_propertyValidator; ++} ++ ++wxPropertyValue& wxProperty::GetValue(void) const ++{ ++ return (wxPropertyValue&) m_value; ++} ++ ++wxPropertyValidator *wxProperty::GetValidator(void) const ++{ ++ return m_propertyValidator; ++} ++ ++wxString& wxProperty::GetName(void) const ++{ ++ return (wxString&) m_name; ++} ++ ++wxString& wxProperty::GetRole(void) const ++{ ++ return (wxString&) m_propertyRole; ++} ++ ++void wxProperty::SetValue(const wxPropertyValue& val) ++{ ++ m_value = val; ++} ++ ++void wxProperty::SetValidator(wxPropertyValidator *ed) ++{ ++ m_propertyValidator = ed; ++} ++ ++void wxProperty::SetRole(wxString& role) ++{ ++ m_propertyRole = role; ++} ++ ++void wxProperty::SetName(wxString& nm) ++{ ++ m_name = nm; ++} ++ ++void wxProperty::operator=(const wxPropertyValue& val) ++{ ++ m_value = val; ++} ++ ++/* ++ * Base property view class ++ */ ++ ++IMPLEMENT_DYNAMIC_CLASS(wxPropertyView, wxEvtHandler) ++ ++wxPropertyView::wxPropertyView(long flags) ++{ ++ m_buttonFlags = flags; ++ m_propertySheet = NULL; ++ m_currentValidator = NULL; ++ m_currentProperty = NULL; ++} ++ ++wxPropertyView::~wxPropertyView(void) ++{ ++} ++ ++void wxPropertyView::AddRegistry(wxPropertyValidatorRegistry *registry) ++{ ++ m_validatorRegistryList.Append(registry); ++} ++ ++wxPropertyValidator *wxPropertyView::FindPropertyValidator(wxProperty *property) ++{ ++ if (property->GetValidator()) ++ return property->GetValidator(); ++ ++ wxNode *node = m_validatorRegistryList.First(); ++ while (node) ++ { ++ wxPropertyValidatorRegistry *registry = (wxPropertyValidatorRegistry *)node->Data(); ++ wxPropertyValidator *validator = registry->GetValidator(property->GetRole()); ++ if (validator) ++ return validator; ++ node = node->Next(); ++ } ++ return NULL; ++/* ++ if (!wxDefaultPropertyValidator) ++ wxDefaultPropertyValidator = new wxPropertyListValidator; ++ return wxDefaultPropertyValidator; ++*/ ++} ++ ++/* ++ * Property sheet ++ */ ++ ++IMPLEMENT_DYNAMIC_CLASS(wxPropertySheet, wxObject) ++ ++wxPropertySheet::wxPropertySheet(void):m_properties(wxKEY_STRING) ++{ ++} ++ ++wxPropertySheet::~wxPropertySheet(void) ++{ ++ Clear(); ++} ++ ++bool wxPropertySheet::Save( ostream& WXUNUSED(str) ) ++{ ++ return FALSE; ++} ++ ++bool wxPropertySheet::Load( ostream& WXUNUSED(str) ) ++{ ++ return FALSE; ++} ++ ++void wxPropertySheet::UpdateAllViews( wxPropertyView *WXUNUSED(thisView) ) ++{ ++} ++ ++// Add a property ++void wxPropertySheet::AddProperty(wxProperty *property) ++{ ++ m_properties.Append((const char*) property->GetName(), property); ++} ++ ++// Get property by name ++wxProperty *wxPropertySheet::GetProperty(wxString name) ++{ ++ wxNode *node = m_properties.Find((const char*) name); ++ if (!node) ++ return NULL; ++ else ++ return (wxProperty *)node->Data(); ++} ++ ++// Clear all properties ++void wxPropertySheet::Clear(void) ++{ ++ wxNode *node = m_properties.First(); ++ while (node) ++ { ++ wxProperty *prop = (wxProperty *)node->Data(); ++ wxNode *next = node->Next(); ++ delete prop; ++ delete node; ++ node = next; ++ } ++} ++ ++// Sets/clears the modified flag for each property value ++void wxPropertySheet::SetAllModified(bool flag) ++{ ++ wxNode *node = m_properties.First(); ++ while (node) ++ { ++ wxProperty *prop = (wxProperty *)node->Data(); ++ prop->GetValue().SetModified(flag); ++ node = node->Next(); ++ } ++} ++ ++/* ++ * Property validator registry ++ * ++ */ ++ ++IMPLEMENT_DYNAMIC_CLASS(wxPropertyValidatorRegistry, wxHashTable) ++ ++wxPropertyValidatorRegistry::wxPropertyValidatorRegistry(void):wxHashTable(wxKEY_STRING) ++{ ++} ++ ++wxPropertyValidatorRegistry::~wxPropertyValidatorRegistry(void) ++{ ++ ClearRegistry(); ++} ++ ++void wxPropertyValidatorRegistry::RegisterValidator(const wxString& typeName, wxPropertyValidator *validator) ++{ ++ Put((const char*) typeName, validator); ++} ++ ++wxPropertyValidator *wxPropertyValidatorRegistry::GetValidator(const wxString& typeName) ++{ ++ return (wxPropertyValidator *)Get((const char*) typeName); ++} ++ ++void wxPropertyValidatorRegistry::ClearRegistry(void) ++{ ++ BeginFind(); ++ wxNode *node; ++ while (node = Next()) ++ { ++ delete (wxPropertyValidator *)node->Data(); ++ } ++} ++ ++ /* ++ * Property validator ++ */ ++ ++ ++IMPLEMENT_ABSTRACT_CLASS(wxPropertyValidator, wxEvtHandler) ++ ++wxPropertyValidator::wxPropertyValidator(long flags) ++{ ++ m_validatorFlags = flags; ++ m_validatorProperty = NULL; ++} ++ ++wxPropertyValidator::~wxPropertyValidator(void) ++{} ++ ++bool wxPropertyValidator::StringToFloat (char *s, float *number) { ++ double num; ++ bool ok = StringToDouble (s, &num); ++ *number = (float) num; ++ return ok; ++} ++ ++bool wxPropertyValidator::StringToDouble (char *s, double *number) { ++ bool ok = TRUE; ++ char *value_ptr; ++ *number = strtod (s, &value_ptr); ++ if (value_ptr) { ++ int len = strlen (value_ptr); ++ for (int i = 0; i < len; i++) { ++ ok = (isspace (value_ptr[i]) != 0); ++ if (!ok) return FALSE; ++ } ++ } ++ return ok; ++} ++ ++bool wxPropertyValidator::StringToInt (char *s, int *number) { ++ long num; ++ bool ok = StringToLong (s, &num); ++ *number = (int) num; ++ return ok; ++} ++ ++bool wxPropertyValidator::StringToLong (char *s, long *number) { ++ bool ok = TRUE; ++ char *value_ptr; ++ *number = strtol (s, &value_ptr, 10); ++ if (value_ptr) { ++ int len = strlen (value_ptr); ++ for (int i = 0; i < len; i++) { ++ ok = (isspace (value_ptr[i]) != 0); ++ if (!ok) return FALSE; ++ } ++ } ++ return ok; ++} ++ ++char *wxPropertyValidator::FloatToString (float number) { ++ static char buf[20]; ++ sprintf (buf, "%.6g", number); ++ return buf; ++} ++ ++char *wxPropertyValidator::DoubleToString (double number) { ++ static char buf[20]; ++ sprintf (buf, "%.6g", number); ++ return buf; ++} ++ ++char *wxPropertyValidator::IntToString (int number) { ++ return ::IntToString (number); ++} ++ ++char *wxPropertyValidator::LongToString (long number) { ++ return ::LongToString (number); ++ } ++ ++ } From crazy at frugalware.org Fri Feb 2 09:00:08 2007 From: crazy at frugalware.org (crazy) Date: Fri Feb 2 09:00:12 2007 Subject: [Frugalware-darcs] wx: xmultimedia-extra Message-ID: <20070202080009.0FED3FA401B@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=wx;a=darcs_commitdiff;h=20070202075646-f6986-c901f089c71293973f5a948eacc71809f7162957.gz; [xmultimedia-extra crazy **20070202075646 * brrr ] { adddir ./source/xmultimedia-extra } From crazy at frugalware.org Fri Feb 2 09:01:16 2007 From: crazy at frugalware.org (crazy) Date: Fri Feb 2 09:01:20 2007 Subject: [Frugalware-darcs] wx: vlc Message-ID: <20070202080118.0F074FA401B@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=wx;a=darcs_commitdiff;h=20070202075821-f6986-7644d83e361f853408fe901791a884ccd1f7acde.gz; [vlc crazy **20070202075821] { adddir ./source/xmultimedia-extra/vlc } From crazy at frugalware.org Fri Feb 2 09:03:20 2007 From: crazy at frugalware.org (crazy) Date: Fri Feb 2 09:03:22 2007 Subject: [Frugalware-darcs] wx: vlc-0.8.6-4-i686 Message-ID: <20070202080320.1EF88FA4024@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=wx;a=darcs_commitdiff;h=20070202080020-f6986-98c516c944f701c3de459ccdd5558a95a6177dea.gz; [vlc-0.8.6-4-i686 crazy **20070202080020 * restore vlc ] { addfile ./source/xmultimedia-extra/vlc/FrugalBuild addfile ./source/xmultimedia-extra/vlc/fix_not_logical_skins2_check.patch addfile ./source/xmultimedia-extra/vlc/wxgtk-2.8.patch addfile ./source/xmultimedia-extra/vlc/vlc-0.8.5-libintl.diff addfile ./source/xmultimedia-extra/vlc/vlc-0.8.6-flac113.diff addfile ./source/xmultimedia-extra/vlc/vlc-ffmpeg.diff addfile ./source/xmultimedia-extra/vlc/vlc.desktop hunk ./source/xmultimedia-extra/vlc/FrugalBuild 1 +# Compiling Time: 3.89 SBU +# Maintainer: VMiklos + +pkgname=vlc +pkgver=0.8.6 +pkgextraver=a +pkgrel=4 +pkgdesc="The cross-platform media player and streaming server." +url="http://www.videolan.org/vlc/" +depends=('alsa-lib' 'dbus-glib>=0.71' 'hal>=0.5.7.1-3' 'libxml2' 'libdvdnav' 'libmad' 'libmatroska' \ + 'mpeg2dec' 'ffmpeg' 'fribidi' 'wxgtk-u8>=2.8.0' 'live' 'speex' 'libdca' 'sysfsutils' 'mesa' 'libdvbpsi' \ + 'libxv' 'sdlimage' 'libcdio' 'libid3tag' 'libtheora' 'faad2' 'libmodplug' 'vcdimager' 'libxcb' 'flac>=1.1.3') +makedepends=('firefox' 'samba' 'cvs' 'lirc') +options=('scriptlet') +groups=('xmultimedia-extra') +archs=('i686' 'x86_64') +up2date="lynx -dump $url/download-sources.html|grep -m1 'Latest VLC'|sed 's/.*(\(.*\)).*/\1/;s/$pkgextraver//'" +source=(http://download.videolan.org/pub/videolan/vlc/$pkgver$pkgextraver/$pkgname-$pkgver$pkgextraver.tar.bz2 \ + $pkgname-ffmpeg.diff $pkgname.desktop vlc-0.8.5-libintl.diff \ + wxgtk-2.8.patch fix_not_logical_skins2_check.patch vlc-0.8.6-flac113.diff) +signatures=("${source[0]}.asc" '' '' '' '' '' '') + +build() +{ + Fpatchall + ##We need this for now :| + export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing" + Fsed 'mozilla-config' 'firefox-config' configure.ac + Fsed 'firefox-config\.h' 'mozilla-config\.h' configure.ac + Fsed '/usr/lib/mozilla' '/usr/lib/firefox' configure.ac + Fsed '/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf' \ + '/usr/X11R6/lib/X11/fonts/TTF/VeraBd.ttf' \ + modules/misc/freetype.c + for i in aclocal automake + do + Fsed "=$i" "=$i-" ./bootstrap + done + ./bootstrap || return 1 + Fconf \ + --enable-dvdread \ + --enable-dvdnav \ + --enable-madi \ + --enable-ffmpeg \ + --enable-lirc \ + --disable-rpath \ + --disable-nls \ + --enable-alsa \ + --enable-skins2 \ + --enable-mozilla \ + --enable-v4l \ + --enable-realrtsp \ + --enable-live555 \ + --with-live555-tree=/usr/lib/live \ + --enable-speex \ + --enable-wxwidgets \ + --with-wx-config=wx-config-u8 \ + --enable-dts \ + --with-gnu-ld \ + --enable-dvbpsi \ + --with-dvbpsi=/usr/include/dvbpsi \ + --with-ffmpeg-{mp3lame,faac,dts,vorbis,theora,ogg} + Fsed '%{idldir}' '/usr/share/idl/firefox' mozilla/Makefile + make || return 1 + make DESTDIR=$Fdestdir \ + plugindir=/usr/lib/mozilla/plugins/ \ + vlcintf_xptdir=/usr/lib/mozilla/plugins/ \ + install || Fdie + Frm /usr/share/vlc/{,k,q,g,gnome-}vlc*.{png,xpm,ico} + #Frm /usr/share/vlc/skins2 + for i in 16 32 48 + do + Ffilerel share/vlc${i}x$i.png \ + /usr/share/icons/hicolor/${i}x$i/apps/vlc.png + done + Ffile /usr/share/applications/$pkgname.desktop +} + +# optimization OK hunk ./source/xmultimedia-extra/vlc/fix_not_logical_skins2_check.patch 1 +diff -Naur vlc-0.8.6a/modules/gui/skins2/x11/x11_factory.cpp vlc-0.8.6a-p/modules/gui/skins2/x11/x11_factory.cpp +--- vlc-0.8.6a/modules/gui/skins2/x11/x11_factory.cpp 2007-01-03 19:27:57.000000000 +0100 ++++ vlc-0.8.6a-p/modules/gui/skins2/x11/x11_factory.cpp 2007-02-01 04:51:06.000000000 +0100 +@@ -73,7 +73,11 @@ + // Initialize the resource path + m_resourcePath.push_back( (string)getIntf()->p_vlc->psz_homedir + + m_dirSep + CONFIG_DIR + "/skins2" ); +- m_resourcePath.push_back( (string)"share/skins2" ); ++ /* uhmm there is _nothing_ like share/foo usr/foo and even 'string' would be '/' *WHO* to hell ++ * installs it in /share/.. this check is just broken and cause VLC to drop weird warning on ++ * switching to skins2 ... ++ */ ++ /* m_resourcePath.push_back( (string)"share/skins2" ); */ + m_resourcePath.push_back( (string)DATA_PATH + "/skins2" ); + + return true; hunk ./source/xmultimedia-extra/vlc/vlc-0.8.5-libintl.diff 1 +--- vlc-0.8.5/src/misc/charset.c.orig 2006-05-08 11:24:23.000000000 +0200 ++++ vlc-0.8.5/src/misc/charset.c 2006-05-08 11:25:19.000000000 +0200 +@@ -33,6 +33,7 @@ + #include + #include + #include ++#include + + #if !defined WIN32 + # if HAVE_LANGINFO_CODESET hunk ./source/xmultimedia-extra/vlc/vlc-0.8.6-flac113.diff 1 +--- vlc-0.8.6-clean/modules/codec/flac.c 2006-12-09 01:12:20.000000000 +0000 ++++ vlc-0.8.6/modules/codec/flac.c 2006-12-24 01:34:54.000000000 +0000 +@@ -40,6 +40,10 @@ + + #define MAX_FLAC_HEADER_SIZE 16 + ++#if defined(FLAC_API_VERSION_CURRENT) && FLAC_API_VERSION_CURRENT >= 8 ++# define USE_NEW_FLAC_API ++#endif ++ + /***************************************************************************** + * decoder_sys_t : FLAC decoder descriptor + *****************************************************************************/ +@@ -225,6 +229,25 @@ + return VLC_EGENERIC; + } + ++#ifdef USE_NEW_FLAC_API ++ if( FLAC__stream_decoder_init_stream( p_sys->p_flac, ++ DecoderReadCallback, ++ NULL, ++ NULL, ++ NULL, ++ NULL, ++ DecoderWriteCallback, ++ DecoderMetadataCallback, ++ DecoderErrorCallback, ++ p_dec ) ++ != FLAC__STREAM_DECODER_INIT_STATUS_OK ) ++ { ++ msg_Err( p_dec, "FLAC__stream_decoder_init_stream() failed" ); ++ FLAC__stream_decoder_delete( p_sys->p_flac ); ++ free( p_sys ); ++ return VLC_EGENERIC; ++ } ++#else + FLAC__stream_decoder_set_read_callback( p_sys->p_flac, + DecoderReadCallback ); + FLAC__stream_decoder_set_write_callback( p_sys->p_flac, +@@ -237,6 +260,7 @@ + + FLAC__stream_decoder_init( p_sys->p_flac ); + #endif ++#endif + + /* Set output properties */ + p_dec->fmt_out.i_cat = AUDIO_ES; +@@ -730,16 +754,27 @@ + case FLAC__STREAM_DECODER_END_OF_STREAM: + msg_Dbg( p_dec, "the decoder has reached the end of the stream." ); + break; ++#ifdef USE_NEW_FLAC_API ++ case FLAC__STREAM_DECODER_OGG_ERROR: ++ msg_Err( p_dec, "error occurred in the Ogg layer." ); ++ break; ++ case FLAC__STREAM_DECODER_SEEK_ERROR: ++ msg_Err( p_dec, "error occurred while seeking." ); ++ break; ++#endif + case FLAC__STREAM_DECODER_ABORTED: + msg_Warn( p_dec, "the decoder was aborted by the read callback." ); + break; ++#ifndef USE_NEW_FLAC_API + case FLAC__STREAM_DECODER_UNPARSEABLE_STREAM: + msg_Warn( p_dec, "the decoder encountered reserved fields in use " + "in the stream." ); + break; ++#endif + case FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR: + msg_Err( p_dec, "error when allocating memory." ); + break; ++#ifndef USE_NEW_FLAC_API + case FLAC__STREAM_DECODER_ALREADY_INITIALIZED: + msg_Err( p_dec, "FLAC__stream_decoder_init() was called when the " + "decoder was already initialized, usually because " +@@ -749,6 +784,7 @@ + msg_Err( p_dec, "FLAC__stream_decoder_init() was called without " + "all callbacks being set." ); + break; ++#endif + case FLAC__STREAM_DECODER_UNINITIALIZED: + msg_Err( p_dec, "decoder in uninitialized state." ); + break; +@@ -1183,7 +1219,12 @@ + p_sys->i_samples_delay = 0; + + /* Create flac encoder */ +- p_sys->p_flac = FLAC__stream_encoder_new(); ++ if( !(p_sys->p_flac = FLAC__stream_encoder_new()) ) ++ { ++ msg_Err( p_enc, "FLAC__stream_encoder_new() failed" ); ++ free( p_sys ); ++ return VLC_EGENERIC; ++ } + + FLAC__stream_encoder_set_streamable_subset( p_sys->p_flac, 1 ); + FLAC__stream_encoder_set_channels( p_sys->p_flac, +@@ -1193,15 +1234,32 @@ + FLAC__stream_encoder_set_bits_per_sample( p_sys->p_flac, 16 ); + p_enc->fmt_in.i_codec = AOUT_FMT_S16_NE; + ++ /* Get and store the STREAMINFO metadata block as a p_extra */ ++ p_sys->p_chain = 0; ++ ++#ifdef USE_NEW_FLAC_API ++ if( FLAC__stream_encoder_init_stream( p_sys->p_flac, ++ EncoderWriteCallback, ++ NULL, ++ NULL, ++ EncoderMetadataCallback, ++ p_enc ) ++ != FLAC__STREAM_ENCODER_INIT_STATUS_OK ) ++ { ++ msg_Err( p_enc, "FLAC__stream_encoder_init_stream() failed" ); ++ FLAC__stream_encoder_delete( p_sys->p_flac ); ++ free( p_sys ); ++ return VLC_EGENERIC; ++ } ++#else + FLAC__stream_encoder_set_write_callback( p_sys->p_flac, + EncoderWriteCallback ); + FLAC__stream_encoder_set_metadata_callback( p_sys->p_flac, + EncoderMetadataCallback ); + FLAC__stream_encoder_set_client_data( p_sys->p_flac, p_enc ); + +- /* Get and store the STREAMINFO metadata block as a p_extra */ +- p_sys->p_chain = 0; + FLAC__stream_encoder_init( p_sys->p_flac ); ++#endif + + return VLC_SUCCESS; + } hunk ./source/xmultimedia-extra/vlc/vlc-ffmpeg.diff 1 +diff -Naur vlc-0.8.4.orig/configure.ac vlc-0.8.4/configure.ac +--- vlc-0.8.4.orig/configure.ac 2005-11-26 17:39:58.000000000 +0100 ++++ vlc-0.8.4/configure.ac 2006-02-25 18:41:17.000000000 +0100 +@@ -2204,7 +2204,7 @@ + fi]) + + dnl Trying with pkg-config +- PKG_CHECK_MODULES(FFMPEG,[libavcodec, libavformat], ++ PKG_CHECK_MODULES(FFMPEG,[libavcodec, libavformat, libpostproc], + [ + AC_CHECK_HEADERS(ffmpeg/avcodec.h) + AC_CHECK_HEADERS(postproc/postprocess.h) +diff -Naur vlc-0.8.4.orig/modules/codec/ffmpeg/ffmpeg.c vlc-0.8.4/modules/codec/ffmpeg/ffmpeg.c +--- vlc-0.8.4.orig/modules/codec/ffmpeg/ffmpeg.c 2005-11-26 17:39:53.000000000 +0100 ++++ vlc-0.8.4/modules/codec/ffmpeg/ffmpeg.c 2006-02-25 18:22:18.000000000 +0100 +@@ -46,7 +46,7 @@ + # ifdef HAVE_POSTPROC_POSTPROCESS_H + # include + # else +-# include ++# include + # endif + #endif + +diff -Naur vlc-0.8.4.orig/modules/codec/ffmpeg/postprocess.c vlc-0.8.4/modules/codec/ffmpeg/postprocess.c +--- vlc-0.8.4.orig/modules/codec/ffmpeg/postprocess.c 2005-11-26 17:39:53.000000000 +0100 ++++ vlc-0.8.4/modules/codec/ffmpeg/postprocess.c 2006-02-25 18:22:18.000000000 +0100 +@@ -40,7 +40,7 @@ + #ifdef HAVE_POSTPROC_POSTPROCESS_H + # include + #else +-# include ++# include + #endif + + #ifndef PP_CPU_CAPS_ALTIVEC +diff -Naur vlc-0.8.4.orig/modules/stream_out/switcher.c vlc-0.8.4/modules/stream_out/switcher.c +--- vlc-0.8.4.orig/modules/stream_out/switcher.c 2005-11-26 17:39:51.000000000 +0100 ++++ vlc-0.8.4/modules/stream_out/switcher.c 2006-02-25 18:22:42.000000000 +0100 +@@ -44,7 +44,7 @@ + #ifdef HAVE_POSTPROC_POSTPROCESS_H + # include + #else +-# include ++# include + #endif + + #define SOUT_CFG_PREFIX "sout-switcher-" hunk ./source/xmultimedia-extra/vlc/vlc.desktop 1 +[Desktop Entry] +Type=Application +Encoding=UTF-8 +Name=VLC Media Player +Comment=VideoLAN Client Media Player +Icon=vlc.png +TryExec=vlc +Exec=vlc +Terminal=false +Categories=AudioVideo;Player; hunk ./source/xmultimedia-extra/vlc/wxgtk-2.8.patch 1 +--- vlc-0.8.6a.orig/modules/gui/wxwidgets/dialogs.cpp ++++ vlc-0.8.6a/modules/gui/wxwidgets/dialogs.cpp +@@ -380,7 +380,7 @@ + { + p_file_generic_dialog->SetMessage( wxU(p_arg->psz_title) ); + p_file_generic_dialog->SetWildcard( wxU(p_arg->psz_extensions) ); +- p_file_generic_dialog->SetStyle( (p_arg->b_save ? wxSAVE : wxOPEN) | ++ p_file_generic_dialog->SetWindowStyle( (p_arg->b_save ? wxSAVE : wxOPEN) | + (p_arg->b_multiple ? wxMULTIPLE:0) ); + } } From crazy at frugalware.org Fri Feb 2 09:19:17 2007 From: crazy at frugalware.org (crazy) Date: Fri Feb 2 09:19:32 2007 Subject: [Frugalware-darcs] wx: wxpython Message-ID: <20070202081919.7EF8E4F03C4@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=wx;a=darcs_commitdiff;h=20070202081617-f6986-da9f4c6190b5235e3c68c1db9740b211d420f271.gz; [wxpython crazy **20070202081617] { adddir ./source/xapps-extra/wxpython } From crazy at frugalware.org Fri Feb 2 09:21:11 2007 From: crazy at frugalware.org (crazy) Date: Fri Feb 2 09:21:18 2007 Subject: [Frugalware-darcs] frugalware-current: wxgtk-2.6.3-8-i686 Message-ID: <20070202082112.34BFCFA401B@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070202081051-f6986-9302a860a5bca51404196fdabd38d8d96382d127.gz; [wxgtk-2.6.3-8-i686 crazy **20070202081051 * remove force ] { hunk ./source/xlib-extra/wxgtk/FrugalBuild 16 -options=('force' 'scriptlet') +options=('scriptlet') } From boobaa at frugalware.org Fri Feb 2 09:59:52 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Fri Feb 2 09:59:54 2007 Subject: [Frugalware-darcs] frugalware-current: php-pear-db-1.7.8-1-i686 Message-ID: <20070202085952.A7A12FA401B@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070202085709-60d9d-26636ddb8cdb75a7abcc74ba05ddd2d549d93059.gz; [php-pear-db-1.7.8-1-i686 CSÉCSY László **20070202085709 version bump ] { hunk ./source/devel-extra/php-pear-db/FrugalBuild 5 -pkgver=1.7.7 +pkgver=1.7.8 hunk ./source/devel-extra/php-pear-db/FrugalBuild 9 -sha1sums=('7acca9f3d9eb4d8a3b8737a85ea346d7b14bdce7') +sha1sums=('135ff939b09e12f1fca6b6ff9478c45a4d3176cc') } From boobaa at frugalware.org Fri Feb 2 10:50:43 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Fri Feb 2 10:50:50 2007 Subject: [Frugalware-darcs] frugalware-current: notecase-1.4.5-1-i686 Message-ID: <20070202095043.3850EFA401B@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070202094835-60d9d-31b7c77c43446bf46831d3c0341986fd2fab9850.gz; [notecase-1.4.5-1-i686 CSÉCSY László **20070202094835 version jump removed patch (in upstream now) ] { hunk ./source/gnome-extra/notecase/FrugalBuild 5 -pkgver=1.2.3 +pkgver=1.4.5 hunk ./source/gnome-extra/notecase/FrugalBuild 17 -source=(${source[@]} notecase-destdir-fix.patch) -sha1sums=('5b97818281d71dacdb70808beee93f2bda68d605' \ - '6520c4ece10735f753fe7c3591a5d451800e2b2e') - hunk ./source/gnome-extra/notecase/FrugalBuild 18 +sha1sums=('12e4e21f9e4a268e4db1ad3afd11d50238fde56d') hunk ./source/gnome-extra/notecase/notecase-destdir-fix.patch 1 -diff -Naur notecase-1.2.3.orig/Makefile notecase-1.2.3/Makefile ---- notecase-1.2.3.orig/Makefile 2006-10-13 19:26:37.000000000 +0200 -+++ notecase-1.2.3/Makefile 2006-10-13 19:28:11.000000000 +0200 -@@ -243,7 +243,7 @@ - rm -f po/messages.mo; \ - msgfmt $$i -o po/messages.mo; \ - echo "Installing: $(INSTALL)$(DATA_DIR)/locale/$$loc/LC_MESSAGES/notecase.mo";\ -- install -D -m 644 po/messages.mo "$(INSTALL)$(DATA_DIR)/locale/$$loc/LC_MESSAGES/notecase.mo"; \ -+ install -D -m 644 po/messages.mo "$(INSTALL)$(DESTDIR)$(DATA_DIR)/locale/$$loc/LC_MESSAGES/notecase.mo"; \ - done; \ - rm -f po/messages.mo; - @echo Done installing translations -@@ -256,11 +256,11 @@ - # install application - # - install: notecase poinstall -- install -D -m 755 $(BIN)/notecase "$(INSTALL)$(BINARY_DIR)/notecase" -- install -D -m 644 docs/help.ncd "$(INSTALL)$(DATA_DIR)/doc/notecase/help.ncd" -- install -D -m 644 docs/notecase.desktop "$(INSTALL)$(DATA_DIR)/applications/notecase.desktop" -- install -D -m 644 docs/notecase.xml "$(INSTALL)$(DATA_DIR)/mime/packages/notecase.xml" -- install -D -m 644 res/notecase.xpm "$(INSTALL)$(DATA_DIR)/icons/notecase.xpm" -+ install -D -m 755 $(BIN)/notecase "$(INSTALL)$(DESTDIR)$(BINARY_DIR)/notecase" -+ install -D -m 644 docs/help.ncd "$(INSTALL)$(DESTDIR)$(DATA_DIR)/doc/notecase/help.ncd" -+ install -D -m 644 docs/notecase.desktop "$(INSTALL)$(DESTDIR)$(DATA_DIR)/applications/notecase.desktop" -+ install -D -m 644 docs/notecase.xml "$(INSTALL)$(DESTDIR)$(DATA_DIR)/mime/packages/notecase.xml" -+ install -D -m 644 res/notecase.xpm "$(INSTALL)$(DESTDIR)$(DATA_DIR)/icons/notecase.xpm" - #TOFIX: how to prevent "fedora-" prefix? - # desktop-file-install --vendor=fedora \ - # --dir=$(datadir)/applications \ -@@ -321,12 +321,6 @@ - convertsrc: - unix2dos -q -k $(SRCPATH)/*.cpp $(SRCPATH)/*.h $(GUIPATH)/*.cpp $(GUIPATH)/*.h $(GUIPATH)/gui/*.cpp $(GUIPATH)/gui/*.h - --# --# - update Linux mime/desktop system --# --updatemime: -- update-mime-database "$(DATA_DIR)/mime/" -- update-desktop-database - - # - # for debugging purposes rmfile ./source/gnome-extra/notecase/notecase-destdir-fix.patch } From crazy at frugalware.org Fri Feb 2 11:00:21 2007 From: crazy at frugalware.org (crazy) Date: Fri Feb 2 11:00:30 2007 Subject: [Frugalware-darcs] wx: wxpython-2.8.0.1-1-i686 Message-ID: <20070202100023.38F2DFA401B@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=wx;a=darcs_commitdiff;h=20070202095310-f6986-2f088b1828c9185fba046f3814abf26e9ab8f781.gz; [wxpython-2.8.0.1-1-i686 crazy **20070202095310 * Version bump to 2.8.0.1 while .1.1 *need* wxgtk stuff from *CVS HEAD* - man this devel is strange , even for this version I was forced to backport CVS shit * merged wxpy and wxpy-u8 in one build * depends() fix * new m8r ] { addfile ./source/xapps-extra/wxpython/FrugalBuild hunk ./source/xapps-extra/wxpython/FrugalBuild 1 +# Compiling Time: ~1.4 SBU +# Maintainer: crazy +# Contributor: Miklos Nemeth + +pkgname=wxpython +pkgver=2.8.0.1 +pkgrel=1 +pkgdesc="wxPython GUI toolkit" +_F_sourceforge_dirname="$pkgname" +_F_sourceforge_name="wxPython-src" +_F_sourceforge_ext=".tar.bz2" +Finclude sourceforge python +url="http://www.wxpython.org/" +options=('scriptlet') +depends=('wxgtk>=2.8.0' 'python>=2.5') +makedepends=('wxgtk-u8>=2.8.0') +groups=('xapps-extra') +archs=('x86_64' 'i686') + +subpkgs=("$pkgname-u8") +subdescs=("wxPython GUI toolkit (unicode version)") +subdepends=("$pkgname=$pkgver wxgtk-u8") +subgroups=('xapps-extra') +subarchs=('i686 x86_64') + + +build() +{ + Fcd wxPython-src-$pkgver + cp -r wxPython wxPython-u8 || Fdie + export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing -Wno-deprecated" + export CFLAGS="$CFLAGS -fno-strict-aliasing" + wxp_config="BUILD_GLCANVAS=0 BUILD_STC=1 BUILD_GIZMOS=1" + cd wxPython-u8 + Fmake ${wxp_config} UNICODE=1 WX_CONFIG='wx-config-u8' + Fmakeinstall ${wxp_config} UNICODE=1 WX_CONFIG='wx-config-u8' + Frm $_F_python_libdir/wxaddons usr/bin usr/include + Frm $_F_python_libdir/{wxversion.*,wx.pth,wxPython_common-${pkgver}-py2.5.egg-info,wxaddons-${pkgver}-py2.5.egg-info} + Fsplit $pkgname-u8 /usr + cd ../wxPython + Fmake ${wxp_config} UNICODE=0 WX_CONFIG='wx-config' + Fmakeinstall ${wxp_config} UNICODE=0 WX_CONFIG='wx-config' +} + +sha1sums=('917b690a1e39cb4919d086a184ae0fdbc0df8c99') +# optimization OK } From crazy at frugalware.org Fri Feb 2 11:07:05 2007 From: crazy at frugalware.org (crazy) Date: Fri Feb 2 11:07:07 2007 Subject: [Frugalware-darcs] frugalware-current: wxgtk-u8-2.6.3-5-i686 Message-ID: <20070202100705.6F51FFA401B@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070202100011-f6986-851c8d86672f0dd4e798dc552e4ea958bb90769f.gz; [wxgtk-u8-2.6.3-5-i686 crazy **20070202100011 * remove force ] { hunk ./source/xlib-extra/wxgtk-u8/FrugalBuild 16 -options=('force' 'scriptlet') +options=('scriptlet') } From boobaa at frugalware.org Fri Feb 2 11:30:20 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Fri Feb 2 11:30:24 2007 Subject: [Frugalware-darcs] frugalware-current: mp3info-0.8.5a-1-i686 Message-ID: <20070202103020.79111FA401B@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070202102824-60d9d-4314da0eb8aada1d528bf9be7e9aebc32ef61943.gz; [mp3info-0.8.5a-1-i686 CSÉCSY László **20070202102824 version bump updated depends removed patch (no longer needed) ] { hunk ./source/multimedia-extra/mp3info/FrugalBuild 5 -pkgver=0.8.4 +pkgver=0.8.5a hunk ./source/multimedia-extra/mp3info/FrugalBuild 12 -makedepends=('gtk+') +makedepends=('gtk+2') hunk ./source/multimedia-extra/mp3info/FrugalBuild 14 -source=(ftp://ftp.ibiblio.org/pub/linux/apps/sound/mp3-utils/$pkgname/$pkgname-$pkgver.tgz gcc3.patch) -sha1sums=('a291aa1c3c216f838f85c1148adbb69f7bf31d80' \ - '2c3d46ef58d16cec0281d20a750a901761f02013') +source=(ftp://ftp.ibiblio.org/pub/linux/apps/sound/mp3-utils/$pkgname/$pkgname-$pkgver.tgz) hunk ./source/multimedia-extra/mp3info/FrugalBuild 30 +sha1sums=('54df29eb6c2e581899affc12be698b0a71d91ca6') hunk ./source/multimedia-extra/mp3info/gcc3.patch 1 -diff -Naur mp3info-0.8.4-orig/gmp3info.c mp3info-0.8.4/gmp3info.c ---- mp3info-0.8.4-orig/gmp3info.c 2001-07-16 11:17:16.000000000 +0200 -+++ mp3info-0.8.4/gmp3info.c 2005-08-29 17:38:46.000000000 +0200 -@@ -484,12 +484,7 @@ - } - - void about_mp3info(void) { -- quick_popup(VERSION,"MP3Info -- An ID3 Tag Editor\n\n -- Original author: Ricardo Cerqueira -- Current maintainer: Cedric Tefft -- GTK Version: Ricardo Cerqueira \n\n -- Ricardo Cerqueira, Cedric Tefft 1999-2001\n\n"); -+ quick_popup(VERSION,"MP3Info\nAn ID3 Tag Editor\n\nOriginal author: Ricardo Cerqueira \nCurrent maintainer: Cedric Tefft \nGTK Version: Ricardo Cerqueira \n\nRicardo Cerqueira, Cedric Tefft 1999-2001\n\n"); - } - - /* rmcc has left the building */ rmfile ./source/multimedia-extra/mp3info/gcc3.patch } From vmiklos at frugalware.org Fri Feb 2 23:08:03 2007 From: vmiklos at frugalware.org (VMiklos) Date: Fri Feb 2 23:08:08 2007 Subject: [Frugalware-darcs] test Message-ID: <20070202220803.GB30431@genesis.frugalware.org> foo udv / greetings, VMiklos -- Developer of Frugalware Linux, to make things frugal - http://frugalware.org -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 189 bytes Desc: not available Url : /pipermail/attachments/20070202/c42800bc/attachment.bin From vmiklos at frugalware.org Fri Feb 2 23:13:24 2007 From: vmiklos at frugalware.org (VMiklos) Date: Fri Feb 2 23:13:26 2007 Subject: [Frugalware-darcs] frugalware-current: openoffice.org-dict-es-0.1-2-x86_64 Message-ID: <20070202221324.87B1213A48D8@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070202231151-e2957-ec5ce075316ea60d1fd1e41b85518dbf73fa62a6.gz; [openoffice.org-dict-es-0.1-2-x86_64 VMiklos **20070202231151 added x86_64 to archs() ] { hunk ./source/locale-extra/openoffice.org-dict-es/FrugalBuild 11 -archs=('i686') +archs=('i686' 'x86_64') } From vmiklos at frugalware.org Fri Feb 2 23:15:59 2007 From: vmiklos at frugalware.org (VMiklos) Date: Fri Feb 2 23:16:02 2007 Subject: [Frugalware-darcs] frugalware-current: openoffice.org-dict-fr-1.0.1-2-x86_64 Message-ID: <20070202221559.644F113A400E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070202231608-e2957-8740a38c29f8ca0ff15dc1af5963bd21a3e38ce2.gz; [openoffice.org-dict-fr-1.0.1-2-x86_64 VMiklos **20070202231608 added x86_64 to archs() ] { hunk ./source/locale-extra/openoffice.org-dict-fr/FrugalBuild 11 -archs=('i686') +archs=('i686' 'x86_64') } From krics at linuxforum.hu Fri Feb 2 23:17:21 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Feb 2 23:17:23 2007 Subject: [Frugalware-darcs] frugalware-current: libbonoboui-2.17.90-1-x86_64 Message-ID: <20070202221721.F21C113A400E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070202221554-d209c-e65840a9423e3867b7401829e7976ee5f628f3b6.gz; [libbonoboui-2.17.90-1-x86_64 Christian Hamar alias krix **20070202221554 * Version bump ] { hunk ./source/gnome/libbonoboui/FrugalBuild 5 -pkgver=2.17.0 +pkgver=2.17.90 hunk ./source/gnome/libbonoboui/FrugalBuild 9 -depends=('libgnomecanvas>=2.14.0-3' 'libgnome>=2.17.3') +depends=('libgnomecanvas>=2.14.0-3' 'libgnome>=2.17.90') hunk ./source/gnome/libbonoboui/FrugalBuild 15 -sha1sums=('2d74cbac050335ed0e08b7bf8bb7ce0ea1aa149d') hunk ./source/gnome/libbonoboui/FrugalBuild 17 +sha1sums=('7c85f0e642fa3e67f073e742b8b4fe2e3bb49aa1') } From krics at linuxforum.hu Fri Feb 2 23:35:21 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Feb 2 23:35:25 2007 Subject: [Frugalware-darcs] frugalware-current: libgnomeui-2.17.90-1-x86_64 Message-ID: <20070202223521.B3BC413A400E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070202223455-d209c-9361521bf4f34abf37f4cc76a5ea8992a5723522.gz; [libgnomeui-2.17.90-1-x86_64 Christian Hamar alias krix **20070202223455 * Version bump ] { hunk ./source/gnome/libgnomeui/FrugalBuild 5 -pkgver=2.17.1 +pkgver=2.17.90 hunk ./source/gnome/libgnomeui/FrugalBuild 9 -depends=('libbonoboui>=2.17.0' 'gnome-keyring>=0.7.3' 'gtk+2>=2.10.7' 'libbonobo') +depends=('libbonoboui>=2.17.90' 'gnome-keyring>=0.7.3' 'gtk+2>=2.10.7' 'libbonobo>=2.17.90') hunk ./source/gnome/libgnomeui/FrugalBuild 14 -sha1sums=('e1b9d825321d9571dbe7a7728b2c0dd262c72e6e') hunk ./source/gnome/libgnomeui/FrugalBuild 16 +sha1sums=('9563526e520f6e8769cdf26d5b07776321a01434') } From krics at linuxforum.hu Fri Feb 2 23:45:12 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Feb 2 23:45:15 2007 Subject: [Frugalware-darcs] frugalware-current: libwnck-2.16.3-1-x86_64 Message-ID: <20070202224512.94D9513A400E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070202224441-d209c-d6b8857dc0fb03f8a2f3fd058a922a3043e0d934.gz; [libwnck-2.16.3-1-x86_64 Christian Hamar alias krix **20070202224441 * Version bump ] { hunk ./source/gnome/libwnck/FrugalBuild 5 -pkgver=2.16.2 +pkgver=2.16.3 hunk ./source/gnome/libwnck/FrugalBuild 14 -sha1sums=('88e4f7efe41de7201481a78cea708184c0f85a18') hunk ./source/gnome/libwnck/FrugalBuild 16 +sha1sums=('adf0275941915385e3d2265fd5f0aec24373dc65') } From krics at linuxforum.hu Fri Feb 2 23:53:57 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Fri Feb 2 23:54:06 2007 Subject: [Frugalware-darcs] frugalware-current: gail-1.10.1-1-x86_64 Message-ID: <20070202225357.6068913A400E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070202225320-d209c-9709cd57cf96f6aa3555e9825d32f58700d94c82.gz; [gail-1.10.1-1-x86_64 Christian Hamar alias krix **20070202225320 * Version bump ] { hunk ./source/gnome/gail/FrugalBuild 5 -pkgver=1.10.0 +pkgver=1.10.1 hunk ./source/gnome/gail/FrugalBuild 14 -sha1sums=('48bae0bc85deea2e78458c11293a0563fb0ffc03') hunk ./source/gnome/gail/FrugalBuild 16 +sha1sums=('97ef57b18796cdbaa8f3520588b1ebfd5d3c1af3') } From krics at linuxforum.hu Sat Feb 3 00:05:26 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sat Feb 3 00:05:28 2007 Subject: [Frugalware-darcs] frugalware-current: at-spi-1.7.16-1-x86_64 Message-ID: <20070202230526.7B4E613A48D9@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070202230403-d209c-b293b733775d9a9f96b76268c2f657c1fa57c014.gz; [at-spi-1.7.16-1-x86_64 Christian Hamar alias krix **20070202230403 * Version bump ] { hunk ./source/gnome/at-spi/FrugalBuild 5 -pkgver=1.7.15 +pkgver=1.7.16 hunk ./source/gnome/at-spi/FrugalBuild 9 -depends=('gtk+2>=2.10.7' 'gail' 'libbonobo>=2.16.0' 'perl-xml' 'libxtst' \ +depends=('gtk+2>=2.10.7' 'gail>=1.10.1' 'libbonobo>=2.17.90' 'perl-xml' 'libxtst' \ hunk ./source/gnome/at-spi/FrugalBuild 15 -sha1sums=('6073392e6bdb37c3a564fb8f9a06b55a1f785240') hunk ./source/gnome/at-spi/FrugalBuild 17 +sha1sums=('07365a7598ce7ea6dc7e429df6c0747ce5ad1e22') } From krics at linuxforum.hu Sat Feb 3 00:40:45 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sat Feb 3 00:40:48 2007 Subject: [Frugalware-darcs] frugalware-current: gnome-desktop-2.17.90-1-x86_64 Message-ID: <20070202234045.9F85013A400E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070202233903-d209c-8da37bc10a91445894181987acfff437bfe063e2.gz; [gnome-desktop-2.17.90-1-x86_64 Christian Hamar alias krix **20070202233903 * Version bump ] { hunk ./source/gnome/gnome-desktop/FrugalBuild 5 -pkgver=2.17.5 +pkgver=2.17.90 hunk ./source/gnome/gnome-desktop/FrugalBuild 9 -depends=('libgnomeui>=2.17.1' 'startup-notification' 'scrollkeeper' 'libbonobo') +depends=('libgnomeui>=2.17.90' 'startup-notification' 'scrollkeeper' 'libbonobo>=2.17.90') hunk ./source/gnome/gnome-desktop/FrugalBuild 15 -sha1sums=('0e2990deac7aef10f6135223343f45e6436654a2') hunk ./source/gnome/gnome-desktop/FrugalBuild 17 +sha1sums=('47e6a1a0c050f903037e0e0c3e5d269bce9d7e8a') } From vmiklos at frugalware.org Sat Feb 3 01:05:15 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Feb 3 01:05:18 2007 Subject: [Frugalware-darcs] frugalware-current: openoffice.org-dict-hu-20031107-3-x86_64 Message-ID: <20070203000515.C33EC13A400E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203010507-e2957-6e114bf632ad039bf6729bb9fc82a421d2c7c800.gz; [openoffice.org-dict-hu-20031107-3-x86_64 VMiklos **20070203010507 added x86_64 to archs() ] { hunk ./source/locale-extra/openoffice.org-dict-hu/FrugalBuild 12 -archs=('i686') +archs=('i686' 'x86_64') } From krics at linuxforum.hu Sat Feb 3 01:09:18 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sat Feb 3 01:09:20 2007 Subject: [Frugalware-darcs] frugalware-current: gnome-icon-theme-2.17.90-1-x86_64 Message-ID: <20070203000918.23DE513A48D9@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203000814-d209c-0e762388b34a67ca7d9f676bb1a73d95bc5123f8.gz; [gnome-icon-theme-2.17.90-1-x86_64 Christian Hamar alias krix **20070203000814 * Version bump ] { hunk ./source/gnome/gnome-icon-theme/FrugalBuild 5 -pkgver=2.17.5 +pkgver=2.17.90 hunk ./source/gnome/gnome-icon-theme/FrugalBuild 14 -sha1sums=('8d4d59ea99aa2c0f6ac4ddea77dc1535bfd0739a') +sha1sums=('44b27ae260d1b41bc62fe99b68a524972af8f5de') } From vmiklos at frugalware.org Sat Feb 3 01:10:36 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Feb 3 01:10:38 2007 Subject: [Frugalware-darcs] frugalware-current: bcm43xx-fwcutter-006-1-x86_64 Message-ID: <20070203001036.2C75513A48D9@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203011020-e2957-1a1a3069cb4f68ee2c5af83a84eb6741cb3c81ab.gz; [bcm43xx-fwcutter-006-1-x86_64 VMiklos **20070203011020 added x86_64 to archs() ] { hunk ./source/network-extra/bcm43xx-fwcutter/FrugalBuild 15 -archs=('i686') +archs=('i686' 'x86_64') } From vmiklos at frugalware.org Sat Feb 3 01:16:37 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Feb 3 01:16:40 2007 Subject: [Frugalware-darcs] frugalware-current: bootpd-2.4-1-x86_64 Message-ID: <20070203001637.62B2413A400E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203011618-e2957-af14e5b6483e125f286ce422f1eea8ce9adea8d2.gz; [bootpd-2.4-1-x86_64 VMiklos **20070203011618 added x86_64 to archs() ] { hunk ./source/network-extra/bootpd/FrugalBuild 11 -archs=('i686') +archs=('i686' 'x86_64') } From vmiklos at frugalware.org Sat Feb 3 01:51:24 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Feb 3 01:51:26 2007 Subject: [Frugalware-darcs] frugalware-current: btg-0.8.5-1-x86_64 Message-ID: <20070203005124.B80D513A400E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203015103-e2957-9e163ee598e538d5947fd875985e033f89973ffe.gz; [btg-0.8.5-1-x86_64 VMiklos **20070203015103 added x86_64 to archs() ] { hunk ./source/network-extra/btg/FrugalBuild 11 -archs=('i686') +archs=('i686' 'x86_64') } From vmiklos at frugalware.org Sat Feb 3 01:55:55 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Feb 3 01:55:57 2007 Subject: [Frugalware-darcs] frugalware-current: bwm_tools-0.2.3-1-x86_64 Message-ID: <20070203005555.614EA13A400E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203015548-e2957-84b178ec25e9f4e25a69c4c8e9860a8b392b6d0a.gz; [bwm_tools-0.2.3-1-x86_64 VMiklos **20070203015548 added x86_64 to archs() ] { hunk ./source/network-extra/bwm_tools/FrugalBuild 10 -archs=('i686') +archs=('i686' 'x86_64') } From vmiklos at frugalware.org Sat Feb 3 01:59:26 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Feb 3 01:59:27 2007 Subject: [Frugalware-darcs] frugalware-current: ipcheck-0.236-1-x86_64 Message-ID: <20070203005926.4E32B13A48D9@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203015938-e2957-1aa252cae73ee7ca8d8a5e161c0715f6d57c3f9a.gz; [ipcheck-0.236-1-x86_64 VMiklos **20070203015938 added x86_64 to archs() ] { hunk ./source/network-extra/ipcheck/FrugalBuild 14 -archs=('i686') +archs=('i686' 'x86_64') } From vmiklos at frugalware.org Sat Feb 3 02:04:18 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Feb 3 02:04:20 2007 Subject: [Frugalware-darcs] frugalware-current: iperf-2.0.2-1-x86_64 Message-ID: <20070203010419.0813113A48D9@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203020426-e2957-6a15325188275541bf411cd465a24ab04219834d.gz; [iperf-2.0.2-1-x86_64 VMiklos **20070203020426 added x86_64 to archs() ] { hunk ./source/network-extra/iperf/FrugalBuild 11 -archs=('i686') +archs=('i686' 'x86_64') } From crazy at frugalware.org Sat Feb 3 02:09:12 2007 From: crazy at frugalware.org (crazy) Date: Sat Feb 3 02:09:15 2007 Subject: [Frugalware-darcs] wx: audacity Message-ID: <20070203010912.326C013A400E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=wx;a=darcs_commitdiff;h=20070203010532-f6986-1038567870f23957f1ad29dc2c0c5d2694ab2560.gz; [audacity crazy **20070203010532 * well still some issues on 'exit from GUI' but I'll push in a bit :s ] { adddir ./source/xapps-extra/audacity } From vmiklos at frugalware.org Sat Feb 3 02:11:36 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Feb 3 02:11:38 2007 Subject: [Frugalware-darcs] frugalware-current: ipx-1.1-1-x86_64 Message-ID: <20070203011136.B0CD613A48D9@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203021146-e2957-1caf9eb671f4d18d30f228d467b9a208ee333b79.gz; [ipx-1.1-1-x86_64 VMiklos **20070203021146 added x86_64 to archs() ] { hunk ./source/network-extra/ipx/FrugalBuild 12 -archs=('i686') +archs=('i686' 'x86_64') } From krics at linuxforum.hu Sat Feb 3 02:13:26 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sat Feb 3 02:13:28 2007 Subject: [Frugalware-darcs] frugalware-current: evolution-data-server-1.9.6.1-1-x86_64 Message-ID: <20070203011327.05B1613A400E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203011225-d209c-38b10a60ccf6a6b680649e355a676851d4cd8ce9.gz; [evolution-data-server-1.9.6.1-1-x86_64 Christian Hamar alias krix **20070203011225 * Version bump ] { hunk ./source/gnome/evolution-data-server/FrugalBuild 5 -pkgver=1.9.5 +pkgver=1.9.6.1 hunk ./source/gnome/evolution-data-server/FrugalBuild 9 -depends=('nss>=3.11.4' 'libsoup>=2.2.99' 'libgnomeui>=2.17.1' 'heimdal' 'gnome-keyring>=0.7.3' \ +depends=('nss>=3.11.4' 'libsoup>=2.2.99' 'libgnomeui>=2.17.90' 'heimdal' 'gnome-keyring>=0.7.3' \ hunk ./source/gnome/evolution-data-server/FrugalBuild 15 -sha1sums=('f57378b45379b27b0e6ffbb6e77223aec0dfe4bd') hunk ./source/gnome/evolution-data-server/FrugalBuild 30 +sha1sums=('2334a8abbfc4040578906d5f04d9031ac29c4221') } From vmiklos at frugalware.org Sat Feb 3 02:14:56 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Feb 3 02:14:58 2007 Subject: [Frugalware-darcs] frugalware-current: jircii-40-1-x86_64 Message-ID: <20070203011456.EBBC313A400E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203021448-e2957-b64e4a6e93ca4fcc8eadb7dbba00c674ca75b3cb.gz; [jircii-40-1-x86_64 VMiklos **20070203021448 added x86_64 to archs() ] { hunk ./source/network-extra/jircii/FrugalBuild 11 -archs=('i686') +archs=('i686' 'x86_64') } From vmiklos at frugalware.org Sat Feb 3 02:18:22 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Feb 3 02:18:24 2007 Subject: [Frugalware-darcs] frugalware-current: linux-atm-2.4.1-1-x86_64 Message-ID: <20070203011822.9861813A400E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203021817-e2957-a58971e710d8edd09a5c2859c517f59a310c3ac4.gz; [linux-atm-2.4.1-1-x86_64 VMiklos **20070203021817 added x86_64 to archs() ] { hunk ./source/network-extra/linux-atm/FrugalBuild 10 -archs=('i686') +archs=('i686' 'x86_64') } From vmiklos at frugalware.org Sat Feb 3 02:26:40 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Feb 3 02:26:42 2007 Subject: [Frugalware-darcs] frugalware-current: p3scan-2.3.2-1-x86_64 Message-ID: <20070203012640.CD90313A400E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203022653-e2957-4f54eca538c02660abfaf6da375f63352b9a4494.gz; [p3scan-2.3.2-1-x86_64 VMiklos **20070203022653 added x86_64 to archs() ] { hunk ./source/network-extra/p3scan/FrugalBuild 17 -archs=('i686') +archs=('i686' 'x86_64') } From krics at linuxforum.hu Sat Feb 3 02:30:40 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sat Feb 3 02:30:41 2007 Subject: [Frugalware-darcs] frugalware-current: gnome-doc-utils-0.9.2-1-x86_64 Message-ID: <20070203013040.D3F2213A400E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203013009-d209c-f46e4d8ea8b591a05b367549ccc1f4ca2de62da9.gz; [gnome-doc-utils-0.9.2-1-x86_64 Christian Hamar alias krix **20070203013009 * Version bump ] { hunk ./source/gnome/gnome-doc-utils/FrugalBuild 5 -pkgver=0.8.0 +pkgver=0.9.2 hunk ./source/gnome/gnome-doc-utils/FrugalBuild 9 -depends=('libxslt' 'scrollkeeper') +depends=('libxslt>=1.1.20' 'scrollkeeper') hunk ./source/gnome/gnome-doc-utils/FrugalBuild 15 -sha1sums=('d134ae18e4fd3a4de3aa6879a67fb93e23e860db') hunk ./source/gnome/gnome-doc-utils/FrugalBuild 16 +sha1sums=('7c6227c4df999f817b1f85aaa3a3a1933726f939') } From crazy at frugalware.org Sat Feb 3 02:35:29 2007 From: crazy at frugalware.org (crazy) Date: Sat Feb 3 02:35:33 2007 Subject: [Frugalware-darcs] wx: audacity-1.3.2-3-i686 Message-ID: <20070203013529.A1E1813A48D8@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=wx;a=darcs_commitdiff;h=20070203013142-f6986-fb63edc20229aa81b1a0f8e160aadcf278e7ea57.gz; [audacity-1.3.2-3-i686 crazy **20070203013142 * Make it work ( uhh weeelll ) with wxgtk>=2.8.0 * added one more patch to fix locale installation ] { addfile ./source/xapps-extra/audacity/FrugalBuild addfile ./source/xapps-extra/audacity/audacity-1.3.2-flac-1.1.3.patch addfile ./source/xapps-extra/audacity/fix-desktop-file-and-warnings.patch addfile ./source/xapps-extra/audacity/locale-DESTDIR.patch addfile ./source/xapps-extra/audacity/soundtouch.patch addfile ./source/xapps-extra/audacity/wx28-configure.patch addfile ./source/xapps-extra/audacity/wxgtk28.patch hunk ./source/xapps-extra/audacity/FrugalBuild 1 +# Compiling Time: 4.89 SBU +# Maintainer: VMiklos + +pkgname=audacity +pkgver=1.3.2 +pkgrel=3 +pkgdesc="A program that lets you manipulate digital audio waveforms" +Finclude sourceforge +url="http://audacity.sourceforge.net/" +depends=('wxgtk' 'libvorbis' 'libid3tag' 'libmad' 'libogg' \ + 'libsamplerate' 'libsamplerate' 'flac>=1.1.3' 'soundtouch') +# TODO: twolame +makedepends=('zip') +groups=('xapps-extra') +archs=('i686' 'x86_64') +options=('scriptlet') +source=(${source/$pkgname-/$pkgname-src-} audacity-1.3.2-flac-1.1.3.patch \ + soundtouch.patch fix-desktop-file-and-warnings.patch \ + wx28-configure.patch wxgtk28.patch locale-DESTDIR.patch) +up2date="lynx -dump http://audacity.sourceforge.net/download/beta_source|grep -om1 'audacity-src-\(.*\).tar.gz'|sed 's/.*rc-\(.*\).t.*/\1/'" + + +build() +{ + unset MAKEFLAGS + export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing" + Fcd $pkgname-src-$pkgver-beta + Fpatchall + Fautoreconf + Fconf \ + --with-lib-preference=system,local \ + --with-portaudio=v19 \ + --with-wx-version=2.8 + make || Fdie + Fmakeinstall + Ffilerel images/AudacityLogo48x48.xpm /usr/share/$pkgname/$pkgname.xpm +} +sha1sums=('87690806763b7de26a8e2df1f0d4c3a7e6d1a404'\ + '1e38825cb8ba0a5ffa74cd4086ca3a04aaa1264c'\ + '219cec3343c3be0ab5cd12c3013241327ba9c309'\ + 'df806f7464e1cb2edfa011a4aeb85afa0e2ec288'\ + 'e04ed6df24b497c9252a58a203798c27095b0356'\ + '9bb0f1d6743b3739e476c9677ce5a46c03bbd94e'\ + 'efd1a76e78e5ff7986c6609a0dc001e924e29ca5') +# optimization OK hunk ./source/xapps-extra/audacity/audacity-1.3.2-flac-1.1.3.patch 1 +? src/export/2 +? src/export/makefile +? src/import/2 +? src/import/makefile +Index: acinclude.m4 +=================================================================== +RCS file: /cvsroot/audacity/audacity-src/acinclude.m4,v +retrieving revision 1.17 +diff -u -r1.17 acinclude.m4 +--- acinclude.m4 20 Oct 2006 10:31:59 -0000 1.17 ++++ acinclude.m4 20 Oct 2006 22:46:26 -0000 +@@ -463,7 +463,7 @@ + dnl See if FLAC is installed in the system + + AC_CHECK_LIB(FLAC, +- FLAC__file_decoder_new, ++ FLAC__stream_decoder_new, + lib_found="yes", + lib_found="no", + -lFLAC++ -lFLAC) +Index: src/export/ExportFLAC.cpp +=================================================================== +RCS file: /cvsroot/audacity/audacity-src/src/export/ExportFLAC.cpp,v +retrieving revision 1.9 +diff -u -r1.9 ExportFLAC.cpp +--- src/export/ExportFLAC.cpp 23 Sep 2006 02:26:41 -0000 1.9 ++++ src/export/ExportFLAC.cpp 20 Oct 2006 22:46:32 -0000 +@@ -41,6 +41,13 @@ + + #define SAMPLES_PER_RUN 8192 + ++/* FLACPP_API_VERSION_CURRENT is 6 for libFLAC++ from flac-1.1.3 (see ) */ ++#if !defined FLACPP_API_VERSION_CURRENT || FLACPP_API_VERSION_CURRENT < 6 ++#define LEGACY_FLAC ++#else ++#undef LEGACY_FLAC ++#endif ++ + bool ExportFLAC(AudacityProject *project, + int numChannels, wxString fName, + bool selectionOnly, double t0, double t1, MixerSpec *mixerSpec) +@@ -58,7 +65,9 @@ + gPrefs->Read(wxT("/FileFormats/FLACBitDepth"), wxT("16")); + + FLAC::Encoder::File *encoder= new FLAC::Encoder::File(); ++#ifdef LEGACY_FLAC + encoder->set_filename(OSFILENAME(fName)); ++#endif + encoder->set_channels(numChannels); + encoder->set_sample_rate(int(rate + 0.5)); + +@@ -72,7 +81,11 @@ + format=int16Sample; + encoder->set_bits_per_sample(16); + } +- encoder->init(); ++#ifdef LEGACY_FLAC ++ encoder->init(); // really should check the return value here... ++#else ++ encoder->init(OSFILENAME(fName)); // really should check the return value here... ++#endif + + int numWaveTracks; + WaveTrack **waveTracks; +@@ -129,7 +142,7 @@ + return !cancelling; + } + +-#endif // USE_LIBVORBIS ++#endif // USE_LIBFLAC + + + // Indentation settings for Vim and Emacs and unique identifier for Arch, a +Index: src/import/ImportFLAC.cpp +=================================================================== +RCS file: /cvsroot/audacity/audacity-src/src/import/ImportFLAC.cpp,v +retrieving revision 1.16 +diff -u -r1.16 ImportFLAC.cpp +--- src/import/ImportFLAC.cpp 23 Sep 2006 02:26:55 -0000 1.16 ++++ src/import/ImportFLAC.cpp 20 Oct 2006 22:46:32 -0000 +@@ -63,6 +63,13 @@ + #include "../WaveTrack.h" + #include "ImportPlugin.h" + ++/* FLACPP_API_VERSION_CURRENT is 6 for libFLAC++ from flac-1.1.3 (see ) */ ++#if !defined FLACPP_API_VERSION_CURRENT || FLACPP_API_VERSION_CURRENT < 6 ++#define LEGACY_FLAC ++#else ++#undef LEGACY_FLAC ++#endif ++ + class FLACImportFileHandle; + + class MyFLACFile : public FLAC::Decoder::File +@@ -264,6 +271,7 @@ + + bool FLACImportFileHandle::Init() + { ++#ifdef LEGACY_FLAC + bool success = mFile->set_filename(OSFILENAME(mName)); + if (!success) { + return false; +@@ -272,11 +280,23 @@ + if (state != FLAC__FILE_DECODER_OK) { + return false; + } ++#else ++ if (mFile->init(OSFILENAME(mName)) != FLAC__STREAM_DECODER_INIT_STATUS_OK) { ++ return false; ++ } ++#endif + mFile->process_until_end_of_metadata(); ++#ifdef LEGACY_FLAC + state = mFile->get_state(); + if (state != FLAC__FILE_DECODER_OK) { + return false; + } ++#else ++ // not necessary to check state, error callback will catch errors, but here's how: ++ if (mFile->get_state() > FLAC__STREAM_DECODER_READ_FRAME) { ++ return false; ++ } ++#endif + if (!mFile->is_valid() || mFile->get_was_error()) + { + // This probably is not a FLAC file at all +@@ -340,7 +360,11 @@ + mChannels[1]->SetTeamed(true); + } + ++#ifdef LEGACY_FLAC + mFile->process_until_end_of_file(); ++#else ++ mFile->process_until_end_of_stream(); ++#endif + + *outTracks = new Track *[*outNumTracks]; + for(c = 0; c < *outNumTracks; c++) { hunk ./source/xapps-extra/audacity/fix-desktop-file-and-warnings.patch 1 +diff -Naur audacity-src-1.3.2-beta/src/audacity.desktop audacity-src-1.3.2-beta-misc/src/audacity.desktop +--- audacity-src-1.3.2-beta/src/audacity.desktop 2006-10-29 01:05:29.000000000 +0200 ++++ audacity-src-1.3.2-beta-misc/src/audacity.desktop 2007-02-02 20:19:56.000000000 +0100 +@@ -1,22 +1,22 @@ +-ďťż[Desktop Entry] +-Encoding=UTF-8 +- +-Name=Audacity Sound Editor +-Name[de]=Audacity Audio-Editor +-Name[ru]=Редактор звуковых файлов Audacity +-GenericName=Sound Editor +-GenericName[de]=Audio-Editor +-GenericName[ru]=Редактор звуковых файлов +-Comment=Record and edit audio files ++[Desktop Entry] ++Encoding=UTF-8 ++ ++Name=Audacity Sound Editor ++Name[de]=Audacity Audio-Editor ++Name[ru]=Редактор звуковых файлов Audacity ++GenericName=Sound Editor ++GenericName[de]=Audio-Editor ++GenericName[ru]=Редактор звуковых файлов ++Comment=Record and edit audio files + Comment[de]=Audio-Dateien aufnehmen und bearbeiten +-Comment[ru]=Запись и редактирование звуковых файлов ++Comment[ru]=Запись и редактирование звуковых файлов ++ ++Icon=/usr/share/audacity/audacity.xpm ++ ++Type=Application ++Categories=QT;GTK;Application;AudioVideo;Audio;Multimedia; + +-Icon=/usr/share/audacity/audacity.xpm +- +-Type=Application +-Categories=Application;AudioVideo;Audio;Multimedia; +- +-Exec=audacity +-StartupNotify=false +-Terminal=false +-MimeType=application/ogg;audio/basic;audio/mpeg;audio/x-aiff;audio/x-mp3;audio/x-wav;application/x-audacity-project; ++Exec=audacity ++StartupNotify=false ++Terminal=false ++MimeType=application/ogg;audio/basic;audio/mpeg;audio/x-aiff;audio/x-mp3;audio/x-wav;application/x-audacity-project; +diff -Naur audacity-src-1.3.2-beta/src/Audacity.h audacity-src-1.3.2-beta-misc/src/Audacity.h +--- audacity-src-1.3.2-beta/src/Audacity.h 2006-10-29 01:05:28.000000000 +0200 ++++ audacity-src-1.3.2-beta-misc/src/Audacity.h 2007-02-02 20:19:21.000000000 +0100 +@@ -29,12 +29,12 @@ + + // Version string for visual display + #define AUDACITY_VERSION_STRING "1.3.2-beta" +-// Need to figure out how to concatenate for unicode builds +-//#define AUDACITY_VERSION_STRING AUDACITY_QUOTE( AUDACITY_VERSION ) "." \ +-// AUDACITY_QUOTE( AUDACITY_RELEASE ) "." \ +-// AUDACITY_QUOTE( AUDACITY_REVISION ) \ +-// AUDACITY_SUFFIX +- ++/* Need to figure out how to concatenate for unicode builds ++ *#define AUDACITY_VERSION_STRING AUDACITY_QUOTE( AUDACITY_VERSION ) "." \ ++ * AUDACITY_QUOTE( AUDACITY_RELEASE ) "." \ ++ * AUDACITY_QUOTE( AUDACITY_REVISION ) \ ++ * AUDACITY_SUFFIX ++ */ + // Version string for file info (under Windows) + #define AUDACITY_FILE_VERSION AUDACITY_QUOTE( AUDACITY_VERSION ) "," \ + AUDACITY_QUOTE( AUDACITY_RELEASE ) "," \ hunk ./source/xapps-extra/audacity/locale-DESTDIR.patch 1 +diff -Naurp audacity-src-1.3.2-beta/locale/Makefile.in audacity-src-1.3.2-beta-locale/locale/Makefile.in +--- audacity-src-1.3.2-beta/locale/Makefile.in 2006-10-29 01:06:04.000000000 +0200 ++++ audacity-src-1.3.2-beta-locale/locale/Makefile.in 2007-02-03 02:01:14.000000000 +0100 +@@ -17,7 +17,7 @@ top_srcdir=@top_srcdir@ + INSTALL=@INSTALL@ + AUDACITY_NAME=@AUDACITY_NAME@ + ifdef DESTDIR +- INSTALL_PATH=$(top_srcdir)/$(DESTDIR) ++ INSTALL_PATH=$(DESTDIR) + else + INSTALL_PATH= + endif hunk ./source/xapps-extra/audacity/soundtouch.patch 1 +diff -Naur audacity-src-1.3.2-beta/acinclude.m4 audacity-src-1.3.2-beta-st/acinclude.m4 +--- audacity-src-1.3.2-beta/acinclude.m4 2006-10-29 01:06:04.000000000 +0200 ++++ audacity-src-1.3.2-beta-st/acinclude.m4 2007-02-02 19:43:34.000000000 +0100 +@@ -88,12 +88,23 @@ + + dnl see if soundtouch is installed on the system + +- dnl ... TODO: I don't know if stock, unmodified soundtouch is +- dnl suitable for audacity, so I don't allow it ++ PKG_CHECK_MODULES(SOUNDTOUCH, soundtouch-1.0 >= 1.3.1, ++ soundtouch_available_system="yes", ++ soundtouch_available_system="no") + +- LIBSOUNDTOUCH_SYSTEM_AVAILABLE="no" + +- dnl see if libresample is available locally ++ if test "x$soundtouch_available_system" = "xyes" ; then ++ LIBSOUNDTOUCH_SYSTEM_AVAILABLE="yes" ++ LIBSOUNDTOUCH_SYSTEM_LIBS=$SOUNDTOUCH_LIBS ++ LIBSOUNDTOUCH_SYSTEM_CXXFLAGS=$SOUNDTOUCH_CFLAGS ++ LIBSOUNDTOUCH_SYSTEM_CPPSYMBOLS="USE_SOUNDTOUCH" ++ AC_MSG_NOTICE([Libsoundtouch libraries are available as system libraries]) ++ else ++ LIBSOUNDTOUCH_SYSTEM_AVAILABLE="no" ++ AC_MSG_NOTICE([Libsoundtouch libraries are NOT available as system libraries]) ++ fi ++ ++ dnl see if libsoundtouch is available locally + + AC_CHECK_FILE(${srcdir}/lib-src/soundtouch/include/SoundTouch.h, + soundtouch_h_found="yes", +@@ -180,6 +191,7 @@ + LIBSAMPLERATE_SYSTEM_AVAILABLE="yes" + LIBSAMPLERATE_SYSTEM_LIBS=$SAMPLERATE_LIBS + LIBSAMPLERATE_SYSTEM_CXXFLAGS=$SAMPLERATE_CFLAGS ++ LIBSAMPLERATE_SYSTEM_CPPSYMBOLS="USE_LIBSAMPLERATE" + AC_MSG_NOTICE([Libsamplerate libraries are available as system libraries]) + else + LIBSAMPLERATE_SYSTEM_AVAILABLE="no" hunk ./source/xapps-extra/audacity/wx28-configure.patch 1 +diff -Naur audacity-src-1.3.2-beta/configure.in audacity-src-1.3.2-beta-p/configure.in +--- audacity-src-1.3.2-beta/configure.in 2006-10-29 01:06:01.000000000 +0200 ++++ audacity-src-1.3.2-beta-p/configure.in 2007-02-02 21:29:16.000000000 +0100 +@@ -124,6 +124,13 @@ + lib_preference=$withval, + lib_preference="system local") + ++AC_ARG_WITH(wx-version, ++ [AC_HELP_STRING([--with-wx-version], ++ [override default wxWidgets version [2.6,2.8]])], ++ wx_preference="--version=$withval", ++ wx_preference="") ++ ++ + LIBRARIES="LIBVORBIS LIBMAD LIBSNDFILE LIBFLAC LIBID3TAG LIBSAMPLERATE LIBRESAMPLE LIBSOUNDTOUCH LIBNYQUIST LIBEXPAT LIBTWOLAME" + + AC_MSG_NOTICE([Determining what libraries are available in this tree and on the system]) +@@ -313,32 +320,34 @@ + dnl wxWindows -- we assume that if wx-config is found, wxWindows is successfully installed. + AC_PATH_PROG(WX_CONFIG, wx-config, no, $PATH:/usr/local/bin ) + if [[ "$WX_CONFIG" = "no" ]] ; then +- AC_MSG_ERROR("Could not find wx-config: is wxWindows installed? is wx-config in your path?") ++ AC_MSG_ERROR("Could not find wx-config: is wxWidgets installed? is wx-config in your path?") + fi + +-dnl Check that the wx version is 2.6.x ++dnl Check that the wx version is at least 2.6.x + +-wx_version=`${WX_CONFIG} $static_preference $unicode_preference --version` ++wx_version=`${WX_CONFIG} $static_preference $unicode_preference $debug_preference $wx_preference --version` + +-AC_MSG_NOTICE([Checking that the installed version of wxWidgets is 2.6.x]) ++AC_MSG_NOTICE([Checking that the installed version of wxWidgets is at least 2.6.x]) + + case "${wx_version}" in +- 2.6.*) +- echo "Great, you're using wxWidgets 2.6.x!" ++ 2.6.*|2.8.*) ++ echo "Great, you're using wxWidgets ${wx_version}!" + ;; + *) + wx_list=`${WX_CONFIG} --list` +- AC_MSG_ERROR([Unable to locate a suitable configuration of wxWidgets v2.6.x. ++ AC_MSG_ERROR([Unable to locate a suitable configuration of wxWidgets v2.6.x or higher. + The currently available configurations are listed below. If necessary, either +-install the package for your distribution or download the latest version of wxWidgets ++install the package for your distribution or download the latest version of ++wxWidgets + from http://wxwidgets.org. + ${wx_list}]) + esac + + dnl Gather wx arguments + +-LIBS="$LIBS `$WX_CONFIG $static_preference $unicode_preference --libs`" +-CPPFLAGS="$CPPFLAGS `$WX_CONFIG $static_preference $unicode_preference --cxxflags`" ++LIBS="$LIBS `$WX_CONFIG $static_preference $unicode_preference $debug_preference $wx_preference --libs`" ++CPPFLAGS="$CPPFLAGS `$WX_CONFIG $static_preference $unicode_preference $debug_preference $wx_preference --cxxflags`" ++ + + AC_CANONICAL_HOST + hunk ./source/xapps-extra/audacity/wxgtk28.patch 1 +diff -Naur audacity-src-1.3.2-beta/src/blockfile/LegacyBlockFile.cpp audacity-src-1.3.2-beta-wx28/src/blockfile/LegacyBlockFile.cpp +--- audacity-src-1.3.2-beta/src/blockfile/LegacyBlockFile.cpp 2006-10-29 01:05:29.000000000 +0200 ++++ audacity-src-1.3.2-beta-wx28/src/blockfile/LegacyBlockFile.cpp 2007-02-02 23:23:29.000000000 +0100 +@@ -316,7 +316,7 @@ + return newBlockFile; + } + +-int LegacyBlockFile::GetSpaceUsage() ++wxLongLong LegacyBlockFile::GetSpaceUsage() + { + wxFFile dataFile(mFileName.GetFullPath()); + return dataFile.Length(); +diff -Naur audacity-src-1.3.2-beta/src/blockfile/LegacyBlockFile.h audacity-src-1.3.2-beta-wx28/src/blockfile/LegacyBlockFile.h +--- audacity-src-1.3.2-beta/src/blockfile/LegacyBlockFile.h 2006-10-29 01:05:29.000000000 +0200 ++++ audacity-src-1.3.2-beta-wx28/src/blockfile/LegacyBlockFile.h 2007-02-02 23:22:18.000000000 +0100 +@@ -57,7 +57,7 @@ + virtual BlockFile *Copy(wxFileName newFileName); + /// Write an XML representation of this file + virtual void SaveXML(XMLWriter &xmlFile); +- virtual int GetSpaceUsage(); ++ virtual wxLongLong GetSpaceUsage(); + virtual void Recover(); + + static BlockFile *BuildFromXML(wxString dir, const wxChar **attrs, +diff -Naur audacity-src-1.3.2-beta/src/blockfile/SilentBlockFile.cpp audacity-src-1.3.2-beta-wx28/src/blockfile/SilentBlockFile.cpp +--- audacity-src-1.3.2-beta/src/blockfile/SilentBlockFile.cpp 2006-10-29 01:05:29.000000000 +0200 ++++ audacity-src-1.3.2-beta-wx28/src/blockfile/SilentBlockFile.cpp 2007-02-02 23:27:49.000000000 +0100 +@@ -68,7 +68,7 @@ + return newBlockFile; + } + +-int SilentBlockFile::GetSpaceUsage() ++wxLongLong SilentBlockFile::GetSpaceUsage() + { + return 0; + } +diff -Naur audacity-src-1.3.2-beta/src/blockfile/SilentBlockFile.h audacity-src-1.3.2-beta-wx28/src/blockfile/SilentBlockFile.h +--- audacity-src-1.3.2-beta/src/blockfile/SilentBlockFile.h 2006-10-29 01:05:29.000000000 +0200 ++++ audacity-src-1.3.2-beta-wx28/src/blockfile/SilentBlockFile.h 2007-02-02 23:29:08.000000000 +0100 +@@ -39,7 +39,7 @@ + virtual BlockFile *Copy(wxFileName newFileName); + /// Write an XML representation of this file + virtual void SaveXML(XMLWriter &xmlFile); +- virtual int GetSpaceUsage(); ++ virtual wxLongLong GetSpaceUsage(); + virtual void Recover() { }; + + static BlockFile *BuildFromXML(DirManager &dm, const wxChar **attrs); +diff -Naur audacity-src-1.3.2-beta/src/blockfile/SimpleBlockFile.cpp audacity-src-1.3.2-beta-wx28/src/blockfile/SimpleBlockFile.cpp +--- audacity-src-1.3.2-beta/src/blockfile/SimpleBlockFile.cpp 2006-10-29 01:05:29.000000000 +0200 ++++ audacity-src-1.3.2-beta-wx28/src/blockfile/SimpleBlockFile.cpp 2007-02-02 23:31:42.000000000 +0100 +@@ -325,7 +325,7 @@ + return newBlockFile; + } + +-int SimpleBlockFile::GetSpaceUsage() ++wxLongLong SimpleBlockFile::GetSpaceUsage() + { + wxFFile dataFile(mFileName.GetFullPath()); + return dataFile.Length(); +diff -Naur audacity-src-1.3.2-beta/src/blockfile/SimpleBlockFile.h audacity-src-1.3.2-beta-wx28/src/blockfile/SimpleBlockFile.h +--- audacity-src-1.3.2-beta/src/blockfile/SimpleBlockFile.h 2006-10-29 01:05:29.000000000 +0200 ++++ audacity-src-1.3.2-beta-wx28/src/blockfile/SimpleBlockFile.h 2007-02-02 23:33:08.000000000 +0100 +@@ -46,7 +46,7 @@ + /// Write an XML representation of this file + virtual void SaveXML(XMLWriter &xmlFile); + +- virtual int GetSpaceUsage(); ++ virtual wxLongLong GetSpaceUsage(); + virtual void Recover(); + + static BlockFile *BuildFromXML(DirManager &dm, const wxChar **attrs); +diff -Naur audacity-src-1.3.2-beta/src/BlockFile.cpp audacity-src-1.3.2-beta-wx28/src/BlockFile.cpp +--- audacity-src-1.3.2-beta/src/BlockFile.cpp 2006-10-29 01:05:27.000000000 +0200 ++++ audacity-src-1.3.2-beta-wx28/src/BlockFile.cpp 2007-02-02 22:40:44.000000000 +0100 +@@ -620,7 +620,7 @@ + mAliasedFileName = newAliasedFile; + } + +-int AliasBlockFile::GetSpaceUsage() ++wxLongLong AliasBlockFile::GetSpaceUsage() + { + wxFFile summaryFile(mFileName.GetFullPath()); + return summaryFile.Length(); +diff -Naur audacity-src-1.3.2-beta/src/BlockFile.h audacity-src-1.3.2-beta-wx28/src/BlockFile.h +--- audacity-src-1.3.2-beta/src/BlockFile.h 2006-10-29 01:05:27.000000000 +0200 ++++ audacity-src-1.3.2-beta-wx28/src/BlockFile.h 2007-02-02 23:03:51.000000000 +0100 +@@ -85,7 +85,7 @@ + /// Create a new BlockFile identical to this, using the given filename + virtual BlockFile *Copy(wxFileName newFileName) = 0; + +- virtual int GetSpaceUsage() = 0; ++ virtual wxLongLong GetSpaceUsage() = 0; + + /// if the on-disk state disappeared, either recover it (if it was + //summary only), write out a placeholder of silence data (missing +@@ -160,7 +160,7 @@ + virtual int ReadData(samplePtr data, sampleFormat format, + sampleCount start, sampleCount len) = 0; + +- virtual int GetSpaceUsage(); ++ virtual wxLongLong GetSpaceUsage(); + + /// as SilentLog (which would affect Summary data access), but + // applying to Alias file access +diff -Naur audacity-src-1.3.2-beta/src/commands/Keyboard.cpp audacity-src-1.3.2-beta-wx28/src/commands/Keyboard.cpp +--- audacity-src-1.3.2-beta/src/commands/Keyboard.cpp 2006-10-29 01:05:27.000000000 +0200 ++++ audacity-src-1.3.2-beta-wx28/src/commands/Keyboard.cpp 2007-02-02 23:40:32.000000000 +0100 +@@ -66,12 +66,14 @@ + case WXK_RETURN: + newStr += wxT("Return"); + break; ++#if !wxCHECK_VERSION(2, 7, 0) + case WXK_PRIOR: + newStr += wxT("PageUp"); + break; + case WXK_NEXT: + newStr += wxT("PageDown"); + break; ++#endif + case WXK_END: + newStr += wxT("End"); + break; +@@ -246,15 +248,17 @@ + case WXK_NUMPAD_DOWN: + newStr += wxT("NUMPAD_DOWN"); + break; ++#if !wxCHECK_VERSION(2, 7, 0) + case WXK_NUMPAD_PRIOR: + newStr += wxT("NUMPAD_PAGEUP"); + break; +- case WXK_NUMPAD_PAGEUP: +- newStr += wxT("NUMPAD_PAGEUP"); +- break; + case WXK_NUMPAD_NEXT: + newStr += wxT("NUMPAD_PAGEDOWN"); + break; ++#endif ++ case WXK_NUMPAD_PAGEUP: ++ newStr += wxT("NUMPAD_PAGEUP"); ++ break; + case WXK_NUMPAD_PAGEDOWN: + newStr += wxT("NUMPAD_PAGEDOWN"); + break; +diff -Naur audacity-src-1.3.2-beta/src/Dependencies.cpp audacity-src-1.3.2-beta-wx28/src/Dependencies.cpp +--- audacity-src-1.3.2-beta/src/Dependencies.cpp 2006-10-29 01:05:29.000000000 +0200 ++++ audacity-src-1.3.2-beta-wx28/src/Dependencies.cpp 2007-02-02 22:42:38.000000000 +0100 +@@ -142,11 +142,11 @@ + AliasedFileHash aliasedFileHash; + ReplacedBlockFileHash blockFileHash; + +- double totalBytesToProcess = 0.0; +- double completedBytes = 0.0; ++ wxLongLong totalBytesToProcess = 0; ++ wxLongLong completedBytes = 0; + unsigned int i; +- for(i=0; iGetCount(); i++) { +- totalBytesToProcess += (double)aliasedFiles->Item(i).bytes; ++ for(i=0; iGetCount(); i++) { ++ totalBytesToProcess += aliasedFiles->Item(i).bytes; + wxString fileNameStr = aliasedFiles->Item(i).fileName.GetFullPath(); + aliasedFileHash[fileNameStr] = &aliasedFiles->Item(i); + } +@@ -178,9 +178,9 @@ + blockFileHash[f] = newBlockFile; + + // Update the progress bar +- completedBytes += (double)SAMPLE_SIZE(format) * len; ++ completedBytes += SAMPLE_SIZE(format) * len; + int progressValue = +- (int)(completedBytes * 1000.0 / totalBytesToProcess); ++ (completedBytes * 1000 / totalBytesToProcess).GetValue(); + GetActiveProject()->ProgressUpdate(progressValue); + } + } +@@ -344,11 +344,10 @@ + unsigned int i; + for(i=0; iGetCount(); i++) { + wxFileName fileName = mAliasedFiles->Item(i).fileName; +- double bytes = mAliasedFiles->Item(i).bytes; +- double overhead = 1.24; ++ wxLongLong bytes = (mAliasedFiles->Item(i).bytes * 124) / 100; + + mFileList->InsertItem(i, fileName.GetFullPath()); +- mFileList->SetItem(i, 1, Internat::FormatSize(bytes * overhead)); ++ mFileList->SetItem(i, 1, Internat::FormatSize(bytes)); + mFileList->SetItemState(i, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED); + } + } +diff -Naur audacity-src-1.3.2-beta/src/Dependencies.h audacity-src-1.3.2-beta-wx28/src/Dependencies.h +--- audacity-src-1.3.2-beta/src/Dependencies.h 2006-10-29 01:05:27.000000000 +0200 ++++ audacity-src-1.3.2-beta-wx28/src/Dependencies.h 2007-02-02 22:41:42.000000000 +0100 +@@ -24,12 +24,12 @@ + + class AliasedFile { + public: +- AliasedFile(wxFileName fileName, double bytes) { ++ AliasedFile(wxFileName fileName, wxLongLong bytes) { + this->fileName = fileName; + this->bytes = bytes; + } + wxFileName fileName; +- double bytes; // if stored as current default sample format ++ wxLongLong bytes; // if stored as current default sample format + }; + + class AudacityProject; +diff -Naur audacity-src-1.3.2-beta/src/export/Export.h audacity-src-1.3.2-beta-wx28/src/export/Export.h +--- audacity-src-1.3.2-beta/src/export/Export.h 2006-10-29 01:05:27.000000000 +0200 ++++ audacity-src-1.3.2-beta-wx28/src/export/Export.h 2007-02-02 23:46:30.000000000 +0100 +@@ -11,6 +11,7 @@ + #ifndef __AUDACITY_EXPORT__ + #define __AUDACITY_EXPORT__ + ++#include + #include + + class AudacityProject; +diff -Naur audacity-src-1.3.2-beta/src/FileNames.cpp audacity-src-1.3.2-beta-wx28/src/FileNames.cpp +--- audacity-src-1.3.2-beta/src/FileNames.cpp 2006-10-29 01:05:28.000000000 +0200 ++++ audacity-src-1.3.2-beta-wx28/src/FileNames.cpp 2007-02-02 22:11:56.000000000 +0100 +@@ -72,8 +72,8 @@ + // If there is a directory "Portable Settings" relative to the + // executable's EXE file, the prefs are stored in there, otherwise + // the prefs are stored in the user data dir provided by the OS. +- wxFileName exePath(PlatformCompatibility::GetExecutablePath()); +- wxFileName portablePrefsPath(exePath.GetPath(), wxT("Portable Settings")); ++ wxFileName portablePrefsPath(PlatformCompatibility::GetExecutablePath()); ++ portablePrefsPath.AppendDir(wxT("Portable Settings")); + + if (portablePrefsPath.DirExists()) + { +diff -Naur audacity-src-1.3.2-beta/src/FreqWindow.cpp audacity-src-1.3.2-beta-wx28/src/FreqWindow.cpp +--- audacity-src-1.3.2-beta/src/FreqWindow.cpp 2006-10-29 01:05:26.000000000 +0200 ++++ audacity-src-1.3.2-beta-wx28/src/FreqWindow.cpp 2007-02-02 22:13:21.000000000 +0100 +@@ -341,9 +341,7 @@ + + DrawPlot(); + +-#if defined(__WXMSW__) + Refresh(true); +-#endif + } + + void FreqWindow::DrawPlot() +diff -Naur audacity-src-1.3.2-beta/src/import/Import.h audacity-src-1.3.2-beta-wx28/src/import/Import.h +--- audacity-src-1.3.2-beta/src/import/Import.h 2006-10-29 01:05:28.000000000 +0200 ++++ audacity-src-1.3.2-beta-wx28/src/import/Import.h 2007-02-02 23:48:23.000000000 +0100 +@@ -11,6 +11,7 @@ + #ifndef _IMPORT_ + #define _IMPORT_ + ++#include + #include + #include + #include +diff -Naur audacity-src-1.3.2-beta/src/Internat.cpp audacity-src-1.3.2-beta-wx28/src/Internat.cpp +--- audacity-src-1.3.2-beta/src/Internat.cpp 2006-10-29 01:05:29.000000000 +0200 ++++ audacity-src-1.3.2-beta-wx28/src/Internat.cpp 2007-02-02 22:48:25.000000000 +0100 +@@ -105,7 +105,7 @@ + + double Internat::CompatibleToDouble(const wxString& stringToConvert) + { +- double result; ++ double result = 0; + Internat::CompatibleToDouble(stringToConvert, &result); + return result; + } +@@ -130,7 +130,7 @@ + if (digitsAfterDecimalPoint == -1) + { + result.Printf(wxT("%f"), numberToConvert); +- ++ + // Not all libcs respect the decimal separator, so always convert + // any dots found to the decimal separator + result.Replace(wxT("."), decSep); +diff -Naur audacity-src-1.3.2-beta/src/LabelDialog.cpp audacity-src-1.3.2-beta-wx28/src/LabelDialog.cpp +--- audacity-src-1.3.2-beta/src/LabelDialog.cpp 2006-10-29 01:05:29.000000000 +0200 ++++ audacity-src-1.3.2-beta-wx28/src/LabelDialog.cpp 2007-02-02 21:44:08.000000000 +0100 +@@ -736,3 +736,21 @@ + + return; + } ++ ++void LabelDialog::OnOK(wxCommandEvent &event) ++{ ++ // Standard handling ++ if (Validate() && TransferDataFromWindow()) { ++ EndModal(wxID_OK); ++ } ++ ++ return; ++} ++ ++void LabelDialog::OnCancel(wxCommandEvent &event) ++{ ++ // Standard handling ++ EndModal(wxID_CANCEL); ++ ++ return; ++} +diff -Naur audacity-src-1.3.2-beta/src/LabelDialog.h audacity-src-1.3.2-beta-wx28/src/LabelDialog.h +--- audacity-src-1.3.2-beta/src/LabelDialog.h 2006-10-29 01:05:28.000000000 +0200 ++++ audacity-src-1.3.2-beta-wx28/src/LabelDialog.h 2007-02-02 21:44:53.000000000 +0100 +@@ -59,6 +59,8 @@ + void OnChangeLabel(wxGridEvent &event, int row, RowData *rd); + void OnChangeStime(wxGridEvent &event, int row, RowData *rd); + void OnChangeEtime(wxGridEvent &event, int row, RowData *rd); ++ void OnOK(wxCommandEvent &event); ++ void OnCancel(wxCommandEvent &event); + + private: + +diff -Naur audacity-src-1.3.2-beta/src/Languages.h audacity-src-1.3.2-beta-wx28/src/Languages.h +--- audacity-src-1.3.2-beta/src/Languages.h 2006-10-29 01:05:28.000000000 +0200 ++++ audacity-src-1.3.2-beta-wx28/src/Languages.h 2007-02-02 22:14:38.000000000 +0100 +@@ -11,6 +11,7 @@ + #ifndef __AUDACITY_LANGUAGES__ + #define __AUDACITY_LANGUAGES__ + ++#include + #include + #include + +diff -Naur audacity-src-1.3.2-beta/src/Prefs.cpp audacity-src-1.3.2-beta-wx28/src/Prefs.cpp +--- audacity-src-1.3.2-beta/src/Prefs.cpp 2006-10-29 01:05:29.000000000 +0200 ++++ audacity-src-1.3.2-beta-wx28/src/Prefs.cpp 2007-02-02 21:48:16.000000000 +0100 +@@ -179,7 +179,7 @@ + gPrefs->Write(wxT("/NewPrefsInitialized"), true); + } + +- gPrefs->Write(wxT("/Version"), wxString(wxT(AUDACITY_VERSION_STRING))); ++ gPrefs->Write(wxT("/Version"), wxString(AUDACITY_VERSION_STRING)); + + // BG: Make sure the users prefs are up to date + // BG: Otherwise reset some of them to their defaults +diff -Naur audacity-src-1.3.2-beta/src/ShuttleGui.cpp audacity-src-1.3.2-beta-wx28/src/ShuttleGui.cpp +--- audacity-src-1.3.2-beta/src/ShuttleGui.cpp 2006-10-29 01:05:26.000000000 +0200 ++++ audacity-src-1.3.2-beta-wx28/src/ShuttleGui.cpp 2007-02-02 22:05:04.000000000 +0100 +@@ -98,6 +98,7 @@ + #include + #include + #include ++#include + #include + #include "Internat.h" + #include "Experimental.h" +diff -Naur audacity-src-1.3.2-beta/src/toolbars/ControlToolBar.cpp audacity-src-1.3.2-beta-wx28/src/toolbars/ControlToolBar.cpp +--- audacity-src-1.3.2-beta/src/toolbars/ControlToolBar.cpp 2006-10-29 01:05:28.000000000 +0200 ++++ audacity-src-1.3.2-beta-wx28/src/toolbars/ControlToolBar.cpp 2007-02-03 00:01:21.000000000 +0100 +@@ -159,7 +159,7 @@ + wxImage * down2 = OverlayImage(bmpRecoloredDownLarge, bmpLoop, xoff + 1, yoff + 1); + wxImage * disable2 = OverlayImage(bmpRecoloredUpLarge, bmpLoopDisabled, xoff, yoff); + +- mPlay->SetAlternateImages(up2, hilite2, down2, disable2); ++ mPlay->SetAlternateImages(*up2, *hilite2, *down2, *disable2); + + delete up2; + delete hilite2; +diff -Naur audacity-src-1.3.2-beta/src/toolbars/ToolBar.cpp audacity-src-1.3.2-beta-wx28/src/toolbars/ToolBar.cpp +--- audacity-src-1.3.2-beta/src/toolbars/ToolBar.cpp 2006-10-29 01:05:28.000000000 +0200 ++++ audacity-src-1.3.2-beta-wx28/src/toolbars/ToolBar.cpp 2007-02-03 00:03:14.000000000 +0100 +@@ -34,6 +34,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -442,8 +443,8 @@ + wxImage * disable2 = OverlayImage(eUp, eDisabled, xoff, yoff); + + AButton * button = +- new AButton(this, id, placement, size, up2, hilite2, down2, +- disable2, processdownevents); ++ new AButton(this, id, placement, size, *up2, *hilite2, *down2, ++ *disable2, processdownevents); + + delete up2; + delete down2; +diff -Naur audacity-src-1.3.2-beta/src/toolbars/ToolManager.cpp audacity-src-1.3.2-beta-wx28/src/toolbars/ToolManager.cpp +--- audacity-src-1.3.2-beta/src/toolbars/ToolManager.cpp 2006-10-29 01:05:28.000000000 +0200 ++++ audacity-src-1.3.2-beta-wx28/src/toolbars/ToolManager.cpp 2007-02-03 00:05:13.000000000 +0100 +@@ -527,7 +527,7 @@ + if( width[ ndx ] != -1 && height[ ndx ] != -1 ) + { + wxSize sz( width[ ndx ], height[ ndx ] ); +- f->SetMinSize( sz ); ++ f->SetSizeHints( sz ); + f->SetSize( sz ); + f->Layout(); + } +diff -Naur audacity-src-1.3.2-beta/src/TrackArtist.cpp audacity-src-1.3.2-beta-wx28/src/TrackArtist.cpp +--- audacity-src-1.3.2-beta/src/TrackArtist.cpp 2006-10-29 01:05:28.000000000 +0200 ++++ audacity-src-1.3.2-beta-wx28/src/TrackArtist.cpp 2007-02-02 22:37:30.000000000 +0100 +@@ -1136,7 +1136,7 @@ + // from now on is drawn using ordinary wxWindows drawing code. + + #if BUFFERED_DRAWING +- wxBitmap *bitmap = new wxBitmap(image); ++ wxBitmap *bitmap = new wxBitmap(*image); + wxMemoryDC *bitmapDC = new wxMemoryDC(); + bitmapDC->SelectObject(*bitmap); + dc.Blit(mid.x, mid.y, drawRect.width, drawRect.height, +@@ -1451,7 +1451,7 @@ + // screen, so remember the display rectangle. + clip->SetDisplayRect(mid); + +- wxBitmap converted = wxBitmap(image); ++ wxBitmap converted = wxBitmap(*image); + + wxMemoryDC memDC; + +diff -Naur audacity-src-1.3.2-beta/src/Track.cpp audacity-src-1.3.2-beta-wx28/src/Track.cpp +--- audacity-src-1.3.2-beta/src/Track.cpp 2006-10-29 01:05:28.000000000 +0200 ++++ audacity-src-1.3.2-beta-wx28/src/Track.cpp 2007-02-02 22:50:21.000000000 +0100 +@@ -569,10 +569,10 @@ + // get the sum of the sizes of all blocks this track list + // references. However, if a block is referred to multiple + // times it is only counted once. Return value is in bytes +-unsigned int TrackList::GetSpaceUsage() ++wxLongLong TrackList::GetSpaceUsage() + { + // the map guarantees that I only count each block once +- std::map blockFiles; ++ std::map blockFiles; + for (TrackListNode *p = head; p; p = p->next) { + if (p->t->GetKind() == Track::Wave) { + WaveTrack* track = ((WaveTrack*)p->t); +@@ -586,8 +586,8 @@ + } + } + +- std::map::const_iterator bfIter; +- unsigned int bytes = 0; ++ std::map::const_iterator bfIter; ++ wxLongLong bytes = 0; + for (bfIter = blockFiles.begin(); bfIter != blockFiles.end(); bfIter++) + bytes += bfIter->second; + +@@ -602,11 +602,11 @@ + // Computed by getting a list of all blocks referenced by + // *this* TrackList and removing all blocks referenced by + // any previous TrackList. +-unsigned int TrackList::GetAdditionalSpaceUsage(UndoStack *stack) ++wxLongLong TrackList::GetAdditionalSpaceUsage(UndoStack *stack) + { + TrackListNode *p; + // get a map of all blocks referenced in this TrackList +- std::map curBlockFiles; ++ std::map curBlockFiles; + for (p = head; p; p = p->next) { + if (p->t->GetKind() == Track::Wave) { + WaveTrack* track = ((WaveTrack*)p->t); +@@ -647,9 +647,9 @@ + curBlockFiles.erase(*prevIter); + + // sum the sizes of the blocks remaining in curBlockFiles; +- std::map::const_iterator curBfIter = ++ std::map::const_iterator curBfIter = + curBlockFiles.begin(); +- unsigned int bytes = 0; ++ wxLongLong bytes = 0; + for (;curBfIter != curBlockFiles.end(); curBfIter++) + bytes += curBfIter->second; + +diff -Naur audacity-src-1.3.2-beta/src/Track.h audacity-src-1.3.2-beta-wx28/src/Track.h +--- audacity-src-1.3.2-beta/src/Track.h 2006-10-29 01:05:28.000000000 +0200 ++++ audacity-src-1.3.2-beta-wx28/src/Track.h 2007-02-02 22:51:19.000000000 +0100 +@@ -13,6 +13,7 @@ + + #include + #include ++#include + + #include "SampleFormat.h" + #include "xml/XMLTagHandler.h" +@@ -238,8 +239,8 @@ + virtual bool Save(wxTextFile * out, bool overwrite); + #endif + +- unsigned int GetSpaceUsage(); +- unsigned int GetAdditionalSpaceUsage(UndoStack *stack); ++ wxLongLong GetSpaceUsage(); ++ wxLongLong GetAdditionalSpaceUsage(UndoStack *stack); + private: + void Swap(TrackListNode * s1, TrackListNode * s2); + +diff -Naur audacity-src-1.3.2-beta/src/UndoManager.cpp audacity-src-1.3.2-beta-wx28/src/UndoManager.cpp +--- audacity-src-1.3.2-beta/src/UndoManager.cpp 2006-10-29 01:05:27.000000000 +0200 ++++ audacity-src-1.3.2-beta-wx28/src/UndoManager.cpp 2007-02-02 22:39:21.000000000 +0100 +@@ -50,7 +50,7 @@ + n -= 1; // 1 based to zero based + + wxASSERT(n < stack.Count()); +- double bytes; ++ wxLongLong bytes; + + *desc = stack[n]->description; + +diff -Naur audacity-src-1.3.2-beta/src/widgets/ASlider.cpp audacity-src-1.3.2-beta-wx28/src/widgets/ASlider.cpp +--- audacity-src-1.3.2-beta/src/widgets/ASlider.cpp 2006-10-29 01:05:28.000000000 +0200 ++++ audacity-src-1.3.2-beta-wx28/src/widgets/ASlider.cpp 2007-02-03 01:18:21.000000000 +0100 +@@ -728,13 +728,17 @@ + break; + + case WXK_PAGEUP: ++#if !wxCHECK_VERSION(2,7,0) + case WXK_PRIOR: ++#endif + Increase( 5 ); + SendUpdate( mCurrentValue ); + break; + + case WXK_PAGEDOWN: ++#if !wxCHECK_VERSION(2,7,0) + case WXK_NEXT: ++#endif + Decrease( 5 ); + SendUpdate( mCurrentValue ); + break; +@@ -761,11 +765,12 @@ + case WXK_RETURN: + case WXK_NUMPAD_ENTER: + { +- wxWindow *def = mParent->GetParent()->GetDefaultItem(); +- if (def) { ++ wxTopLevelWindow *tlw = wxDynamicCast(wxGetTopLevelParent(mParent), wxTopLevelWindow); ++ wxWindow *def = tlw->GetDefaultItem(); ++ if (def && def->IsEnabled()) { + wxCommandEvent cevent(wxEVT_COMMAND_BUTTON_CLICKED, + def->GetId()); +- mParent->ProcessEvent( cevent ); ++ mParent->ProcessEvent(cevent); + } + } + +diff -Naur audacity-src-1.3.2-beta/src/widgets/ImageRoll.cpp audacity-src-1.3.2-beta-wx28/src/widgets/ImageRoll.cpp +--- audacity-src-1.3.2-beta/src/widgets/ImageRoll.cpp 2006-10-29 01:05:28.000000000 +0200 ++++ audacity-src-1.3.2-beta-wx28/src/widgets/ImageRoll.cpp 2007-02-03 00:11:30.000000000 +0100 +@@ -267,6 +267,14 @@ + mMaxSize.y = src.GetHeight(); + break; + ++ /* Adding these shuts up some GCC warnings. It is functionally what was ++ * implict here before - Richard */ ++ case Uninitialized: ++ break; ++ ++ case Frame: ++ break; ++ + } // switch + } + +@@ -394,6 +402,13 @@ + case FixedImage: + DrawBitmap(dc, mPieces[0], rect.x, rect.y); + break; ++ /* the other possible cases don't really make sense, but not having them ++ * listed gives a GCC warning */ ++ case Uninitialized: ++ break; ++ ++ case Frame: ++ break; + + } // switch + } +diff -Naur audacity-src-1.3.2-beta/src/widgets/Ruler.cpp audacity-src-1.3.2-beta-wx28/src/widgets/Ruler.cpp +--- audacity-src-1.3.2-beta/src/widgets/Ruler.cpp 2006-10-29 01:05:28.000000000 +0200 ++++ audacity-src-1.3.2-beta-wx28/src/widgets/Ruler.cpp 2007-02-03 00:12:26.000000000 +0100 +@@ -60,6 +60,7 @@ + #include + #include + #include ++#include + + #include "../Internat.h" + #include "../Project.h" +diff -Naur audacity-src-1.3.2-beta/src/widgets/TimeTextCtrl.cpp audacity-src-1.3.2-beta-wx28/src/widgets/TimeTextCtrl.cpp +--- audacity-src-1.3.2-beta/src/widgets/TimeTextCtrl.cpp 2006-10-29 01:05:28.000000000 +0200 ++++ audacity-src-1.3.2-beta-wx28/src/widgets/TimeTextCtrl.cpp 2007-02-03 00:13:37.000000000 +0100 +@@ -166,6 +166,7 @@ + #include + #include + #include ++#include + + #define ID_MENU 9800 + +@@ -980,8 +981,8 @@ + } + + else if (keyCode == WXK_RETURN || keyCode == WXK_NUMPAD_ENTER) { +- wxWindow *parent = GetParent(); +- wxWindow *def = parent->GetDefaultItem(); ++ wxTopLevelWindow *tlw = wxDynamicCast(wxGetTopLevelParent(this), wxTopLevelWindow); ++ wxWindow *def = tlw->GetDefaultItem(); + if (def && def->IsEnabled()) { + wxCommandEvent cevent(wxEVT_COMMAND_BUTTON_CLICKED, + def->GetId()); +diff -Naur audacity-src-1.3.2-beta/src/widgets/treebook.cpp audacity-src-1.3.2-beta-wx28/src/widgets/treebook.cpp +--- audacity-src-1.3.2-beta/src/widgets/treebook.cpp 2006-10-29 01:05:28.000000000 +0200 ++++ audacity-src-1.3.2-beta-wx28/src/widgets/treebook.cpp 2007-02-03 00:14:47.000000000 +0100 +@@ -54,7 +54,11 @@ + // ============================================================================ + // wxTreebook implementation + // ============================================================================ ++#if wxCHECK_VERSION(2,7,0) ++WX_DELEGATE_TO_CONTROL_CONTAINER(wxTreebook, wxWindow) ++#else + WX_DELEGATE_TO_CONTROL_CONTAINER(wxTreebook) ++#endif + + // ---------------------------------------------------------------------------- + // wxTreebook creation +@@ -509,4 +513,4 @@ + { + //return m_list->SetItemImage(n, imageId); + return false; +-} +\ Kein Zeilenumbruch am Dateiende. ++} +diff -Naur audacity-src-1.3.2-beta/src/widgets/treebook.h audacity-src-1.3.2-beta-wx28/src/widgets/treebook.h +--- audacity-src-1.3.2-beta/src/widgets/treebook.h 2006-10-29 01:05:28.000000000 +0200 ++++ audacity-src-1.3.2-beta-wx28/src/widgets/treebook.h 2007-02-03 00:15:54.000000000 +0100 +@@ -80,7 +80,8 @@ + { + return InsertPage(GetRootItem(), n, page, text, bSelect, imageId).IsOk(); + } +- virtual int SetSelection(size_t n); ++ virtual int SetSelection(size_t n); ++ int ChangeSelection(size_t n) { return SetSelection(n); }; + + // returns true if we have wxLB_TOP or wxLB_BOTTOM style + bool IsVertical() const { return HasFlag(wxLB_BOTTOM | wxLB_TOP); } } From krics at linuxforum.hu Sat Feb 3 02:51:45 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sat Feb 3 02:51:47 2007 Subject: [Frugalware-darcs] frugalware-current: gnome-panel-2.17.90-1-x86_64 Message-ID: <20070203015145.85D0D13A400E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203015045-d209c-bd0e80fd7c1821b40d5fbdd08970704b24637369.gz; [gnome-panel-2.17.90-1-x86_64 Christian Hamar alias krix **20070203015045 * Version bump ] { hunk ./source/gnome/gnome-panel/FrugalBuild 5 -pkgver=2.16.2 -pkgrel=2 +pkgver=2.17.90 +pkgrel=1 hunk ./source/gnome/gnome-panel/FrugalBuild 9 -rodepends=('alacarte>=0.10.1') -depends=('gnome-desktop>=2.17.5' 'gnome-menus>=2.17.5' 'libwnck>=2.16.2' \ - 'gnome-vfs>=2.16.2' 'evolution-data-server>=1.9.5' \ +rodepends=('alacarte>=0.11.1.1') +depends=('gnome-desktop>=2.17.90' 'gnome-menus>=2.17.5' 'libwnck>=2.16.3' \ + 'gnome-vfs>=2.17.90' 'evolution-data-server>=1.9.6.1' \ hunk ./source/gnome/gnome-panel/FrugalBuild 13 -makedepends=('intltool' 'gtk-doc' 'gnome-doc-utils>=0.8.0') +makedepends=('intltool' 'gtk-doc' 'gnome-doc-utils>=0.9.2') hunk ./source/gnome/gnome-panel/FrugalBuild 28 -sha1sums=('b01ca1610fb4f78a00aee9c0f48c305b5ea605ce') hunk ./source/gnome/gnome-panel/FrugalBuild 40 +sha1sums=('4c61aa2183be7bdfd747f7857b91e707375a06eb') } From krics at linuxforum.hu Sat Feb 3 03:04:50 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sat Feb 3 03:04:52 2007 Subject: [Frugalware-darcs] frugalware-current: eel-2.17.90-1-x86_64 Message-ID: <20070203020450.3BC9413A400E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203020415-d209c-5c65d6a9d1583fa0b549b63b34196e27f5b38bac.gz; [eel-2.17.90-1-x86_64 Christian Hamar alias krix **20070203020415 * Version bump ] { hunk ./source/gnome/eel/FrugalBuild 5 -pkgver=2.17.1 +pkgver=2.17.90 hunk ./source/gnome/eel/FrugalBuild 9 -depends=('gail>=1.9.4' 'gnome-menus>=2.17.2' 'gnome-desktop>=2.17.2') +depends=('gail>=1.10.1' 'gnome-menus>=2.17.5' 'gnome-desktop>=2.17.90') hunk ./source/gnome/eel/FrugalBuild 14 -sha1sums=('b2ff402843f7587166d77bed4b80e14c86fb657c') hunk ./source/gnome/eel/FrugalBuild 15 +sha1sums=('8e35f1777b553c0020d24c327dd8bb51b7677717') } From krics at linuxforum.hu Sat Feb 3 03:28:32 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sat Feb 3 03:28:39 2007 Subject: [Frugalware-darcs] frugalware-current: nautilus-2.17.90-1-x86_64 Message-ID: <20070203022832.7775313A400E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203022754-d209c-6ea6b937a11fdd50bc4872b59337198040823f6a.gz; [nautilus-2.17.90-1-x86_64 Christian Hamar alias krix **20070203022754 * Version bump ] { hunk ./source/gnome/nautilus/FrugalBuild 5 -pkgver=2.17.1 -pkgrel=4 +pkgver=2.17.90 +pkgrel=1 hunk ./source/gnome/nautilus/FrugalBuild 9 -depends=('eel>=2.17.1' 'librsvg>=2.16.0' 'libexif' 'eject' 'desktop-file-utils' 'libgnome>=2.17.1' 'gnome-vfs>=2.17.2') +depends=('eel>=2.17.90' 'librsvg>=2.16.0' 'libexif' 'eject' 'desktop-file-utils' 'libgnome>=2.17.90' 'gnome-vfs>=2.17.90') hunk ./source/gnome/nautilus/FrugalBuild 18 -sha1sums=('582302953db291250cbd886ec492788a13d9eaeb' \ - 'f328b08f6c92e2d2c5efb28fc6999d8f7ea60c5a') hunk ./source/gnome/nautilus/FrugalBuild 20 +sha1sums=('7da38e33125bdbf6c446c0f30b7e341991cc7ff3'\ + 'f328b08f6c92e2d2c5efb28fc6999d8f7ea60c5a') } From krics at linuxforum.hu Sat Feb 3 03:53:35 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sat Feb 3 03:53:37 2007 Subject: [Frugalware-darcs] frugalware-current: control-center-2.17.90-1-x86_64 Message-ID: <20070203025335.B39F313A48D8@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203025233-d209c-48b9d8d031b4edefe8ec49d6110a53561fd7d40e.gz; [control-center-2.17.90-1-x86_64 Christian Hamar alias krix **20070203025233 * Version bump ] { hunk ./source/gnome/control-center/FrugalBuild 5 -pkgver=2.17.5 -pkgrel=2 +pkgver=2.17.90 +pkgrel=1 hunk ./source/gnome/control-center/FrugalBuild 9 -depends=('gnome-desktop>=2.17.5' 'gnome-menus>=2.17.5' 'metacity>=2.17.1' 'libgnomekbd' \ - 'nautilus>=2.17.1-4' 'gst-plugins-base>=0.10.10-2' 'desktop-file-utils' \ - 'evolution-data-server>=1.9.5' 'libxxf86misc' 'libxscrnsaver' 'xrdb' \ - 'gnome-vfs>=2.16.1' 'gnome-panel>=2.16.0') -makedepends=('intltool' 'gnome-doc-utils>=0.8.0') +depends=('gnome-desktop>=2.17.90' 'gnome-menus>=2.17.5' 'metacity>=2.17.1' 'libgnomekbd' \ + 'nautilus>=2.17.90' 'gst-plugins-base>=0.10.10-2' 'desktop-file-utils' \ + 'evolution-data-server>=1.9.6.1' 'libxxf86misc' 'libxscrnsaver' 'xrdb' \ + 'gnome-vfs>=2.17.90' 'gnome-panel>=2.17.90') +makedepends=('intltool' 'gnome-doc-utils>=0.9.2') hunk ./source/gnome/control-center/FrugalBuild 28 -sha1sums=('79b077f039e28b41bb582f12a47b730453831d4d' \ - 'a82ee917b3096b9ef22974573714cab74e393b72') hunk ./source/gnome/control-center/FrugalBuild 39 +sha1sums=('e29a901f113a90baca6b9829c6af3b219557b7a3'\ + 'a82ee917b3096b9ef22974573714cab74e393b72') } From crazy at frugalware.org Sat Feb 3 13:53:23 2007 From: crazy at frugalware.org (crazy) Date: Sat Feb 3 13:53:26 2007 Subject: [Frugalware-darcs] frugalware-current: kernel-grsec-2.1.9-5-i686 Message-ID: <20070203125324.14BA413A400E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203124832-f6986-8792ec8232cf16acaf303d830e649ab81b182635.gz; [kernel-grsec-2.1.9-5-i686 crazy **20070203124832 * new m8r ] { hunk ./source/base-extra/kernel-grsec/FrugalBuild 2 -# Maintainer: Karoly CZOVEK +# Maintainer: crazy } From crazy at frugalware.org Sat Feb 3 13:53:23 2007 From: crazy at frugalware.org (crazy) Date: Sat Feb 3 13:53:27 2007 Subject: [Frugalware-darcs] frugalware-current: gradm-2.1.9-3-i686 Message-ID: <20070203125324.22E1113A48DB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203124934-f6986-6dbd7ea273b2ab73f25969b13fd50eb614f771af.gz; [gradm-2.1.9-3-i686 crazy **20070203124934 * new m8r ] { hunk ./source/base-extra/gradm/FrugalBuild 2 -# Maintainer: Karoly CZOVEK +# Maintainer: crazy } From krics at linuxforum.hu Sat Feb 3 14:18:28 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sat Feb 3 14:18:30 2007 Subject: [Frugalware-darcs] frugalware-current: libgnomeprint-2.17.90-1-x86_64 Message-ID: <20070203131828.654A413A48D8@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203131757-d209c-a89baf5c2c732a990c4350cf241282d44590bbda.gz; [libgnomeprint-2.17.90-1-x86_64 Christian Hamar alias krix **20070203131757 * Version bump ] { hunk ./source/gnome/libgnomeprint/FrugalBuild 5 -pkgver=2.17.0 +pkgver=2.17.90 hunk ./source/gnome/libgnomeprint/FrugalBuild 15 -sha1sums=('7deaa96c34b3e7d7af18d12432ba6839c3d2e957' \ - '6e76a279547af2631d3003e9dece6cf4f7fd81dd') hunk ./source/gnome/libgnomeprint/FrugalBuild 17 +sha1sums=('8a5cec322872f5f5e50b2358e460e6261e40a1ff'\ + '6e76a279547af2631d3003e9dece6cf4f7fd81dd') } From vmiklos at frugalware.org Sat Feb 3 14:27:07 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Feb 3 14:27:10 2007 Subject: [Frugalware-darcs] frugalware-current: java-gcj-compat-1.0.69-1-i686 Message-ID: <20070203132707.F244A13A400E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203132601-e2957-0efdc4db9dc74c20d4f20395a96e5099a4331c58.gz; [java-gcj-compat-1.0.69-1-i686 VMiklos **20070203132601 version bump fake version is now 1.5.0 ] { hunk ./source/devel-extra/java-gcj-compat/FrugalBuild 5 -pkgver=1.0.68 -pkgrel=3 +pkgver=1.0.69 +pkgrel=1 hunk ./source/devel-extra/java-gcj-compat/FrugalBuild 19 + Fsed 'libgcj-tools' 'libgcj' Makefile.am + Fautoreconf hunk ./source/devel-extra/java-gcj-compat/FrugalBuild 22 - Fln jvm/java-1.4.2-gcj-1.4.2.0/lib/tools.jar /usr/lib/ + Fln jvm/java-1.5.0-gcj-1.5.0.0/lib/tools.jar /usr/lib/ hunk ./source/devel-extra/java-gcj-compat/FrugalBuild 32 +sha1sums=('41c56601fe668b82167221812e275bcfd00afe74'\ + '73c1f3cc2db4f63cb051e65f0c664358289e9f13') hunk ./source/devel-extra/java-gcj-compat/FrugalBuild 36 -sha1sums=('5b81c2ef22d7e1becb070dec08e462f57082377c' \ - '73c1f3cc2db4f63cb051e65f0c664358289e9f13') } From krics at linuxforum.hu Sat Feb 3 14:28:16 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sat Feb 3 14:28:18 2007 Subject: [Frugalware-darcs] frugalware-current: libgnomeprintui-2.17.90-1-x86_64 Message-ID: <20070203132816.3649013A48DB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203132724-d209c-a70393ffae05c2b2129cb2891b4978a6a300f000.gz; [libgnomeprintui-2.17.90-1-x86_64 Christian Hamar alias krix **20070203132724 * Version bump ] { hunk ./source/gnome/libgnomeprintui/FrugalBuild 5 -pkgver=2.17.0 +pkgver=2.17.90 hunk ./source/gnome/libgnomeprintui/FrugalBuild 9 -depends=('libgnomeprint>=2.17.0' 'libgnomecanvas' 'gnome-icon-theme') +depends=('libgnomeprint>=2.17.90' 'libgnomecanvas' 'gnome-icon-theme') hunk ./source/gnome/libgnomeprintui/FrugalBuild 14 -sha1sums=('6655e08fab2486cd45c132b16ebc50777a6c542d') hunk ./source/gnome/libgnomeprintui/FrugalBuild 16 +sha1sums=('182e1f0e92badc074be64734f9500560d7066379') } From crazy at frugalware.org Sat Feb 3 14:47:10 2007 From: crazy at frugalware.org (crazy) Date: Sat Feb 3 14:47:16 2007 Subject: [Frugalware-darcs] frugalware-current: kavi2svcd-0.8.7-1-i686 Message-ID: <20070203134710.E473213A400E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203132831-f6986-05a84531075f87b7332e68ca65f09cee22be9c83.gz; [kavi2svcd-0.8.7-1-i686 crazy **20070203132831 * Fix Finclude kde and url ] { hunk ./source/kde-extra/kavi2svcd/FrugalBuild 9 -url="http://www.cornelinux.de/web/linux/kavi2svcd/" hunk ./source/kde-extra/kavi2svcd/FrugalBuild 13 -Finclude sourceforge kdeapps +_F_kde_defaults=0 +Finclude sourceforge kde +url="http://www.cornelinux.de/web/linux/kavi2svcd/" } From crazy at frugalware.org Sat Feb 3 14:47:13 2007 From: crazy at frugalware.org (crazy) Date: Sat Feb 3 14:47:17 2007 Subject: [Frugalware-darcs] frugalware-current: kasablanca-0.4.0.2-1-i686 Message-ID: <20070203134713.E290D13A4ED8@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203132545-f6986-3efc585c2484a28689f5d5c0262e991c2a51b7b7.gz; [kasablanca-0.4.0.2-1-i686 crazy **20070203132545 * Fix Finclude kde ] { hunk ./source/kde-extra/kasablanca/FrugalBuild 8 -Finclude berlios kdeapps +_F_kde_defaults=0 +Finclude berlios kde hunk ./source/kde-extra/kasablanca/FrugalBuild 15 -options=('scriptlet') } From crazy at frugalware.org Sat Feb 3 14:47:14 2007 From: crazy at frugalware.org (crazy) Date: Sat Feb 3 14:47:17 2007 Subject: [Frugalware-darcs] frugalware-current: k9copy-1.0.4_2-2-i686 Message-ID: <20070203134714.93F1F13A4ED8@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203132232-f6986-aabc486a93257fb1ffcc605eb86bd07e19ab4c63.gz; [k9copy-1.0.4_2-2-i686 crazy **20070203132232 * Fix Finclude kde and url ] { hunk ./source/kde-extra/k9copy/FrugalBuild 9 -url="http://k9copy.sourceforge.net/index.php" hunk ./source/kde-extra/k9copy/FrugalBuild 13 -Finclude sourceforge kdeapps +_F_kde_defaults=0 +Finclude sourceforge kde +url="http://k9copy.sourceforge.net/index.php" } From crazy at frugalware.org Sat Feb 3 14:47:16 2007 From: crazy at frugalware.org (crazy) Date: Sat Feb 3 14:47:22 2007 Subject: [Frugalware-darcs] frugalware-current: gwenview-1.4.1-2-i686 Message-ID: <20070203134717.27E0713A4ED9@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203132114-f6986-3f50152ef3110ca6bcfac9c9f85d4370e1fc797a.gz; [gwenview-1.4.1-2-i686 crazy **20070203132114 * Fix Finclude kde ] { hunk ./source/kde-extra/gwenview/FrugalBuild 12 -Finclude sourceforge kdeapps -Fconfopts="$Fconfopts --with-kipi --with-gnu-ld --enable-gcc-hidden-visibility" +_F_kde_defaults=0 +Finclude sourceforge kde +Fconfopts="$Fconfopts --with-kipi" } From crazy at frugalware.org Sat Feb 3 14:47:21 2007 From: crazy at frugalware.org (crazy) Date: Sat Feb 3 14:47:25 2007 Subject: [Frugalware-darcs] frugalware-current: koctave-0.70-1-i686 Message-ID: <20070203134722.1C5A413A5135@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203133920-f6986-fa6a53d64d26ccb8739a94996cc561a0adb34670.gz; [koctave-0.70-1-i686 crazy **20070203133920 * Fix Finclude kde ] { hunk ./source/kde-extra/koctave/FrugalBuild 11 -Finclude sourceforge kdeapps +_F_kde_defaults=0 +Finclude sourceforge kde } From crazy at frugalware.org Sat Feb 3 14:47:23 2007 From: crazy at frugalware.org (crazy) Date: Sat Feb 3 14:47:27 2007 Subject: [Frugalware-darcs] frugalware-current: kplayer-0.6.0-2-i686 Message-ID: <20070203134723.B465B13A5136@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203134222-f6986-be3d811df33a520f238fe23f51f69b231c4826c2.gz; [kplayer-0.6.0-2-i686 crazy **20070203134222 * Fix Finclude kde ] { hunk ./source/kde-extra/kplayer/FrugalBuild 15 -Finclude sourceforge kdeapps +_F_kde_defaults=0 +Finclude sourceforge kde } From crazy at frugalware.org Sat Feb 3 14:47:24 2007 From: crazy at frugalware.org (crazy) Date: Sat Feb 3 14:47:29 2007 Subject: [Frugalware-darcs] frugalware-current: klibido-0.2.5-3-i686 Message-ID: <20070203134724.73B2B13A5135@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203133209-f6986-e5fcdb2cd0d47df355d82085dce7d501e21ceee8.gz; [klibido-0.2.5-3-i686 crazy **20070203133209 * Fix Finclude kde ] { hunk ./source/kde-extra/klibido/FrugalBuild 8 -url="http://klibido.sourceforge.net/" hunk ./source/kde-extra/klibido/FrugalBuild 11 -Finclude sourceforge kdeapps +_F_kde_defaults=0 +Finclude sourceforge kde } From krics at linuxforum.hu Sat Feb 3 14:47:29 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sat Feb 3 14:47:32 2007 Subject: [Frugalware-darcs] frugalware-current: gnome-session-2.17.90.1-1-x86_64 Message-ID: <20070203134730.25CC613A5141@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203134655-d209c-8baa51a853550b39981b931062f4e5751e671303.gz; [gnome-session-2.17.90.1-1-x86_64 Christian Hamar alias krix **20070203134655 * Version bump ] { hunk ./source/gnome/gnome-session/FrugalBuild 7 -pkgver=2.17.5 +pkgver=2.17.90.1 hunk ./source/gnome/gnome-session/FrugalBuild 11 -depends=('libgnomeui>=2.17.1' 'gnome-desktop>=2.17.5' \ - 'dbus-glib>=0.71' 'control-center>=2.17.5-2' 'gnome-vfs>=2.16.2' \ +depends=('libgnomeui>=2.17.90' 'gnome-desktop>=2.17.90' \ + 'dbus-glib>=0.71' 'control-center>=2.17.90' 'gnome-vfs>=2.17.90' \ hunk ./source/gnome/gnome-session/FrugalBuild 23 -sha1sums=('cd6a23b71609c41b2611c2350952e5950c6172cb' \ - 'd45d51203dc7ad290b12bc70281d59844a79be75' \ - 'cde258937505af49a68f235749584ab8fed78693' \ - 'eedaff2af08bfc28ffc029ae35ec3b1c54ccf7cd' \ - '2ac5fb404a42548afd9dfbe0478ca1027bebd58c' \ - '97585abf9d468e532422af3daceb42b61d832a13' \ - 'beaaad2f2949d091a588539c99085f2f242f0d34' \ - 'c96f814d29ae8805ee27852da795b489928e8d3c') hunk ./source/gnome/gnome-session/FrugalBuild 39 +sha1sums=('b0ad3d3a548b9f1111949e4c8622287aee24f997'\ + 'd45d51203dc7ad290b12bc70281d59844a79be75'\ + 'cde258937505af49a68f235749584ab8fed78693'\ + 'eedaff2af08bfc28ffc029ae35ec3b1c54ccf7cd'\ + '2ac5fb404a42548afd9dfbe0478ca1027bebd58c'\ + '97585abf9d468e532422af3daceb42b61d832a13'\ + 'beaaad2f2949d091a588539c99085f2f242f0d34'\ + 'c96f814d29ae8805ee27852da795b489928e8d3c') } From crazy at frugalware.org Sat Feb 3 14:47:28 2007 From: crazy at frugalware.org (crazy) Date: Sat Feb 3 14:47:32 2007 Subject: [Frugalware-darcs] frugalware-current: kdbg-2.0.5-1-i686 Message-ID: <20070203134730.355C713A513E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203132952-f6986-6d7050aa76bfc518383de2ee1a077b1540dedb88.gz; [kdbg-2.0.5-1-i686 crazy **20070203132952 * Fix Finclude kde ] { hunk ./source/kde-extra/kdbg/FrugalBuild 8 -url="http://members.nextra.at/johsixt/kdbg.html" hunk ./source/kde-extra/kdbg/FrugalBuild 11 -options=('scriptlet') -Finclude sourceforge kdeapps +_F_kde_defaults=0 +Finclude sourceforge kde +url="http://members.nextra.at/johsixt/kdbg.html" } From crazy at frugalware.org Sat Feb 3 14:47:30 2007 From: crazy at frugalware.org (crazy) Date: Sat Feb 3 14:47:38 2007 Subject: [Frugalware-darcs] frugalware-current: kdenlive-0.4-1-i686 Message-ID: <20070203134730.EDC9013A5141@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203133058-f6986-aba4bcb2cf49c8ecafa33a291579ba05dcaa153d.gz; [kdenlive-0.4-1-i686 crazy **20070203133058 * Fix Finclude kde ] { hunk ./source/kde-extra/kdenlive/FrugalBuild 4 - hunk ./source/kde-extra/kdenlive/FrugalBuild 10 -options=('scriptlet') -Finclude sourceforge kdeapps +_F_kde_defaults=0 +Finclude sourceforge kde } From crazy at frugalware.org Sat Feb 3 14:47:32 2007 From: crazy at frugalware.org (crazy) Date: Sat Feb 3 14:47:41 2007 Subject: [Frugalware-darcs] frugalware-current: kmobiletools-0.5_beta1-1-i686 Message-ID: <20070203134732.D47F713A514B@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203133320-f6986-a0e49e96703b2db31cfd53632e3cc44d7c732cab.gz; [kmobiletools-0.5_beta1-1-i686 crazy **20070203133320 *Fix Finclude kde ] { hunk ./source/kde-extra/kmobiletools/FrugalBuild 15 -Finclude berlios kdeapps +_F_kde_defaults=0 +Finclude berlios kde } From crazy at frugalware.org Sat Feb 3 14:47:33 2007 From: crazy at frugalware.org (crazy) Date: Sat Feb 3 14:47:42 2007 Subject: [Frugalware-darcs] frugalware-current: kmymoney2-0.8.5-2-i686 Message-ID: <20070203134733.8585E13A5142@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203133434-f6986-9076c4feca5360f7c45f96b06a69329648b3d6ad.gz; [kmymoney2-0.8.5-2-i686 crazy **20070203133434 * Fix Finclude kde ] { hunk ./source/kde-extra/kmymoney2/FrugalBuild 14 -Finclude sourceforge kdeapps -Fconfopts="$Fconfopts --enable-finale --enable-gcc-hidden-visibility" +_F_kde_defaults=0 +Finclude sourceforge kde } From crazy at frugalware.org Sat Feb 3 14:47:33 2007 From: crazy at frugalware.org (crazy) Date: Sat Feb 3 14:47:43 2007 Subject: [Frugalware-darcs] frugalware-current: bibletime-1.6.2-1-i686 Message-ID: <20070203134733.D3EEC13A514B@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203131751-f6986-a6a5d3a06b107a72311ea1a83a61ae0b0a440f13.gz; [bibletime-1.6.2-1-i686 crazy **20070203131751 * Fix Finclude kde ] { hunk ./source/kde-extra/bibletime/FrugalBuild 14 -Finclude sourceforge kdeapps +_F_kde_defaults=0 +Finclude sourceforge kde } From crazy at frugalware.org Sat Feb 3 14:47:34 2007 From: crazy at frugalware.org (crazy) Date: Sat Feb 3 14:47:45 2007 Subject: [Frugalware-darcs] frugalware-current: digikam-0.9.0-1-i686 Message-ID: <20070203134734.5F30213A512E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203131957-f6986-eb588a20108730149a0edabc72290df252eb2eb8.gz; [digikam-0.9.0-1-i686 crazy **20070203131957 * Fix Finclude kde ] { hunk ./source/kde-extra/digikam/FrugalBuild 16 -Finclude sourceforge kdeapps -Fconfopts="$Fconfopts --enable-gcc-hidden-visibility" +_F_kde_defaults=0 +Finclude sourceforge kde } From crazy at frugalware.org Sat Feb 3 14:47:35 2007 From: crazy at frugalware.org (crazy) Date: Sat Feb 3 14:47:49 2007 Subject: [Frugalware-darcs] frugalware-current: knetstats-1.6.1-1-i686 Message-ID: <20070203134735.3B3F313A512E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203133537-f6986-b967aa9b867aa20953f92e9793e9773d6b9ae99b.gz; [knetstats-1.6.1-1-i686 crazy **20070203133537 * Fix Finclude kde ] { hunk ./source/kde-extra/knetstats/FrugalBuild 12 -options=('scriptlet') hunk ./source/kde-extra/knetstats/FrugalBuild 14 -Finclude sourceforge kdeapps +_F_kde_defaults=0 +Finclude sourceforge kde } From crazy at frugalware.org Sat Feb 3 14:47:35 2007 From: crazy at frugalware.org (crazy) Date: Sat Feb 3 14:47:51 2007 Subject: [Frugalware-darcs] frugalware-current: konversation-1.0.1-1-i686 Message-ID: <20070203134735.CC90113A512E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203134049-f6986-986941e3d56304a19c0ce6d8b9dcc6c69ebf0129.gz; [konversation-1.0.1-1-i686 crazy **20070203134049 * Fix Finclude kde ] { hunk ./source/kde-extra/konversation/FrugalBuild 10 -Finclude berlios kdeapps +_F_kde_defaults=0 +Finclude berlios kde hunk ./source/kde-extra/konversation/FrugalBuild 16 -options=('scriptlet') } From crazy at frugalware.org Sat Feb 3 14:47:36 2007 From: crazy at frugalware.org (crazy) Date: Sat Feb 3 14:47:52 2007 Subject: [Frugalware-darcs] frugalware-current: knoda-0.8.3-1-i686 Message-ID: <20070203134736.5101113A514D@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203133754-f6986-c18d86f17dcc6ea203556a2bbf03a416d4cd386b.gz; [knoda-0.8.3-1-i686 crazy **20070203133754 * Fix Finclude kde * removed up2date line ( use the _F_sourceforge_* one ) ] { hunk ./source/kde-extra/knoda/FrugalBuild 14 -Finclude sourceforge kdeapps -up2date="lynx -dump 'http://knoda.sourceforge.net/tiki-page.php?pageName=Download'|grep -o 'knoda-[0-9\.]\+'|sed 's/knoda-//'" +_F_sourceforge_broken_up2date=1 +_F_kde_defaults=0 +Finclude sourceforge kde } From crazy at frugalware.org Sat Feb 3 14:47:37 2007 From: crazy at frugalware.org (crazy) Date: Sat Feb 3 14:47:54 2007 Subject: [Frugalware-darcs] frugalware-current: kalgebra-20060501-1-i686 Message-ID: <20070203134737.168FC13A514E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203132356-f6986-b8447312939b5ff5a0274dadb78b5cf43e4c5cec.gz; [kalgebra-20060501-1-i686 crazy **20070203132356 * Fix Finclude kde and url ] { hunk ./source/kde-extra/kalgebra/FrugalBuild 9 -url="http://kalgebra.berlios.de/" hunk ./source/kde-extra/kalgebra/FrugalBuild 14 -Finclude berlios kdeapps +_F_kde_defaults=0 +Finclude berlios kde } From crazy at frugalware.org Sat Feb 3 14:47:39 2007 From: crazy at frugalware.org (crazy) Date: Sat Feb 3 14:47:59 2007 Subject: [Frugalware-darcs] frugalware-current: katapult-0.3.1.4-1-i686 Message-ID: <20070203134740.DDAAC13A515C@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203132701-f6986-313256800e833125b06e3d74b4611d217ef9f727.gz; [katapult-0.3.1.4-1-i686 crazy **20070203132701 * Fix Finclude kde ] { hunk ./source/kde-extra/katapult/FrugalBuild 8 -url="http://www.thekatapult.org.uk/wiki/index.php?title=Home" hunk ./source/kde-extra/katapult/FrugalBuild 10 -Finclude sourceforge kdeapps +_F_kde_defaults=0 +Finclude sourceforge kde +url="http://www.thekatapult.org.uk/wiki/index.php?title=Home" } From krics at linuxforum.hu Sat Feb 3 14:57:49 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sat Feb 3 14:57:57 2007 Subject: [Frugalware-darcs] frugalware-current: gcalctool-5.9.11-1-x86_64 Message-ID: <20070203135749.9AEC413A400E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203135702-d209c-a022f9851f41f518a72db598572cd4343fec872e.gz; [gcalctool-5.9.11-1-x86_64 Christian Hamar alias krix **20070203135702 * Version bump ] { hunk ./source/gnome/gcalctool/FrugalBuild 5 -pkgver=5.9.10 +pkgver=5.9.11 hunk ./source/gnome/gcalctool/FrugalBuild 9 -depends=('libgnomeui>=2.17.1' 'scrollkeeper' 'libbonobo') -makedepends=('intltool' 'gnome-doc-utils>=0.8.0') +depends=('libgnomeui>=2.17.90' 'scrollkeeper' 'libbonobo>=2.17.90') +makedepends=('intltool' 'gnome-doc-utils>=0.9.2') hunk ./source/gnome/gcalctool/FrugalBuild 18 -sha1sums=('1d713f67c485f1e5033c4da190228c5907abf30f') hunk ./source/gnome/gcalctool/FrugalBuild 19 +sha1sums=('e4d1ac9bcc515a49b5913f9e3c6993e219efcdb8') } From crazy at frugalware.org Sat Feb 3 15:01:56 2007 From: crazy at frugalware.org (crazy) Date: Sat Feb 3 15:02:03 2007 Subject: [Frugalware-darcs] frugalware-current: libkexif-0.2.5-1-i686 Message-ID: <20070203140157.48D7613A512A@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203135239-f6986-7dddaa2d17198e2c1a6673e57787760e472c9411.gz; [libkexif-0.2.5-1-i686 crazy **20070203135239 * Fix Finclude kde ] { hunk ./source/kde-extra/libkexif/FrugalBuild 14 -Finclude sourceforge kdeapps +_F_kde_defaults=0 +Finclude sourceforge kde } From crazy at frugalware.org Sat Feb 3 15:01:56 2007 From: crazy at frugalware.org (crazy) Date: Sat Feb 3 15:02:04 2007 Subject: [Frugalware-darcs] frugalware-current: kshutdown-0.8.2-1-i686 Message-ID: <20070203140157.7A14413A48DB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203134928-f6986-a162e385532389679af59d8f23f1d38bc31e3de0.gz; [kshutdown-0.8.2-1-i686 crazy **20070203134928 * Fix Finclude kde ] { hunk ./source/kde-extra/kshutdown/FrugalBuild 13 -Finclude sourceforge kdeapps +_F_kde_defaults=0 +Finclude sourceforge kde } From crazy at frugalware.org Sat Feb 3 15:01:57 2007 From: crazy at frugalware.org (crazy) Date: Sat Feb 3 15:02:05 2007 Subject: [Frugalware-darcs] frugalware-current: transkode-0.6b2-2-i686 Message-ID: <20070203140157.B7CE813A512C@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203135555-f6986-8cb7c756b968b85ced608780faf33e62d6eddacd.gz; [transkode-0.6b2-2-i686 crazy **20070203135555 * Fix Finclude kde ] { hunk ./source/kde-extra/transkode/FrugalBuild 8 -url="http://transkode.sourceforge.net/" hunk ./source/kde-extra/transkode/FrugalBuild 10 -options=('scriptlet') hunk ./source/kde-extra/transkode/FrugalBuild 15 -_F_kdeapps_id="37669" +_F_kde_id="37669" +_F_kde_defaults=0 } From crazy at frugalware.org Sat Feb 3 15:01:57 2007 From: crazy at frugalware.org (crazy) Date: Sat Feb 3 15:02:07 2007 Subject: [Frugalware-darcs] frugalware-current: kvideoencoder-0.08-1-i686 Message-ID: <20070203140157.9E96E13A4ED9@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203135130-f6986-b4afaebe9b452ca0b77f080feba9f2e69f8dbafb.gz; [kvideoencoder-0.08-1-i686 crazy **20070203135030 * Fix Finclude kde ] { hunk ./source/kde-extra/kvideoencoder/FrugalBuild 18 -Finclude sourceforge kdeapps +_F_kde_defaults=0 +Finclude sourceforge kde } [kvideoencoder-0.08-1-i686 crazy **20070203135130 * forgot the _F_kde_id =) ] { hunk ./source/kde-extra/kvideoencoder/FrugalBuild 17 -_F_kdeapps_id="31385" +_F_kde_id="31385" } From crazy at frugalware.org Sat Feb 3 15:01:58 2007 From: crazy at frugalware.org (crazy) Date: Sat Feb 3 15:02:12 2007 Subject: [Frugalware-darcs] frugalware-current: ksensors-0.7.3-4-i686 Message-ID: <20070203140158.B95C113A5130@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203134818-f6986-2ec6ce4ad4e786f57c7307b7df081c2c28c52861.gz; [ksensors-0.7.3-4-i686 crazy **20070203134818 * Fix Finclude kde ] { hunk ./source/kde-extra/ksensors/FrugalBuild 12 -Finclude sourceforge kdeapps +_F_kde_defaults=0 +Finclude sourceforge kde } From crazy at frugalware.org Sat Feb 3 15:01:57 2007 From: crazy at frugalware.org (crazy) Date: Sat Feb 3 15:02:13 2007 Subject: [Frugalware-darcs] frugalware-current: kscope-1.4.3-1-i686 Message-ID: <20070203140158.182E613A512D@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203134722-f6986-02597a141a67475bbca02b55723d348d5d446661.gz; [kscope-1.4.3-1-i686 crazy **20070203134722 * Fix Finclude kde ] { hunk ./source/kde-extra/kscope/FrugalBuild 12 -Finclude sourceforge kdeapps +_F_kde_defaults=0 +Finclude sourceforge kde } From crazy at frugalware.org Sat Feb 3 15:01:58 2007 From: crazy at frugalware.org (crazy) Date: Sat Feb 3 15:02:16 2007 Subject: [Frugalware-darcs] frugalware-current: pwmanager-1.2.4-1-i686 Message-ID: <20070203140159.2003B13A5131@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203135331-f6986-ff533356e685b974baca3a234784314d3b521ae2.gz; [pwmanager-1.2.4-1-i686 crazy **20070203135331 * Fix Finclude kde ] { hunk ./source/kde-extra/pwmanager/FrugalBuild 14 -Finclude sourceforge kdeapps +_F_kde_defaults=0 +Finclude sourceforge kde } From crazy at frugalware.org Sat Feb 3 15:02:00 2007 From: crazy at frugalware.org (crazy) Date: Sat Feb 3 15:02:17 2007 Subject: [Frugalware-darcs] frugalware-current: smb4k-0.8.0-1-i686 Message-ID: <20070203140201.E5BED13A512A@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203135434-f6986-9a4f34dd2618168cdf0c8f5e028a1911da9e7caf.gz; [smb4k-0.8.0-1-i686 crazy **20070203135434 * Fix Finclude kde ] { hunk ./source/kde-extra/smb4k/FrugalBuild 9 -Finclude berlios kdeapps +_F_kde_defaults=0 +Finclude berlios kde } From crazy at frugalware.org Sat Feb 3 15:02:07 2007 From: crazy at frugalware.org (crazy) Date: Sat Feb 3 15:02:18 2007 Subject: [Frugalware-darcs] frugalware-current: hydrogen-0.9.3-2-i686 Message-ID: <20070203140207.6532C13A5133@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203135706-f6986-fd107db818cd0cf8d7c58f286dfd1ce8585dea9d.gz; [hydrogen-0.9.3-2-i686 crazy **20070203135706 * Fix Finclude kde ] { hunk ./source/xmultimedia-extra/hydrogen/FrugalBuild 9 -Finclude sourceforge kdeapps +_F_kde_defaults=0 +Finclude sourceforge kde } From crazy at frugalware.org Sat Feb 3 15:23:26 2007 From: crazy at frugalware.org (crazy) Date: Sat Feb 3 15:23:28 2007 Subject: [Frugalware-darcs] frugalware-current: djvulibre-3.5.18-1-i686 Message-ID: <20070203142326.6B42813A400E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203141907-f6986-e4d00a2b7578aa11d28615c9fa544b93afa47a04.gz; [djvulibre-3.5.18-1-i686 crazy **20070203141907 * up2date fix ] { hunk ./source/xapps-extra/djvulibre/FrugalBuild 15 +_F_sourceforge_broken_up2date=1 } From krics at linuxforum.hu Sat Feb 3 15:23:47 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sat Feb 3 15:23:49 2007 Subject: [Frugalware-darcs] frugalware-current: gnome-utils-2.17.91-1-x86_64 Message-ID: <20070203142347.5FA4613A48DB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203142321-d209c-ad323dbf136b83ca719dbd340b3b85b4bc674a71.gz; [gnome-utils-2.17.91-1-x86_64 Christian Hamar alias krix **20070203142321 * Version bump * Disabled gtk-doc because now it fails :S ] { hunk ./source/gnome/gnome-utils/FrugalBuild 5 -pkgver=2.17.1 +pkgver=2.17.91 hunk ./source/gnome/gnome-utils/FrugalBuild 9 -depends=('libgnomeprintui' 'gnome-panel>=2.16.1-2' 'e2fsprogs' 'scrollkeeper' \ - 'desktop-file-utils' 'hal>=0.5.8.1-4' 'libgtop>=2.14.3' 'gnome-vfs>=2.17.2' \ +depends=('libgnomeprintui>=2.17.90' 'gnome-panel>=2.17.90' 'e2fsprogs' 'scrollkeeper' \ + 'desktop-file-utils' 'hal>=0.5.8.1-4' 'libgtop>=2.14.3' 'gnome-vfs>=2.17.90' \ hunk ./source/gnome/gnome-utils/FrugalBuild 12 -makedepends=('intltool' 'gnome-doc-utils>=0.8.0' 'gtk-doc') +makedepends=('intltool' 'gnome-doc-utils>=0.9.2' 'gtk-doc') hunk ./source/gnome/gnome-utils/FrugalBuild 24 -sha1sums=('f8bd1fe644de0e4f3fd343dfc90f0ab43c15b515') -Fconfopts="$Fconfopts --enable-hal --enable-ipv6 --enable-gtk-doc" +Fconfopts="$Fconfopts --enable-hal --enable-ipv6 --disable-gtk-doc" hunk ./source/gnome/gnome-utils/FrugalBuild 26 +sha1sums=('20cd430a52e30df858db135bff68951249a43a6f') } From crazy at frugalware.org Sat Feb 3 15:28:50 2007 From: crazy at frugalware.org (crazy) Date: Sat Feb 3 15:28:53 2007 Subject: [Frugalware-darcs] frugalware-current: postgresql-8.2.2-1-i686 Message-ID: <20070203142850.5F4B113A400E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203142350-f6986-3982264781e7643e49d158529382c6cc47f2c410.gz; [postgresql-8.2.2-1-i686 crazy **20070203142350 * Version bump ] { hunk ./source/apps-extra/postgresql/FrugalBuild 6 -pkgver=8.2.1 +pkgver=8.2.2 hunk ./source/apps-extra/postgresql/FrugalBuild 17 -sha1sums=('d73b964ca068c36c9d88766d551f25e0feb8de13' \ - 'faa7229726d07a3af32cff8abf8bbb9b46900763') hunk ./source/apps-extra/postgresql/FrugalBuild 69 -# optimization ok +sha1sums=('6419677afd0cc3a93070e966bdf449094d2110f0'\ + 'faa7229726d07a3af32cff8abf8bbb9b46900763') +# optimization OK } From krics at linuxforum.hu Sat Feb 3 15:35:38 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sat Feb 3 15:35:47 2007 Subject: [Frugalware-darcs] frugalware-current: gnome-system-monitor-2.17.6-1-x86_64 Message-ID: <20070203143538.A1E2F13A400E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203143355-d209c-4e49af9a79b8187d63068e0d419588d562f5b7c3.gz; [gnome-system-monitor-2.17.6-1-x86_64 Christian Hamar alias krix **20070203143355 * Version bump ] { hunk ./source/gnome/gnome-system-monitor/FrugalBuild 5 -pkgver=2.17.5 +pkgver=2.17.6 hunk ./source/gnome/gnome-system-monitor/FrugalBuild 9 -depends=('libgnomeui>=2.17.1' 'libgtop>=2.14.3' 'libwnck>=2.16.1' \ +depends=('libgnomeui>=2.17.90' 'libgtop>=2.14.3' 'libwnck>=2.16.3' \ hunk ./source/gnome/gnome-system-monitor/FrugalBuild 18 -sha1sums=('026c6472d611ee4bacbd0b3d31fcefe6d0911267') hunk ./source/gnome/gnome-system-monitor/FrugalBuild 19 +sha1sums=('3897b88a41daf66c257ae7d1184b992fa1f3998e') } From crazy at frugalware.org Sat Feb 3 15:47:46 2007 From: crazy at frugalware.org (crazy) Date: Sat Feb 3 15:47:51 2007 Subject: [Frugalware-darcs] frugalware-current: kde-theme-qtcurve-0.46.4-1-i686 Message-ID: <20070203144746.741DE13A400E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203144236-f6986-a40a27e512460664586eb619e7e5fc22fd9f0368.gz; [kde-theme-qtcurve-0.46.4-1-i686 crazy **20070203144236 * Version bump ] { hunk ./source/kde-extra/kde-theme-qtcurve/FrugalBuild 5 -pkgver=0.46.3 +pkgver=0.46.4 hunk ./source/kde-extra/kde-theme-qtcurve/FrugalBuild 16 -sha1sums=('b006c4daa914ea5712a0f0f891d4ae8d42c4cf99' \ - '983f20d75efa622494a5b53da42b123456ad1657' \ - '5f99980cc75133c5a8c0b9ebc533aad6b257337d') hunk ./source/kde-extra/kde-theme-qtcurve/FrugalBuild 37 - --enable-final --enable-tab-mouse-over + --enable-tab-mouse-over hunk ./source/kde-extra/kde-theme-qtcurve/FrugalBuild 41 +sha1sums=('586394dcd33fe7ca0a1763481ea296308ccd3d46'\ + 'f7932d6333c2497ee91e7c12bd022665f6a14cae'\ + '5f99980cc75133c5a8c0b9ebc533aad6b257337d') } From krics at linuxforum.hu Sat Feb 3 15:47:53 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sat Feb 3 15:48:01 2007 Subject: [Frugalware-darcs] frugalware-current: gnome-terminal-2.17.90-1-x86_64 Message-ID: <20070203144753.B9DFA13A512A@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203144715-d209c-18f9c41eeb3097379b9a46d1a157cb6f59a50917.gz; [gnome-terminal-2.17.90-1-x86_64 Christian Hamar alias krix **20070203144715 * Version bump ] { hunk ./source/gnome/gnome-terminal/FrugalBuild 5 -pkgver=2.16.1 -pkgrel=2 +pkgver=2.17.90 +pkgrel=1 hunk ./source/gnome/gnome-terminal/FrugalBuild 9 -depends=('libgnomeui>=2.17.1' 'startup-notification' 'vte>=0.15.1' 'scrollkeeper' 'gnome-vfs>=2.16.1' \ +depends=('libgnomeui>=2.17.90' 'startup-notification' 'vte>=0.15.2' 'scrollkeeper' 'gnome-vfs>=2.17.90' \ hunk ./source/gnome/gnome-terminal/FrugalBuild 19 -sha1sums=('a969fe3203a622a68fbde1f377d0e48234a27a72' \ - '825da7671bf95eaa970d44de52cd3586205717ca' \ - '0146084932430786185eaacafc06852a87cfe632') hunk ./source/gnome/gnome-terminal/FrugalBuild 20 +sha1sums=('622777455bd94ba0f385cf9477f2e7bb9ab64315'\ + '825da7671bf95eaa970d44de52cd3586205717ca'\ + '0146084932430786185eaacafc06852a87cfe632') } From krics at linuxforum.hu Sat Feb 3 15:57:06 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sat Feb 3 15:57:10 2007 Subject: [Frugalware-darcs] frugalware-current: zenity-2.17.90-1-x86_64 Message-ID: <20070203145707.5458113A400E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203145615-d209c-1baf0e3a068fcca3f43160777dcf8db04b6d18eb.gz; [zenity-2.17.90-1-x86_64 Christian Hamar alias krix **20070203145615 * Version bump ] { hunk ./source/gnome/zenity/FrugalBuild 5 -pkgver=2.17.3 +pkgver=2.17.90 hunk ./source/gnome/zenity/FrugalBuild 16 -sha1sums=('80a8bbd91117ae5600f18810d316c3d11fc52a30') hunk ./source/gnome/zenity/FrugalBuild 17 +sha1sums=('7a13f7bb55aaf8e765a4e50789c16dc21a33f9d1') } From krics at linuxforum.hu Sat Feb 3 16:11:00 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sat Feb 3 16:11:03 2007 Subject: [Frugalware-darcs] frugalware-current: gdm-2.17.6-1-x86_64 Message-ID: <20070203151100.457C213A48D8@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203151030-d209c-1fd5c0e5029194ddafc6f2f0e75d53791b206cec.gz; [gdm-2.17.6-1-x86_64 Christian Hamar alias krix **20070203151030 * Version bump ] { hunk ./source/gnome/gdm/FrugalBuild 5 -pkgver=2.17.5 -pkgrel=2 +pkgver=2.17.6 +pkgrel=1 hunk ./source/gnome/gdm/FrugalBuild 10 -depends=('zenity>=2.17.0' 'libgnomeui>=2.17.1' 'libxi' 'fontconfig' 'libxrandr' 'librsvg>=2.16.0' \ +depends=('zenity>=2.17.90' 'libgnomeui>=2.17.90' 'libxi' 'fontconfig' 'libxrandr' 'librsvg>=2.16.0' \ hunk ./source/gnome/gdm/FrugalBuild 21 -sha1sums=('11d177d519f69e24e283e673f907c2416a8a12ae' \ - 'a61f7c9569a2d73a5cf078e61a17cfed7d280b12' \ - '2abed3ef1a655dec144aadc2b899f0734b853c6b' \ - 'ce0a72a0420164dfbe0080a570c6801d85613a77') hunk ./source/gnome/gdm/FrugalBuild 43 +sha1sums=('c25e22c26dd1b70899fb2f8ea516faf409429632'\ + 'a61f7c9569a2d73a5cf078e61a17cfed7d280b12'\ + '2abed3ef1a655dec144aadc2b899f0734b853c6b'\ + 'ce0a72a0420164dfbe0080a570c6801d85613a77') } From vmiklos at frugalware.org Sat Feb 3 16:18:37 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Feb 3 16:18:39 2007 Subject: [Frugalware-darcs] frugalware-current: postfixadmin-2.1.0-1-x86_64 Message-ID: <20070203151837.C99CB13A400E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203161816-e2957-9570d39f78d9b031bc267b19d84a234957344765.gz; [postfixadmin-2.1.0-1-x86_64 VMiklos **20070203161816 added x86_64 to archs() ] { hunk ./source/network-extra/postfixadmin/FrugalBuild 11 -archs=('i686') +archs=('i686' 'x86_64') } From krics at linuxforum.hu Sat Feb 3 16:21:50 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sat Feb 3 16:21:51 2007 Subject: [Frugalware-darcs] frugalware-current: file-roller-2.17.90-1-x86_64 Message-ID: <20070203152150.25B3213A400E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203152111-d209c-63ca3295a1c599eb3da1137000f037ec42eb3ab6.gz; [file-roller-2.17.90-1-x86_64 Christian Hamar alias krix **20070203152111 * Version bump ] { hunk ./source/gnome/file-roller/FrugalBuild 5 -pkgver=2.17.5 +pkgver=2.17.90 hunk ./source/gnome/file-roller/FrugalBuild 9 -depends=('nautilus>=2.17.1-2' 'scrollkeeper' 'desktop-file-utils') -makedepends=('intltool' 'gnome-doc-utils>=0.8.0') +depends=('nautilus>=2.17.90' 'scrollkeeper' 'desktop-file-utils') +makedepends=('intltool' 'gnome-doc-utils>=0.9.2') hunk ./source/gnome/file-roller/FrugalBuild 17 -sha1sums=('6f43af74cc6e746c534bbd20442b36c3691be499') hunk ./source/gnome/file-roller/FrugalBuild 18 +sha1sums=('5872f1017afc03d430f38d0fc4d11534aaf935ed') } From vmiklos at frugalware.org Sat Feb 3 16:25:42 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Feb 3 16:25:45 2007 Subject: [Frugalware-darcs] frugalware-current: privoxy-3.0.6-1-x86_64 Message-ID: <20070203152543.2FBF013A400E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203162507-e2957-041f3af345ec9bf79baa0f6d90ed2c8c8cb6341a.gz; [privoxy-3.0.6-1-x86_64 VMiklos **20070203162507 added x86_64 to archs() ] { hunk ./source/network-extra/privoxy/FrugalBuild 16 -archs=('i686') +archs=('i686' 'x86_64') } From vmiklos at frugalware.org Sat Feb 3 16:30:27 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Feb 3 16:30:30 2007 Subject: [Frugalware-darcs] frugalware-current: vnstat-1.4-1-x86_64 Message-ID: <20070203153027.99B5B13A400E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203162924-e2957-f36b82c293eff70b6c6901cabeee59e2299e0de9.gz; [vnstat-1.4-1-x86_64 VMiklos **20070203162924 added x86_64 to archs() ] { hunk ./source/network-extra/vnstat/FrugalBuild 12 -archs=('i686') +archs=('i686' 'x86_64') } From krics at linuxforum.hu Sat Feb 3 16:34:23 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sat Feb 3 16:34:26 2007 Subject: [Frugalware-darcs] frugalware-current: nautilus-cd-burner-2.17.6-1-x86_64 Message-ID: <20070203153423.5B3C413A400E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203153321-d209c-f7f056c7c92d5e15340d20465bf1020af6e5c37d.gz; [nautilus-cd-burner-2.17.6-1-x86_64 Christian Hamar alias krix **20070203153321 * Version bump ] { hunk ./source/gnome/nautilus-cd-burner/FrugalBuild 5 -pkgver=2.17.5 +pkgver=2.17.6 hunk ./source/gnome/nautilus-cd-burner/FrugalBuild 9 -depends=('nautilus>=2.17.1-4' 'cdrtools') +depends=('nautilus>=2.17.90' 'cdrtools') hunk ./source/gnome/nautilus-cd-burner/FrugalBuild 15 -sha1sums=('8a80681ca7a7470d9689a4fc95c31dbfea786a84') hunk ./source/gnome/nautilus-cd-burner/FrugalBuild 16 +sha1sums=('27e2e28f112a129ac407eccbf17b11055ddc2ae8') } From vmiklos at frugalware.org Sat Feb 3 16:35:57 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Feb 3 16:35:58 2007 Subject: [Frugalware-darcs] frugalware-current: wgetpro-0.1.3-1-x86_64 Message-ID: <20070203153557.45CAF13A48DB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203163510-e2957-9c15cd2d0d4ad88646e3663ac3a1c90e0ad57d0c.gz; [wgetpro-0.1.3-1-x86_64 VMiklos **20070203163510 added x86_64 to archs() ] { hunk ./source/network-extra/wgetpro/FrugalBuild 11 -archs=('i686') +archs=('i686' 'x86_64') } From vmiklos at frugalware.org Sat Feb 3 16:40:51 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Feb 3 16:40:54 2007 Subject: [Frugalware-darcs] frugalware-current: xmlrpc-c-1.09.00-1-x86_64 Message-ID: <20070203154052.0097F13A48DB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203163952-e2957-e0c3c5dad6629306d5f2a470b4cbeb1f9db34fe6.gz; [xmlrpc-c-1.09.00-1-x86_64 VMiklos **20070203163952 added x86_64 to archs() ] { hunk ./source/network-extra/xmlrpc-c/FrugalBuild 11 -archs=('i686') +archs=('i686' 'x86_64') } From vmiklos at frugalware.org Sat Feb 3 16:43:53 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Feb 3 16:43:55 2007 Subject: [Frugalware-darcs] frugalware-current: zd1211-firmware-1.1-1-x86_64 Message-ID: <20070203154353.338B813A400E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203164343-e2957-64980a1f069ab0d143f7f267aafff903fdcbe442.gz; [zd1211-firmware-1.1-1-x86_64 VMiklos **20070203164343 added x86_64 to archs() ] { hunk ./source/network-extra/zd1211-firmware/FrugalBuild 14 -archs=('i686') +archs=('i686' 'x86_64') } From vmiklos at frugalware.org Sat Feb 3 16:46:58 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Feb 3 16:47:00 2007 Subject: [Frugalware-darcs] frugalware-current: ttf-indic-otf-0.2-1-x86_64 Message-ID: <20070203154658.C20EC13A400E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203164638-e2957-13bb63501e3fb2be879a213d8e2f889045816154.gz; [ttf-indic-otf-0.2-1-x86_64 VMiklos **20070203164638 added x86_64 to archs() ] { hunk ./source/x11/ttf-indic-otf/FrugalBuild 11 -archs=('i686') +archs=('i686' 'x86_64') } From vmiklos at frugalware.org Sat Feb 3 16:52:27 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Feb 3 16:52:29 2007 Subject: [Frugalware-darcs] frugalware-current: nuovext-1.6-1-x86_64 Message-ID: <20070203155227.BD28413A400E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203165155-e2957-2cfa97646036638c32f8245ed4fd4f334de825b9.gz; [nuovext-1.6-1-x86_64 VMiklos **20070203165155 added x86_64 to archs() ] { hunk ./source/x11-extra/nuovext/FrugalBuild 15 -archs=('i686') +archs=('i686' 'x86_64') } From krics at linuxforum.hu Sat Feb 3 16:57:53 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sat Feb 3 16:58:03 2007 Subject: [Frugalware-darcs] frugalware-current: gtkhtml-3.13.6-1-x86_64 Message-ID: <20070203155753.562B113A400E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203155644-d209c-cbfff5d9e0cead14d685e185b0d0f7364265c200.gz; [gtkhtml-3.13.6-1-x86_64 Christian Hamar alias krix **20070203155644 * Version bump ] { hunk ./source/gnome/gtkhtml/FrugalBuild 5 -pkgver=3.13.5 +pkgver=3.13.6 hunk ./source/gnome/gtkhtml/FrugalBuild 9 -depends=('gail>=1.9.5' 'libgnomeui>=2.17.1' \ - 'libgnomeprintui>=2.12.1-3' 'libsoup>=2.2.99' 'gnome-icon-theme>=2.17.5' \ - 'libbonobo') +depends=('gail>=1.10.1' 'libgnomeui>=2.17.90' \ + 'libgnomeprintui>=2.17.90' 'libsoup>=2.2.99' 'gnome-icon-theme>=2.17.90' \ + 'libbonobo>=2.17.90') hunk ./source/gnome/gtkhtml/FrugalBuild 16 -sha1sums=('0f6705bc09db9f836ba716cccf366d9eb1cffcf3') hunk ./source/gnome/gtkhtml/FrugalBuild 17 +sha1sums=('a1dedd4fc0161cf5c943d5e7cbbce3cc923ac02e') } From vmiklos at frugalware.org Sat Feb 3 17:07:05 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Feb 3 17:07:11 2007 Subject: [Frugalware-darcs] frugalware-current: slim-1.2.6-1-x86_64 Message-ID: <20070203160705.6143813A400E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203170649-e2957-7f082b5ee70545b39ce8eb8e60f45c2bd715aef2.gz; [slim-1.2.6-1-x86_64 VMiklos **20070203170649 added x86_64 to archs() ] { hunk ./source/x11-extra/slim/FrugalBuild 12 -archs=('i686') +archs=('i686' 'x86_64') } From vmiklos at frugalware.org Sat Feb 3 17:11:34 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Feb 3 17:11:36 2007 Subject: [Frugalware-darcs] frugalware-current: albumart-1.6.0-2-x86_64 Message-ID: <20070203161134.7029713A400E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203171059-e2957-959c616639691d4d7baa6eef59757bca98ff44fd.gz; [albumart-1.6.0-2-x86_64 VMiklos **20070203171059 added x86_64 to archs() ] { hunk ./source/xapps-extra/albumart/FrugalBuild 12 -archs=('i686') +archs=('i686' 'x86_64') } From vmiklos at frugalware.org Sat Feb 3 17:15:56 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Feb 3 17:15:59 2007 Subject: [Frugalware-darcs] frugalware-current: asunder-0.1.0-1-x86_64 Message-ID: <20070203161556.3242713A400E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203171504-e2957-f60a297974803ba841b881d1545740f06b71c1fc.gz; [asunder-0.1.0-1-x86_64 VMiklos **20070203171504 added x86_64 to archs() ] { hunk ./source/xapps-extra/asunder/FrugalBuild 11 -archs=('i686') +archs=('i686' 'x86_64') } From crazy at frugalware.org Sat Feb 3 17:22:59 2007 From: crazy at frugalware.org (crazy) Date: Sat Feb 3 17:23:02 2007 Subject: [Frugalware-darcs] frugalware-current: libgtkhtml-2.11.0-3-i686 Message-ID: <20070203162259.F40D113A400E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203161711-f6986-d6c29f50d5f8477f355c3017988899fc50cfa80e.gz; [libgtkhtml-2.11.0-3-i686 crazy **20070203161711 * removed gnome-vfs depend , is only needed for the _test_ app :) ] { hunk ./source/gnome/libgtkhtml/FrugalBuild 6 -pkgrel=2 +pkgrel=3 hunk ./source/gnome/libgtkhtml/FrugalBuild 9 -depends=('gail' 'gnome-vfs' 'libxml2') +depends=('gail' 'libxml2') } From vmiklos at frugalware.org Sat Feb 3 18:00:31 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Feb 3 18:00:33 2007 Subject: [Frugalware-darcs] frugalware-current: include/kernel.sh: no longer require a patch to update the config file on x86_64 Message-ID: <20070203170031.78A1713A400E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203165926-e2957-b631da9f75cd0245c1298fb02d61dae3715de797.gz; [include/kernel.sh: no longer require a patch to update the config file on x86_64 VMiklos **20070203165926] { hunk ./source/base/kernel/FrugalBuild 11 -[ "$CARCH" == "x86_64" ] && \ - _F_kernel_patches=(${_F_kernel_patches[@]} linux-2.6.11-x86_64_config.patch0) hunk ./source/base/kernel/linux-2.6.11-x86_64_config.patch0 1 ---- .config.orig 2005-06-02 09:29:11.000000000 +0200 -+++ .config 2005-06-02 09:20:49.000000000 +0200 -@@ -203,6 +203,11 @@ - # - CONFIG_BINFMT_ELF=y - CONFIG_BINFMT_MISC=m -+CONFIG_IA32_EMULATION=y -+CONFIG_IA32_AOUT=y -+CONFIG_COMPAT=y -+CONFIG_SYSVIPC_COMPAT=y -+CONFIG_UID16=y - - # - # Device Drivers rmfile ./source/base/kernel/linux-2.6.11-x86_64_config.patch0 hunk ./source/base-extra/kernel-fwlive/FrugalBuild 11 -[ "$CARCH" == "x86_64" ] && \ - _F_kernel_patches=(${_F_kernel_patches[@]} linux-2.6.11-x86_64_config.patch0) hunk ./source/base-extra/kernel-fwlive/linux-2.6.11-x86_64_config.patch0 1 ---- .config.orig 2005-06-02 09:29:11.000000000 +0200 -+++ .config 2005-06-02 09:20:49.000000000 +0200 -@@ -203,6 +203,11 @@ - # - CONFIG_BINFMT_ELF=y - CONFIG_BINFMT_MISC=m -+CONFIG_IA32_EMULATION=y -+CONFIG_IA32_AOUT=y -+CONFIG_COMPAT=y -+CONFIG_SYSVIPC_COMPAT=y -+CONFIG_UID16=y - - # - # Device Drivers rmfile ./source/base-extra/kernel-fwlive/linux-2.6.11-x86_64_config.patch0 hunk ./source/base-extra/kernel-grsec/FrugalBuild 18 -[ "$CARCH" == "x86_64" ] && \ - _F_kernel_patches=(${_F_kernel_patches[@]} linux-2.6.11-x86_64_config.patch0) hunk ./source/base-extra/kernel-grsec/linux-2.6.11-x86_64_config.patch0 1 ---- .config.orig 2005-06-02 09:29:11.000000000 +0200 -+++ .config 2005-06-02 09:20:49.000000000 +0200 -@@ -203,6 +203,11 @@ - # - CONFIG_BINFMT_ELF=y - CONFIG_BINFMT_MISC=m -+CONFIG_IA32_EMULATION=y -+CONFIG_IA32_AOUT=y -+CONFIG_COMPAT=y -+CONFIG_SYSVIPC_COMPAT=y -+CONFIG_UID16=y - - # - # Device Drivers rmfile ./source/base-extra/kernel-grsec/linux-2.6.11-x86_64_config.patch0 hunk ./source/base-extra/kernel-xen0/FrugalBuild 9 +_F_kernel_manualamd64=1 hunk ./source/base-extra/kernel-xenU/FrugalBuild 9 +_F_kernel_manualamd64=1 hunk ./source/include/kernel.sh 3 -# (c) 2006 Miklos Vajna +# (c) 2006-2007 Miklos Vajna hunk ./source/include/kernel.sh 14 +# +# there are only two required variables: pkgver and pkgrel. here is a list of +# other optional variables: +# hunk ./source/include/kernel.sh 29 +# _F_kernel_manualamd64 (don't update the config automatically to add 32bit emulation support on x86_64) hunk ./source/include/kernel.sh 151 + if [ "$CARCH" = "x86_64" -a -z "$_F_kernel_manualamd64" ]; then + sed -e "/CONFIG_BINFMT_MISC=m/{ + n + i \ + CONFIG_IA32_EMULATION=y\n\ + CONFIG_IA32_AOUT=y\n\ + CONFIG_COMPAT=y\n\ + CONFIG_SYSVIPC_COMPAT=y\n\ + CONFIG_UID16=y + }" .config + fi } From krics at linuxforum.hu Sat Feb 3 18:14:32 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sat Feb 3 18:14:37 2007 Subject: [Frugalware-darcs] frugalware-current: evolution-2.9.6-1-x86_64 Message-ID: <20070203171432.1B7DC13A400E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203171314-d209c-4cef0501288a6be4872ec030853cb50517dad414.gz; [evolution-2.9.6-1-x86_64 Christian Hamar alias krix **20070203171314 * Version bump ] { hunk ./source/gnome/evolution/FrugalBuild 5 -pkgver=2.9.5 +pkgver=2.9.6 hunk ./source/gnome/evolution/FrugalBuild 9 -depends=('gail>=1.9.5' 'gal>=2.5.3' 'evolution-data-server>=1.9.5' 'gtkhtml>=3.13.5' \ +depends=('gail>=1.10.1' 'gal>=2.5.3' 'evolution-data-server>=1.9.6.1' 'gtkhtml>=3.13.6' \ hunk ./source/gnome/evolution/FrugalBuild 11 - 'evolution-data-server-ldap>=1.9.5' 'libbonobo>=2.16.0' 'nss>=3.11.4' 'nspr' \ + 'evolution-data-server-ldap>=1.9.6.1' 'libbonobo>=2.17.90' 'nss>=3.11.4' 'nspr' \ hunk ./source/gnome/evolution/FrugalBuild 26 -sha1sums=('8741444d5d18cd57b185ddeb6b4b69ab262a553f' \ - '41988b2a14c10156b60a6000efc058c59248b5e2' \ - '5f549aa2a52b7a312ba716cd07d387b76d6688ee') + +# Pilot conduits disabled atm :S hunk ./source/gnome/evolution/FrugalBuild 53 +sha1sums=('6567d6ff2173a48a616d0469e523ec1e57282a42'\ + '41988b2a14c10156b60a6000efc058c59248b5e2'\ + '5f549aa2a52b7a312ba716cd07d387b76d6688ee') } From krics at linuxforum.hu Sat Feb 3 18:33:52 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sat Feb 3 18:34:00 2007 Subject: [Frugalware-darcs] frugalware-current: gnome-media-2.17.90-1-x86_64 Message-ID: <20070203173352.5C2EB13A400E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203173232-d209c-eb170e8a554dd3901b8e2a4d04d42c4977d4902b.gz; [gnome-media-2.17.90-1-x86_64 Christian Hamar alias krix **20070203173232 * Version bump ] { hunk ./source/gnome/gnome-media/FrugalBuild 5 -pkgver=2.17.2 +pkgver=2.17.90 hunk ./source/gnome/gnome-media/FrugalBuild 9 -depends=('gst-plugins-good>=0.10.4-2' 'gail>=1.10.0' 'nautilus-cd-burner>=2.17.5' 'scrollkeeper' \ - 'gst-plugins-base-oil' 'gst-plugins-good-gconf' 'gnome-vfs>=2.17.2') +depends=('gst-plugins-good>=0.10.4-2' 'gail>=1.10.1' 'nautilus-cd-burner>=2.17.6' 'scrollkeeper' \ + 'gst-plugins-base-oil' 'gst-plugins-good-gconf' 'gnome-vfs>=2.17.90') hunk ./source/gnome/gnome-media/FrugalBuild 21 -sha1sums=('d52177dce31471f943701ce7ca9f712bebb8aad9') hunk ./source/gnome/gnome-media/FrugalBuild 23 +sha1sums=('0d760dced1da2459727accddd56b6839c19fcd3e') } From krics at linuxforum.hu Sat Feb 3 18:57:34 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sat Feb 3 18:57:36 2007 Subject: [Frugalware-darcs] frugalware-current: eog-2.17.90-1-x86_64 Message-ID: <20070203175734.2E36413A48D8@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203175654-d209c-5e250bbe642bd6acc354e7a9bdd0022b8790ea4c.gz; [eog-2.17.90-1-x86_64 Christian Hamar alias krix **20070203175654 * Version bump ] { hunk ./source/gnome/eog/FrugalBuild 5 -pkgver=2.17.4 +pkgver=2.17.90 hunk ./source/gnome/eog/FrugalBuild 9 -depends=('libexif' 'libgnomeui>=2.17.1' 'scrollkeeper' 'desktop-file-utils' \ - 'libgnomeprintui' 'gnome-desktop>=2.17.5' 'lcms') -makedepends=('intltool' 'gdk-pixbuf' 'libart_lgpl' 'gnome-doc-utils>=0.8.0') +depends=('libexif' 'libgnomeui>=2.17.90' 'scrollkeeper' 'desktop-file-utils' \ + 'libgnomeprintui>=2.17.90' 'gnome-desktop>=2.17.90' 'lcms') +makedepends=('intltool' 'gdk-pixbuf' 'libart_lgpl' 'gnome-doc-utils>=0.9.2') hunk ./source/gnome/eog/FrugalBuild 18 -sha1sums=('be8aa672ceeb9c4ed958d45483b85e907dcf7b8c') hunk ./source/gnome/eog/FrugalBuild 19 +sha1sums=('df03a378bfbe224b6d2ee4efef12a4ebbcc4e259') } From krics at linuxforum.hu Sat Feb 3 20:42:41 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sat Feb 3 20:42:45 2007 Subject: [Frugalware-darcs] frugalware-current: orbit2-2.14.5-1-x86_64 Message-ID: <20070203194241.9195713A400E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203193936-d209c-e4064d89a69f0b126defa6a23c739f2430142508.gz; [orbit2-2.14.5-1-x86_64 Christian Hamar alias krix **20070203193936 * Version bump ] { hunk ./source/gnome/orbit2/FrugalBuild 6 -pkgver=2.14.4 +pkgver=2.14.5 hunk ./source/gnome/orbit2/FrugalBuild 19 -sha1sums=('7994094305fcb600326b9b3ffe2ed2d8863b0c5d') hunk ./source/gnome/orbit2/FrugalBuild 20 +sha1sums=('6af07a22f30572ed1c1e5b375ea057da21f2510b') } From krics at linuxforum.hu Sat Feb 3 21:13:00 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sat Feb 3 21:13:03 2007 Subject: [Frugalware-darcs] frugalware-current: gnome-games-2.17.90.1-1-x86_64 Message-ID: <20070203201300.1FB1413A48DB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203201155-d209c-e7c804a1f3b961c8191f6fe830c123c01de744d3.gz; [gnome-games-2.17.90.1-1-x86_64 Christian Hamar alias krix **20070203201155 * Version bump ] { hunk ./source/gnome/gnome-games/FrugalBuild 5 -pkgver=2.17.5 +pkgver=2.17.90.1 hunk ./source/gnome/gnome-games/FrugalBuild 9 -depends=('guile' 'libgnomeui>=2.17.1' 'librsvg>=2.16.0' 'scrollkeeper' \ - 'desktop-file-utils' 'libbonobo>=2.16.0' ) +depends=('guile' 'libgnomeui>=2.17.90' 'librsvg>=2.16.0' 'scrollkeeper' \ + 'desktop-file-utils' 'libbonobo>=2.17.90' ) hunk ./source/gnome/gnome-games/FrugalBuild 33 -sha1sums=('8cf5458f1f5bff7ed30fed382ed8e4ec99f7bcc9') hunk ./source/gnome/gnome-games/FrugalBuild 35 +sha1sums=('11a8fce4a06a2723fc5c3e5acc3a716bc8aad10b') } From vmiklos at frugalware.org Sat Feb 3 21:29:12 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Feb 3 21:29:15 2007 Subject: [Frugalware-darcs] pacman-g2: alpm_pkg_getinfo(): PM_PKG_NAME and PM_PKG_VERSION is loaded from the directory name Message-ID: <20070203202912.913FE13A400E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman-g2;a=darcs_commitdiff;h=20070203195228-e2957-c5efbc21b0f043b963acef7ee312a6652ea9a731.gz; [alpm_pkg_getinfo(): PM_PKG_NAME and PM_PKG_VERSION is loaded from the directory name VMiklos **20070203195228] { hunk ./lib/libalpm/alpm.c 478 - /*case PM_PKG_NAME: - case PM_PKG_VERSION:*/ } From vmiklos at frugalware.org Sat Feb 3 21:29:12 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Feb 3 21:29:17 2007 Subject: [Frugalware-darcs] pacman-g2: fix test sync992 Message-ID: <20070203202913.0CD3513A4ED7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman-g2;a=darcs_commitdiff;h=20070203202250-e2957-5473ba77603adc5bcabbffb1a226235ef4948777.gz; [fix test sync992 VMiklos **20070203202250] { hunk ./lib/libalpm/conflict.c 66 - for(j = tp->conflicts; j; j = j->next) { + for(j = _alpm_pkg_getinfo(tp, PM_PKG_CONFLICTS); j; j = j->next) { hunk ./lib/libalpm/conflict.c 92 - for(m = dp->provides; m; m = m->next) { + for(m = _alpm_pkg_getinfo(dp, PM_PKG_PROVIDES); m; m = m->next) { hunk ./lib/libalpm/conflict.c 128 - for(m = otp->provides; m; m = m->next) { + for(m = _alpm_pkg_getinfo(otp, PM_PKG_PROVIDES); m; m = m->next) { hunk ./lib/libalpm/conflict.c 161 - conflicts = pkg->conflicts; + conflicts = _alpm_pkg_getinfo(pkg, PM_PKG_CONFLICTS); hunk ./lib/libalpm/conflict.c 167 - conflicts = info->conflicts; + conflicts = _alpm_pkg_getinfo(info, PM_PKG_CONFLICTS); hunk ./lib/libalpm/conflict.c 184 - for(n = tp->provides; n; n = n->next) { + for(n = _alpm_pkg_getinfo(tp, PM_PKG_PROVIDES); n; n = n->next) { hunk ./lib/libalpm/deps.c 130 - for(j = p->depends; j; j = j->next) { + for(j = _alpm_pkg_getinfo(p, PM_PKG_DEPENDS); j; j = j->next) { hunk ./lib/libalpm/deps.c 148 - for(l = q->provides; l; l = l->next) { + for(l = _alpm_pkg_getinfo(q, PM_PKG_PROVIDES); l; l = l->next) { hunk ./lib/libalpm/deps.c 223 - for(k = p->depends; k && !found; k = k->next) { + for(k = _alpm_pkg_getinfo(p, PM_PKG_DEPENDS); k && !found; k = k->next) { hunk ./lib/libalpm/deps.c 279 - for(j = tp->depends; j; j = j->next) { + for(j = _alpm_pkg_getinfo(tp, PM_PKG_DEPENDS); j; j = j->next) { hunk ./lib/libalpm/deps.c 360 - if(!strcmp(p->name, depend.name) || _alpm_list_is_strin(depend.name, p->provides)) { + if(!strcmp(p->name, depend.name) || _alpm_list_is_strin(depend.name, _alpm_pkg_getinfo(p, PM_PKG_PROVIDES))) { hunk ./lib/libalpm/deps.c 417 - if(spkg && _alpm_list_is_strin(tp->name, spkg->provides)) { + if(spkg && _alpm_list_is_strin(tp->name, _alpm_pkg_getinfo(spkg, PM_PKG_PROVIDES))) { hunk ./lib/libalpm/deps.c 496 - for(j = ((pmpkg_t *)i->data)->depends; j; j = j->next) { + for(j = (_alpm_pkg_getinfo((pmpkg_t *)i->data, PM_PKG_DEPENDS)); j; j = j->next) { hunk ./lib/libalpm/deps.c 588 - if(_alpm_list_is_strin(miss->depend.name, sp->provides)) { + if(_alpm_list_is_strin(miss->depend.name, _alpm_pkg_getinfo(sp, PM_PKG_PROVIDES))) { } From vmiklos at frugalware.org Sat Feb 3 21:29:13 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Feb 3 21:29:18 2007 Subject: [Frugalware-darcs] pacman-g2: new function: _alpm_pkg_getinfo() Message-ID: <20070203202913.8640713A4ED8@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman-g2;a=darcs_commitdiff;h=20070203201033-e2957-d0e15c54fa228b5d2c584fdeff571ff102ec7c66.gz; [new function: _alpm_pkg_getinfo() VMiklos **20070203201033 this should be used in case we're not sure the required info is loaded or not (possibly whenever) ] { hunk ./lib/libalpm/alpm.c 468 - void *data = NULL; - hunk ./lib/libalpm/alpm.c 472 - /* Update the cache package entry if needed */ - if(pkg->origin == PKG_FROM_CACHE) { - switch(parm) { - /* Desc entry */ - case PM_PKG_DESC: - case PM_PKG_GROUPS: - case PM_PKG_URL: - case PM_PKG_LICENSE: - case PM_PKG_ARCH: - case PM_PKG_BUILDDATE: - case PM_PKG_INSTALLDATE: - case PM_PKG_PACKAGER: - case PM_PKG_SIZE: - case PM_PKG_USIZE: - case PM_PKG_REASON: - case PM_PKG_MD5SUM: - case PM_PKG_SHA1SUM: - if(!(pkg->infolevel & INFRQ_DESC)) { - _alpm_log(PM_LOG_DEBUG, _("loading DESC info for '%s'"), pkg->name); - _alpm_db_read(pkg->data, INFRQ_DESC, pkg); - } - break; - /* Depends entry */ - case PM_PKG_DEPENDS: - case PM_PKG_REQUIREDBY: - case PM_PKG_CONFLICTS: - case PM_PKG_PROVIDES: - case PM_PKG_REPLACES: - if(!(pkg->infolevel & INFRQ_DEPENDS)) { - _alpm_log(PM_LOG_DEBUG, "loading DEPENDS info for '%s'", pkg->name); - _alpm_db_read(pkg->data, INFRQ_DEPENDS, pkg); - } - break; - /* Files entry */ - case PM_PKG_FILES: - case PM_PKG_BACKUP: - if(pkg->data == handle->db_local && !(pkg->infolevel & INFRQ_FILES)) { - _alpm_log(PM_LOG_DEBUG, _("loading FILES info for '%s'"), pkg->name); - _alpm_db_read(pkg->data, INFRQ_FILES, pkg); - } - break; - /* Scriptlet */ - case PM_PKG_SCRIPLET: - if(pkg->data == handle->db_local && !(pkg->infolevel & INFRQ_SCRIPLET)) { - _alpm_log(PM_LOG_DEBUG, _("loading SCRIPLET info for '%s'"), pkg->name); - _alpm_db_read(pkg->data, INFRQ_SCRIPLET, pkg); - } - break; - } - } - - switch(parm) { - case PM_PKG_NAME: data = pkg->name; break; - case PM_PKG_VERSION: data = pkg->version; break; - case PM_PKG_DESC: data = pkg->desc; break; - case PM_PKG_GROUPS: data = pkg->groups; break; - case PM_PKG_URL: data = pkg->url; break; - case PM_PKG_ARCH: data = pkg->arch; break; - case PM_PKG_BUILDDATE: data = pkg->builddate; break; - case PM_PKG_BUILDTYPE: data = pkg->buildtype; break; - case PM_PKG_INSTALLDATE: data = pkg->installdate; break; - case PM_PKG_PACKAGER: data = pkg->packager; break; - case PM_PKG_SIZE: data = (void *)(long)pkg->size; break; - case PM_PKG_USIZE: data = (void *)(long)pkg->usize; break; - case PM_PKG_REASON: data = (void *)(long)pkg->reason; break; - case PM_PKG_LICENSE: data = pkg->license; break; - case PM_PKG_REPLACES: data = pkg->replaces; break; - case PM_PKG_MD5SUM: data = pkg->md5sum; break; - case PM_PKG_SHA1SUM: data = pkg->sha1sum; break; - case PM_PKG_DEPENDS: data = pkg->depends; break; - case PM_PKG_REMOVES: data = pkg->removes; break; - case PM_PKG_REQUIREDBY: data = pkg->requiredby; break; - case PM_PKG_PROVIDES: data = pkg->provides; break; - case PM_PKG_CONFLICTS: data = pkg->conflicts; break; - case PM_PKG_FILES: data = pkg->files; break; - case PM_PKG_BACKUP: data = pkg->backup; break; - case PM_PKG_SCRIPLET: data = (void *)(long)pkg->scriptlet; break; - case PM_PKG_DATA: data = pkg->data; break; - default: - data = NULL; - break; - } - - return(data); + return(_alpm_pkg_getinfo(pkg, parm)); hunk ./lib/libalpm/package.c 38 +#include "db.h" +#include "handle.h" hunk ./lib/libalpm/package.c 488 + +void *_alpm_pkg_getinfo(pmpkg_t *pkg, unsigned char parm) +{ + void *data = NULL; + + /* Update the cache package entry if needed */ + if(pkg->origin == PKG_FROM_CACHE) { + switch(parm) { + /* Desc entry */ + case PM_PKG_DESC: + case PM_PKG_GROUPS: + case PM_PKG_URL: + case PM_PKG_LICENSE: + case PM_PKG_ARCH: + case PM_PKG_BUILDDATE: + case PM_PKG_INSTALLDATE: + case PM_PKG_PACKAGER: + case PM_PKG_SIZE: + case PM_PKG_USIZE: + case PM_PKG_REASON: + case PM_PKG_MD5SUM: + case PM_PKG_SHA1SUM: + if(!(pkg->infolevel & INFRQ_DESC)) { + _alpm_log(PM_LOG_DEBUG, _("loading DESC info for '%s'"), pkg->name); + _alpm_db_read(pkg->data, INFRQ_DESC, pkg); + } + break; + /* Depends entry */ + case PM_PKG_DEPENDS: + case PM_PKG_REQUIREDBY: + case PM_PKG_CONFLICTS: + case PM_PKG_PROVIDES: + case PM_PKG_REPLACES: + if(!(pkg->infolevel & INFRQ_DEPENDS)) { + _alpm_log(PM_LOG_DEBUG, "loading DEPENDS info for '%s'", pkg->name); + _alpm_db_read(pkg->data, INFRQ_DEPENDS, pkg); + } + break; + /* Files entry */ + case PM_PKG_FILES: + case PM_PKG_BACKUP: + if(pkg->data == handle->db_local && !(pkg->infolevel & INFRQ_FILES)) { + _alpm_log(PM_LOG_DEBUG, _("loading FILES info for '%s'"), pkg->name); + _alpm_db_read(pkg->data, INFRQ_FILES, pkg); + } + break; + /* Scriptlet */ + case PM_PKG_SCRIPLET: + if(pkg->data == handle->db_local && !(pkg->infolevel & INFRQ_SCRIPLET)) { + _alpm_log(PM_LOG_DEBUG, _("loading SCRIPLET info for '%s'"), pkg->name); + _alpm_db_read(pkg->data, INFRQ_SCRIPLET, pkg); + } + break; + } + } + + switch(parm) { + case PM_PKG_NAME: data = pkg->name; break; + case PM_PKG_VERSION: data = pkg->version; break; + case PM_PKG_DESC: data = pkg->desc; break; + case PM_PKG_GROUPS: data = pkg->groups; break; + case PM_PKG_URL: data = pkg->url; break; + case PM_PKG_ARCH: data = pkg->arch; break; + case PM_PKG_BUILDDATE: data = pkg->builddate; break; + case PM_PKG_BUILDTYPE: data = pkg->buildtype; break; + case PM_PKG_INSTALLDATE: data = pkg->installdate; break; + case PM_PKG_PACKAGER: data = pkg->packager; break; + case PM_PKG_SIZE: data = (void *)(long)pkg->size; break; + case PM_PKG_USIZE: data = (void *)(long)pkg->usize; break; + case PM_PKG_REASON: data = (void *)(long)pkg->reason; break; + case PM_PKG_LICENSE: data = pkg->license; break; + case PM_PKG_REPLACES: data = pkg->replaces; break; + case PM_PKG_MD5SUM: data = pkg->md5sum; break; + case PM_PKG_SHA1SUM: data = pkg->sha1sum; break; + case PM_PKG_DEPENDS: data = pkg->depends; break; + case PM_PKG_REMOVES: data = pkg->removes; break; + case PM_PKG_REQUIREDBY: data = pkg->requiredby; break; + case PM_PKG_PROVIDES: data = pkg->provides; break; + case PM_PKG_CONFLICTS: data = pkg->conflicts; break; + case PM_PKG_FILES: data = pkg->files; break; + case PM_PKG_BACKUP: data = pkg->backup; break; + case PM_PKG_SCRIPLET: data = (void *)(long)pkg->scriptlet; break; + case PM_PKG_DATA: data = pkg->data; break; + default: + data = NULL; + break; + } + + return(data); +} hunk ./lib/libalpm/package.h 102 +void *_alpm_pkg_getinfo(pmpkg_t *pkg, unsigned char parm); } From vmiklos at frugalware.org Sat Feb 3 21:29:14 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Feb 3 21:29:24 2007 Subject: [Frugalware-darcs] pacman-g2: _alpm_db_load_pkgcache(): fix the log message Message-ID: <20070203202914.1944A13A4ED9@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman-g2;a=darcs_commitdiff;h=20070203195449-e2957-7ddd78fe053f5d4bdab6c10f6bcdc3777dfb79ce.gz; [_alpm_db_load_pkgcache(): fix the log message VMiklos **20070203195449] { hunk ./lib/libalpm/cache.c 54 - infolevel, db->treename); + 0, db->treename); } From vmiklos at frugalware.org Sat Feb 3 21:29:14 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Feb 3 21:29:28 2007 Subject: [Frugalware-darcs] pacman-g2: _alpm_db_load_pkgcache: call _alpm_db_scan() with infolevel=0 Message-ID: <20070203202915.4915D13A512B@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman-g2;a=darcs_commitdiff;h=20070203194919-e2957-b35f3e1afedc76518e046120027d787346edc554.gz; [_alpm_db_load_pkgcache: call _alpm_db_scan() with infolevel=0 VMiklos **20070203194919] { hunk ./lib/libalpm/cache.c 46 - /* The group cache needs INFRQ_DESC as well */ - unsigned char infolevel = INFRQ_DEPENDS | INFRQ_DESC; hunk ./lib/libalpm/cache.c 57 - while((info = _alpm_db_scan(db, NULL, infolevel)) != NULL) { + while((info = _alpm_db_scan(db, NULL, 0)) != NULL) { } From vmiklos at frugalware.org Sat Feb 3 21:29:18 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Feb 3 21:29:31 2007 Subject: [Frugalware-darcs] pacman-g2: the cache is no longer loaded with DEPENDS by default Message-ID: <20070203202920.AD5B613A512C@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman-g2;a=darcs_commitdiff;h=20070203194935-e2957-6a9a5af41f3a8557e04fec1de883e66c66e51014.gz; [the cache is no longer loaded with DEPENDS by default VMiklos **20070203194935] { hunk ./lib/libalpm/alpm.c 499 - /* not needed: the cache is loaded with DEPENDS by default hunk ./lib/libalpm/alpm.c 508 - break;*/ + break; } From vmiklos at frugalware.org Sat Feb 3 21:29:22 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Feb 3 21:29:32 2007 Subject: [Frugalware-darcs] pacman-g2: fix test sync999 Message-ID: <20070203202922.A39BA13A512C@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman-g2;a=darcs_commitdiff;h=20070203201136-e2957-b4ced7f625b38973a02e69467d4c801bfa518392.gz; [fix test sync999 VMiklos **20070203201136] { hunk ./lib/libalpm/sync.c 130 - for(k = spkg->replaces; k; k = k->next) { + for(k = _alpm_pkg_getinfo(spkg, PM_PKG_REPLACES); k; k = k->next) { } From vmiklos at frugalware.org Sat Feb 3 21:29:32 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sat Feb 3 21:29:43 2007 Subject: [Frugalware-darcs] pacman-g2: fix test sync050 Message-ID: <20070203202933.8928F13A48DB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman-g2;a=darcs_commitdiff;h=20070203202530-e2957-0b9012b6e370ef7dba122addb1c224c8cf7060ea.gz; [fix test sync050 VMiklos **20070203202530] { hunk ./lib/libalpm/provide.c 45 - if(_alpm_list_is_strin(package, info->provides)) { + if(_alpm_list_is_strin(package, _alpm_pkg_getinfo(info, PM_PKG_PROVIDES))) { } From crazy at frugalware.org Sat Feb 3 22:22:57 2007 From: crazy at frugalware.org (crazy) Date: Sat Feb 3 22:22:59 2007 Subject: [Frugalware-darcs] frugalware-current: lighttpd-1.4.13-2-i686 Message-ID: <20070203212257.37DC913A48DB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203211850-f6986-f34cdfe933a5409ea0e8f73a8d990d068a49288c.gz; [lighttpd-1.4.13-2-i686 crazy **20070203211850 * fix source|up2date ( uhh well till the lighttpd devels post something on that page .. ) ] { hunk ./source/network-extra/lighttpd/FrugalBuild 11 -up2date="lynx -dump $url/download/|grep -m 1 -o '[0-9\.]\+\.tar\.gz'|sed 's/\.tar\.gz//'" -source=($url/download/$pkgname-$pkgver.tar.gz $pkgname.conf rc.$pkgname index.html http://frugalware.org/images/frugalware.png) +up2date="lynx -dump lynx -dump http://www.lighttpd.net/download|grep -m1 'lighttpd-'|sed 's/.*pd-//'|tr - ." +source=( http://64.34.180.144/assets/2007/1/29/$pkgname-$pkgver.tar.gz \ + $pkgname.conf rc.$pkgname index.html http://frugalware.org/images/frugalware.png) hunk ./source/network-extra/lighttpd/FrugalBuild 18 -sha1sums=('b17553e66609f85baec50263712a4a5aeca50ca5' \ - '1a1d742bba61f24b42a4aea99623ceabbd345d3e' \ - 'f30cb68ad73467a43317afabe0f4a90472df222e' \ - 'd6c2577965670f3e116d9358551cdc2f4b10b4b4' \ - '62fdfe9e07b2b55be660bd107bb6e1c742d90a3e') hunk ./source/network-extra/lighttpd/FrugalBuild 38 +sha1sums=('b17553e66609f85baec50263712a4a5aeca50ca5'\ + '1a1d742bba61f24b42a4aea99623ceabbd345d3e'\ + 'f30cb68ad73467a43317afabe0f4a90472df222e'\ + 'd6c2577965670f3e116d9358551cdc2f4b10b4b4'\ + '62fdfe9e07b2b55be660bd107bb6e1c742d90a3e') } From crazy at frugalware.org Sat Feb 3 22:27:05 2007 From: crazy at frugalware.org (crazy) Date: Sat Feb 3 22:27:07 2007 Subject: [Frugalware-darcs] frugalware-current: lighttpd-1.4.13-2-i686 Message-ID: <20070203212705.6FC9E13A400E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203212338-f6986-7535d570e5dce98746b9a7cd7a67a0b32801da78.gz; [lighttpd-1.4.13-2-i686 crazy **20070203212338 * uff typo ] { hunk ./source/network-extra/lighttpd/FrugalBuild 11 -up2date="lynx -dump lynx -dump http://www.lighttpd.net/download|grep -m1 'lighttpd-'|sed 's/.*pd-//'|tr - ." +up2date="lynx -dump http://www.lighttpd.net/download|grep -m1 'lighttpd-'|sed 's/.*pd-//'|tr - ." } From krics at linuxforum.hu Sat Feb 3 22:27:23 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sat Feb 3 22:27:25 2007 Subject: [Frugalware-darcs] frugalware-current: gedit-2.17.4-1-x86_64 Message-ID: <20070203212724.0CC7613A48D8@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203212639-d209c-4e40c199ed82d417d0f5b9a09ec9694ed69ff00f.gz; [gedit-2.17.4-1-x86_64 Christian Hamar alias krix **20070203212639 * Version bump ] { hunk ./source/gnome/gedit/FrugalBuild 5 -pkgver=2.17.3 +pkgver=2.17.4 hunk ./source/gnome/gedit/FrugalBuild 9 -depends=('eel>=2.17.1' 'scrollkeeper' 'desktop-file-utils' 'python>=2.5' 'gtksourceview>=1.8.3' 'dbus-glib>=0.71-2' 'enchant' 'iso-codes') +depends=('eel>=2.17.90' 'scrollkeeper' 'desktop-file-utils' 'python>=2.5' 'gtksourceview>=1.8.3' 'dbus-glib>=0.71-2' 'enchant' 'iso-codes') hunk ./source/gnome/gedit/FrugalBuild 18 -sha1sums=('195f311778773cccc8670deed8f5ddf538381ab2') hunk ./source/gnome/gedit/FrugalBuild 32 - Fsplit gedit-python usr/lib/gedit-2/plugins/*.py* + # zzzz why this dont need ? hm. strange :P +# Fsplit gedit-python usr/lib/gedit-2/plugins/*.py* hunk ./source/gnome/gedit/FrugalBuild 44 +sha1sums=('1c6f517aeb67c431c911ddca5ab654ab4a0b55b2') } From janny at frugalware.org Sun Feb 4 00:38:44 2007 From: janny at frugalware.org (Janny) Date: Sun Feb 4 00:38:48 2007 Subject: [Frugalware-darcs] frugalware-current: spidermonkey-1.60-1-i686 Message-ID: <20070203233844.C96D213A400E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070203233516-ee5de-527019d215c1694f89a5b80d9bc846d23395e2dc.gz; [spidermonkey-1.60-1-i686 Janny **20070203233516 version bump ] { hunk ./source/lib-extra/spidermonkey/FrugalBuild 5 -pkgver=1.5 +pkgver=1.60 hunk ./source/lib-extra/spidermonkey/FrugalBuild 10 -depends=('glibc') +depends=('glibc' 'nspr') hunk ./source/lib-extra/spidermonkey/FrugalBuild 15 -sha1sums=('707755be3a94207d5d10ccd1011ca00babe0a689') +sha1sums=('db1457c28d2a55080520d7565a2c271eb1599064') hunk ./source/lib-extra/spidermonkey/FrugalBuild 18 + unset MAKEFLAGS hunk ./source/lib-extra/spidermonkey/FrugalBuild 20 - make -f Makefile.ref BUILD_OPT=1 DIST=$Fdestdir/usr all export + # TODO testing this + #[ "$CARCH" = "x86_64" ] && sed -i -e "s:lib64:lib:g" config.mk + make -f Makefile.ref BUILD_OPT=1 DIST=$Fdestdir/usr all export || Fdie + Fmkdir /usr/include/js + Fmv usr/include/*.h usr/include/js/ hunk ./source/lib-extra/spidermonkey/FrugalBuild 27 -# optimalization ok +# optimization OK } From crazy at frugalware.org Sun Feb 4 01:10:09 2007 From: crazy at frugalware.org (crazy) Date: Sun Feb 4 01:10:16 2007 Subject: [Frugalware-darcs] frugalware-current: oxine-0.6.4-1-i686 Message-ID: <20070204001011.8374513A48DB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070204000633-f6986-a810f6e7f9ad6519bbac52c4e1ffaa31dba2afb9.gz; [oxine-0.6.4-1-i686 crazy **20070204000633 * Version bump * added lirc support ] { hunk ./source/xapps-extra/oxine/FrugalBuild 5 -pkgver=0.6.3 +pkgver=0.6.4 hunk ./source/xapps-extra/oxine/FrugalBuild 8 -depends=('libxtst' 'libxinerama' 'fontconfig' 'openssl' 'curl>=7.16.0' 'xine-lib' 'imagemagick' 'eject' 'mjpegtools>=1.8.0-2' 'netpbm') -makedepends=('inputproto') +depends=('libxtst' 'libxinerama' 'fontconfig' 'openssl' 'curl>=7.16.1' 'xine-lib>=1.1.4' 'imagemagick' \ + 'eject' 'mjpegtools>=1.8.0-2' 'netpbm') +makedepends=('inputproto' 'lirc') hunk ./source/xapps-extra/oxine/FrugalBuild 16 -source=(${source/$pkgver/0.6} ${source/$pkgver.tar.gz/0_6_0-to-0_6_3.patch} \ +source=(${source/$pkgver/0.6} ${source/$pkgver.tar.gz/0_6_0-to-0_6_4.patch} \ hunk ./source/xapps-extra/oxine/FrugalBuild 19 -Fconfopts="$Fconfopts --disable-joystick --disable-lirc --enable-vdr" -sha1sums=('f59572c9152d53c359f1ee9024496835b117770c' \ - '88234f73298c97cd1dc0026bcc6212bc7460b207' \ - '8baab02025c54ed28fc16cb443ea6fb4fca16db9') +Fconfopts="$Fconfopts --disable-joystick --enable-lirc --enable-vdr" hunk ./source/xapps-extra/oxine/FrugalBuild 22 +sha1sums=('f59572c9152d53c359f1ee9024496835b117770c'\ + '5c06c9674bd33b7b4f080be308edd11fa06db752'\ + '8baab02025c54ed28fc16cb443ea6fb4fca16db9') } From crazy at frugalware.org Sun Feb 4 02:47:26 2007 From: crazy at frugalware.org (crazy) Date: Sun Feb 4 02:47:28 2007 Subject: [Frugalware-darcs] frugalware-current: transkode-0.6-1-i686 Message-ID: <20070204014726.3B67A13A400E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070204014356-f6986-5ec8381d0274175ba4792a2d8fa743c02a930ee0.gz; [transkode-0.6-1-i686 crazy **20070204014356 * Version bump ] { hunk ./source/kde-extra/transkode/FrugalBuild 5 -pkgver=0.6b2 -pkgrel=2 +pkgver=0.6 +pkgrel=1 hunk ./source/kde-extra/transkode/FrugalBuild 12 -_F_cd_path="$pkgname" hunk ./source/kde-extra/transkode/FrugalBuild 16 -Finclude kde sourceforge -sha1sums=('36601cf0ee877a08f51614f6fbfd289e922f456b') +options=('force') +Finclude sourceforge kde hunk ./source/kde-extra/transkode/FrugalBuild 20 +sha1sums=('33636a8caddf55696a31a2e39c49b9c411bae841') } From crazy at frugalware.org Sun Feb 4 03:15:45 2007 From: crazy at frugalware.org (crazy) Date: Sun Feb 4 03:15:47 2007 Subject: [Frugalware-darcs] frugalware-current: loudmouth-1.2.0-1-i686 Message-ID: <20070204021545.4E63013A48DB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070204021205-f6986-7160582cf50244879adead62cc0308925521947f.gz; [loudmouth-1.2.0-1-i686 crazy **20070204021205 * Version bump ] { hunk ./source/apps-extra/loudmouth/FrugalBuild 5 -pkgver=1.0.5 -pkgrel=2 +pkgver=1.2.0 +pkgrel=1 hunk ./source/apps-extra/loudmouth/FrugalBuild 15 -sha1sums=('1b32a74846be7924be2fa2ac4f48742627236dd5') - +Fconfopts="$Fconfopts --enable-debug=no" +sha1sums=('cfd7e523ca79ae9700e6be007c2fab382c4d8d4d') } From crazy at frugalware.org Sun Feb 4 04:51:22 2007 From: crazy at frugalware.org (crazy) Date: Sun Feb 4 04:51:32 2007 Subject: [Frugalware-darcs] frugalware-current: inkscape-0.44.1-3-i686 Message-ID: <20070204035122.CE03413A400E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070204034615-f6986-3e9867ac8076bd4e15c43e12ff5794e36322aa40.gz; [inkscape-0.44.1-3-i686 crazy **20070204034615 * rebuild with loudmouth * added an patch to get the bindings to compile ] { addfile ./source/xapps-extra/inkscape/bindings-compile-fix.patch hunk ./source/xapps-extra/inkscape/FrugalBuild 7 -pkgrel=2 +pkgrel=3 hunk ./source/xapps-extra/inkscape/FrugalBuild 10 -depends=('lcms' 'atk' 'gtkmm>=2.10.1' 'libxslt' 'pango>=1.14.3' 'loudmouth>=1.0.4-3' 'libgc' 'gtkspell' \ +depends=('lcms' 'atk' 'gtkmm>=2.10.1' 'libxslt' 'pango>=1.14.3' 'loudmouth>=1.2.0' 'libgc' 'gtkspell' \ hunk ./source/xapps-extra/inkscape/FrugalBuild 17 -sha1sums=('6e55d0cf9f4ef50aaca250de36cde33654fb180a') +source=($source bindings-compile-fix.patch) hunk ./source/xapps-extra/inkscape/FrugalBuild 31 +sha1sums=('6e55d0cf9f4ef50aaca250de36cde33654fb180a'\ + '85d9b4a7bf718a51efa13eb40fcc01a2d9378734') hunk ./source/xapps-extra/inkscape/bindings-compile-fix.patch 1 +diff -Naur inkscape-0.44.1/src/extension/script/inkscape_perl_wrap.cpp inkscape-0.44.1-p/src/extension/script/inkscape_perl_wrap.cpp +--- inkscape-0.44.1/src/extension/script/inkscape_perl_wrap.cpp 2006-09-06 07:42:03.000000000 +0200 ++++ inkscape-0.44.1-p/src/extension/script/inkscape_perl_wrap.cpp 2007-02-04 04:07:25.000000000 +0100 +@@ -776,14 +776,17 @@ + static void _swig_create_magic(CPerlObj *pPerl, SV *sv, const char *name, int (CPerlObj::*set)(SV *, MAGIC *), int (CPerlObj::*get)(SV *, MAGIC *)) { + #endif + MAGIC *mg; ++ MGVTBL *mgvtbl; + sv_magic(sv,sv,'U',(char *) name,strlen(name)); + mg = mg_find(sv,'U'); +- mg->mg_virtual = (MGVTBL *) malloc(sizeof(MGVTBL)); +- mg->mg_virtual->svt_get = (SwigMagicFuncHack) get; +- mg->mg_virtual->svt_set = (SwigMagicFuncHack) set; +- mg->mg_virtual->svt_len = 0; +- mg->mg_virtual->svt_clear = 0; +- mg->mg_virtual->svt_free = 0; ++ mgvtbl = (MGVTBL *) malloc(sizeof(MGVTBL)); ++ memcpy((void*)mgvtbl, (const void*)mg, sizeof(MGVTBL)); ++ mgvtbl->svt_get = (SwigMagicFuncHack) get; ++ mgvtbl->svt_set = (SwigMagicFuncHack) set; ++ mgvtbl->svt_len = 0; ++ mgvtbl->svt_clear = 0; ++ mgvtbl->svt_free = 0; ++ mg->mg_virtual = mgvtbl; + } + + +diff -Naur inkscape-0.44.1/src/extension/script/inkscape_py_wrap.cpp inkscape-0.44.1-p/src/extension/script/inkscape_py_wrap.cpp +--- inkscape-0.44.1/src/extension/script/inkscape_py_wrap.cpp 2006-09-06 07:42:03.000000000 +0200 ++++ inkscape-0.44.1-p/src/extension/script/inkscape_py_wrap.cpp 2007-02-04 04:08:14.000000000 +0100 +@@ -802,7 +802,7 @@ + obj = pyobj; + if (PyCFunction_Check(obj)) { + /* here we get the method pointer for callbacks */ +- char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc); ++ const char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc); + c = doc ? strstr(doc, "swig_ptr: ") : 0; + if (c) { + c += 10; +@@ -977,11 +977,11 @@ + swig_type_info **types_initial) { + int i; + for (i = 0; methods[i].ml_name; ++i) { +- char *c = methods[i].ml_doc; ++ const char *c = methods[i].ml_doc; + if (c && (c = strstr(c, "swig_ptr: "))) { + int j; + swig_const_info *ci = 0; +- char *name = c + 10; ++ const char *name = c + 10; + for (j = 0; const_table[j].type; j++) { + if (strncmp(const_table[j].name, name, + strlen(const_table[j].name)) == 0) { } From alex at alex-smith.me.uk Sun Feb 4 08:38:47 2007 From: alex at alex-smith.me.uk (AlexExtreme) Date: Sun Feb 4 08:38:52 2007 Subject: [Frugalware-darcs] frugalware-current: gnome-screensaver-2.17.6-1-i686 Message-ID: <20070204073847.DE9B713A400E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070204073813-46e39-1dd42c54d7e763b9fd4e3b5f0dbc1fce5e8e6973.gz; [gnome-screensaver-2.17.6-1-i686 AlexExtreme **20070204073813 * Version bump ] { hunk ./source/gnome/gnome-screensaver/FrugalBuild 5 -pkgver=2.17.5 +pkgver=2.17.6 hunk ./source/gnome/gnome-screensaver/FrugalBuild 9 -depends=('libgnomeui>=2.17.1' 'dbus-glib>=0.71' 'gnome-menus>=2.17.5' 'gdm>=2.17.5' 'libgnomekbd' \ +depends=('libgnomeui>=2.17.90' 'dbus-glib>=0.71' 'gnome-menus>=2.17.5' 'gdm>=2.17.6' 'libgnomekbd' \ hunk ./source/gnome/gnome-screensaver/FrugalBuild 19 -source=(${source[@]} 61_switch_user_by_default.patch categorize_capplet_desktop_file.patch) -sha1sums=('428f7b23e421ef79c259d02b6c2404368b472ce7' \ - 'b9b5caf32bfd048107da4616c78276e3fe8fe7ee' \ - 'e0173d2446405b6ee32828206cba6e3c877a3e63') +source=(${source[@]} 61_switch_user_by_default.patch) +sha1sums=('b6ab58186863052384c3d5f376f47f8ae743e3c2' \ + 'b9b5caf32bfd048107da4616c78276e3fe8fe7ee') hunk ./source/gnome/gnome-screensaver/categorize_capplet_desktop_file.patch 1 -Index: data/gnome-screensaver-preferences.desktop.in -=================================================================== ---- data/gnome-screensaver-preferences.desktop.in (revision 1067) -+++ data/gnome-screensaver-preferences.desktop.in (working copy) -@@ -6,7 +6,7 @@ - Exec=gnome-screensaver-preferences - Terminal=false - Type=Application --Categories=Application;Settings; -+Categories=Application;Settings;DesktopSettings; - OnlyShowIn=GNOME; - StartupNotify=true - X-GNOME-Bugzilla-Bugzilla=GNOME rmfile ./source/gnome/gnome-screensaver/categorize_capplet_desktop_file.patch } From alex at alex-smith.me.uk Sun Feb 4 08:58:14 2007 From: alex at alex-smith.me.uk (AlexExtreme) Date: Sun Feb 4 08:58:18 2007 Subject: [Frugalware-darcs] frugalware-current: virt-manager-0.3.0-1-i686 Message-ID: <20070204075815.81C0313A400E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070204075755-46e39-ed29d20f6d4b0c90fea6b906586eaac6f81bff1a.gz; [virt-manager-0.3.0-1-i686 AlexExtreme **20070204075755 * Version bump ] { hunk ./source/gnome-extra/virt-manager/FrugalBuild 5 -pkgver=0.2.6 +pkgver=0.3.0 hunk ./source/gnome-extra/virt-manager/FrugalBuild 9 -depends=('pygtk' 'libvirt-python' 'dbus-python' 'libxml2' 'gnome-python-desktop' 'vte-python' 'virtinst' 'xen>=3.0.3-2') +depends=('pygtk' 'libvirt-python' 'dbus-python' 'libxml2' 'gnome-python-desktop' 'vte-python' 'virtinst>=0.100.0' 'xen>=3.0.4') hunk ./source/gnome-extra/virt-manager/FrugalBuild 18 -sha1sums=('499a3c02005447edf9737790d23593df595992e3' \ - '2347aed5a8bf42809db8294c75da97f47a724eb9') +sha1sums=('7ac577f90085be50bd31172df0aaa97ebd4942d0'\ + '2347aed5a8bf42809db8294c75da97f47a724eb9') } From alex at alex-smith.me.uk Sun Feb 4 09:03:53 2007 From: alex at alex-smith.me.uk (AlexExtreme) Date: Sun Feb 4 09:03:55 2007 Subject: [Frugalware-darcs] frugalware-current: beryl.sh: version bump Message-ID: <20070204080353.4F53313A400E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070204080156-46e39-e8b81a52ed4ac20ebda6dcf1d5ffa433d5b371a9.gz; [beryl.sh: version bump AlexExtreme **20070204080156] { hunk ./source/include/beryl.sh 13 -pkgver=0.1.99.2 +pkgver=0.1.9999.1 } From alex at alex-smith.me.uk Sun Feb 4 09:10:29 2007 From: alex at alex-smith.me.uk (AlexExtreme) Date: Sun Feb 4 09:10:31 2007 Subject: [Frugalware-darcs] frugalware-current: beryl.sh: un-version bump (i don't know how to revert a patch in darcs ><), there's some stuff missing from .9999.1 Message-ID: <20070204081029.DAE6C13A400E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070204080914-46e39-ff46e85b81622e260ba28f9119383aa55c1e2c89.gz; [beryl.sh: un-version bump (i don't know how to revert a patch in darcs ><), there's some stuff missing from .9999.1 AlexExtreme **20070204080914] { hunk ./source/include/beryl.sh 13 -pkgver=0.1.9999.1 +pkgver=0.1.99.2 } From boobaa at frugalware.org Sun Feb 4 09:21:17 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Sun Feb 4 09:21:19 2007 Subject: [Frugalware-darcs] frugalware-current: tellico-1.2.8-1-i686 Message-ID: <20070204082117.9B15713A400E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070204082028-60d9d-b8c3c0d728b0425b9a494ade9508fdc2fc0f61a6.gz; [tellico-1.2.8-1-i686 CSÉCSY László **20070204082028 version bump ] { hunk ./source/kde-extra/tellico/FrugalBuild 5 -pkgver=1.2.7 +pkgver=1.2.8 hunk ./source/kde-extra/tellico/FrugalBuild 15 -sha1sums=('be7bcff438ee9c90ffa08a120d8386c855875350') hunk ./source/kde-extra/tellico/FrugalBuild 17 +sha1sums=('11053292b102a6b23181f998d1d1e0ebedb06997') } From krics at linuxforum.hu Sun Feb 4 13:45:24 2007 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sun Feb 4 13:45:33 2007 Subject: [Frugalware-darcs] frugalware-current: gnome-keyring-manager-2.17.0-1-x86_64 Message-ID: <20070204124524.978C513A400E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070204124424-d209c-4ba24d53f31954bed468b3fb4d1e56c63ce29872.gz; [gnome-keyring-manager-2.17.0-1-x86_64 Christian Hamar alias krix **20070204124424 * Version bump ] { hunk ./source/gnome-extra/gnome-keyring-manager/FrugalBuild 5 -pkgver=2.16.0 -pkgrel=2 +pkgver=2.17.0 +pkgrel=1 hunk ./source/gnome-extra/gnome-keyring-manager/FrugalBuild 9 -depends=('gtk+2' 'gnome-keyring>=0.6.0' 'libgnomeui>=2.16.0' 'dbus-glib>=0.71-2') +depends=('gtk+2' 'gnome-keyring>=0.6.0' 'libgnomeui>=2.17.90' 'dbus-glib>=0.71-2') hunk ./source/gnome-extra/gnome-keyring-manager/FrugalBuild 17 -sha1sums=('400e50c2cdfabb846221b217aeb18774ac070d40') hunk ./source/gnome-extra/gnome-keyring-manager/FrugalBuild 18 +sha1sums=('5851bd906de53cf63063c9a8f079a29341de3d7b') } From vmiklos at frugalware.org Sun Feb 4 13:46:48 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Feb 4 13:46:49 2007 Subject: [Frugalware-darcs] frugalware-current: pysvn-1.5.1-1-i686 Message-ID: <20070204124648.546D913A400E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070204124601-e2957-3dc9a15381dad2dd392138e5dfae1ed4ab53d23a.gz; [pysvn-1.5.1-1-i686 VMiklos **20070204124601 version bump ] { hunk ./source/devel-extra/pysvn/FrugalBuild 5 -pkgver=1.5.0 -pkgid=34994 +pkgver=1.5.1 +pkgid=36248 hunk ./source/devel-extra/pysvn/FrugalBuild 27 - Fexerel pysvn/_pysvn.so $_F_python_libdir/pysvn/ + Fexerel pysvn/_pysvn_2_5.so $_F_python_libdir/pysvn/ hunk ./source/devel-extra/pysvn/FrugalBuild 30 -sha1sums=('6a9219fb7a95d97b826e3932ed9d2c9fd02dd774' \ - '1b2412c256caa8f938a029c4beee26310471c570') +sha1sums=('1f24b5b18bf93fc978afca049a219128c372ca57'\ + '1b2412c256caa8f938a029c4beee26310471c570') } From vmiklos at frugalware.org Sun Feb 4 13:55:17 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Feb 4 13:55:20 2007 Subject: [Frugalware-darcs] frugalware-current: udev-105-1-i686 Message-ID: <20070204125517.CFE2813A400E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070204125304-e2957-2b96ee84106492580320d18567f397309297b2a8.gz; [udev-105-1-i686 VMiklos **20070204125304 version bump ] { hunk ./source/base/udev/FrugalBuild 5 -pkgver=104 +pkgver=105 } From vmiklos at frugalware.org Sun Feb 4 14:22:22 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Feb 4 14:22:25 2007 Subject: [Frugalware-darcs] frugalware-current: httrack-3.41-1-i686 Message-ID: <20070204132222.3703513A400E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070204132142-e2957-e0216b9d05f6ca117181f84245027e135ed5da12.gz; [httrack-3.41-1-i686 VMiklos **20070204132142 version bump ] { hunk ./source/apps-extra/httrack/FrugalBuild 6 -pkgver=3.40_2 -realver=3.40.3 +pkgver=3.41 +realver=3.41.20 hunk ./source/apps-extra/httrack/FrugalBuild 29 -# optimization ok -sha1sums=('a6da028849f0897e201c3a3e60fa116184bb1965' \ - 'fdf9c19195d9df9e785e01427edada535e5f1a74') +sha1sums=('d8c0685e088c298e12f179054408e8ed31213519'\ + 'fdf9c19195d9df9e785e01427edada535e5f1a74') +# optimization OK } From crazy at frugalware.org Sun Feb 4 16:24:58 2007 From: crazy at frugalware.org (crazy) Date: Sun Feb 4 16:25:01 2007 Subject: [Frugalware-darcs] frugalware-current: pan-0.122-1-i686 Message-ID: <20070204152458.6303913A400E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070204152010-f6986-693d3cdb2e6ea42ec3a2e78144795efec355dc76.gz; [pan-0.122-1-i686 crazy **20070204152010 * Version bump ] { hunk ./source/gnome-extra/pan/FrugalBuild 6 -pkgver=0.121 +pkgver=0.122 hunk ./source/gnome-extra/pan/FrugalBuild 24 -sha1sums=('9b22353995dac00daf5609d4a1754ea7008b7dac') +sha1sums=('996fd306ee41c337202627a778bbc5dcee46ee22') } From crazy at frugalware.org Sun Feb 4 16:39:07 2007 From: crazy at frugalware.org (crazy) Date: Sun Feb 4 16:39:11 2007 Subject: [Frugalware-darcs] frugalware-current: ndiswrapper-1.37-1-i686 Message-ID: <20070204153907.EFBDC13A400E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070204153433-f6986-64417441aa731873853932576de52905ed31a7c8.gz; [ndiswrapper-1.37-1-i686 crazy **20070204153433 * Version bump ] { hunk ./source/network-extra/ndiswrapper/FrugalBuild 5 -pkgver=1.35 +pkgver=1.37 hunk ./source/network-extra/ndiswrapper/FrugalBuild 16 -sha1sums=('3e7e2b632dadec6ec70681c0d4e4d7d0ca1366b1'\ +sha1sums=('480b08a011a8f2970e7501cb1d957a60ca763357'\ } From boobaa at frugalware.org Sun Feb 4 18:55:33 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Sun Feb 4 18:55:36 2007 Subject: [Frugalware-darcs] frugalware-current: bibletime-1.6.3b-1-i686 Message-ID: <20070204175533.3FFDC13A400E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070204175307-60d9d-d1e126a507901643cfce2092bebbdd7fd90fae29.gz; [bibletime-1.6.3b-1-i686 CSÉCSY László **20070204175307 version bump ] { hunk ./source/kde-extra/bibletime/FrugalBuild 6 -pkgver=1.6.2 +pkgver=1.6.3b hunk ./source/kde-extra/bibletime/FrugalBuild 17 -sha1sums=('d66cd3c227e2989d1e2716e861ac982221d8877a') hunk ./source/kde-extra/bibletime/FrugalBuild 19 +sha1sums=('d16b9641d692dff39e3f2a2e09793fbaf80fdd4c') } From vmiklos at frugalware.org Sun Feb 4 19:31:30 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Feb 4 19:31:32 2007 Subject: [Frugalware-darcs] frugalware-current: bmp-docklet-1.3-1-x86_64 Message-ID: <20070204183130.277CB13A400E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070204193032-e2957-be8f376df67e09cd38772cf1249522cb69bf30c9.gz; [bmp-docklet-1.3-1-x86_64 VMiklos **20070204193032 added x86_64 to archs() ] { hunk ./source/xapps-extra/bmp-docklet/FrugalBuild 12 -archs=('i686') +archs=('i686' 'x86_64') } From vmiklos at frugalware.org Sun Feb 4 19:36:28 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Feb 4 19:36:30 2007 Subject: [Frugalware-darcs] frugalware-current: coccinella-0.95.15-1-x86_64 Message-ID: <20070204183628.DE87813A400E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070204193602-e2957-0971352387fe52ff0f8fad7b8d501ea383fa7dbe.gz; [coccinella-0.95.15-1-x86_64 VMiklos **20070204193602 added x86_64 to archs() ] { hunk ./source/xapps-extra/coccinella/FrugalBuild 10 -archs=('i686') +archs=('i686' 'x86_64') } From vmiklos at frugalware.org Sun Feb 4 19:42:18 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Feb 4 19:42:21 2007 Subject: [Frugalware-darcs] frugalware-current: codeblocks-1.0rc2-1-x86_64 Message-ID: <20070204184218.97ABB13A400E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070204194130-e2957-3d412e984e411a38d811c35f2df2bb7f80bf6ef5.gz; [codeblocks-1.0rc2-1-x86_64 VMiklos **20070204194130 added x86_64 to archs() ] { hunk ./source/xapps-extra/codeblocks/FrugalBuild 12 -archs=('i686') +archs=('i686' 'x86_64') } From boobaa at frugalware.org Sun Feb 4 19:44:11 2007 From: boobaa at frugalware.org (CSÉCSY László) Date: Sun Feb 4 19:44:13 2007 Subject: [Frugalware-darcs] frugalware-current: bibletime-i18n-1.6.3b-1-i686 Message-ID: <20070204184411.AB17513A400E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070204183233-60d9d-578ae012607a376720540b6a7588f8700a09c513.gz; [bibletime-i18n-1.6.3b-1-i686 CSÉCSY László **20070204183233 version bump ] { hunk ./source/locale-extra/bibletime-i18n/FrugalBuild 6 -pkgver=1.6.2 +pkgver=1.6.3b hunk ./source/locale-extra/bibletime-i18n/FrugalBuild 17 -sha1sums=('c641db28a9c26ab0ff551d09eda90655db833c31' \ - 'e64002420c47e08ff7704bd53b048ef4f763bdc9') hunk ./source/locale-extra/bibletime-i18n/FrugalBuild 24 +sha1sums=('35d9561985733e540f7b66cb4b1f3e1bc7a5ecda'\ + 'e64002420c47e08ff7704bd53b048ef4f763bdc9') + } From vmiklos at frugalware.org Sun Feb 4 19:57:06 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Feb 4 19:57:08 2007 Subject: [Frugalware-darcs] frugalware-current: dlume-0.2.4-1-x86_64 Message-ID: <20070204185706.DB87B13A400E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070204195619-e2957-5e5ba27a13e1de68f9afa048c4fa4b4cd9be84ca.gz; [dlume-0.2.4-1-x86_64 VMiklos **20070204195619 added x86_64 to archs() ] { hunk ./source/xapps-extra/dlume/FrugalBuild 11 -archs=('i686') +archs=('i686' 'x86_64') } From vmiklos at frugalware.org Sun Feb 4 20:23:51 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Feb 4 20:23:54 2007 Subject: [Frugalware-darcs] frugalware-current: openjdk-1.6.0-4-i686 Message-ID: <20070204192351.89A8913A48D8@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070204192034-e2957-995a57369191bc2acfff40b672b6ac2daf8db929.gz; [openjdk-1.6.0-4-i686 VMiklos **20070204192034 update to build '07' ] { hunk ./source/devel-extra/openjdk/FrugalBuild 6 -pkgrel=3 -build_id="06" -rel_id="hotspot-7-ea-src-b$build_id-18_jan_2007" +pkgrel=4 +build_id="07" +rel_id="hotspot-7-ea-src-b$build_id-01_feb_2007" hunk ./source/devel-extra/openjdk/FrugalBuild 67 -sha1sums=('880bee9fd660913dd919aa5857d482d8b78403ff' \ - '20daed3070cfed23b9c1d8d47f261c1d6151c4d4' \ - '26762d4aa846b15229fd175577f26611cc22194d') +sha1sums=('c47c04db77511858b6b8687b20aa828f63b49981'\ + '20daed3070cfed23b9c1d8d47f261c1d6151c4d4'\ + '26762d4aa846b15229fd175577f26611cc22194d') } From vmiklos at frugalware.org Sun Feb 4 20:28:39 2007 From: vmiklos at frugalware.org (VMiklos) Date: Sun Feb 4 20:28:41 2007 Subject: [Frugalware-darcs] frugalware-current: fwbuilder-2.1.8-1-x86_64 Message-ID: <20070204192839.B1AF413A48DB@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070204202751-e2957-227001f3f868b1f71ea5d24cd0e52957f512dace.gz; [fwbuilder-2.1.8-1-x86_64 VMiklos **20070204202751 added x86_64 to archs() ] { hunk ./source/xapps-extra/fwbuilder/FrugalBuild 12 -archs=('i686') +archs=('i686' 'x86_64') } From voroskoi at frugalware.org Sun Feb 4 20:31:45 2007 From: voroskoi at frugalware.org (voroskoi) Date: Sun Feb 4 20:31:47 2007 Subject: [Frugalware-darcs] frugalware-current: seamonkey-1.1-1-i686 Message-ID: <20070204193146.1D5F613A400E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070204192616-dd049-d2d33e4e5b6fb88c672a71856cc98f73941f6dad.gz; [seamonkey-1.1-1-i686 voroskoi **20070204192616 version bump removed no more necessary nss patch calendar is no more available ] { hunk ./source/xapps-extra/seamonkey/00-firefox-1.5-system-nss.patch 1 ---- mozilla/configure.in 4 Oct 2005 05:53:49 -0000 1.1503.2.15 -+++ mozilla/configure.in 15 Dec 2005 05:40:40 -0000 -@@ -86,6 +86,7 @@ - MOZPNG=10207 - MOZZLIB=1.2.3 - NSPR_VERSION=4 -+NSS_VERSION=3 - - dnl Set the minimum version of toolkit libs used by mozilla - dnl ======================================================== -@@ -3472,6 +3473,19 @@ - fi - fi - -+dnl ======================================================== -+dnl = If NSS was not detected in the system, -+dnl = use the one in the source tree (mozilla/security/nss) -+dnl ======================================================== -+ -+MOZ_ARG_WITH_BOOL(system-nss, -+[ --with-system-nss Use system installed NSS], -+ _USE_SYSTEM_NSS=1 ) -+ -+if test -n "$_USE_SYSTEM_NSS"; then -+ AM_PATH_NSS(3.0.0, [MOZ_NATIVE_NSS=1], [MOZ_N