diff options
| -rw-r--r-- | .SRCINFO | 9 | ||||
| -rw-r--r-- | PKGBUILD | 31 | ||||
| -rw-r--r-- | fix_gcc4.5.patch | 29 | ||||
| -rw-r--r-- | netemul.desktop_fix.patch | 29 |
4 files changed, 85 insertions, 13 deletions
@@ -1,13 +1,18 @@ pkgbase = netemul pkgdesc = a program for simulating computer networks pkgver = 1.0 - pkgrel = 1 + pkgrel = 2 url = http://sourceforge.net/projects/netemul arch = i686 + arch = x86_64 license = GPL - depends = qt + depends = qt4 source = http://sourceforge.net/projects/netemul/files/release-1.0/netemul-1.0.tar.gz + source = fix_gcc4.5.patch + source = netemul.desktop_fix.patch md5sums = 551c5047cb496d0e29cec692899e6e7c + md5sums = 9ba75d825bef9a46fbeecdc209862805 + md5sums = fe642185e030dd731d42a09a03d3676f pkgname = netemul @@ -1,21 +1,30 @@ -# Contributor: Jozef Riha <jose1711 gmail com> +# Maintainer: Jozef Riha <jose1711 gmail com> pkgname=netemul pkgver=1.0 -pkgrel=1 +pkgrel=2 pkgdesc="a program for simulating computer networks" -arch=('i686') +arch=('i686' 'x86_64') url="http://sourceforge.net/projects/netemul" license=('GPL') -depends=('qt') -source=("http://sourceforge.net/projects/${pkgname}/files/release-${pkgver}/${pkgname}-${pkgver}.tar.gz") -md5sums=('551c5047cb496d0e29cec692899e6e7c') +depends=('qt4') +source=("http://sourceforge.net/projects/${pkgname}/files/release-${pkgver}/${pkgname}-${pkgver}.tar.gz" "fix_gcc4.5.patch" "netemul.desktop_fix.patch") +md5sums=('551c5047cb496d0e29cec692899e6e7c' + '9ba75d825bef9a46fbeecdc209862805' + 'fe642185e030dd731d42a09a03d3676f') build() { + export QT_SELECT=4 cd ${srcdir}/${pkgname}-${pkgver} - qmake PREFIX=/usr || return 1 - make || return 1 - make INSTALL_ROOT=$pkgdir install || return 1 - /bin/sed -i '/Exec\|Icon/s/local\///g' $pkgdir/usr/share/applications/netemul.desktop || return 1 - install -D -m644 $srcdir/${pkgname}-${pkgver}/images/NetEmul_32x32.png $pkgdir/usr/share/netemul/pixmap/NetEmul.png || return 1 + patch -p1 < $srcdir/fix_gcc4.5.patch + patch -p1 < $srcdir/netemul.desktop_fix.patch + /usr/bin/qmake-qt4 PREFIX=/usr + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make INSTALL_ROOT=$pkgdir install + /bin/sed -i '/Exec\|Icon/s/local\///g' $pkgdir/usr/share/applications/netemul.desktop + install -D -m644 $srcdir/${pkgname}-${pkgver}/images/NetEmul_32x32.png $pkgdir/usr/share/netemul/pixmap/NetEmul.png } diff --git a/fix_gcc4.5.patch b/fix_gcc4.5.patch new file mode 100644 index 000000000000..4a8e670df3ef --- /dev/null +++ b/fix_gcc4.5.patch @@ -0,0 +1,29 @@ +Description: Fix FTBFS with gcc 4.5 + This patch should fix compilation with gcc 4.5. +Author: Stefan Potyra <stefan.potyra@informatik.uni-erlangen.de> +--- +Origin: Ubuntu + + +--- a/src/tools/scenexmlreader.cpp ++++ b/src/tools/scenexmlreader.cpp +@@ -48,7 +48,7 @@ + readNext(); + if ( isEndElement() ) break; + if ( name() == "device" ) { +- device::device *item = new ::device(*this); ++ ::device *item = new ::device(*this); + item->setMenu(myScene->itemMenu() ); + myScene->registerDevice(item); + } +--- a/src/tools/scenexmlwriter.cpp ++++ b/src/tools/scenexmlwriter.cpp +@@ -13,7 +13,7 @@ + writeStartDocument(); + writeStartElement("netemul"); + writeAttribute("version",QCoreApplication::applicationVersion() ); +- foreach ( device::device *i , myScene->devices() ) ++ foreach ( ::device *i , myScene->devices() ) + i->writeXml(*this); + foreach ( textItem *i , myScene->textItems() ) { + writeStartElement("textitem"); diff --git a/netemul.desktop_fix.patch b/netemul.desktop_fix.patch new file mode 100644 index 000000000000..9f2f55923dac --- /dev/null +++ b/netemul.desktop_fix.patch @@ -0,0 +1,29 @@ +Description: Modified netemul.desktop file + This patch modifies netemul.desktop to: + * Comply with the FreeDesktop standars in not using an Encoding entry + * Change the path of the binary from /usr/local/bin/ to /usr/local +Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com> +--- +Origin: Debian + +Index: netemul-git-package/netemul.desktop +=================================================================== +--- netemul-git-package.orig/netemul.desktop 2009-11-27 22:28:22.000000000 -0300 ++++ netemul-git-package/netemul.desktop 2009-11-27 22:29:18.000000000 -0300 +@@ -1,13 +1,12 @@ + [Desktop Entry] +-Encoding=UTF-8 + Name=NetEmul + Name[ru]=NetEmul + Comment=The LAN network simulator + Comment[es]=Simulador de redes de computadoras + Comment[ru]=Симулятор работы локольной сети + Type=Application +-Exec=/usr/local/bin/netemul +-Icon=/usr/local/share/netemul/pixmap/NetEmul.png ++Exec=/usr/bin/netemul ++Icon=/usr/share/netemul/pixmap/NetEmul.png + Terminal=false +-Categories=GNOME;Education; ++Categories=Education; + StartupNotify=true |