From 3b67dd2ef7de9522c5c1156f9985fd17933d4eb2e51bc49ed861314d17006b7f Mon Sep 17 00:00:00 2001 From: Michael Andres Date: Tue, 5 Nov 2024 13:36:59 +0000 Subject: [PATCH] Fix-to-compile-with-gcc-14.2.1 OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/xpinguin?expand=0&rev=8 --- .gitattributes | 23 ++++++ .gitignore | 1 + 0001-Fix-to-compile-with-gcc-14.2.1.patch | 85 +++++++++++++++++++++++ xpinguin.changes | 72 +++++++++++++++++++ xpinguin.desktop | 10 +++ xpinguin.png | 3 + xpinguin.spec | 58 ++++++++++++++++ xpinguin.tar.gz | 3 + 8 files changed, 255 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 0001-Fix-to-compile-with-gcc-14.2.1.patch create mode 100644 xpinguin.changes create mode 100644 xpinguin.desktop create mode 100644 xpinguin.png create mode 100644 xpinguin.spec create mode 100644 xpinguin.tar.gz diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/0001-Fix-to-compile-with-gcc-14.2.1.patch b/0001-Fix-to-compile-with-gcc-14.2.1.patch new file mode 100644 index 0000000..2e3bf68 --- /dev/null +++ b/0001-Fix-to-compile-with-gcc-14.2.1.patch @@ -0,0 +1,85 @@ +From b413331a7ee84c4119e59d77351d62db14824b0c Mon Sep 17 00:00:00 2001 +From: Michael Andres +Date: Tue, 5 Nov 2024 13:24:44 +0100 +Subject: [PATCH] Fix to compile with gcc 14.2.1 + +Add missing include and fix some wanings. +--- + xpinguin.c | 14 ++++++++------ + 1 file changed, 8 insertions(+), 6 deletions(-) + +diff --git a/xpinguin.c b/xpinguin.c +index ef3137c..7706358 100644 +--- a/xpinguin.c ++++ b/xpinguin.c +@@ -26,6 +26,7 @@ + #include + #endif + ++#include + #include + #include + +@@ -44,13 +45,12 @@ static char *progname; + Display *display; + int screen_num; + +-void main(argc, argv) ++int main(argc, argv) + int argc; + char **argv; + { + /* Display, window and gc manipulation variables */ + Window win; +- GC gc; + XSetWindowAttributes setwinattr; + XGCValues gcvalues; + unsigned long valuemask, gcvaluemask, inputmask; +@@ -74,7 +74,6 @@ void main(argc, argv) + int bufsize = 20; + KeySym keysym; + XComposeStatus compose; +- int charcount; + Cursor cursor; + + #ifndef NOXPM +@@ -84,8 +83,10 @@ void main(argc, argv) + XpmAttributes xpmattributes; + XVisualInfo *visual_info, vinfo_template; + int nmatches; ++#ifdef DEBUG + static char *visual_name[]={ "StaticGray", "GrayScale", "StaticColor", + "PseudoColor", "TrueColor", "DirectColor" }; ++#endif + #endif + + /* Window movement variables */ +@@ -154,7 +155,7 @@ void main(argc, argv) + gcvalues.foreground = BlackPixel(display,screen_num); + gcvalues.background = WhitePixel(display,screen_num); + gcvaluemask = GCForeground | GCBackground; +- gc = XCreateGC(display, win, gcvaluemask, &gcvalues); ++ XCreateGC(display, win, gcvaluemask, &gcvalues); + + #ifdef NOXPM + /* Use b/w dithered X bitmap no matter what */ +@@ -355,8 +356,8 @@ void main(argc, argv) + break; + case KeyPress: + /* Exit on "q" or "Q" */ +- charcount = XLookupString(&report.xkey, buffer, bufsize, +- &keysym, &compose); ++ XLookupString(&report.xkey, buffer, bufsize, ++ &keysym, &compose); + if((keysym == XK_Q) || (keysym == XK_q)) + { + XCloseDisplay(display); +@@ -368,4 +369,5 @@ void main(argc, argv) + break; + } /* end switch */ + } /* end while */ ++ return 0; + } +-- +2.35.3 + diff --git a/xpinguin.changes b/xpinguin.changes new file mode 100644 index 0000000..eb84fc8 --- /dev/null +++ b/xpinguin.changes @@ -0,0 +1,72 @@ +------------------------------------------------------------------- +Mon Mar 15 08:14:49 UTC 2021 - Martin Pluskal + +- Enforce usage of optflags +- Modernise spec file + +------------------------------------------------------------------- +Mon Feb 19 20:31:37 UTC 2018 - crrodriguez@opensuse.org + +- Remove xorg-x11-devel buildRequires + +------------------------------------------------------------------- +Thu Jul 5 15:58:39 CEST 2007 - coolo@suse.de + +- put the desktop file into the package + +------------------------------------------------------------------- +Wed Aug 2 20:37:39 CEST 2006 - aj@suse.de + +- Fix paths for X11R7. + +------------------------------------------------------------------- +Wed Jan 25 21:43:22 CET 2006 - mls@suse.de + +- converted neededforbuild to BuildRequires + +------------------------------------------------------------------- +Mon Jan 23 10:32:26 CET 2006 - dmueller@suse.de + +- add workaround because update-desktop-files didn't make it + into beta2 + +------------------------------------------------------------------- +Mon Jan 23 00:43:56 CET 2006 - dmueller@suse.de + +- fix file list + +------------------------------------------------------------------- +Wed Sep 28 23:42:39 CEST 2005 - dmueller@suse.de + +- add norootforbuild + +------------------------------------------------------------------- +Sat Aug 16 14:55:46 CEST 2003 - adrian@suse.de + +- install desktop file from kappfinder + +------------------------------------------------------------------- +Thu May 22 16:00:23 CEST 2003 - coolo@suse.de + +- use BuildRoot + +------------------------------------------------------------------- +Tue Sep 17 17:34:28 CEST 2002 - ro@suse.de + +- removed bogus self-provides + +------------------------------------------------------------------- +Tue Oct 31 16:47:23 CET 2000 - ma@suse.de + +- removed group unsorted + +------------------------------------------------------------------- +Mon Sep 13 17:23:57 CEST 1999 - bs@suse.de + +- ran old prepare_spec on spec file to switch to new prepare_spec. + +------------------------------------------------------------------- +Tue Oct 21 17:04:53 MEST 1997 - ma@suse.de + +- prepared for autobuild + diff --git a/xpinguin.desktop b/xpinguin.desktop new file mode 100644 index 0000000..cce6e18 --- /dev/null +++ b/xpinguin.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Tux +GenericName=Linux Mascot +Exec=xpinguin +Icon=xpinguin +Path= +Type=Application +Terminal=false +X-KDE-StartupNotify=false diff --git a/xpinguin.png b/xpinguin.png new file mode 100644 index 0000000..653909d --- /dev/null +++ b/xpinguin.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5d4310413d65422c80a31ea51f5737b91a6ba588f7eb239ef0027d95a3ab9cf5 +size 2016 diff --git a/xpinguin.spec b/xpinguin.spec new file mode 100644 index 0000000..0c567d7 --- /dev/null +++ b/xpinguin.spec @@ -0,0 +1,58 @@ +# +# spec file for package xpinguin +# +# Copyright (c) 2024 SUSE LLC +# +# 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 https://bugs.opensuse.org/ +# + + +Name: xpinguin +Version: 1.0.2 +Release: 0 +Summary: The 'Logo' of Linux 2.0 +License: GPL-2.0-or-later +Group: Amusements/Toys/Graphics +Source: xpinguin.tar.gz +Source1: xpinguin.png +Source2: xpinguin.desktop +Patch1: 0001-Fix-to-compile-with-gcc-14.2.1.patch +BuildRequires: imake +BuildRequires: pkgconfig +BuildRequires: update-desktop-files +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xext) +BuildRequires: pkgconfig(xpm) + +%description +Based on xteddy -- really cute ;-) + +%prep +%autosetup -n xpinguin +ln -s xpinguin.1 xpinguin.man +xmkmf -a + +%build +%make_build CC="cc %{optflags}" + +%install +%make_install install.man +rm -f %{buildroot}%{_prefix}/X11R6/man/man1/xpinguin.1x.gz +%suse_update_desktop_file -i xpinguin Amusement + +%files +%{_bindir}/xpinguin +%{_mandir}/man1/xpinguin.1x.gz +%{_datadir}/applications/xpinguin.desktop +%{_datadir}/pixmaps/xpinguin.png + +%changelog diff --git a/xpinguin.tar.gz b/xpinguin.tar.gz new file mode 100644 index 0000000..235f403 --- /dev/null +++ b/xpinguin.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:89a3b75f9db7c4678a1113bf968c6459df9a9546e567c680f057f5dda5c56fc7 +size 43920