Hello community, here is the log from the commit of package nvdock for openSUSE:Factory checked in at Tue May 17 12:59:55 CEST 2011.
-------- New Changes file: --- /dev/null 2010-08-26 16:28:41.000000000 +0200 +++ nvdock/nvdock.changes 2011-05-04 08:51:38.000000000 +0200 @@ -0,0 +1,10 @@ +------------------------------------------------------------------- +Wed May 4 06:44:48 UTC 2011 - a...@mizerski.pl + +- added nvdock-1.02-datadir.patch.in + +------------------------------------------------------------------- +Tue Mar 22 17:44:05 UTC 2011 - a...@mizerski.pl + +- new package + calling whatdependson for head-i586 New: ---- Makefile nvdock-1.02-argptr.patch nvdock-1.02-datadir.patch.in nvdock-1.02.tar.bz2 nvdock.changes nvdock.desktop nvdock.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nvdock.spec ++++++ # # spec file for package nvdock # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: nvdock Version: 1.02 Release: 1 Summary: Tray icon for launching NVIDIA Settings Group: System/X11/Utilities License: BSD-3 Url: http://www.opsat.net/development/nvdock/ Source0: http://bobmajdakjr.googlecode.com/files/%{name}-%{version}.tar.bz2 # The provided Makefile sucks, so I did this one. -- a...@mizerski.pl Source1: Makefile Source2: %{name}.desktop # PATCH-FEATURE-OPENSUSE nvdock-1.02-datadir.patch.in a...@mizerski.pl - allow custom datadir Source3: %{name}-1.02-datadir.patch.in # PATCH-FIX-UPSTREAM nvdock-1.02-argptr.patch a...@mizerski.pl - Get rid of "warning: cast to pointer from integer of different size" Patch0: %{name}-1.02-argptr.patch BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: update-desktop-files %description Little NVIDIA tray icon. Hover over it and it will tell you your GPU temperature if your card is into that kind of thing. A double click will launch the NVIDIA settings control panel, and right click will bring up a nifty menu with a few options. Also on the menu it will show the NVIDIA driver version, which is surely to come in handy at least one time in your life. %prep %setup -q %patch0 -p1 sed -i "s|@DATADIR@|%{_datadir}|g" %{SOURCE3} | patch -p1 %build make -C src -f %{SOURCE1} %{?_smp_mflags} %install install -m 755 -D src/nvdock %{buildroot}%{_bindir}/nvdock install -m 644 -D data/nvdock.png %{buildroot}%{_datadir}/pixmaps/nvdock.png install -m 644 -D %{SOURCE2} %{buildroot}%{_datadir}/applications/nvdock.desktop %suse_update_desktop_file nvdock %clean rm -rf %{buildroot} %files %defattr(-,root,root) %{_bindir}/nvdock %{_datadir}/pixmaps/nvdock.png %{_datadir}/applications/nvdock.desktop %doc COPYING ChangeLog README TODO %changelog ++++++ Makefile ++++++ CC = gcc CFLAGS = $(shell pkg-config --cflags gtk+-2.0) ${RPM_OPT_FLAGS} LDLIBS = $(shell pkg-config --libs gtk+-2.0) all: nvdock nvdock: nvdock.o icon.o util.o ++++++ nvdock-1.02-argptr.patch ++++++ diff -rupN nvdock-1.02/src/nvdock.c nvdock-1.02_mod/src/nvdock.c --- nvdock-1.02/src/nvdock.c 2007-10-19 12:05:06.000000000 +0200 +++ nvdock-1.02_mod/src/nvdock.c 2011-03-22 18:17:01.478213919 +0100 @@ -40,7 +40,7 @@ bob_main_quit(void) { return; } -int main(int argc, char *argv) { +int main(int argc, char **argv) { if(!exists_application("cut") || !exists_application("grep")) { puts("error: make sure `cut` and `grep` are installed."); @@ -59,7 +59,7 @@ int main(int argc, char *argv) { unsigned int pid = 0; - arg = (argstruct *)argc_argv_parse(argc,argv); + argc_argv_parse(argc,argv); //. more preliminary checks. arg->has_nvclock = exists_application("nvclock"); diff -rupN nvdock-1.02/src/nvdock.h nvdock-1.02_mod/src/nvdock.h --- nvdock-1.02/src/nvdock.h 2007-10-19 12:07:19.000000000 +0200 +++ nvdock-1.02_mod/src/nvdock.h 2011-03-23 00:38:31.472213662 +0100 @@ -79,13 +79,15 @@ typedef struct _argc_argv { gboolean has_nvclock:1; gboolean has_nvclock_gtk:1; - unsigned char nvversion[32]; + char nvversion[32]; } argstruct; argstruct *arg; BobStatusIcon *bsi; +void argc_argv_parse(int argc, char **argv); + gboolean exists_application(const char *); gboolean exists_icon_file(const char *); diff -rupN nvdock-1.02/src/util.c nvdock-1.02_mod/src/util.c --- nvdock-1.02/src/util.c 2007-11-24 12:17:51.000000000 +0100 +++ nvdock-1.02_mod/src/util.c 2011-03-22 18:17:22.350213797 +0100 @@ -33,14 +33,14 @@ The NVIDIA name and Logo are property of #include "nvdock.h" -argstruct * +void argc_argv_parse(int argc, char **argv) { //. this function requires the typedef struct _argc_argv, which has been //. placed in nvdock.h for this application. int a = 1; - argstruct *arg = (argstruct *)malloc(sizeof(argstruct)); + arg = (argstruct *)malloc(sizeof(argstruct)); arg->version = 0; arg->help = 0; @@ -78,8 +78,6 @@ argc_argv_parse(int argc, char **argv) { ++a; } - - return arg; } int ++++++ nvdock-1.02-datadir.patch.in ++++++ diff -rupN nvdock-1.02/src/nvdock.h nvdock-1.02_mod/src/nvdock.h --- nvdock-1.02/src/nvdock.h 2007-10-19 12:07:19.000000000 +0200 +++ nvdock-1.02_mod/src/nvdock.h 2011-05-04 08:37:30.491419448 +0200 @@ -50,7 +50,7 @@ The NVIDIA name and Logo are property of #define CMD_NVIDIA_VERSION "nvidia-settings -q NvidiaDriverVersion | grep Attribute | cut -d : -f 3 | cut -d ' ' -f 2" #define CMD_WHICH_QUERY "which %s 2> /dev/null" -#define ICON "/usr/share/pixmaps/nvdock.png" +#define ICON "@DATADIR@/pixmaps/nvdock.png" #define REFRESH_ICON "GTK_STOCK_REFRESH" #define VERSION_PRINTF "nvDock v%s\nCopyright (c) 2007 Bob Majdak Jr <b...@kateos.org>\nReleased under the BSD License.\n" ++++++ nvdock.desktop ++++++ [Desktop Entry] Type=Application Encoding=UTF-8 Name=NVIDIA Dock GenericName=Tray dock Comment=Tray icon launcher for NVIDIA settings Exec=nvdock Icon=nvdock Categories=TrayIcon; OnlyShowIn=GNOME;KDE;XFCE;LXDE; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
