[packages/vdk] - updated to 2.5.1

qboosh qboosh at pld-linux.org
Tue Jul 23 21:44:58 CEST 2024 

commit 759cf7af8ee72181793aa1f7e968b5df46ab329e
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Tue Jul 23 21:38:30 2024 +0200

    - updated to 2.5.1

 vdk-ac_FLAGS.patch | 45 ++++++++++++---------------------
 vdk-format.patch   | 11 ++++++++
 vdk.spec           | 73 +++++++++++++++++++++++++++++++++++-------------------
 3 files changed, 74 insertions(+), 55 deletions(-)
---
diff --git a/vdk.spec b/vdk.spec
index 4d8a1ab..794628f 100644
--- a/vdk.spec
+++ b/vdk.spec
@@ -1,31 +1,33 @@
 #
 # Conditional build:
-%bcond_without	static_libs # don't build static libraries
+%bcond_without	static_libs	# static library
 #
-Summary:	C++ Wrapper over GTK+ 2.x library
-Summary(pl.UTF-8):	Wrapper C++ dla GTK+ 2.x
+Summary:	VDK Visual Development Kit - C++ Wrapper over GTK+ 2.x library
+Summary(pl.UTF-8):	VDK Visual Development Kit - obudowanie C++ dla GTK+ 2.x
 Name:		vdk
-Version:	2.4.1
+Version:	2.5.1
 Release:	1
-License:	LGPL
+License:	LGPL v2+
 Group:		X11/Libraries
-Source0:	http://dl.sourceforge.net/sourceforge/vdklib/%{name}-%{version}.tar.gz
-# Source0-md5:	f388bf265a476880e98ddec7ac4e63f7
+Source0:	https://downloads.sourceforge.net/vdklib/%{name}-%{version}.tar.gz
+# Source0-md5:	559d9feab3ae8433620bd061f03e4fb4
 Patch0:		%{name}-ac_FLAGS.patch
-Patch1:		%{name}-cairo.patch
-URL:		http://www.mariomotta.it/vdklib/
+Patch1:		%{name}-format.patch
+URL:		https://vdklib.sourceforkge.net/
 BuildRequires:	autoconf >= 2.52
 BuildRequires:	automake
 BuildRequires:	doxygen
 BuildRequires:	freetype-devel >= 2.0.0
-BuildRequires:	gtk+2-devel >= 2:2.4.0
+BuildRequires:	gtk+2-devel >= 2:2.18.0
 BuildRequires:	imlib-devel
 BuildRequires:	libstdc++-devel
-BuildRequires:	libtool
+BuildRequires:	libtool >= 2:1.5
 BuildRequires:	perl-devel >= 1:5.6
-BuildRequires:	pkgconfig
+BuildRequires:	pkgconfig >= 1:0.8
+BuildRequires:	rpm-build >= 4.6
 BuildRequires:	rpm-perlprov >= 4.1-13
 BuildRequires:	zlib-devel
+Requires:	gtk+2 >= 2:2.18.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -39,7 +41,7 @@ Summary:	VDK header files, development documentation
 Summary(pl.UTF-8):	Pliki nagłówkowe VDK, dokumentacja dla programistów
 Group:		X11/Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	gtk+2-devel >= 2:2.4.0
+Requires:	gtk+2-devel >= 2:2.18.0
 
 %description devel
 Header files and development documentation for VDK library.
@@ -59,21 +61,33 @@ VDK static libraries.
 %description static -l pl.UTF-8
 Biblioteki statyczne VDK.
 
+%package apidocs
+Summary:	API documentation for VDK library
+Summary(pl.UTF-8):	Dokumentacja API biblioteki VDK
+Group:		Documentation
+BuildArch:	noarch
+
+%description apidocs
+API documentation for VDK library.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API biblioteki VDK.
+
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
 
 %build
-# exceptions and rtti are used in this package --misiek
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
+%{__autoheader}
 %{__automake}
 %configure \
-	%{?with_static_libs:--enable-static=yes} \
-	%{!?with_static_libs:--enable-static=no}
+	%{!?with_static_libs:--disable-static}
 %{__make}
+
 %{__make} docs
 
 %install
@@ -86,6 +100,9 @@ install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 cp -dpr example/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
+# obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libvdk-2.la
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -94,22 +111,26 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
+%doc AUTHORS BUGS ChangeLog NEWS README TODO
+%attr(755,root,root) %{_libdir}/libvdk-2.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libvdk-2.so.2
 
 %files devel
 %defattr(644,root,root,755)
-%doc README ChangeLog AUTHORS NEWS BUGS TODO doc/doxy/html
-%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.la
-%{_aclocaldir}/*.m4
-%{_includedir}/vdk2
-%{_mandir}/man1/*
+%attr(755,root,root) %{_bindir}/vdk-config-2
+%attr(755,root,root) %{_libdir}/libvdk-2.so
+%{_includedir}/vdk-2
+%{_pkgconfigdir}/vdk-2.x.pc
+%{_aclocaldir}/vdk-2.m4
+%{_mandir}/man1/vdk-config-2.1*
 %{_examplesdir}/%{name}-%{version}
-%{_pkgconfigdir}/*
 
 %if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libvdk-2.a
 %endif
+
+%files apidocs
+%defattr(644,root,root,755)
+%doc doc/doxy/html/*.{css,gif,html,js,png}
diff --git a/vdk-ac_FLAGS.patch b/vdk-ac_FLAGS.patch
index dab19e7..b26a1ed 100644
--- a/vdk-ac_FLAGS.patch
+++ b/vdk-ac_FLAGS.patch
@@ -1,22 +1,21 @@
-diff -Nurb o.vdk-2.4.1/configure.in n.vdk-2.4.1/configure.in
---- o.vdk-2.4.1/configure.in	2004-11-06 19:16:43.000000000 +0100
-+++ n.vdk-2.4.1/configure.in	2005-08-28 02:02:50.092475176 +0200
-@@ -2,8 +2,6 @@
+--- vdk-2.5.1/configure.ac.orig	2024-07-23 20:16:48.771220917 +0200
++++ vdk-2.5.1/configure.ac	2024-07-23 20:16:53.034531154 +0200
+@@ -2,8 +2,6 @@ dnl configure.ac for VDK
  AC_PREREQ(2.52)
- AC_INIT(vdk/vdk.h)
+ AC_INIT(include/vdk/vdk.h)
  
 -cflags_set=${CFLAGS+set}
 -
  VDK_VERSION_MAJOR=2
- VDK_VERSION_MINOR=4
+ VDK_VERSION_MINOR=5
  VDK_VERSION_MICRO=1
-@@ -121,28 +119,15 @@
+@@ -135,28 +133,15 @@ AM_CONFIG_HEADER(config.h)
  dnl ==========================
  dnl user configurable options
  dnl ==========================
 -AC_ARG_ENABLE(debug,   [  --enable-debug=[no/minimum/yes]  enable debug information [default=no]],,enable_debug=no)
 -AC_ARG_ENABLE(opt,     [  --enable-opt=[OPTIMIZATION/no]  Compile with -Ox optimization [default=2]],,enable_opt=2)
-+AC_ARG_ENABLE(vdkdebug, [  --enable-vdkdebug=[no/yes]  enable vdkdebug information [default=no]],,enable_debug=no)
++AC_ARG_ENABLE(vdkdebug,[  --enable-vdkdebug=[no/minimum/yes]  enable debug information [default=no]],,enable_debug=no)
  AC_ARG_ENABLE(testvdk, [  --enable-testvdk=[yes/no] Compile testvdk program example [default=yes]],,enable_testvdk=yes)
  dnl doxygen options
  AC_ARG_ENABLE(doc-html,  [ --enable-doc-html[=yes/no] enable generation of docs in html format [default=yes]],,enable_doc_html=yes)
@@ -24,12 +23,12 @@ diff -Nurb o.vdk-2.4.1/configure.in n.vdk-2.4.1/configure.in
  AC_ARG_ENABLE(doc-man,   [ --enable-doc-man[=yes/no] enable generation of docs in latex format [default=no]],,enable_doc_man=no)
  
 -if test "x$enable_debug" = "xminimum"; then
--  AC_DEFINE(VDKDEBUG)
+-  AC_DEFINE([VDKDEBUG], [], [Debug purposes])
 -  CXXFLAGS="-s"
 -else
 -  if test "x$enable_debug" = "xyes"; then
 +if test "x$enable_vdkdebug" = "xyes"; then
-     AC_DEFINE(VDKDEBUG)
+     AC_DEFINE([VDKDEBUG], [], [Debug purposes])
 -    CXXFLAGS="-g"
 -  else
 -    CXXFLAGS="-s"
@@ -41,7 +40,7 @@ diff -Nurb o.vdk-2.4.1/configure.in n.vdk-2.4.1/configure.in
  fi
  
  if test "x$enable_testvdk" = "xyes"; then
-@@ -179,10 +164,6 @@
+@@ -193,10 +178,6 @@ else
  	TAG_SIGC=""
  fi
  
@@ -52,25 +51,13 @@ diff -Nurb o.vdk-2.4.1/configure.in n.vdk-2.4.1/configure.in
  if test "x$enable_doc_latex" = "xyes"; then
  	GENERATE_LATEX=YES
  #	TAG_SIGC=USE_SIGCPLUSPLUS
-diff -Nurb o.vdk-2.4.1/testvdk/Makefile.am n.vdk-2.4.1/testvdk/Makefile.am
---- o.vdk-2.4.1/testvdk/Makefile.am	2004-11-06 18:47:14.000000000 +0100
-+++ n.vdk-2.4.1/testvdk/Makefile.am	2005-08-28 02:45:08.377597184 +0200
-@@ -5,7 +5,6 @@
- EXTRA_PROGRAMS = testvdk testvdkstring
+--- vdk-2.5.1/testvdk/Makefile.am.orig	2024-07-23 20:18:55.017203651 +0200
++++ vdk-2.5.1/testvdk/Makefile.am	2024-07-23 20:19:17.063750881 +0200
+@@ -5,7 +5,6 @@ noinst_PROGRAMS = @TESTVDK@
+ EXTRA_PROGRAMS = testvdk testvdkstring testvdkustring
  
- INCLUDES = @INCLUDES@
+ INCLUDES = -I../include @INCLUDES@
 -AM_CXXFLAGS = @CXXFLAGS@
  
  testvdk_LDFLAGS = $(GTK_LIBS)
- testvdk_LDADD = $(top_srcdir)/vdk/libvdk.la
-diff -Nurb o.vdk-2.4.1/vdk/Makefile.am n.vdk-2.4.1/vdk/Makefile.am
---- o.vdk-2.4.1/vdk/Makefile.am	2004-11-06 18:47:10.000000000 +0100
-+++ n.vdk-2.4.1/vdk/Makefile.am	2005-08-28 02:45:22.032521320 +0200
-@@ -186,7 +186,6 @@
- 		-version-info $(LT_VDK_CURRENT):$(LT_VDK_REVISION):$(LT_VDK_AGE)
- 
- INCLUDES = -I$(top_srcdir)/include @INCLUDES@
--AM_CXXFLAGS = @CXXFLAGS@
- 
- AM_LDFLAGS = $(GTK_CFLAGS) 
- LIBS = $(GTK_LIBS)
+ testvdk_LDADD = $(top_srcdir)/src/libvdk- at VDK_VERSION_MAJOR@.la
diff --git a/vdk-format.patch b/vdk-format.patch
new file mode 100644
index 0000000..9d41c6a
--- /dev/null
+++ b/vdk-format.patch
@@ -0,0 +1,11 @@
+--- vdk-2.5.1/src/msgdialog.cc.orig	2010-08-30 12:14:03.000000000 +0200
++++ vdk-2.5.1/src/msgdialog.cc	2024-07-23 20:43:00.242707526 +0200
+@@ -90,7 +90,7 @@ MakeDialog(GtkMessageType type, GtkButto
+ 						GtkDialogFlags(GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT),
+ 						type,
+ 						buttons,
+-						(char*)prompt);
++						"%s", prompt);
+ 	if (!dialog) return NULL;
+ 	if (caption) gtk_window_set_title(GTK_WINDOW(dialog), caption);
+ 	gtk_window_position(GTK_WINDOW(dialog), parent ? GTK_WIN_POS_CENTER_ON_PARENT : GTK_WIN_POS_CENTER);
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/vdk.git/commitdiff/759cf7af8ee72181793aa1f7e968b5df46ab329e

More information about the pld-cvs-commit mailing list