From c55f7a7a93e86b260a2a4d9d8acde04eb0c489c1bc7dffef73ff1ab999e26162 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=98=D0=BB=D1=8C=D1=8F=20=D0=98=D0=BD=D0=B4=D0=B8=D0=B3?= =?UTF-8?q?=D0=BE?= Date: Tue, 18 Jun 2024 13:23:24 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libcaca?expand=0&rev=77 --- libcaca-0.99.beta20-gcc14.patch | 66 +++++++++++++++++++++++++++++++++ libcaca.changes | 16 ++++++-- libcaca.spec | 38 +++++++++---------- 3 files changed, 98 insertions(+), 22 deletions(-) create mode 100644 libcaca-0.99.beta20-gcc14.patch diff --git a/libcaca-0.99.beta20-gcc14.patch b/libcaca-0.99.beta20-gcc14.patch new file mode 100644 index 0000000..ad2e4fe --- /dev/null +++ b/libcaca-0.99.beta20-gcc14.patch @@ -0,0 +1,66 @@ +index 5dc66ab..826d4d8 100644 +--- a/ruby/caca-canvas.c ++++ b/ruby/caca-canvas.c +@@ -16,6 +16,7 @@ + #include + #include "caca-dither.h" + #include "caca-font.h" ++#include "caca_internals.h" + #include "common.h" + + VALUE cCanvas; +@@ -143,7 +143,7 @@ static VALUE put_str(VALUE self, VALUE x + return self; + } + +-static VALUE get_attr(VALUE self, VALUE x, VALUE y) ++static VALUE get_attr(VALUE self, VALUE x, VALUE y, VALUE) + { + unsigned long int ch; + ch = caca_get_attr(_SELF, NUM2INT(x), NUM2INT(y)); +@@ -454,7 +454,7 @@ static VALUE fill_triangle(VALUE self, V + return self; + } + +-static VALUE fill_triangle_textured(VALUE self, VALUE coords, VALUE texture, VALUE uv) ++static VALUE fill_triangle_textured(VALUE self, VALUE coords, VALUE texture, VALUE uv, VALUE) + { + caca_canvas_t *ctexture; + int i, l; +index ac29daf..36020a9 100644 +--- a/ruby/caca-display.c ++++ b/ruby/caca-display.c +@@ -226,7 +226,7 @@ static VALUE get_event(VALUE self, VALUE event_mask, VALUE timeout) + return e; + } + +-static VALUE driver_list(void) ++static VALUE driver_list(VALUE) + { + VALUE ary; + char const* const* list; +index 705f928..c5f5d27 100644 +--- a/ruby/caca-font.c ++++ b/ruby/caca-font.c +@@ -41,7 +41,7 @@ static VALUE font_initialize(VALUE self, VALUE name) + return self; + } + +-static VALUE font_list(void) ++static VALUE font_list(VALUE) + { + VALUE ary; + char const* const* list; +Index: libcaca-0.99.beta20/ruby/common.h +=================================================================== +--- libcaca-0.99.beta20.orig/ruby/common.h ++++ libcaca-0.99.beta20/ruby/common.h +@@ -16,7 +16,7 @@ + #define _SELF (DATA_PTR(self)) + + #define get_singleton_double_list(x) \ +-static VALUE x##_list(void) \ ++static VALUE x##_list(VALUE) \ + { \ + VALUE ary, ary2; \ + char const* const* list; \ diff --git a/libcaca.changes b/libcaca.changes index b527967..1056eb4 100644 --- a/libcaca.changes +++ b/libcaca.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Jun 17 19:39:46 UTC 2024 - Илья Индиго + +- Updated spec-file with manual optimizations. + +------------------------------------------------------------------- +Mon Jun 17 16:54:04 UTC 2024 - Martin Jambor + +- Added file libcaca-0.99.beta20-gcc14.patch (boo#1225795). + ------------------------------------------------------------------- Fri Feb 23 08:48:14 UTC 2024 - Valentin Lefebvre @@ -67,10 +77,10 @@ Tue Mar 10 15:20:55 UTC 2020 - Josef Möllers [libcaca-prevent-overflow.patch] ------------------------------------------------------------------- -Wed Feb 26 16:47:50 UTC 2020 - Илья Индиго +Wed Feb 26 16:47:50 UTC 2020 - Илья Индиго -- Refresh spec-file via spec-cleaner. -- Add Requires:toilet for caca-utils, because need for cacaclock. +- Refreshed spec-file via spec-cleaner. +- Added Requires:toilet for caca-utils, because need for cacaclock. ------------------------------------------------------------------- Thu Aug 1 09:46:57 UTC 2019 - Michel Normand diff --git a/libcaca.spec b/libcaca.spec index 06f1398..f152fa5 100644 --- a/libcaca.spec +++ b/libcaca.spec @@ -25,18 +25,18 @@ Group: Development/Languages/C and C++ URL: http://caca.zoy.org Source0: https://github.com/cacalabs/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz Source1: baselibs.conf -Patch: libcaca-X11_test.patch -Patch: libcaca-ruby_am_cflags.patch -Patch: libcaca-ruby_vendor_install.patch -Patch: libcaca-0.99.beta16-missing-GLU.patch -Patch: caca-no-build-date.patch -Patch: libcaca-0.99-texbuild.patch -Patch: libcaca-ncurses6.patch -Patch: Bug1143286_libcaca_configure_ac_chg_for_lto.patch -Patch: bsc1184751-add-space-for-NUL-byte.patch -# PATCH-FIX-UPSTREAM correctly-handle-zero-width-or-height-images.patch bsc#1197028 -Patch: bsc1197028-correctly-handle-zero-width-or-height-images.patch -Patch: libcaca-autoconf-2.69.patch +Patch0: %{name}-X11_test.patch +Patch1: %{name}-ruby_am_cflags.patch +Patch2: %{name}-ruby_vendor_install.patch +Patch3: %{name}-0.99.beta16-missing-GLU.patch +Patch4: caca-no-build-date.patch +Patch5: %{name}-0.99-texbuild.patch +Patch6: %{name}-ncurses6.patch +Patch7: Bug1143286_libcaca_configure_ac_chg_for_lto.patch +Patch8: bsc1184751-add-space-for-NUL-byte.patch +Patch9: bsc1197028-correctly-handle-zero-width-or-height-images.patch +Patch10: %{name}-autoconf-2.69.patch +Patch11: %{name}-0.99.beta20-gcc14.patch BuildRequires: doxygen BuildRequires: fdupes BuildRequires: freeglut-devel @@ -61,11 +61,11 @@ functions for colour text drawing, simple primitives for line, polygon and ellipse drawing, as well as powerful image to text conversion routines. -%package -n libcaca0 +%package -n %{name}0 Summary: Library for Colour ASCII Art, text mode graphics Group: Development/Languages/C and C++ -Provides: libcaca = %{version} -Obsoletes: libcaca < %{version} +Provides: %{name} = %{version} +Obsoletes: %{name} < %{version} %description -n libcaca0 libcaca is the Colour AsCii Art library. It provides high level @@ -84,7 +84,7 @@ This package contains the header files and static libraries needed to compile applications or shared objects that use libcaca. %package -n python3-caca -Summary: Python3 support for libcaca +Summary: Python3 support for %{name} Group: Development/Languages/Python Requires: %{name} = %{version} BuildArch: noarch @@ -93,7 +93,7 @@ BuildArch: noarch This package contains all that is needed to use libcaca from python3. %package -n libcaca0-plugins -Summary: Plugins for libcaca +Summary: Plugins for %{name} Group: Development/Languages/C and C++ Requires: %{name} = %{version} @@ -101,7 +101,7 @@ Requires: %{name} = %{version} This package contains gl and x11 plugins for caca. %package ruby -Summary: Ruby bindings for libcaca +Summary: Ruby bindings for %{name} Group: Development/Languages/Ruby Requires: %{name} = %{version} Requires: ruby @@ -210,7 +210,7 @@ find %{buildroot} -type f -name "*.la" -delete -print %{_bindir}/cacaclock %{_bindir}/cacaserver %{_bindir}/img2txt -%{_datadir}/libcaca +%{_datadir}/%{name} %{_mandir}/man1/cacademo.1%{?ext_man} %{_mandir}/man1/cacafire.1%{?ext_man} %{_mandir}/man1/cacaview.1%{?ext_man}