Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d8f8a5406002ab562e5dfcc6147faf2a0d338518
commit d8f8a5406002ab562e5dfcc6147faf2a0d338518
Author: Devil505 <devil505li...@gmail.com>
Date: Wed Nov 17 11:02:06 2010 +0100
libclaw-1.6.0-1-i686
* version bump
* removed useless patchs
diff --git a/source/xlib-extra/libclaw/FrugalBuild
b/source/xlib-extra/libclaw/FrugalBuild
index 21c769a..f69d9ac 100644
--- a/source/xlib-extra/libclaw/FrugalBuild
+++ b/source/xlib-extra/libclaw/FrugalBuild
@@ -2,16 +2,13 @@
# Maintainer: Devil505 <devil505li...@gmail.com>
pkgname=libclaw
-pkgver=1.5.4
-pkgrel=2
+pkgver=1.6.0
+pkgrel=1
pkgdesc="C++ Library Absolutely Wonderful"
depends=('libstdc++' 'libjpeg>=8a' 'libpng>=1.4.1')
groups=('xlib-extra')
Finclude sourceforge cmake
-source=(${sour...@]} $pkgname-$pkgver-gcc-4.5.patch
$pkgname-$pkgver-png-1.4.patch)
archs=('i686' 'x86_64')
-sha1sums=('79fcd958f143232ae4ddd0fd8deeeb4c6d13ebbf' \
- '7ce188e8800ba275a82d9255122ddf52b4f30eb9' \
- 'cb95cb57773c7deb742c3d0380940ae4dcee3681')
+sha1sums=('468972e12977ef1919134c754b92dd1086329442')
# optimization OK
diff --git a/source/xlib-extra/libclaw/libclaw-1.5.4-gcc-4.5.patch
b/source/xlib-extra/libclaw/libclaw-1.5.4-gcc-4.5.patch
deleted file mode 100644
index 9e99128..0000000
--- a/source/xlib-extra/libclaw/libclaw-1.5.4-gcc-4.5.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff -aur libclaw-1.5.4/claw/code/basic_socket.cpp
libclaw-1.5.4-2/claw/code/basic_socket.cpp
---- libclaw-1.5.4/claw/code/basic_socket.cpp 2008-01-07 10:38:58.000000000
-0600
-+++ libclaw-1.5.4-2/claw/code/basic_socket.cpp 2010-05-15 00:45:20.000000000
-0500
-@@ -45,7 +45,7 @@
- * \brief Open the socket.
- * \return this is everything works fine, NULL otherwise.
- */
--claw::net::basic_socket::basic_socket* claw::net::basic_socket::open()
-+claw::net::basic_socket* claw::net::basic_socket::open()
- {
- basic_socket* result = NULL;
-
-@@ -62,7 +62,7 @@
- * \brief Close the socket.
- * \return this if everything works fine, NULL otherwise.
- */
--claw::net::basic_socket::basic_socket* claw::net::basic_socket::close()
-+claw::net::basic_socket* claw::net::basic_socket::close()
- {
- basic_socket* result = this;
-
-diff -aur libclaw-1.5.4/claw/code/socket_server.cpp
libclaw-1.5.4-2/claw/code/socket_server.cpp
---- libclaw-1.5.4/claw/code/socket_server.cpp 2008-01-07 10:38:58.000000000
-0600
-+++ libclaw-1.5.4-2/claw/code/socket_server.cpp 2010-05-15
00:48:49.000000000 -0500
-@@ -58,7 +58,7 @@
- * \param queue_size The size of the waiting queue for incoming connections.
- * \return this if everything works fine, NULL otherwise.
- */
--claw::net::socket_server::socket_server*
-+claw::net::socket_server*
- claw::net::socket_server::open( int port, unsigned int queue_size )
- {
- socket_server* result = NULL;
-@@ -78,7 +78,7 @@
- /**
- * \brief Close the socket.
- */
--claw::net::socket_server::socket_server* claw::net::socket_server::close()
-+claw::net::socket_server* claw::net::socket_server::close()
- {
- if ( basic_socket::close() )
- return this;
-diff -aur libclaw-1.5.4/claw/impl/logger.tpp
libclaw-1.5.4-2/claw/impl/logger.tpp
---- libclaw-1.5.4/claw/impl/logger.tpp 2008-01-07 10:38:58.000000000 -0600
-+++ libclaw-1.5.4-2/claw/impl/logger.tpp 2010-05-15 00:38:44.000000000
-0500
-@@ -36,7 +36,7 @@
- * \remark T must support operator<<(std::ostream&, const T&);
- */
- template<class T>
--claw::log_system::log_system& claw::log_system::operator<<( const T& t )
-+claw::log_system& claw::log_system::operator<<( const T& t )
- {
- if (m_message_level <= m_log_level)
- {
diff --git a/source/xlib-extra/libclaw/libclaw-1.5.4-png-1.4.patch
b/source/xlib-extra/libclaw/libclaw-1.5.4-png-1.4.patch
deleted file mode 100644
index e2a5c16..0000000
--- a/source/xlib-extra/libclaw/libclaw-1.5.4-png-1.4.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Only in libclaw-1.5.4-2: build
-diff -aur libclaw-1.5.4/claw/code/png_reader.cpp
libclaw-1.5.4-2/claw/code/png_reader.cpp
---- libclaw-1.5.4/claw/code/png_reader.cpp 2008-09-12 08:17:23.000000000
-0500
-+++ libclaw-1.5.4-2/claw/code/png_reader.cpp 2010-05-15 01:05:14.000000000
-0500
-@@ -146,7 +146,7 @@
- {
- /* If we get here, we had a problem reading the file */
- /* Free all of the memory associated with the png_ptr and info_ptr */
-- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
-+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
- throw CLAW_EXCEPTION("Invalid PNG file.");
- }
-
-@@ -156,7 +156,8 @@
- claw__graphic__png__source_manager__read );
-
- png_set_strip_16(png_ptr);
-- png_set_gray_1_2_4_to_8(png_ptr);
-+ png_set_expand_gray_1_2_4_to_8(png_ptr);
-+ png_set_tRNS_to_alpha(png_ptr);
- png_set_packing(png_ptr);
-
- // transform palette index into RGB value
-@@ -170,7 +171,7 @@
- png_read_info(png_ptr, info_ptr);
- read_image( png_ptr, info_ptr );
-
-- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
-+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
- } // png::reader::read_from_file()
-
-
/*----------------------------------------------------------------------------*/
-@@ -340,7 +341,7 @@
- info_ptr = png_create_info_struct(png_ptr);
-
- if (!info_ptr)
-- png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL);
-+ png_destroy_read_struct(&png_ptr, NULL, NULL);
- }
-
- if (!png_ptr || !info_ptr)
-diff -aur libclaw-1.5.4/claw/code/png_writer.cpp
libclaw-1.5.4-2/claw/code/png_writer.cpp
---- libclaw-1.5.4/claw/code/png_writer.cpp 2008-01-07 10:38:58.000000000
-0600
-+++ libclaw-1.5.4-2/claw/code/png_writer.cpp 2010-05-15 01:10:25.000000000
-0500
-@@ -296,7 +296,7 @@
- info_ptr = png_create_info_struct(png_ptr);
-
- if (!info_ptr)
-- png_destroy_write_struct(&png_ptr, png_infopp_NULL);
-+ png_destroy_write_struct(&png_ptr, NULL);
- }
-
- if (!png_ptr || !info_ptr)
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
