Rename __KDE_HAVE_GCC_VISIBILITY to __TDE_HAVE_GCC_VISIBILITY

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

CMakeLists.txt

@@ -7,13 +7,16 @@
 ############################################
 
 
-cmake_minimum_required( VERSION 2.8.12 )
+##### set project version ########################
+
+include( TDEVersion )
+cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} )
+tde_set_project_version( )
 
 
 #### general package setup
 
 project( libart-lgpl )
-set( VERSION R14.0.11 )
 set( LIBART_VERSION 2.3.21 )
 
 string( REPLACE "." ";" LIBART_VERSION_LIST ${LIBART_VERSION} )
@@ -33,7 +36,6 @@ include( CheckCSourceCompiles   )
 
 #### include our cmake modules
 
-set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" )
 include( TDEMacros )
 
 

config.h.cmake

@@ -1,7 +1,7 @@
 #define VERSION "@VERSION@"
 
 // Defined if you have fvisibility and fvisibility-inlines-hidden support.
-#cmakedefine __KDE_HAVE_GCC_VISIBILITY 1
+#cmakedefine __TDE_HAVE_GCC_VISIBILITY 1
 
 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
    significant byte first (like Motorola and SPARC, unlike Intel). */

doc/man/CMakeLists.txt

@@ -1,4 +1,4 @@
-INSTALL(
+install(
     FILES libart2-config.1
     DESTINATION ${MAN_INSTALL_DIR}/man1
     COMPONENT doc

src/art_config.h.cmake

@@ -11,7 +11,7 @@ typedef @ART_U8_TYPE@ art_u8;
 typedef @ART_U16_TYPE@ art_u16;
 typedef @ART_U32_TYPE@ art_u32;
 
-#if defined(__KDE_HAVE_GCC_VISIBILITY) || defined(G_HAVE_GCC_VISIBILITY)
+#if defined(__TDE_HAVE_GCC_VISIBILITY) || defined(G_HAVE_GCC_VISIBILITY)
 #define LIBART_NO_EXPORT __attribute__ ((visibility("hidden")))
 #define LIBART_EXPORT __attribute__ ((visibility("default")))
 #elif defined(_WIN32)

src/art_render.c

@@ -48,9 +48,6 @@ art_render_new (int x0, int y0, int x1, int y1,
   ArtRenderPriv *priv;
   ArtRender *result;
 
-  priv = art_new (ArtRenderPriv, 1);
-  result = &priv->super;
-
   if (n_chan > ART_MAX_CHAN)
     {
       art_warn ("art_render_new: n_chan = %d, exceeds %d max\n",
@@ -68,6 +65,10 @@ art_render_new (int x0, int y0, int x1, int y1,
       art_warn ("art_render_new: x0 >= x1 (x0 = %d, x1 = %d)\n", x0, x1);
       return NULL;
     }
+
+  priv = art_new (ArtRenderPriv, 1);
+  result = &priv->super;
+
   result->x0 = x0;
   result->y0 = y0;
   result->x1 = x1;