From 47c290b08d0eb553697ea99079c3a0ab9877d563 Mon Sep 17 00:00:00 2001 From: kostas Date: Mon, 14 May 2012 23:05:45 +0000 Subject: [PATCH] "make install" works in unix "make install" now installs icon and ".desktop" file Initial Arch-Linux pkgbuild support FossilOrigin-Name: 1b4bb884b1f1c64c3ab7b415fdface636434b6ac --- dist/arch/PKGBUILD | 31 +++++++++++++++++++++++++++++++ fuel.pro | 32 +++++++++++++++++++++++++------- manifest | 15 +++++++++------ manifest.uuid | 2 +- rsrc/fuel.desktop | 10 ++++++++++ rsrc/icons/fuel.png | Bin 0 -> 7116 bytes 6 files changed, 76 insertions(+), 14 deletions(-) create mode 100644 dist/arch/PKGBUILD create mode 100644 rsrc/fuel.desktop create mode 100644 rsrc/icons/fuel.png diff --git a/dist/arch/PKGBUILD b/dist/arch/PKGBUILD new file mode 100644 index 0000000..1535d91 --- /dev/null +++ b/dist/arch/PKGBUILD @@ -0,0 +1,31 @@ +# Maintainer: Kostas Karanikolas +pkgname=fuel +pkgver=0.9.6 +pkgrel=1 +#epoch= +pkgdesc="A GUI front-end to Fossil SCM" +arch=(i686 x86_64) +url="fuel-scm.org" +license=('GPL2') +#groups=() +depends=('qt>=4.7.0', 'fossil') +source=("http://fuel-scm.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") + +md5sums=() #generate with 'makepkg -g' + +build() { + cd "${srcdir}" + [ -d build ] && rm -r build + mkdir build + cd build + qmake "${srcdir}/${pkgname}-${pkgver}/fuel.pro" + make +} + +package() { + cd "${srcdir}/build" + make INSTALL_ROOT="${pkgdir}/usr" install + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} + diff --git a/fuel.pro b/fuel.pro index 0d6e284..3d6f809 100644 --- a/fuel.pro +++ b/fuel.pro @@ -7,11 +7,32 @@ QT += core gui TARGET = Fuel TEMPLATE = app -# OSX Icon -ICON = rsrc/icons/fuel.icns +win32 { + RC_FILE = rsrc/fuel.rc + LIBS += -luser32 -lshell32 +} + +macx { + ICON = rsrc/icons/fuel.icns +} + +unix:!macx { + TARGET = fuel + ICON = rsrc/icons/fuel.png + PREFIX = /usr + BINDIR = $$PREFIX/bin + DATADIR = $$PREFIX/share + target.path = $$BINDIR + + desktop.path = $$DATADIR/applications + desktop.files += rsrc/fuel.desktop + + icon.path = $$DATADIR/icons/hicolor/256x256/apps + icon.files += rsrc/icons/fuel.png + + INSTALLS += target desktop icon +} -# Win Icon -RC_FILE = rsrc/fuel.rc INCLUDEPATH += src @@ -43,6 +64,3 @@ FORMS += ui/MainWindow.ui \ RESOURCES += \ rsrc/resources.qrc -win32 { - LIBS += -luser32 -lshell32 -} diff --git a/manifest b/manifest index e6a15d9..7b87ba9 100644 --- a/manifest +++ b/manifest @@ -1,10 +1,12 @@ -C Updated\sbuild\sinstructions -D 2012-05-13T05:42:39.461 +C "make\sinstall"\sworks\sin\sunix\n"make\sinstall"\snow\sinstalls\sicon\sand\s".desktop"\sfile\nInitial\sArch-Linux\spkgbuild\ssupport\n +D 2012-05-14T23:05:45.682 +F dist/arch/PKGBUILD aa60632b98b7f2c32432d350f8c6a911f1e86b62 F dist/win/fuel.iss ef3558dbba409eb194938b930377fc9ee27d319e F doc/Building.txt cc8113d8e77f1f87809d5222fcfe8b505eb890b8 F doc/Changes.txt e21c9355aaeb7643c8d6784effd2f9ebadf3a8e0 F doc/License.txt 4cc77b90af91e615a64ae04893fdffa7939db84c -F fuel.pro fb579b5fbb9e80c8b47d40bb9c1f888fc4fa85ad +F fuel.pro 2f1650c8b3e4b09eeb5b6283655d2142fe67cb00 +F rsrc/fuel.desktop 43145556bc61f5a91b497c38a16aec44af271d29 F rsrc/fuel.rc 8e9ac966f283102c11a77cd7f936cdc09e09bd79 F rsrc/icons/Address\sBook-01.png ef2cec80ea5a559b72e8be4a344a1869fe69cbd8 F rsrc/icons/Adobe\sIllustrator\sCS3\sDocument-01.png 2e44e933d58eefee7ccfa1650fed4ceadcf3c2be @@ -160,6 +162,7 @@ F rsrc/icons/Zoom\sOut-01.png 8eda092100d9e00c9097f43a80d1e26695947448 F rsrc/icons/Zoom-01.png 67ca532922e9166325c5c75fce1ca3fbb0d2b6a6 F rsrc/icons/fuel.icns 81e535004b62db801a02f3e15d0a33afc9d4070b F rsrc/icons/fuel.ico eb529ab3332a17b9302ef3e851db5b9ebce2a038 +F rsrc/icons/fuel.png 40daf53b7f6bdcdd0d6aa5ef433d078ec5ea4342 F rsrc/resources.qrc e98383ed205f4e37100c60057e0129c3b86dea53 F src/CloneDialog.cpp 85bc6473d1e3a47d0f981e96357a376be63ab0bc F src/CloneDialog.h 1c63da4346ca20b67d52016b7b64875b9c5b477f @@ -184,7 +187,7 @@ F ui/CommitDialog.ui 813d7cba316e226de1a22b7e480bb969fbe9b0c4 F ui/FileActionDialog.ui c63644428579741aeb5fa052e237ba799ced9ad7 F ui/MainWindow.ui 5f4e40bfb3e93b00f2e06a6071187998eb617224 F ui/SettingsDialog.ui 8964629ea80c61971c0601624c84d1927902b1fd -P 235ee0f6e817a0b7f6ff335cfd10c0db0ad83585 -R 3bfce3beaad26fb315dd61015edb9c99 +P af3cadec91e2bab6ba54202d3d82e077fcca8e83 +R 631fd2b96b9460c3ce2c3f7634b8818c U kostas -Z fb35d9f186746b5be2bf8c0ff59628ad +Z c35e58e71af4d6829abb46ea20f9b3b3 diff --git a/manifest.uuid b/manifest.uuid index dc0f97f..201f083 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -af3cadec91e2bab6ba54202d3d82e077fcca8e83 \ No newline at end of file +1b4bb884b1f1c64c3ab7b415fdface636434b6ac \ No newline at end of file diff --git a/rsrc/fuel.desktop b/rsrc/fuel.desktop new file mode 100644 index 0000000..c48a004 --- /dev/null +++ b/rsrc/fuel.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Encoding=UTF-8 +Type=Application +Exec=/usr/bin/fuel +Icon=/usr/share/icons/hicolor/256x256/apps/fuel.png +Terminal=false +Name=Fuel +GenericName=Software Configuration Management tool +Comment=GUI Front-End to the Fossil SCM tool +Categories=Qt;Development;RevisionControl diff --git a/rsrc/icons/fuel.png b/rsrc/icons/fuel.png new file mode 100644 index 0000000000000000000000000000000000000000..067c5fb18f50b0f2b29aaeeec9b047243e61f551 GIT binary patch literal 7116 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