commit nvdock for openSUSE:Factory
Hello community,
here is the log from the commit of package nvdock for openSUSE:Factory checked
in at 2020-06-10 00:48:11
Comparing /work/SRC/openSUSE:Factory/nvdock (Old)
and /work/SRC/openSUSE:Factory/.nvdock.new.3606 (New)
Package is "nvdock"
Wed Jun 10 00:48:11 2020 rev:9 rq:812690 version:1.02
Changes:
--- /work/SRC/openSUSE:Factory/nvdock/nvdock.changes2011-09-23
02:14:55.0 +0200
+++ /work/SRC/openSUSE:Factory/.nvdock.new.3606/nvdock.changes 2020-06-10
00:48:14.506917612 +0200
@@ -1,0 +2,7 @@
+Sun Jun 7 21:34:54 UTC 2020 - Michal Suchanek
+
+- Use license compatibility cruft, cleanup spec file
+- Fix build with gcc10
+ * nvdock-fix-gcc10-build.patch
+
+---
New:
nvdock-fix-gcc10-build.patch
Other differences:
--
++ nvdock.spec ++
--- /var/tmp/diff_new_pack.L7aJ2n/_old 2020-06-10 00:48:15.202919432 +0200
+++ /var/tmp/diff_new_pack.L7aJ2n/_new 2020-06-10 00:48:15.202919432 +0200
@@ -1,7 +1,7 @@
#
# spec file for package nvdock
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,19 +12,17 @@
# 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/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
-
Name: nvdock
Version:1.02
-Release:1
+Release:0
Summary:Tray icon for launching NVIDIA Settings
-Group: System/X11/Utilities
-
License:BSD-3-Clause
-Url:http://www.opsat.net/development/nvdock/
+Group: System/X11/Utilities
+URL:https://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
@@ -33,9 +31,10 @@
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)
+Patch1: %{name}-fix-gcc10-build.patch
+BuildRequires: pkgconfig
BuildRequires: update-desktop-files
+BuildRequires: pkgconfig(gtk+-2.0)
%description
Little NVIDIA tray icon.
@@ -45,8 +44,8 @@
%prep
%setup -q
-%patch0 -p1
-sed -i "s|@DATADIR@|%{_datadir}|g" %{SOURCE3} | patch -p1
+sed -e "s|@DATADIR@|%{_datadir}|g" < %{SOURCE3} | patch -p1
+%autopatch -p1
%build
make -C src -f %{SOURCE1} %{?_smp_mflags}
@@ -57,14 +56,23 @@
install -m 644 -D %{SOURCE2}
%{buildroot}%{_datadir}/applications/nvdock.desktop
%suse_update_desktop_file nvdock
-%clean
-rm -rf %{buildroot}
+# Compatibility cruft
+# there is no %%license prior to SLE12
+%if %{undefined _defaultlicensedir}
+%define license %doc
+%else
+# filesystem before SLE12 SP3 lacks /usr/share/licenses
+%if 0%(test ! -d %{_defaultlicensedir} && echo 1)
+%define _defaultlicensedir %{_defaultdocdir}
+%endif
+%endif
+# End of compatibility cruft
%files
-%defattr(-,root,root)
%{_bindir}/nvdock
%{_datadir}/pixmaps/nvdock.png
%{_datadir}/applications/nvdock.desktop
-%doc COPYING ChangeLog README TODO
+%license COPYING
+%doc ChangeLog README TODO
%changelog
++ nvdock-fix-gcc10-build.patch ++
diff -ur nvdock-1.02.orig/src/nvdock.c nvdock-1.02/src/nvdock.c
--- nvdock-1.02.orig/src/nvdock.c 2020-06-07 23:45:25.322091577 +0200
+++ nvdock-1.02/src/nvdock.c2020-06-07 23:54:36.049756123 +0200
@@ -33,6 +33,9 @@
#include "nvdock.h"
+argstruct *arg;
+BobStatusIcon *bsi;
+
void
bob_main_quit(void) {
gtk_main_quit();
diff -ur nvdock-1.02.orig/src/nvdock.h nvdock-1.02/src/nvdock.h
--- nvdock-1.02.orig/src/nvdock.h 2020-06-07 23:45:25.322091577 +0200
+++ nvdock-1.02/src/nvdock.h2020-06-07 23:57:10.671907728 +0200
@@ -83,8 +83,8 @@
} argstruct;
-argstruct *arg;
-BobStatusIcon *bsi;
+extern argstruct *arg;
+extern BobStatusIcon *bsi;
void argc_argv_parse(int argc, char **argv);
diff -ur nvdock-1.02.orig/src/util.c nvdock-1.02/src/util.c
--- nvdock-1.02.orig/src/util.c 2020-06-07 23:45:25.322091577 +0200
+++ nvdock-1.02/src/util.c 2020-06-08 00:02:32.440385202 +0200
@@ -112,7 +112,7 @@
unsigned char len = strlen(string);
int a = 0, iter = 0;
- char new[len];
+ char new[len+1];
unsigned char newlen;
while(a < len) {
commit nvdock for openSUSE:Factory
Hello community,
here is the log from the commit of package nvdock for openSUSE:Factory checked
in at 2011-12-06 18:32:54
Comparing /work/SRC/openSUSE:Factory/nvdock (Old)
and /work/SRC/openSUSE:Factory/.nvdock.new (New)
Package is "nvdock", Maintainer is ""
Changes:
Other differences:
--
++ nvdock.spec ++
--- /var/tmp/diff_new_pack.ZwOwqr/_old 2011-12-06 18:53:55.0 +0100
+++ /var/tmp/diff_new_pack.ZwOwqr/_new 2011-12-06 18:53:55.0 +0100
@@ -23,7 +23,7 @@
Summary:Tray icon for launching NVIDIA Settings
Group: System/X11/Utilities
-License:BSD-3
+License:BSD-3-Clause
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
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit nvdock for openSUSE:Factory
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.0 +0200
+++ nvdock/nvdock.changes 2011-05-04 08:51:38.0 +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.c2007-10-19 12:05:06.0 +0200
+++ nvdock-1.02_mod/src/nvdock.c2011-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.h2007-10-19 12:07:19.0 +0200
+++ nvdock-1.02_mod/src/nvdock.h2011-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_applic
