[gentoo-commits] gentoo-x86 commit in net-p2p/museek+/files: museek+-0.1.13-post_release_fixes.patch museek+-0.1.13-optional-deps.patch digest-museek+-0.1.13-r1 digest-museek+-0.1.13

[Santiago M. Mola (coldwind)]

coldwind    07/09/23 12:20:23

  Modified:             museek+-0.1.13-post_release_fixes.patch
  Added:                museek+-0.1.13-optional-deps.patch
                        digest-museek+-0.1.13-r1
  Removed:              digest-museek+-0.1.13
  Log:
  Make optional deps configurable.
  (Portage version: 2.1.3.9)

Revision  Changes    Path
1.2                  net-p2p/museek+/files/museek+-0.1.13-post_release_fixes.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/museek+/files/museek+-0.1.13-post_release_fixes.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/museek+/files/museek+-0.1.13-post_release_fixes.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/museek+/files/museek+-0.1.13-post_release_fixes.patch?r1=1.1&r2=1.2

Index: museek+-0.1.13-post_release_fixes.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-p2p/museek+/files/museek+-0.1.13-post_release_fixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- museek+-0.1.13-post_release_fixes.patch	22 Sep 2007 19:26:08 -0000	1.1
+++ museek+-0.1.13-post_release_fixes.patch	23 Sep 2007 12:20:22 -0000	1.2
@@ -51,13 +51,6 @@
  
  set(ICONS
    museeq.png
-@@ -369,4 +374,4 @@
-   MESSAGE(" * without a Trayicon.. [TRAYICON=1]")
- else (NOT TRAYICON)
-   MESSAGE(" * with a Trayicon.. [TRAYICON=0]")
--endif (NOT TRAYICON)
-\ Sin fin-de-línea al final del archivo
-+endif (NOT TRAYICON)
 Index: museeq/mainwin.cpp
 ===================================================================
 --- museeq/mainwin.cpp	(revisión: 735)



1.1                  net-p2p/museek+/files/museek+-0.1.13-optional-deps.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/museek+/files/museek+-0.1.13-optional-deps.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/museek+/files/museek+-0.1.13-optional-deps.patch?rev=1.1&content-type=text/plain

Index: museek+-0.1.13-optional-deps.patch
===================================================================
--- CMakeLists.txt	2007-09-23 13:10:33.000000000 +0200
+++ CMakeLists.txt	2007-09-23 13:14:32.000000000 +0200
@@ -261,7 +261,7 @@
 endif (NOT DIR_H)
 
 # Detect Vorbisfile library
-if (HAVE_VORBIS_H)
+if (HAVE_VORBIS_H AND VORBIS)
   find_library(VORBIS_LIBRARIES NAMES vorbisfile PATHS /usr/lib /usr/local/lib)
   if (VORBIS_LIBRARIES)
     set(HAVE_VORBIS 1)
@@ -270,9 +270,9 @@
     message(STATUS "Vorbisfile library wasn't found, ogg metadata will not be created")
     set(VORBIS_LIBRARIES "")
   endif (VORBIS_LIBRARIES)
-else (HAVE_VORBIS_H)
+else (HAVE_VORBIS_H AND VORBIS)
   set(VORBIS_LIBRARIES "")
-endif (HAVE_VORBIS_H)
+endif (HAVE_VORBIS_H AND VORBIS)
 
 set(CMAKE_REQUIRED_LIBRARIES)
 
@@ -340,4 +340,4 @@
   add_subdirectory(museeq)
 else (C_MUSEEQ)
   message("!!! museeq will NOT be installed [NO_MUSEEQ=0]")
-endif (C_MUSEEQ)
\ No hay ningún carácter de nueva línea al final del fichero
+endif (C_MUSEEQ)
--- museeq/CMakeLists.txt	2007-09-23 13:10:33.000000000 +0200
+++ museeq/CMakeLists.txt	2007-09-23 13:13:58.000000000 +0200
@@ -1,9 +1,7 @@
 project(museeq) # the name of your project
 
 MESSAGE("DECLARATIONS: PREFIX (/usr), MANDIR (PREFIX/man), DATADIR (PREFIX/share), BINRELOC, TRAYICON
-Prefix declarations with -D and set them with either 1, 0 or a path.
-QSA is detected automatically
-")
+Prefix declarations with -D and set them with either 1, 0 or a path.")
 
 
 cmake_minimum_required(VERSION 2.4.0)
@@ -175,13 +173,17 @@
   int main() {
      QSInterpreter::defaultInterpreter()->hasFunction(\"\");
   }
-" QSA)
+" HAVE_QSA)
 
 if (QSA)
-MESSAGE(STATUS "QSA available")
- add_definitions(-DHAVE_QSA=1 -DHAVE_QSA_DIALOG=1 )
+  if (HAVE_QSA)
+    MESSAGE(STATUS "QSA available")
+    add_definitions(-DHAVE_QSA=1 -DHAVE_QSA_DIALOG=1 )
+  else (HAVE_QSA)
+    MESSAGE(FATAL_ERROR "!!! QSA NOT available")
+  endif (HAVE_QSA)
 else (QSA)
-MESSAGE("!!! QSA NOT available")
+MESSAGE("!!! QSA disabled")
 endif (QSA)
 
 message(STATUS "moc binary:" ${QT_MOC_EXECUTABLE})
@@ -369,4 +371,4 @@
   MESSAGE(" * without a Trayicon.. [TRAYICON=1]")
 else (NOT TRAYICON)
   MESSAGE(" * with a Trayicon.. [TRAYICON=0]")
-endif (NOT TRAYICON)
\ No hay ningún carácter de nueva línea al final del fichero
+endif (NOT TRAYICON)
--- Tools/CMakeLists.txt	2007-09-23 13:10:33.000000000 +0200
+++ Tools/CMakeLists.txt	2007-09-23 13:11:55.000000000 +0200
@@ -42,7 +42,7 @@
 )
 MESSAGE("--> muscan (file scanner) will be installed..")
 # To build, or not build muscand
-if (FAM_LIBRARIES AND FAM_H)
+if (NOT NO_MUSCAND AND FAM_LIBRARIES AND FAM_H)
 
 add_executable(muscand ${MUSCAND_SOURCES})
 
@@ -68,9 +68,9 @@
   DESTINATION bin
 )
   MESSAGE("--> muscand (FAM-based file scanning daemon) will be installed..")
-else(FAM_LIBRARIES AND FAM_H)
+else(NOT NO_MUSCAND AND FAM_LIBRARIES AND FAM_H)
   MESSAGE("!!! muscand will NOT be installed..")
-endif(FAM_LIBRARIES AND FAM_H)
+endif(NOT NO_MUSCAND AND FAM_LIBRARIES AND FAM_H)
 
 target_link_libraries(
   muscan



1.1                  net-p2p/museek+/files/digest-museek+-0.1.13-r1

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/museek+/files/digest-museek+-0.1.13-r1?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/museek+/files/digest-museek+-0.1.13-r1?rev=1.1&content-type=text/plain

Index: digest-museek+-0.1.13-r1
===================================================================
MD5 7aada627839578ebe525c54a1cef7dc4 museek+-0.1.13.tar.bz2 1186870
RMD160 25e1febce98ee536ba380e58b052ed7113f84d06 museek+-0.1.13.tar.bz2 1186870
SHA256 e1958556b30dee59eb7648973432d4d048f30c79f38ab7145fca6f0f2690473e museek+-0.1.13.tar.bz2 1186870



-- 
gentoo-commits@g.o mailing list