test win7 translucency

.gitignore

@@ -11,10 +11,4 @@ moc_*
 /tomahawk
 thirdparty/qtweetlib/WARNING-twitter-api-keys
 .kdev4
-*.kdev4
-*.kate-swp
-clang/
-win/
-gcc/
-tags
-.DS_Store
+tomahawk.kdev4

.gitmodules

@@ -0,0 +1,6 @@
+[submodule "thirdparty/jreen"]
+	path = thirdparty/jreen
+	url = git://github.com/euroelessar/jreen.git
+[submodule "thirdparty/qtweetlib/QTweetLib"]
+	path = thirdparty/qtweetlib/QTweetLib
+	url = git://github.com/minimoog/QTweetLib.git

CMakeLists.txt

@@ -1,6 +1,5 @@
 PROJECT( tomahawk )
 CMAKE_MINIMUM_REQUIRED( VERSION 2.8 )
-SET( CMAKE_MODULE_PATH  "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules" )
 
 IF( ${CMAKE_VERSION} VERSION_GREATER 2.8.3 )
   CMAKE_POLICY(SET CMP0017 NEW)
@@ -12,84 +11,45 @@ ENDIF( ${CMAKE_VERSION} VERSION_GREATER 2.8.3 )
 SET( TOMAHAWK_ORGANIZATION_NAME "Tomahawk" )
 SET( TOMAHAWK_ORGANIZATION_DOMAIN "tomahawk-player.org" )
 SET( TOMAHAWK_APPLICATION_NAME  "Tomahawk" )
-SET( TOMAHAWK_DESCRIPTION_SUMMARY "The social media player" )
-
-SET( TOMAHAWK_VERSION_MAJOR 0 )
-SET( TOMAHAWK_VERSION_MINOR 3 )
-SET( TOMAHAWK_VERSION_PATCH 99 )
-
-#SET( TOMAHAWK_VERSION_RC 0 )
-
-
-# build options
-option(BUILD_GUI "Build Tomahawk with GUI" ON)
-option(BUILD_RELEASE "Generate TOMAHAWK_VERSION without GIT info" OFF)
-option(LEGACY_KDE_INTEGRATION "Install tomahawk.protocol file, deprecated since 4.6.0" OFF)
-
-# generate version string
-
-# base string used in release and unstable builds
-SET( TOMAHAWK_VERSION ${TOMAHAWK_VERSION_MAJOR}.${TOMAHAWK_VERSION_MINOR}.${TOMAHAWK_VERSION_PATCH} )
-IF( TOMAHAWK_VERSION_RC )
-  SET( TOMAHAWK_VERSION ${TOMAHAWK_VERSION}rc${TOMAHAWK_VERSION_RC} )
-ENDIF()
-
-# additional info for non-release builds
-IF( NOT BUILD_RELEASE )
-    INCLUDE( CMakeDateStamp )
-    SET( TOMAHAWK_VERSION_DATE "${CMAKE_DATESTAMP_YEAR}${CMAKE_DATESTAMP_MONTH}${CMAKE_DATESTAMP_DAY}" )
-    IF( ${TOMAHAWK_VERSION_DATE} GREATER 0)
-        SET( TOMAHAWK_VERSION ${TOMAHAWK_VERSION}.${TOMAHAWK_VERSION_DATE} )
-    ENDIF()
-
-    INCLUDE( CMakeVersionSource )
-    IF( CMAKE_VERSION_SOURCE )
-        SET( TOMAHAWK_VERSION ${TOMAHAWK_VERSION}-${CMAKE_VERSION_SOURCE} )
-    ENDIF()
-ENDIF()
+SET( TOMAHAWK_VERSION "0.1.0" )
 
 
 # set paths
+SET( CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${CMAKE_SOURCE_DIR}/CMakeModules" )
 SET( THIRDPARTY_DIR  ${CMAKE_SOURCE_DIR}/thirdparty )
-SET( CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" )
-SET( CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" )
-SET( CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" )
+SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")
+SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")
+SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")
 
-# make predefined install dirs available everywhere
-INCLUDE(GNUInstallDirs)
-
-# installer creation
-INCLUDE( TomahawkCPack.cmake )
+# Check if we need qtgui:
+IF( "${gui}" STREQUAL "no" )
+    ADD_DEFINITIONS( -DENABLE_HEADLESS )
+    MESSAGE( STATUS "Building in HEADLESS mode ***" )
+	FIND_PACKAGE( Qt4 4.7.0 COMPONENTS QtCore QtXml QtNetwork REQUIRED )
+ELSE()
+    MESSAGE( STATUS "Building full GUI version ***" )
+	FIND_PACKAGE( Qt4 4.7.0 COMPONENTS QtGui QtCore QtXml QtNetwork REQUIRED )
+ENDIF()
 
 #deps
 INCLUDE( MacroOptionalFindPackage )
 INCLUDE( MacroLogFeature )
 
-# Check if we need qtgui:
-SET(NEEDED_QT4_COMPONENTS QtCore QtXml QtNetwork )
-IF( NOT BUILD_GUI )
-    ADD_DEFINITIONS( -DENABLE_HEADLESS )
-    MESSAGE( STATUS "Building Tomahawk ${TOMAHAWK_VERSION} in HEADLESS mode ***" )
-ELSE()
-    MESSAGE( STATUS "Building Tomahawk ${TOMAHAWK_VERSION} full GUI version ***" )
-    LIST(APPEND NEEDED_QT4_COMPONENTS "QtGui" "QtWebkit" )
-ENDIF()
+# required
+#While we distribute our own liblastfm2, don't need to look for it
+#macro_optional_find_package(LibLastFm 0.3.3)
+#macro_log_feature(LIBLASTFM_FOUND "LastFm" "Qt library for the Last.fm webservices" "https://github.com/mxcl/liblastfm" FALSE "" "liblastfm is needed for scrobbling tracks to Last.fm and fetching cover artwork")
+set(LIBLASTFM_FOUND true)
 
-IF( BUILD_GUI AND UNIX AND NOT APPLE )
-    FIND_PACKAGE( X11 )
-ENDIF()
-
-macro_optional_find_package(Qt4 4.7.0 COMPONENTS ${NEEDED_QT4_COMPONENTS} )
-macro_log_feature(QT4_FOUND "Qt" "A cross-platform application and UI framework" "http://qt.nokia.com" TRUE "" "If you see this, although libqt4-devel is installed, check whether \n     the qtwebkit-devel package is installed as well")
-
-macro_optional_find_package(Phonon 4.5.0)
-macro_log_feature(PHONON_FOUND "Phonon" "The Phonon multimedia library" "http://phonon.kde.org" TRUE "" "")
-if(PHONON_FOUND)
-    message(STATUS "Phonon found; ensure that phonon-vlc is at least 0.4")
+find_package(Phonon REQUIRED)
+if(PHONON_VERSION STRLESS "4.5.0")
+	message(FATAL_ERROR "Phonon version 4.5.0 or higher is required, you have version ${PHONON_VERSION}")
+else()
+	message(STATUS "Phonon found; ensure that phonon-vlc is at least 0.4")
 endif()
 
-macro_optional_find_package(LibEchonest 1.1.10)
-macro_log_feature(LIBECHONEST_FOUND "Echonest" "Qt library for communicating with The Echo Nest" "http://projects.kde.org/libechonest" TRUE "" "libechonest 1.1.10 is needed for dynamic playlists and the infosystem")
+macro_optional_find_package(LibEchonest 1.1.7)
+macro_log_feature(LIBECHONEST_FOUND "Echonest" "Qt library for communicating with The Echo Nest" "http://projects.kde.org/libechonest" TRUE "" "libechonest 1.1.8 is needed for dynamic playlists and the infosystem")
 
 macro_optional_find_package(CLucene 0.9.23)
 macro_log_feature(CLucene_FOUND "CLucene" "The open-source, C++ search engine" "http://clucene.sf.net" TRUE "" "CLucene is used for indexing the collection")
@@ -99,61 +59,34 @@ macro_log_feature(QJSON_FOUND "QJson" "Qt library that maps JSON data to QVarian
 
 macro_optional_find_package(Taglib 1.6.0)
 macro_log_feature(TAGLIB_FOUND "TagLib" "Audio Meta-Data Library" "http://developer.kde.org/~wheeler/taglib.html" TRUE "" "taglib is needed for reading meta data from audio files")
-include( CheckTagLibFileName )
-check_taglib_filename( COMPLEX_TAGLIB_FILENAME )
-
-macro_optional_find_package(Boost)
-macro_log_feature(Boost_FOUND "Boost" "Provides free peer-reviewed portable C++ source libraries" "http://www.boost.org" TRUE "" "") #FIXME: give useful explaination
-
-macro_optional_find_package(QCA2)
-macro_log_feature(QCA2_FOUND "QCA2" "Provides encryption and signing functions required for Grooveshark resolver" "http://delta.affinix.com/qca/" FALSE "" "")
-
-macro_optional_find_package(LibAttica)
-macro_log_feature(LIBATTICA_FOUND "libattica" "Provides support for automatic fetching and managing of resolvers from the tomahawk website" "https://projects.kde.org/projects/kdesupport/attica" FALSE "" "")
-
-macro_optional_find_package(QuaZip)
-macro_log_feature(QuaZip_FOUND "QuaZip" "Provides support for extracting downloaded resolvers automatically." "http://quazip.sourceforge.net/" FALSE "" "")
-
-macro_optional_find_package(Jreen)
-macro_log_feature(LIBJREEN_FOUND "Jreen" "Qt XMPP Library" "https://github.com/euroelessar/jreen" FALSE "" "Jreen is needed for the Jabber SIP plugin.\n")
-
-macro_optional_find_package(QTweetLib)
-macro_log_feature(QTWEETLIB_FOUND "QTweetLib" "Qt Twitter Library" "https://github.com/minimoog/QTweetLib" FALSE "" "QTweetLib is needed for the Twitter SIP plugin.\n")
-
-macro_optional_find_package(VSXu)
-macro_log_feature(VSXU_FOUND "VSXu" "Vovoid VSXu Ultra" "https://www.vsxu.com" FALSE "" "VSXu is needed for some really cool music visualization.\n")
-
-IF( NOT QuaZip_FOUND )
-    add_subdirectory( ${CMAKE_SOURCE_DIR}/src/libtomahawk/thirdparty/quazip )
-    SET( QuaZip_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/libtomahawk/thirdparty/quazip )
-    SET( QuaZip_LIBRARY quazip )
-    SET( QuaZip_LIBRARIES ${QuaZip_LIBRARY} )
-    SET( QuaZip_FOUND true )
-    macro_log_feature(QuaZip_FOUND "QuaZip" "Provides support for extracting downloaded resolvers automatically. Building internal copy" "http://quazip.sourceforge.net/" FALSE "" "")
-
-    # copy headers to build/quazip so we can use proper includes inside the code
-    FILE( COPY ${CMAKE_SOURCE_DIR}/src/libtomahawk/thirdparty/quazip/quazip/ DESTINATION ${CMAKE_BINARY_DIR}/libtomahawk/thirdparty/quazip )
-ENDIF()
-
-# required
-#While we distribute our own liblastfm2, don't need to look for it
-#macro_optional_find_package(LibLastFm 0.3.3)
-#macro_log_feature(LIBLASTFM_FOUND "LastFm" "Qt library for the Last.fm webservices" "https://github.com/mxcl/liblastfm" FALSE "" "liblastfm is needed for scrobbling tracks to Last.fm and fetching cover artwork")
-set(LIBLASTFM_FOUND true)
-
-#### submodules start
-# automatically init submodules here, don't delete this code we may add submodules again
 
 # this installs headers and such and should really be handled in a separate package by packagers
+IF( INTERNAL_JREEN )
+    ADD_SUBDIRECTORY( ${THIRDPARTY_DIR}/jreen )
+    SET( LIBJREEN_INCLUDE_DIR  ${CMAKE_CURRENT_BINARY_DIR}/thirdparty/jreen/include )
+    SET( LIBJREEN_LIBRARY jreen )
+    SET( LIBJREEN_LIBRARIES ${LIBJREEN_LIBRARY} )
+    SET( LIBJREEN_FOUND  true )
+    MESSAGE(STATUS "INTERNAL libjreen: ${LIBJREEN_INCLUDE_DIR}, ${LIBJREEN_LIBRARY}")
+ELSE( INTERNAL_JREEN )
+    macro_optional_find_package(Jreen)
+ENDIF( INTERNAL_JREEN )
+macro_log_feature(LIBJREEN_FOUND "Jreen" "Qt XMPP Library" "http://gitorious.org/jreen/jreen" FALSE "" "Jreen is needed for the Jabber SIP plugin. \n\n     Use -DINTERNAL_JREEN=ON to build the git submodule inside Tomahawk \n     Be aware this installs a full jreen with headers and everything!\n")
 
-# IF( FALSE )
-#     IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.gitmodules)
-#         EXECUTE_PROCESS(COMMAND git submodule init WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} )
-#         EXECUTE_PROCESS(COMMAND git submodule update WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} )
-#     ENDIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.gitmodules)
-# ENDIF()
-
-#### submodules end
+# this installs headers and such and should really be handled in a separate package by packagers
+IF( INTERNAL_QTWEETLIB )
+    ADD_SUBDIRECTORY( ${THIRDPARTY_DIR}/qtweetlib )
+    # copy headers to build/QTweetLib so we can use proper includes inside the code
+    FILE( COPY ${CMAKE_SOURCE_DIR}/thirdparty/qtweetlib/QTweetLib/src/ DESTINATION ${CMAKE_BINARY_DIR}/QTweetLib )
+    SET( QTWEETLIB_INCLUDE_DIR  ${CMAKE_BINARY_DIR} )
+    SET( QTWEETLIB_LIBRARY  tomahawk_qtweetlib )
+    SET( QTWEETLIB_LIBRARIES ${QTWEETLIB_LIBRARY} )
+    SET( QTWEETLIB_FOUND  true )
+    MESSAGE(STATUS "INTERNAL libQTweetLib: ${QTWEETLIB_INCLUDE_DIR}, ${QTWEETLIB_LIBRARY}")
+ELSE( INTERNAL_QTWEETLIB )
+    macro_optional_find_package(QTweetLib)
+ENDIF( INTERNAL_QTWEETLIB )
+macro_log_feature(QTWEETLIB_FOUND "QTweetLib" "Qt Twitter Library" "https://github.com/minimoog/QTweetLib" FALSE "" "QTweetLib is needed for the Twitter SIP plugin. \n\n     Use -DINTERNAL_QTWEETLIB=ON to build the git submodule inside Tomahawk \n")
 
 ### libportfwd
 SET( LIBPORTFWD_INCLUDE_DIR ${THIRDPARTY_DIR}/libportfwd/include )
@@ -162,27 +95,21 @@ SET( LIBPORTFWD_LIBRARIES ${LIBPORTFWD_LIBRARY} )
 ADD_SUBDIRECTORY( ${THIRDPARTY_DIR}/libportfwd )
 
 # we need pthreads too
-#macro_optional_find_package(Threads)
-#macro_log_feature(THREADS_FOUND "Threads" "Threading Library" "" TRUE "" "Platform specific library for threading")
+find_package(Threads)
 
-macro_optional_find_package(KDE4)
-macro_optional_find_package(KDE4Installed)
-
-# this was used before we had FindKDE4Installed, just leaving it here to keep the flags
-# for future kde integration
-
-# macro_optional_find_package(KDE4)
+find_package(KDE4Installed)
+find_package(KDE4)
 IF(KDE4_FOUND)
-    IF( CMAKE_C_FLAGS )
-        # KDE4 adds and removes some compiler flags that we don't like
-        # (only for gcc not for clang e.g.)
-        STRING( REPLACE "-std=iso9899:1990" "" CLEAN_C_FLAGS ${CMAKE_C_FLAGS} )
-        SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions" )
-    ENDIF()
+    #KDE4 adds and removes some compiler flags that we don't like
+    STRING( REPLACE "-std=iso9899:1990" "" CLEAN_C_FLAGS ${CMAKE_C_FLAGS} )
+    SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions" )
 ELSE()
     SET( CLEAN_C_FLAGS ${CMAKE_C_FLAGS} )
 ENDIF()
 
+include( CheckTagLibFileName )
+check_taglib_filename( COMPLEX_TAGLIB_FILENAME )
+
 IF( WIN32 )
   find_library(QTSPARKLE_LIBRARIES qtsparkle)
 ENDIF( WIN32 )
@@ -213,9 +140,3 @@ ADD_SUBDIRECTORY( src/libtomahawk )
 SET( TOMAHAWK_LIBRARIES tomahawklib )
 ADD_SUBDIRECTORY( src )
 ADD_SUBDIRECTORY( admin )
-
-IF( BUILD_GUI )
-    IF( NOT DISABLE_CRASHREPORTER )
-        ADD_SUBDIRECTORY( src/breakpad/CrashReporter )
-    ENDIF()
-ENDIF()

CMakeModules/AddAppIconMacro.cmake

@@ -1,5 +1,3 @@
-SET(WINDRES_EXECUTABLE  ${CMAKE_RC_COMPILER})
-
 # This macro is taken from kdelibs/cmake/modules/KDE4Macros.cmake.
 #
 # Copyright (c) 2006-2009 Alexander Neundorf, <neundorf@kde.org>

CMakeModules/CMakeDateStamp.cmake

@@ -1,23 +0,0 @@
-find_program(DATE_EXECUTABLE NAMES date)
-mark_as_advanced(DATE_EXECUTABLE)
-
-if(DATE_EXECUTABLE)
-  execute_process(
-    COMMAND ${DATE_EXECUTABLE} +%Y
-    OUTPUT_VARIABLE CMAKE_DATESTAMP_YEAR
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-  )
-  execute_process(
-    COMMAND ${DATE_EXECUTABLE} +%m
-    OUTPUT_VARIABLE CMAKE_DATESTAMP_MONTH
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-  )
-  execute_process(
-    COMMAND ${DATE_EXECUTABLE} +%d
-    OUTPUT_VARIABLE CMAKE_DATESTAMP_DAY
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-  )
-endif()

CMakeModules/CMakeVersionSource.cmake

@@ -1,45 +0,0 @@
-# Try to identify the current development source version.
-set(CMAKE_VERSION_SOURCE "")
-if(EXISTS ${CMAKE_SOURCE_DIR}/.git/HEAD)
-  find_program(GIT_EXECUTABLE NAMES git git.cmd)
-  mark_as_advanced(GIT_EXECUTABLE)
-  if(GIT_EXECUTABLE)
-    execute_process(
-      COMMAND ${GIT_EXECUTABLE} rev-parse --verify -q --short=7 HEAD
-      OUTPUT_VARIABLE head
-      OUTPUT_STRIP_TRAILING_WHITESPACE
-      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-      )
-    if(head)
-      set(branch "")
-      execute_process(
-        COMMAND ${GIT_EXECUTABLE} name-rev HEAD
-        OUTPUT_VARIABLE branch
-        OUTPUT_STRIP_TRAILING_WHITESPACE
-        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-        )
-      string(REGEX REPLACE "HEAD " "" branch "${branch}")
-      set(CMAKE_VERSION_SOURCE "git-${branch}-${head}")
-      execute_process(
-        COMMAND ${GIT_EXECUTABLE} update-index -q --refresh
-        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-        )
-      execute_process(
-        COMMAND ${GIT_EXECUTABLE} diff-index --name-only HEAD --
-        OUTPUT_VARIABLE dirty
-        OUTPUT_STRIP_TRAILING_WHITESPACE
-        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-        )
-      if(dirty)
-        set(CMAKE_VERSION_SOURCE "${CMAKE_VERSION_SOURCE}-dirty")
-      endif()
-    endif()
-  endif()
-elseif(EXISTS ${CMAKE_SOURCE_DIR}/CVS/Repository)
-  file(READ ${CMAKE_SOURCE_DIR}/CVS/Repository repo)
-  set(branch "")
-  if("${repo}" MATCHES "\\.git/")
-    string(REGEX REPLACE ".*\\.git/([^\r\n]*).*" "-\\1" branch "${repo}")
-  endif()
-  set(CMAKE_VERSION_SOURCE "cvs${branch}")
-endif()

CMakeModules/FindCLucene.cmake

@@ -2,7 +2,6 @@
 # This module looks for clucene (http://clucene.sf.net) support
 # It will define the following values
 #
-# CLUCENE_INCLUDE_DIRS = CLUCENE_INCLUDE_DIR + CLUCENE_LIBRARY_DIR
 # CLUCENE_INCLUDE_DIR  = where CLucene/StdHeader.h can be found
 # CLUCENE_LIBRARY_DIR  = where CLucene/clucene-config.h can be found
 # CLUCENE_LIBRARIES    = the libraries to link against CLucene
@@ -13,21 +12,9 @@
 INCLUDE(CheckSymbolExists)
 INCLUDE(FindLibraryWithDebug)
 
-# try to locate a patched unstable version (for comp's sake *sigh*) first
-FIND_PACKAGE(CLuceneUnstable)
-IF(CLUCENEUNSTABLE_FOUND)
-    SET(CLucene_FOUND TRUE)
-    SET(CLUCENE_INCLUDE_DIR ${CLUCENE_UNSTABLE_INCLUDE_DIRS})
-    SET(CLUCENE_INCLUDE_DIRS ${CLUCENE_INCLUDE_DIR})
-    SET(CLUCENE_LIBRARIES ${CLUCENE_UNSTABLE_LIBS})
-
-    #MESSAGE(FATAL_ERROR NARF)
-ELSE(CLUCENEUNSTABLE_FOUND)
-IF(CLucene_FIND_VERSION)
-  SET(CLUCENE_MIN_VERSION ${CLucene_FIND_VERSION})
-ELSEIF()
-  SET(CLUCENE_MIN_VERSION "0.9.23")
-ENDIF(CLucene_FIND_VERSION)
+if(NOT CLUCENE_MIN_VERSION)
+  set(CLUCENE_MIN_VERSION "0.9.23")
+endif(NOT CLUCENE_MIN_VERSION)
 
 IF(EXISTS ${PROJECT_CMAKE}/CLuceneConfig.cmake)
   INCLUDE(${PROJECT_CMAKE}/CLuceneConfig.cmake)
@@ -108,11 +95,8 @@ ENDIF (CLUCENE_LIBRARY_DIR)
 
 IF(CLUCENE_INCLUDE_DIR AND CLUCENE_LIBRARIES AND CLUCENE_LIBRARY_DIR AND CLUCENE_GOOD_VERSION)
   SET(CLucene_FOUND TRUE)
-  SET(CLUCENE_INCLUDE_DIRS ${CLUCENE_LIBRARY_DIR} ${CLUCENE_INCLUDE_DIR})
 ENDIF(CLUCENE_INCLUDE_DIR AND CLUCENE_LIBRARIES AND CLUCENE_LIBRARY_DIR AND CLUCENE_GOOD_VERSION)
 
-ENDIF(CLUCENEUNSTABLE_FOUND)
-
 IF(CLucene_FOUND)
   IF(NOT CLucene_FIND_QUIETLY)
     MESSAGE(STATUS "Found CLucene: ${CLUCENE_LIBRARIES} version ${CLUCENE_VERSION}")
@@ -124,8 +108,7 @@ ELSE(CLucene_FOUND)
 ENDIF(CLucene_FOUND)
 
 MARK_AS_ADVANCED(
-  CLUCENE_INCLUDE_DIRS
-  CLUCENE_INCLUDE_DIR
-  CLUCENE_LIBRARY_DIR
+  CLUCENE_INCLUDE_DIR 
+  CLUCENE_LIBRARY_DIR 
   CLUCENE_LIBRARIES
   )

CMakeModules/FindCLuceneUnstable.cmake

@@ -1,37 +0,0 @@
-# - Try to find clucene-unstable
-#  This is a workaround for distros, that want to ship a recent enough clucene but don't want to replace the old version
-#
-#  CLUCENEUNSTABLE_FOUND - system has clucene-unstable
-#  CLUCENE_UNSTABLE_INCLUDE_DIR - the clucene-unstable include directories
-#  CLUCENE_UNSTABLE_LIBS - link these to use clucene-unstable
-#
-# (c) Dominik Schmidt <dev@dominik-schmidt.de>
-#
-
-# Include dir
-find_path(CLUCENE_UNSTABLE_INCLUDE_DIR
-  NAMES CLucene.h
-  PATH_SUFFIXES clucene-unstable
-  PATHS ${KDE4_INCLUDE_DIR}
-)
-
-# Finally the library itself
-find_library(CLUCENE_UNSTABLE_SHARED_LIB
-  NAMES clucene-unstable-shared
-  PATHS ${KDE4_LIB_DIR}
-)
-
-find_library(CLUCENE_UNSTABLE_CORE_LIB
-  NAMES clucene-unstable-core
-  PATHS ${KDE4_LIB_DIR}
-)
-
-
-SET( CLUCENE_UNSTABLE_LIBS  ${CLUCENE_UNSTABLE_SHARED_LIB} ${CLUCENE_UNSTABLE_CORE_LIB} )
-SET( CLUCENE_UNSTABLE_INCLUDE_DIRS ${CLUCENE_UNSTABLE_INCLUDE_DIR})
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(CLuceneUnstable DEFAULT_MSG CLUCENE_UNSTABLE_LIBS CLUCENE_UNSTABLE_INCLUDE_DIRS)
-
-
-MARK_AS_ADVANCED(CLUCENE_UNSTABLE_LIBS CLUCENE_UNSTABLE_INCLUDE_DIRS)
-

CMakeModules/FindLibAttica.cmake

@@ -1,63 +0,0 @@
-# Try to find the Attica library
-# Once done this will define
-#
-#   LIBATTICA_FOUND          Indicates that Attica was found
-#   LIBATTICA_LIBRARIES      Libraries needed to use Attica
-#   LIBATTICA_LIBRARY_DIRS   Paths needed for linking against Attica
-#   LIBATTICA_INCLUDE_DIR    Path needed for finding Attica include files
-#
-# The minimum required version of LibAttica can be specified using the
-# standard syntax, e.g. find_package(LibAttica 0.20)
-
-# Copyright (c) 2009 Frederik Gladhorn <gladhorn@kde.org>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-
-# Support LIBATTICA_MIN_VERSION for compatibility:
-IF(NOT LibAttica_FIND_VERSION)
-  SET(LibAttica_FIND_VERSION "${LIBATTICA_MIN_VERSION}")
-ENDIF(NOT LibAttica_FIND_VERSION)
-
-# the minimum version of LibAttica we require
-IF(NOT LibAttica_FIND_VERSION)
-  SET(LibAttica_FIND_VERSION "0.1.0")
-ENDIF(NOT LibAttica_FIND_VERSION)
-
-
-IF (NOT WIN32)
-   # use pkg-config to get the directories and then use these values
-   # in the FIND_PATH() and FIND_LIBRARY() calls
-   FIND_PACKAGE(PkgConfig)
-   PKG_CHECK_MODULES(PC_LIBATTICA QUIET libattica)
-   SET(LIBATTICA_DEFINITIONS ${PC_ATTICA_CFLAGS_OTHER})
-ENDIF (NOT WIN32)
-
-FIND_PATH(LIBATTICA_INCLUDE_DIR attica/provider.h
-   HINTS
-   ${PC_LIBATTICA_INCLUDEDIR}
-   ${PC_LIBATTICA_INCLUDE_DIRS}
-   PATH_SUFFIXES attica
-   )
-
-# Store the version number in the cache, so we don't have to search everytime:
-IF(LIBATTICA_INCLUDE_DIR  AND NOT  LIBATTICA_VERSION)
-  FILE(READ ${LIBATTICA_INCLUDE_DIR}/attica/version.h LIBATTICA_VERSION_CONTENT)
-  STRING (REGEX MATCH "LIBATTICA_VERSION_STRING \".*\"\n" LIBATTICA_VERSION_MATCH "${LIBATTICA_VERSION_CONTENT}")
-  IF(LIBATTICA_VERSION_MATCH)
-    STRING(REGEX REPLACE "LIBATTICA_VERSION_STRING \"(.*)\"\n" "\\1" _LIBATTICA_VERSION ${LIBATTICA_VERSION_MATCH})
-  ENDIF(LIBATTICA_VERSION_MATCH)
-  SET(LIBATTICA_VERSION "${_LIBATTICA_VERSION}" CACHE STRING "Version number of LibAttica" FORCE)
-ENDIF(LIBATTICA_INCLUDE_DIR  AND NOT  LIBATTICA_VERSION)
-
-
-FIND_LIBRARY(LIBATTICA_LIBRARIES NAMES attica libattica
-   HINTS
-   ${PC_LIBATTICA_LIBDIR}
-   ${PC_LIBATTICA_LIBRARY_DIRS}
-   )
-
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibAttica  REQUIRED_VARS LIBATTICA_LIBRARIES LIBATTICA_INCLUDE_DIR
-                                             VERSION_VAR LIBATTICA_VERSION)
-
-MARK_AS_ADVANCED(LIBATTICA_INCLUDE_DIR LIBATTICA_LIBRARIES)

CMakeModules/FindPhonon.cmake

@@ -19,19 +19,53 @@ macro(_phonon_find_version)
    file(READ ${_phonon_namespace_header_file} _phonon_header LIMIT 5000 OFFSET 1000)
    string(REGEX MATCH "define PHONON_VERSION_STR \"(4\\.[0-9]+\\.[0-9a-z]+)\"" _phonon_version_match "${_phonon_header}")
    set(PHONON_VERSION "${CMAKE_MATCH_1}")
+   message(STATUS "Phonon Version: ${PHONON_VERSION}")
 endmacro(_phonon_find_version)
 
-# the dirs listed with HINTS are searched before the default sets of dirs
-find_library(PHONON_LIBRARY NAMES phonon HINTS ${KDE4_LIB_INSTALL_DIR} ${QT_LIBRARY_DIR})
-find_path(PHONON_INCLUDE_DIR NAMES phonon/phonon_export.h HINTS ${KDE4_INCLUDE_INSTALL_DIR} ${QT_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR} ${QT_LIBRARY_DIR})
-
-if(PHONON_INCLUDE_DIR AND PHONON_LIBRARY)
-   set(PHONON_LIBS ${phonon_LIB_DEPENDS} ${PHONON_LIBRARY})
-   set(PHONON_INCLUDES ${PHONON_INCLUDE_DIR}/KDE ${PHONON_INCLUDE_DIR})
+if(PHONON_FOUND)
+   # Already found, nothing more to do except figuring out the version
    _phonon_find_version()
-endif(PHONON_INCLUDE_DIR AND PHONON_LIBRARY)
+else(PHONON_FOUND)
+   if(PHONON_INCLUDE_DIR AND PHONON_LIBRARY)
+      set(PHONON_FIND_QUIETLY TRUE)
+   endif(PHONON_INCLUDE_DIR AND PHONON_LIBRARY)
 
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Phonon  DEFAULT_MSG  PHONON_INCLUDE_DIR PHONON_LIBRARY)
+   # As discussed on kde-buildsystem: first look at CMAKE_PREFIX_PATH, then at the suggested PATHS (kde4 install dir)
+   find_library(PHONON_LIBRARY NAMES phonon phonon4 PATHS ${KDE4_LIB_INSTALL_DIR} ${QT_LIBRARY_DIR})
+   # then at the default system locations (CMAKE_SYSTEM_PREFIX_PATH, i.e. /usr etc.)
+   find_library(PHONON_LIBRARY NAMES phonon phonon4)
 
-mark_as_advanced(PHONON_INCLUDE_DIR PHONON_LIBRARY)
+   find_path(PHONON_INCLUDE_DIR NAMES phonon/phonon_export.h PATHS ${KDE4_INCLUDE_INSTALL_DIR} ${QT_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR} ${QT_LIBRARY_DIR})
+   find_path(PHONON_INCLUDE_DIR NAMES phonon/phonon_export.h)
+
+   if(PHONON_INCLUDE_DIR AND PHONON_LIBRARY)
+      set(PHONON_LIBS ${phonon_LIB_DEPENDS} ${PHONON_LIBRARY})
+      set(PHONON_INCLUDES ${PHONON_INCLUDE_DIR}/KDE ${PHONON_INCLUDE_DIR})
+      set(PHONON_FOUND TRUE)
+      _phonon_find_version()
+   else(PHONON_INCLUDE_DIR AND PHONON_LIBRARY)
+      set(PHONON_FOUND FALSE)
+   endif(PHONON_INCLUDE_DIR AND PHONON_LIBRARY)
+
+   if(PHONON_FOUND)
+      if(NOT PHONON_FIND_QUIETLY)
+         message(STATUS "Found Phonon: ${PHONON_LIBRARY}")
+         message(STATUS "Found Phonon Includes: ${PHONON_INCLUDES}")
+      endif(NOT PHONON_FIND_QUIETLY)
+   else(PHONON_FOUND)
+      if(Phonon_FIND_REQUIRED)
+         if(NOT PHONON_INCLUDE_DIR)
+            message(STATUS "Phonon includes NOT found!")
+         endif(NOT PHONON_INCLUDE_DIR)
+         if(NOT PHONON_LIBRARY)
+            message(STATUS "Phonon library NOT found!")
+         endif(NOT PHONON_LIBRARY)
+         message(FATAL_ERROR "Phonon library or includes NOT found!")
+      else(Phonon_FIND_REQUIRED)
+         message(STATUS "Unable to find Phonon")
+      endif(Phonon_FIND_REQUIRED)
+   endif(PHONON_FOUND)
+
+
+   mark_as_advanced(PHONON_INCLUDE_DIR PHONON_LIBRARY PHONON_INCLUDES)
+endif(PHONON_FOUND)

CMakeModules/FindQCA2.cmake

@@ -1,48 +0,0 @@
-# - Try to find QCA2 (Qt Cryptography Architecture 2)
-# Once done this will define
-#
-#  QCA2_FOUND - system has QCA2
-#  QCA2_INCLUDE_DIR - the QCA2 include directory
-#  QCA2_LIBRARIES - the libraries needed to use QCA2
-#  QCA2_DEFINITIONS - Compiler switches required for using QCA2
-#
-# use pkg-config to get the directories and then use these values
-# in the FIND_PATH() and FIND_LIBRARY() calls
-
-# Copyright (c) 2006, Michael Larouche, <michael.larouche@kdemail.net>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-include(FindLibraryWithDebug)
-
-if (QCA2_INCLUDE_DIR AND QCA2_LIBRARIES)
-
-  # in cache already
-  set(QCA2_FOUND TRUE)
-
-else (QCA2_INCLUDE_DIR AND QCA2_LIBRARIES)
-
-
-  if (NOT WIN32)
-    find_package(PkgConfig)
-    pkg_check_modules(PC_QCA2 qca2)
-    set(QCA2_DEFINITIONS ${PC_QCA2_CFLAGS_OTHER})
-  endif (NOT WIN32)
-
-  find_library_with_debug(QCA2_LIBRARIES
-                  WIN32_DEBUG_POSTFIX d
-                  NAMES qca
-                  HINTS ${PC_QCA2_LIBDIR} ${PC_QCA2_LIBRARY_DIRS}
-                  )
-
-  find_path(QCA2_INCLUDE_DIR qca.h
-            HINTS ${PC_QCA2_INCLUDEDIR} ${PC_QCA2_INCLUDE_DIRS}
-            PATH_SUFFIXES QtCrypto)
-
-  include(FindPackageHandleStandardArgs)
-  find_package_handle_standard_args(QCA2  DEFAULT_MSG  QCA2_LIBRARIES QCA2_INCLUDE_DIR)
-
-  mark_as_advanced(QCA2_INCLUDE_DIR QCA2_LIBRARIES)
-
-endif (QCA2_INCLUDE_DIR AND QCA2_LIBRARIES)

CMakeModules/FindQuaZip.cmake

@@ -1,11 +0,0 @@
-find_package(Qt4)
-find_path(QuaZip_INCLUDE_DIR quazip.h ${CMAKE_INSTALL_PREFIX}/include/quazip ${CMAKE_INSTALL_PREFIX}/include /usr/include/quazip /usr/local/include/quazip ${QT_INCLUDE_DIR}/quazip ${QT_INCLUDE_DIR} ${QUAZIP_DIR}/include/quazip ${QUAZIP_DIR}/quazip ${QUAZIP_DIR}/include)
-find_library(QuaZip_LIBRARY NAMES quazip PATHS ${CMAKE_INSTALL_PREFIX}/lib64 ${CMAKE_INSTALL_PREFIX}/lib ${CMAKE_INSTALL_PREFIX}/Library/Frameworks ${QUAZIP_DIR}/lib64 ${QUAZIP_DIR}/lib ${QUAZIP_DIR}/quazip ${QUAZIP_DIR})
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(quazip DEFAULT_MSG QuaZip_LIBRARY QuaZip_INCLUDE_DIR)
-set(QuaZip_LIBRARIES ${QuaZip_LIBRARY})
-mark_as_advanced(QuaZip_LIBRARY QuaZip_INCLUDE_DIR)
-
-if(QuaZip_LIBRARY AND QuaZip_INCLUDE_DIR)
-   set(QuaZip_FOUND TRUE)
-endif()

CMakeModules/FindVSXu.cmake

@@ -1,48 +0,0 @@
-# Find VSXU - JSON handling library for Qt
-#
-# This module defines
-#  VSXU_FOUND - whether the qsjon library was found
-#  VSXU_LIBRARIES - the vsxu library
-#  VSXU_INCLUDE_DIRS - the include path of the vsxu library
-#
-
-if (VSXU_INCLUDE_DIRS AND VSXU_LIBRARIES)
-
-  # Already in cache
-  set (VSXU_FOUND TRUE)
-
-else (VSXU_INCLUDE_DIRS AND VSXU_LIBRARIES)
-
-  if (NOT WIN32)
-    # use pkg-config to get the values of VSXU_INCLUDE_DIRS
-    # and VSXU_LIBRARY_DIRS to add as hints to the find commands.
-    include (FindPkgConfig)
-    pkg_check_modules (VSXU REQUIRED libvsxu)
-  endif (NOT WIN32)
-
-  find_library (VSXU_LIBRARIES
-    NAMES
-    libvsxu_engine
-    PATHS
-    ${VSXU_LIBRARY_DIRS}
-    ${LIB_INSTALL_DIR}
-    ${KDE4_LIB_DIR}
-  )
-
-  find_path (VSXU_INCLUDE_DIRS
-    NAMES
-    vsxu_platform.h
-    PATHS
-    ${VSXU_INCLUDE_DIRS}
-    ${INCLUDE_INSTALL_DIR}
-    ${KDE4_INCLUDE_DIR}
-  )
-
-  include(FindPackageHandleStandardArgs)
-  find_package_handle_standard_args(VSXu DEFAULT_MSG VSXU_LIBRARIES VSXU_INCLUDE_DIRS)
-
-  if ( UNIX AND NOT APPLE )
-    set ( VSXU_LIBRARIES "${VSXU_LIBRARIES} ${VSXU_LDFLAGS}" CACHE INTERNAL "")
-  endif ()
-
-endif (VSXU_INCLUDE_DIRS AND VSXU_LIBRARIES)

CMakeModules/GNUInstallDirs.cmake

@@ -1,182 +0,0 @@
-# - Define GNU standard installation directories
-# Provides install directory variables as defined for GNU software:
-#  http://www.gnu.org/prep/standards/html_node/Directory-Variables.html
-# Inclusion of this module defines the following variables:
-#  CMAKE_INSTALL_<dir>      - destination for files of a given type
-#  CMAKE_INSTALL_FULL_<dir> - corresponding absolute path
-# where <dir> is one of:
-#  BINDIR           - user executables (bin)
-#  SBINDIR          - system admin executables (sbin)
-#  LIBEXECDIR       - program executables (libexec)
-#  SYSCONFDIR       - read-only single-machine data (etc)
-#  SHAREDSTATEDIR   - modifiable architecture-independent data (com)
-#  LOCALSTATEDIR    - modifiable single-machine data (var)
-#  LIBDIR           - object code libraries (lib or lib64)
-#  INCLUDEDIR       - C header files (include)
-#  OLDINCLUDEDIR    - C header files for non-gcc (/usr/include)
-#  DATAROOTDIR      - read-only architecture-independent data root (share)
-#  DATADIR          - read-only architecture-independent data (DATAROOTDIR)
-#  INFODIR          - info documentation (DATAROOTDIR/info)
-#  LOCALEDIR        - locale-dependent data (DATAROOTDIR/locale)
-#  MANDIR           - man documentation (DATAROOTDIR/man)
-#  DOCDIR           - documentation root (DATAROOTDIR/doc/PROJECT_NAME)
-# Each CMAKE_INSTALL_<dir> value may be passed to the DESTINATION options of
-# install() commands for the corresponding file type.  If the includer does
-# not define a value the above-shown default will be used and the value will
-# appear in the cache for editing by the user.
-# Each CMAKE_INSTALL_FULL_<dir> value contains an absolute path constructed
-# from the corresponding destination by prepending (if necessary) the value
-# of CMAKE_INSTALL_PREFIX.
-
-#=============================================================================
-# Copyright 2011 Nikita Krupen'ko <krnekit@gmail.com>
-# Copyright 2011 Kitware, Inc.
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-# (To distribute this file outside of CMake, substitute the full
-#  License text for the above reference.)
-
-# Installation directories
-#
-if(NOT DEFINED CMAKE_INSTALL_BINDIR)
-  set(CMAKE_INSTALL_BINDIR "bin" CACHE PATH "user executables (bin)")
-endif()
-
-if(NOT DEFINED CMAKE_INSTALL_SBINDIR)
-  set(CMAKE_INSTALL_SBINDIR "sbin" CACHE PATH "system admin executables (sbin)")
-endif()
-
-if(NOT DEFINED CMAKE_INSTALL_LIBEXECDIR)
-  set(CMAKE_INSTALL_LIBEXECDIR "libexec" CACHE PATH "program executables (libexec)")
-endif()
-
-if(NOT DEFINED CMAKE_INSTALL_SYSCONFDIR)
-  set(CMAKE_INSTALL_SYSCONFDIR "etc" CACHE PATH "read-only single-machine data (etc)")
-endif()
-
-if(NOT DEFINED CMAKE_INSTALL_SHAREDSTATEDIR)
-  set(CMAKE_INSTALL_SHAREDSTATEDIR "com" CACHE PATH "modifiable architecture-independent data (com)")
-endif()
-
-if(NOT DEFINED CMAKE_INSTALL_LOCALSTATEDIR)
-  set(CMAKE_INSTALL_LOCALSTATEDIR "var" CACHE PATH "modifiable single-machine data (var)")
-endif()
-
-if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
-  set(_LIBDIR_DEFAULT "lib")
-  # Override this default 'lib' with 'lib64' iff:
-  #  - we are on Linux system but NOT cross-compiling
-  #  - we are NOT on debian
-  #  - we are on a 64 bits system
-  # reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf
-  # Note that the future of multi-arch handling may be even
-  # more complicated than that: http://wiki.debian.org/Multiarch
-  if(CMAKE_SYSTEM_NAME MATCHES "Linux"
-      AND NOT CMAKE_CROSSCOMPILING
-      AND NOT EXISTS "/etc/debian_version")
-    if(NOT DEFINED CMAKE_SIZEOF_VOID_P)
-      message(AUTHOR_WARNING
-        "Unable to determine default CMAKE_INSTALL_LIBDIR directory because no target architecture is known. "
-        "Please enable at least one language before including GNUInstallDirs.")
-    else()
-      if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
-        set(_LIBDIR_DEFAULT "lib64")
-      endif()
-    endif()
-  endif()
-  set(CMAKE_INSTALL_LIBDIR "${_LIBDIR_DEFAULT}" CACHE PATH "object code libraries (${_LIBDIR_DEFAULT})")
-endif()
-
-if(NOT DEFINED CMAKE_INSTALL_INCLUDEDIR)
-  set(CMAKE_INSTALL_INCLUDEDIR "include" CACHE PATH "C header files (include)")
-endif()
-
-if(NOT DEFINED CMAKE_INSTALL_OLDINCLUDEDIR)
-  set(CMAKE_INSTALL_OLDINCLUDEDIR "/usr/include" CACHE PATH "C header files for non-gcc (/usr/include)")
-endif()
-
-if(NOT DEFINED CMAKE_INSTALL_DATAROOTDIR)
-  set(CMAKE_INSTALL_DATAROOTDIR "share" CACHE PATH "read-only architecture-independent data root (share)")
-endif()
-
-#-----------------------------------------------------------------------------
-# Values whose defaults are relative to DATAROOTDIR.  Store empty values in
-# the cache and store the defaults in local variables if the cache values are
-# not set explicitly.  This auto-updates the defaults as DATAROOTDIR changes.
-
-if(NOT CMAKE_INSTALL_DATADIR)
-  set(CMAKE_INSTALL_DATADIR "" CACHE PATH "read-only architecture-independent data (DATAROOTDIR)")
-  set(CMAKE_INSTALL_DATADIR "${CMAKE_INSTALL_DATAROOTDIR}")
-endif()
-
-if(NOT CMAKE_INSTALL_INFODIR)
-  set(CMAKE_INSTALL_INFODIR "" CACHE PATH "info documentation (DATAROOTDIR/info)")
-  set(CMAKE_INSTALL_INFODIR "${CMAKE_INSTALL_DATAROOTDIR}/info")
-endif()
-
-if(NOT CMAKE_INSTALL_LOCALEDIR)
-  set(CMAKE_INSTALL_LOCALEDIR "" CACHE PATH "locale-dependent data (DATAROOTDIR/locale)")
-  set(CMAKE_INSTALL_LOCALEDIR "${CMAKE_INSTALL_DATAROOTDIR}/locale")
-endif()
-
-if(NOT CMAKE_INSTALL_MANDIR)
-  set(CMAKE_INSTALL_MANDIR "" CACHE PATH "man documentation (DATAROOTDIR/man)")
-  set(CMAKE_INSTALL_MANDIR "${CMAKE_INSTALL_DATAROOTDIR}/man")
-endif()
-
-if(NOT CMAKE_INSTALL_DOCDIR)
-  set(CMAKE_INSTALL_DOCDIR "" CACHE PATH "documentation root (DATAROOTDIR/doc/PROJECT_NAME)")
-  set(CMAKE_INSTALL_DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${PROJECT_NAME}")
-endif()
-
-#-----------------------------------------------------------------------------
-
-mark_as_advanced(
-  CMAKE_INSTALL_BINDIR
-  CMAKE_INSTALL_SBINDIR
-  CMAKE_INSTALL_LIBEXECDIR
-  CMAKE_INSTALL_SYSCONFDIR
-  CMAKE_INSTALL_SHAREDSTATEDIR
-  CMAKE_INSTALL_LOCALSTATEDIR
-  CMAKE_INSTALL_LIBDIR
-  CMAKE_INSTALL_INCLUDEDIR
-  CMAKE_INSTALL_OLDINCLUDEDIR
-  CMAKE_INSTALL_DATAROOTDIR
-  CMAKE_INSTALL_DATADIR
-  CMAKE_INSTALL_INFODIR
-  CMAKE_INSTALL_LOCALEDIR
-  CMAKE_INSTALL_MANDIR
-  CMAKE_INSTALL_DOCDIR
-  )
-
-# Result directories
-#
-foreach(dir
-    BINDIR
-    SBINDIR
-    LIBEXECDIR
-    SYSCONFDIR
-    SHAREDSTATEDIR
-    LOCALSTATEDIR
-    LIBDIR
-    INCLUDEDIR
-    OLDINCLUDEDIR
-    DATAROOTDIR
-    DATADIR
-    INFODIR
-    LOCALEDIR
-    MANDIR
-    DOCDIR
-    )
-  if(NOT IS_ABSOLUTE ${CMAKE_INSTALL_${dir}})
-    set(CMAKE_INSTALL_FULL_${dir} "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_${dir}}")
-  else()
-    set(CMAKE_INSTALL_FULL_${dir} "${CMAKE_INSTALL_${dir}}")
-  endif()
-endforeach()

CMakeModules/NSIS.InstallOptions.ini.in

@@ -1,24 +0,0 @@
-[Settings]
-NumFields=3
-
-[Field 1]
-Type=Label
-Left=0
-Right=-1
-Top=0
-Bottom=24
-
-[Field 2]
-Type=RadioButton
-Left=30
-Right=-1
-Top=50
-Bottom=58
-State=1
-
-[Field 3]
-Type=RadioButton
-Left=30
-Right=-1
-Top=70
-Bottom=78

CPackOptions.cmake.in

@@ -1,77 +0,0 @@
-# This file is configured at cmake time, and loaded at cpack time.
-# To pass variables to cpack from cmake, they must be configured
-# in this file.
-
-if(CPACK_GENERATOR MATCHES "NSIS")
-  if( NOT EXISTS "@CMAKE_SOURCE_DIR@/admin/win/vlc/")
-    MESSAGE(FATAL_ERROR "\n You don't have vlc in your admin/win/ dir. \n Please change into that dir and execute 'sh update-vlc.sh'" )
-  endif()
-
-  #SET(CPACK_NSIS_INSTALL_ROOT "@CPACK_NSIS_INSTALL_ROOT@")
-
-  # set the install/unistall icon used for the installer itself
-  # There is a bug in NSI that does not handle full unix paths properly.
-  #SET(CPACK_NSIS_MUI_ICON "@CMake_SOURCE_DIR@/Utilities/Release\\CMakeLogo.ico")
-  #SET(CPACK_NSIS_MUI_UNIICON "@CMake_SOURCE_DIR@/Utilities/Release\\CMakeLogo.ico")
-  # set the package header icon for MUI
-  #SET(CPACK_PACKAGE_ICON "@CMake_SOURCE_DIR@/Utilities/Release\\CMakeInstall.bmp")
-  # tell cpack to create links to the doc files
-  #SET(CPACK_NSIS_MENU_LINKS
-  #  "doc/cmake-@CMake_VERSION_MAJOR@.@CMake_VERSION_MINOR@/cmake-gui.html" "cmake-gui Help"
-  #  "doc/cmake-@CMake_VERSION_MAJOR@.@CMake_VERSION_MINOR@/cmake.html" "CMake Help"
-  #  "doc/cmake-@CMake_VERSION_MAJOR@.@CMake_VERSION_MINOR@/cmake-properties.html"
-  #  "CMake Properties and Variables Help"
-  #  "doc/cmake-@CMake_VERSION_MAJOR@.@CMake_VERSION_MINOR@/ctest.html" "CTest Help"
-  #  "doc/cmake-@CMake_VERSION_MAJOR@.@CMake_VERSION_MINOR@/cmake-modules.html" "CMake Modules Help"
-  #  "doc/cmake-@CMake_VERSION_MAJOR@.@CMake_VERSION_MINOR@/cmake-commands.html" "CMake Commands Help"
-  #  "doc/cmake-@CMake_VERSION_MAJOR@.@CMake_VERSION_MINOR@/cpack.html" "CPack Help"
-  #  "http://www.cmake.org" "CMake Web Site"
-  #  )
-  # Use the icon from cmake-gui for add-remove programs
-  #SET(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\cmake-gui.exe")
-  #
-  #SET(CPACK_NSIS_PACKAGE_NAME "@CPACK_NSIS_PACKAGE_NAME@")
-  #SET(CPACK_NSIS_DISPLAY_NAME "@CPACK_NSIS_PACKAGE_NAME@, a cross-platform, open-source build system")
-  #SET(CPACK_NSIS_HELP_LINK "http://www.cmake.org")
-  #SET(CPACK_NSIS_URL_INFO_ABOUT "http://www.kitware.com")
-  #SET(CPACK_NSIS_CONTACT @CPACK_PACKAGE_CONTACT@)
-  #SET(CPACK_NSIS_MODIFY_PATH ON)
-
-
-
-##### all options
-#CPACK_NSIS_MUI_ICON     The icon file (.ico) for the generated install program. Both this and CPACK_NSIS_MUI_UNIICON need to set for this to have any effect.   installer.ico
-#CPACK_NSIS_MUI_UNIICON  The icon file (.ico) for the generated uninstall program. Both this and CPACK_NSIS_MUI_ICON need to set for this to have any effect.    uninstaller.ico
-SET( CPACK_PACKAGE_ICON  @CMAKE_SOURCE_DIR@/admin/win/nsi/installer.ico ) #  A branding image that will be displayed on the top bar inside the installer.    installer.bmp
-#CPACK_NSIS_EXTRA_INSTALL_COMMANDS   Extra NSIS commands that will be added to the install Section.  ExecWait '\\\"$INSTDIR\\\\vcredist_x86.exe\\\" /q:a'
-#CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS     Extra NSIS commands that will be added to the uninstall Section.
-SET( CPACK_NSIS_COMPRESSOR   "/SOLID lzma" ) # The arguments that will be passed to the NSIS SetCompressor command.    /SOLID lzma
-#CPACK_NSIS_MODIFY_PATH  If this is set to "ON", then an extra page will appear in the installer that will allow the user to choose whether the program directory should be added to the system PATH variable.   ON
-#CPACK_NSIS_DISPLAY_NAME     Undocumented.   "${CPACK_PACKAGE_INSTALL_DIRECTORY} My Famous Project"
-#CPACK_NSIS_INSTALLED_ICON_NAME  Set the icon used for the Windows "Add or Remove Programs" tool.    "bin\\\\MyExecutable.exe"
-#CPACK_NSIS_HELP_LINK    Adds link to registry. URI.     "http:\\\\\\\\www.my-project-home-page.org"
-#CPACK_NSIS_URL_INFO_ABOUT   Adds link to registry and the vendor in add/remove programs' "Click here for support information" in program entry links here.  "http:\\\\\\\\www.my-personal-home-page.com"
-#CPACK_NSIS_CONTACT  Adds link to add/remove programs' "Click here for support information" in program entry.    "me@my-personal-home-page.com"
-#CPACK_NSIS_CREATE_ICONS_EXTRA   Additional NSIS commands for creating start menu shortcuts.     set(CPACK_NSIS_CREATE_ICONS "CreateShortCut '\$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\${PROJECT_NAME}.lnk' '\$INSTDIR\\\\${PROJECT_NAME}.exe'")
-#CPACK_NSIS_DELETE_ICONS_EXTRA   Undocumented. Possibly: Additional NSIS commands to uninstall start menu shortcuts.
-#CPACK_NSIS_MENU_LINKS   Used to override the Start Menu links.  "doc/cmake-@CMake_VERSION_MAJOR@.@CMake_VERSION_MINOR@/CMakeSetup.html" "CMakeSetup Help"
-#CPACK_NSIS_MUI_FINISHPAGE_RUN   If used, will make it possible for user to choose (on an additional page, displayed at the end of the installation) to run intalled program. Should point to program name to run, seemingly without any sub-directories of the installation directory in case program installed in such sub-directories (but please check generated NSIS script if you can't make it work).     "MyExecutable.exe"
-
-endif(CPACK_GENERATOR MATCHES "NSIS")
-
-## include the cpack options for qt dialog if they exisit
-## they might not if qt was not enabled for the build
-#INCLUDE("@QT_DIALOG_CPACK_OPTIONS_FILE@" OPTIONAL)
-
-
-#if("${CPACK_GENERATOR}" STREQUAL "PackageMaker")
-#  if(CMAKE_PACKAGE_QTGUI)
-#    set(CPACK_PACKAGE_DEFAULT_LOCATION "/Applications")
-#  else(CMAKE_PACKAGE_QTGUI)
-#    set(CPACK_PACKAGE_DEFAULT_LOCATION "/usr")
-#  endif(CMAKE_PACKAGE_QTGUI)
-#endif("${CPACK_GENERATOR}" STREQUAL "PackageMaker")
-
-
-SET( CMAKE_SOURCE_DIR @CMAKE_SOURCE_DIR@ )
-SET( CMAKE_BINARY_DIR @CMAKE_BINARY_DIR@ )

ChangeLog

@@ -1,228 +1,22 @@
-Version 0.3.3:
-    * Automatically load Super Collection tracks when no official release
-      information is available.
-    * Fixed stations not fetching new tracks under certain circumstances.
-    * Fixed Footnotes not always updating when selecting a new track.
-    * Added support for ow.ly, fb.me, itun.es and tinyurl.com URL shorteners.
-    * Fixed playback issues with non-latin filenames on Windows.
-    * Fixed tomahawk:// protocol not working properly on Windows.
-    * Fixed dupe menu entry appearing on OS X.
-    * Fixed invisible sidebar items on Linux.
-
-Version 0.3.2: 
-    * Improved syncing process, it's faster and more reliable now.
-    * Fixed UPnP issues.
-    * Fixed not updating collections and views after a collection changes.
-    * Fixed not showing a source's proper name at all times.
-    * Improved music scanner reliability.
-    * Fixed various labels not being painted in the right color when selected.
-    * Support .oga (ogg mimetype) files.
-    * Fixed stuck Now Playing indicator icon.
-    * Fixed sidebar width of settings dialog on Windows.
-    * Fixed not always showing delete icon on hovered temporary pages.
-    * Fixed inability to select externally mounted drives.
-    * Fixed bug where speaker would be stuck next to a playlist.
-    * Fixed bug where first startup would show a loading spinner in the
-      Dashboard's "Recent Additions" forever.
-    * Automatically upgrade resolvers when an update is found.
-    * Fixed last played track of a friend never expiring.
-    * Fixed parsing of rdio tracks.
-    * Changed steering mechanism in stations to be user-friendlier.
-    * Fixed loading biographies of artist names with special characters.
-    * Fixed behaviour of dropping Spotify playlists on the sidebar.
-    * Fixed hard to read source-name in the audio control area on OS X.
-    * Fixed crashes when playing Grooveshark tracks.
-    * Fixed bug where clicking the latch button would flicker and unlatch.
-    * Fixed Jabber accounts not connecting properly when proxy is in use.
-
-Version 0.3.1:
-    * Fixed not resolving to local files.
-    * Fixed shutdown crash on Windows.
-    * Support more widget types in Javascript resolver configs.
-    * Fixed bug where red headphone would be visible on My Collection
-      when listened along to source went offline.
-    * Draw author name as well as avatar in recently played playlists.
-    * Fixed Tomahawk integration in Unity.
-    * Fixed incorrect item selected in source tree when deleting temporary
-      pages.
-    * Fixed currently played label disappearing after 10 minutes regardless
-      of length of track.
-    * Fixed crash on Sparkle upgrade on OS X.
-
-Version 0.3.0:
-    * Make artist names in the album view clickable.
-    * Don't start playing if a tomahawk:// link was clicked while Tomahawk
-      is paused.
-    * Make artist name clickable in header of Album pages.
-    * Added a drop shadow to cover images, and put placeholder in jewel case.
-    * Added shuffle and repeat support to tree view.
-    * Draw a speaker next to the currently playing playlist.
-    * Refresh station previews whenever a filter is changed.
-    * Support and show official releases on album and track pages.
-    * Filter out duplicates from station previews and upcoming tracks.
-    * Added YouTube resolver.
-    * Fixed bug where going offline then online would not re-connect to many
-      peers.
-    * Added support for auto-updating live XSPF playlists. 
-    * Don't show an age of 41 years for tracks that have no age information.
-    * Show config UI for resolvers that have them as soon as you add them.
-    * Add support for Echo Nest Personal Catalogs and User Radio. Synchronize
-      your catalog with The Echo Nest and enable personal recommendations
-      from you and your friends.
-    * Added support for Grooveshark resolver (requires Grooveshark Anywhere).
-    * Fixed re-resolving when resolvers or sources go off- / online.
-    * Correctly sort recently played tracks on the Dashboard.
-    * Show a Lion full-screen toggle button if running on Lion.
-    * Show a list of users who are currently listening along to you.
-    * Show headphone icon in source item to allow users to listen along; paint
-      headphones red on a source if you are currently listening along to it.
-    * Added new job status view in the bottom of the source list that displays
-      current jobs such as resolving, parsing playlists, and loading from
-      database.
-    * Parse and convert a Spotify playlist URL when dropped anywhere on the
-      sidebar.
-    * Convert resolvers to use asynchronous calls to avoid blocking Tomahawk's
-      UI, greatly increasing responsiveness of Tomahawk while resolving.
-    * Fixed no playlists overlay not disappearing when playlists were added.
-    * Add support for parsing itunes track, artist and album links.
-    * Fixed crash when syncing playlists with peers.
-    * Add support for browsing, downloading and rating resolvers from within
-      Tomahawk directly.
-    * Support multi-folder selection and scanning.
-    * Fixed handling of special characters in tomahawk:// links
-    * Improve sidebar performance by caching pixmaps and shrinking them.
-    * Send updated playlists to peers when tracks are moved/copied.
-    * Remove splitter handles in sidebar.
-    * Fixed Tomahawk preventing system shutdown / logout.
-    * Ignore leading 'The' when sorting artists.
-    * Added Charts page, which shows various sources' top hits & artists.
-    * The Collection tree-views can now be filtered.
-    * Fixed crash when pressing enter in an empty playlist.
-    * Moved the song queue to the bottom of the sidebar.
-    * Added Footnotes, a contextual view that you can slide it.
-    * Show recently added playlists in dashboard rather than recently opened
-      playlists.
-    * Fixed seek slider and give it some smooth animation between ticks.
-    * Fixed Twitter issue where it would repeatedly send DMs to friends.
-    * Add a new drag and drop menu when dropping items onto playlists,
-      allowing users to drop the dragged tracks, the whole album, or
-      the whole artists's tracks.
-    * Bring Tomahawk window to the front when clicking a Tomahawk link.
-    * Fixed crash in source list when initially syncing with remote sources.
-    * Open temporary artist, album, and search playlists as temporary items
-      in the sidebar.
-    * Fixed sorting of playlists and items in the artist view.
-    * Allow dragging and dropping albums and artists to playlists.
-    * Added MPRIS 2.1 support.
-
-Version 0.2.3:
-    * Fixed opening Rdio and Spotify links.
-    * Fixed potential crash in sidebar during syncing of sources.
-    * When Listening Along, the last song a peer plays is no longer duplicated.
-    * Fixed an issue where the Twitter plugin could get out of sync if the
-      database was cleared, leading to eventual crashes when re-connecting.
-    * Fixed duplicate albums showing up on Dashboard.
-    * Automatically sort search results by score.
-    * Fixed stations being stuck not fetching more songs.
-    * Fixed issue where artist bio could be referring to a different artist.
-    * Opening a "tomahawk" URL (or other URL with Tomahawk) brings the Tomahawk
-      window to the foreground.
-
-Version 0.2.2:
-    * Fixed crash pressing previous and next when playing a song from the Queue.
-    * Fixed issue where wrench for newly added resolvers would not show up.
-    * Fixed sidebar statistics not updating after collection scan finished.
-    * Fixed omitting a few tracks in the Collection tree-view.
-    * Fixed sidebar & track sorting issues.
-    * Seek- & volume sliders now directly jump to the position you clicked on.
-    * Added ability to drag artists and albums within Tomahawk.
-    * (OS X) Fixed Ogg Vorbis support.
-
-Version 0.2.1:
-    * Fixed crashing trying to play an unavailable track.
-    * Fixed a crash caused by using Javascript resolvers.
-    * Fixed searching with Javascript resolvers.
-
-Version 0.2.0:
-    * Re-resolve queries when their resolved-to source goes offline.
-    * Cleanup formatting of Preference/Configure and Diagnostics windows.
-    * Add selection indicator on album art.
-    * Fix inability to create Echonest playlists based solely on style or mood.
-    * Created new Artist & Album page, showing various related information.
-    * Update playlists in dashboard to keep them in sync.
-    * Support Rdio track URLs and ability to drop them onto Tomahawk.
-    * Change "Recently Played" page to "Dashboard".
-    * Prioritize resolving newer queries to make GUI more responsive.
-    * Automatically expand local collection node in sidebar on launch.
-    * Display spinner animation while searching for tracks.
-    * Let Tomahawk-headless users trigger a rescan with --filescan.
-    * Include Stations and Automatic Playlists in "New Stations and Playlists".
-    * Always keep current page and sidebar selection in sync.
-    * New icon theme and many design tweaks.
-    * Fixed bug where drop indicator wouldn't show below the last track of a
-      playlist.
-    * Added support for "playing" Spotify track URLs (and t.co and bit.ly
-      shortened track URLs) and ability to drag/drop them into Tomahawk.
-    * Added support for JSPF playlists (XSPF via JSON).
-    * Scroll per pixel to making scrolling feel more natural.
-    * Filter out duplicate tracks in Collection tree view.
-    * Spotify resolver now honors SOCKS5 proxy settings.
-    * Made "show offline sources" menu option a toggle instead of two separate
-      entries.
-    * Properly decode escaped characters coming from HTTP API.
-    * Handle/display resolver file paths becoming invalid in Preferences.
-    * Fixed track skipping-on-pause bug when using Gstreamer backend.
-    * Fixed a few crashes that could occur when fetching data from Last.fm.
-    * Made Twitter dialog more readable/understandable.
-    * Fixed streaming from https:// links.
-    * Implement new Javascript resolver API and ability to present config
-      dialogs for resolvers.
-    * Show when a track was played in the Recently Played tracks history.
-    * Added context menus for Artists and Albums.
-    * Fixed playlist bugs that would cause track to stop playing when dropping
-      or moving items in the same playlist.
-    * Set volume to 75% on startup.
-    * Added "listen along" feature (and ability to "catch up").
-    * Added "love" feature - also "loves" track on Last.fm.
-    * Twitter checks for updates less often now, saving user API calls from
-      running out when using multiple clients.
-    * Added score column and score bars to indicate resolver match certainty.
-    * Added "New Additions" page for each source.
-    * Improved tomahawk:// link handling. Added support for http://toma.hk/.
-    * Fixed sorting by file size.
-    * Improved the way Adium status is updated with now-playing information.
-    * Re-resolve tracks when a resolver is added/removed/enabled/disabled.
-    * Added global search function that searches all available sources.
-    * Collection scanner can now run automatically, watching files and dirs for
-      changes.
-    * Added Pipeline status view.
-    * Allow seeking in songs - if supported by audio backend.
-    * Added ability to make a copy of a peer's playlist.
-    * Shuffle and Repeat settings are stored on a playlist by playlist basis.
-    * (Linux) Desktop notifications for now playing.
-    * (OS X) Removed "test login" button from Last.fm settings.
-    * (OS X) Added MediaKey support.
-    * (OS X) Don't quit on window close to conform to best practices.
-
 Version 0.1.0:
     * Fixed stations so they resolve against all available sources instead of
       only local and friend's collections.
-    * Add a Song seed for stations and automatic playlists, and allow dragging
-      of any tracks to the New Stations entry to create a pre-seeded station.
+    * Add a Song seed for stations and automatic playlists, and allow dragging of
+      any tracks to the New Stations entry to create a pre-seeded station.
     * Added auto-completion for artists while filling in a station or automatic
       playlist.
     * SOCKS5 proxy support. Noproxy hosts are also supported but no wildcard
       support (yet).
-    * Support loading of - and exporting to - .xspf playlists.
-    * Added Tomahawk:// protocol support and share links for many things
-      including tracks, playlists, and stations.
+    * Support loading of - and exporting to - .xspf playlists
+    * Added Tomahawk:// protocol support and share links for many things including
+      tracks, playlists, and stations.
     * Autoload automatically detected resolvers on startup.
     * Fix issue where track resolving spinner never stopped if tracks were
       removed from playlist while resolving.
     * Twitter & Jabber profile pictures are shown.
     * Fix issues with stations where multiple tracks could be added at once.
     * Allow multiple accounts of the same type.
-    * Add new Google account type, a thin wrapper around a Jabber plugin.
+    * Add new Google account type that is a thin wrapper around a Jabber plugin.
     * Overhaul the settings dialog interface.
     * Resolvers can now be enabled and disabled, and some can be configured
       directly in Tomahawk, for example the new Spotify resolver.
@@ -230,21 +24,21 @@ Version 0.1.0:
       as a node under the Super Collection.
     * Fix massive speed bottleneck on startup in the case of many recently
       played playlists.
-    * Removed filter and song view from Super Collection, coming back in the
-      next release.
+    * Removed filter and song view from Super Collection, coming back in the next
+      release.
     * Browse and play collections in our snappy tree-mode, which also shows
       images for artists and albums.
     * Fixed crash that could occur when playing a track from a browser.
     * Fixed a crash caused by sources going on or offline.
     * Huge optimizations in the resolving pipeline.
-    * Improved the handling of automatic status messages for Google Talk.
+    * Improved the handling of automatic status messages for Google Talk
     * Switch to Phonon sound system, allowing us to support a wide variety
       of audio formats.
     * UI tweaks and cleanup.
     * (OS X) Open configuration dialogs as sliding sheets.
     * (OS X) Increase our available file watches to the maximum that the system
       reports.
-    * (OS X) Added 'Window' menu with zoom/minimize actions.
+    * (OS X) Added 'Window' menu with zoom/minimize actions
 
 Version 0.0.3:
     * Show spinner while resolving playlists.
@@ -263,9 +57,8 @@ Version 0.0.3:
     * Faster painting of playlists with lots of unresolved tracks.
     * Prefer local results when results' score is equal.
     * (Windows) The tomahawk:// protocol handler works on Windows now.
+    * (Windows) Fixed launching Tomahawk from Windows installer with admin privileges.
     * (Windows) Prevent launching a second instance on Windows.
-    * (Windows) Fixed launching Tomahawk from Windows installer with admin
-      privileges.
 
 Version 0.0.2:
     * Don't reconnect to Jabber if the settings dialog is closed successfully

README

@@ -19,33 +19,22 @@ Detailed building instructions for OS X
 ---------------------------------------
  See: http://wiki.tomahawk-player.org/mediawiki/index.php/Building_OS_X_Application_Bundle_on_Snow_Leopard_(10.6)
 
-Doxygen Documentation
----------------------
- See: http://dev.tomahawk-player.org/api/classes.html
-
 
 Dependencies
 ------------
 
-  CMake 2.8.0 - http://www.cmake.org/
-  Qt 4.7.0 - http://qt.nokia.com/
-  QJson 0.7.1 - http://qjson.sourceforge.net/
-  SQLite 3.6.22 - http://www.sqlite.org/
-  TagLib 1.6.2 - http://developer.kde.org/~wheeler/taglib.html
-  Boost 1.3 - http://www.boost.org/
-  CLucene 0.9.23 (0.9.21 will fail) - http://clucene.sourceforge.net/download.shtml
-  libechonest 1.2.0 - http://projects.kde.org/projects/playground/libs/libechonest/
-
- The following dependencies are optional, but recommended:
-
-  Attica 0.2.0 - ftp://ftp.kde.org/pub/kde/stable/attica/
-  Jreen 1.0.1 - https://github.com/euroelessar/jreen
-  QTweetLib 0.3.0 - https://github.com/minimoog/QTweetLib
+  CMake 2.8.0 http://www.cmake.org/
+  Qt 4.7.0 http://qt.nokia.com/
+  QJson 0.7.1 http://qjson.sourceforge.net/
+  SQLite 3.6.22 http://www.sqlite.org/
+  TagLib 1.6.2 http://developer.kde.org/~wheeler/taglib.html
+  Boost 1.3x http://www.boost.org/
+  CLucene 0.9.23 (0.9.21 will fail) http://clucene.sourceforge.net/download.shtml
+  libechonest 1.1.8 http://projects.kde.org/projects/playground/libs/libechonest/
 
  Third party libraries that we ship with our source:
 
-  MiniUPnP 1.6 - http://miniupnp.free.fr/
-  liblastfm 0.4.0 - http://github.com/jonocole/liblastfm/
-  QuaZip 0.4.3 - http://quazip.sourceforge.net/
+  MiniUPnP http://miniupnp.free.fr/
+  liblastfm 0.4.0 http://github.com/jonocole/liblastfm/
 
 Enjoy!

TomahawkCPack.cmake

@@ -1,53 +0,0 @@
-INCLUDE( InstallRequiredSystemLibraries )
-
-SET( CPACK_PACKAGE_CONTACT  "Dominik Schmidt <domme@tomahawk-player.org>" )
-
-SET( CPACK_PACKAGE_FILE_NAME  tomahawk-${TOMAHAWK_VERSION} )    # Package file name without extension. Also a directory of installer  cmake-2.5.0-Linux-i686
-
-# CPACK_GENERATOR   CPack generator to be used  STGZ;TGZ;TZ
-# CPACK_INCLUDE_TOPLEVEL_DIRECTORY    Controls whether CPack adds a top-level directory, usually of the form ProjectName-Version-OS, to the top of package tree.  0 to disable, 1 to enable
-# CPACK_INSTALL_CMAKE_PROJECTS    List of four values: Build directory, Project Name, Project Component, Directory in the package     /home/andy/vtk/CMake-bin;CMake;ALL;/
-SET( CPACK_PACKAGE_DESCRIPTION_FILE  "${CMAKE_SOURCE_DIR}/README" ) # File used as a description of a project     /path/to/project/ReadMe.txt
-SET( CPACK_PACKAGE_DESCRIPTION_SUMMARY  ${TOMAHAWK_DESCRIPTION_SUMMARY} ) #  Description summary of a project
-# CPACK_PACKAGE_EXECUTABLES   List of pairs of executables and labels. Used by the NSIS generator to create Start Menu shortcuts.     ccmake;CMake
-SET( CPACK_PACKAGE_INSTALL_DIRECTORY  ${TOMAHAWK_APPLICATION_NAME} )     # Installation directory on the target system -> C:\Program Files\fellody
-SET( CPACK_PACKAGE_INSTALL_REGISTRY_KEY ${TOMAHAWK_APPLICATION_NAME} )  # Registry key used when installing this project  CMake 2.5.0
-SET( CPACK_PACKAGE_NAME  ${TOMAHAWK_APPLICATION_NAME} ) # Package name, defaults to the project name
-SET( CPACK_PACKAGE_VENDOR  ${TOMAHAWK_ORGANIZATION_NAME} )   # Package vendor name
-SET( CPACK_PACKAGE_VERSION_MAJOR  ${TOMAHAWK_VERSION_MAJOR} )
-SET( CPACK_PACKAGE_VERSION_MINOR  ${TOMAHAWK_VERSION_MINOR} )
-SET( CPACK_PACKAGE_VERSION_PATCH  ${TOMAHAWK_VERSION_PATCH} )
-
-# CPACK_SOURCE_GENERATOR  List of generators used for the source package  TGZ;TZ
-
-SET( CPACK_SOURCE_GENERATOR TGZ )
-SET( CPACK_SOURCE_IGNORE_FILES "/\\\\.git/" ".*~$" ".kate-swp$" "/build_dir/" "/clang/" "/gcc/" "/build/" "/win/" ) # Pattern of files in the source tree that won't be packaged
-SET( CPACK_SOURCE_PACKAGE_FILE_NAME tomahawk-${TOMAHAWK_VERSION} ) # Name of the source package
-# CPACK_SOURCE_STRIP_FILES    List of files in the source tree that will be stripped. Starting with CMake 2.6.0 CPACK_SOURCE_STRIP_FILES will be a boolean variable which enables stripping of all files (a list of files evaluates to TRUE in CMake, so this change is compatible).
-# CPACK_STRIP_FILES   List of files to be stripped. Starting with CMake 2.6.0 CPACK_STRIP_FILES will be a boolean variable which enables stripping of all files (a list of files evaluates to TRUE in CMake, so this change is compatible).   bin/ccmake;bin/cmake;bin/cpack;bin/ctest
-# CPACK_SYSTEM_NAME   System name, defaults to the value of ${CMAKE_SYSTEM_NAME}.     Linux-i686
-
-# Advanced settings
-# CPACK_CMAKE_GENERATOR   What CMake generator should be used if the project is CMake project. Defaults to the value of CMAKE_GENERATOR.  Unix Makefiles
-SET( CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE.txt" ) # License file for the project, used by the STGZ, NSIS, and PackageMaker generators.  /home/andy/vtk/CMake/Copyright.txt
-# CPACK_RESOURCE_FILE_README  ReadMe file for the project, used by PackageMaker generator.    /home/andy/vtk/CMake/Templates/CPack.GenericDescription.txt
-# CPACK_RESOURCE_FILE_WELCOME     Welcome file for the project, used by PackageMaker generator.   /home/andy/vtk/CMake/Templates/CPack.GenericWelcome.txt
-SET( CPACK_PACKAGE_VERSION  ${TOMAHAWK_VERSION} )
-
-SET( CPACK_TOPLEVEL_TAG "narf" ) # Directory for the installed files.  - needed to provide anything to avoid an error# CPACK_INSTALL_COMMANDS  Extra commands to install components.
-# CPACK_INSTALL_DIRECTORIES   Extra directories to install.
-# CPACK_MONOLITHIC_INSTALL    When set disables the component-based installer.
-# CPACK_PACKAGING_INSTALL_PREFIX  Sets the default root that the generated package installs into, '/usr' is the default for the debian and redhat generators  /usr/local
-
-##
-# INSTALL DEPS
-##
-
-
-
-# Set the options file that needs to be included inside CMakeCPackOptions.cmake
-#SET(QT_DIALOG_CPACK_OPTIONS_FILE ${CMake_BINARY_DIR}/Source/QtDialog/QtDialogCPack.cmake)
-configure_file("${CMAKE_SOURCE_DIR}/CPackOptions.cmake.in"
-    "${CMAKE_BINARY_DIR}/CPackOptions.cmake" @ONLY)
-set(CPACK_PROJECT_CONFIG_FILE "${CMAKE_BINARY_DIR}/CPackOptions.cmake") # File included at cpack time, once per generator after setting CPACK_GENERATOR to the actual generator being used; allows per-generator setting of CPACK_* variables at cpack time.  ${PROJECT_BINARY_DIR}/CPackOptions.cmake
-include(CPack)

admin/CMakeLists.txt

@@ -1,3 +1,3 @@
 IF(WIN32)
     INSTALL(DIRECTORY win DESTINATION share/tomahawk/admin )
-ENDIF(WIN32)
+ENDIF(WIN32)

admin/copy_syms.sh

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-DUMPID=`head -n1 $1 | cut -f4 -d' '`
-mkdir -p $2/$DUMPID
-cp $1 $2/$DUMPID/

admin/mac/Info.plist

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
@@ -23,42 +23,40 @@
 	<key>CFBundleName</key>
 	<string>Tomahawk</string>
 	<key>LSMinimumSystemVersion</key>
-	<string>10.5.0</string>
-	<key>SUFeedURL</key>
-	<string>http://download.tomahawk-player.org/sparkle/update.php</string>
-	<key>SUPublicDSAKeyFile</key>
-	<string>sparkle_pub.pem</string>
-	<key>SUEnableSystemProfiling</key>
-	<true/>
-	<key>CFBundleURLTypes</key>
-	<array>
-		<dict>
-			<key>CFBundleURLName</key>
-			<string>Tomahawk URL</string>
-			<key>CFBundleURLSchemes</key>
-			<array>
-				<string>tomahawk</string>
-			</array>
-		</dict>
-	</array>
-	<key>CFBundleDocumentTypes</key>
-	<array>
-		<dict>
-			<key>CFBundleTypeExtensions</key>
-			<array>
-				<string>xspf</string>
-			</array>
-			<key>CFBundleTypeIconFile</key>
-			<string>Generic.icns</string>
-			<key>CFBundleTypeMIMETypes</key>
-			<array>
-				<string>application/xspf+xml</string>
-			</array>
-			<key>CFBundleTypeName</key>
-			<string>XSPF Playlist</string>
-			<key>CFBundleTypeRole</key>
-			<string>Viewer</string>
-		</dict>
-	</array>
+    <string>10.5.0</string>
+    <key>SUFeedURL</key>
+    <string>http://download.tomahawk-player.org/sparkle</string>
+    <key>SUPublicDSAKeyFile</key>
+    <string>sparkle_pub.pem</string>
+    <key>CFBundleURLTypes</key>
+        <array>
+            <dict>
+                <key>CFBundleURLName</key>
+                <string>Tomahawk URL</string>
+                <key>CFBundleURLSchemes</key>
+                <array>
+                    <string>tomahawk</string>
+                </array>
+            </dict>
+        </array>
+    <key>CFBundleDocumentTypes</key>
+      <array>
+        <dict>
+          <key>CFBundleTypeExtensions</key>
+          <array>
+            <string>xspf</string>
+          </array>
+          <key>CFBundleTypeIconFile</key>
+          <string>Generic.icns</string>
+          <key>CFBundleTypeMIMETypes</key>
+          <array>
+            <string>application/xspf+xml</string>
+          </array>
+          <key>CFBundleTypeName</key>
+          <string>XSPF Playlist</string>
+          <key>CFBundleTypeRole</key>
+          <string>Viewer</string>
+        </dict>
+      </array>        
 </dict>
 </plist>

admin/mac/add-Qt-to-bundle.sh

@@ -0,0 +1,64 @@
+#!/bin/sh
+# author: max@last.fm
+# usage:  Run from inside the bundle root directory, eg. Last.fm.app
+#         The first parameter should be the QtFrameworks to copy.
+#         Remaining parameters are plugins to copy, directories and files are 
+#         valid.
+# eg:     add-Qt-to-bundle.sh 'QtCore QtGui QtXml' \
+#                             imageformats \
+#                             sqldrivers/libsqlite.dylib
+################################################################################
+
+QT_FRAMEWORKS_DIR="$QTDIR/lib"
+QT_PLUGINS_DIR="$QTDIR/plugins"
+
+if [[ ! -d "$QTDIR/lib/QtCore.framework" ]]
+then
+    # this dir is the location of install for the official Trolltech dmg 
+    if [[ -d /Library/Frameworks/QtCore.framework ]]
+    then
+        QT_FRAMEWORKS_DIR=/Library/Frameworks
+        QT_PLUGINS_DIR=/Developer/Applications/Qt/plugins
+    fi
+fi
+
+echo "Plugins go to: $QT_PLUGINS_DIR"
+
+if [ -z $QTDIR ]
+then
+    echo QTDIR must be set, or install the official Qt dmg
+    exit 1
+fi
+################################################################################
+
+
+#first frameworks
+mkdir -p Contents/Frameworks
+for x in $1
+do
+    echo "C $x"
+    cp -R $QT_FRAMEWORKS_DIR/$x.framework Contents/Frameworks/
+    chmod -R u+rw Contents/Frameworks/
+done
+
+#plugins
+shift
+mkdir -p Contents/MacOS
+mkdir -p Contents/MacOS/sqldrivers
+mkdir -p Contents/MacOS/imageformats
+mkdir -p Contents/MacOS/phonon_backend
+mkdir -p Contents/MacOS/crypto
+
+cp -R $QT_PLUGINS_DIR/sqldrivers/libqsqlite.dylib Contents/MacOS/sqldrivers/
+cp -R $QT_PLUGINS_DIR/imageformats/libqgif.dylib Contents/MacOS/imageformats/
+cp -R $QT_PLUGINS_DIR/imageformats/libqjpeg.dylib Contents/MacOS/imageformats/
+cp -R $QT_PLUGINS_DIR/imageformats/libqico.dylib Contents/MacOS/imageformats/
+cp -R $QT_PLUGINS_DIR/imageformats/libqmng.dylib Contents/MacOS/imageformats/
+cp -R $QT_PLUGINS_DIR/imageformats/libqsvg.dylib Contents/MacOS/imageformats/
+cp -R $QT_PLUGINS_DIR/imageformats/libqtiff.dylib Contents/MacOS/imageformats/
+cp -R $QT_PLUGINS_DIR/crypto/libqca-ossl.dylib Contents/MacOS/crypto/
+cp -R $QT_PLUGINS_DIR/phonon_backend/phonon_vlc.so Contents/MacOS/phonon_backend/
+
+#cleanup
+find Contents/Frameworks -name Headers -o -name \*.prl -o -name \*_debug | xargs rm -rf
+find Contents -name \*_debug -o -name \*_debug.dylib | xargs rm

admin/mac/add-spotify.sh

@@ -0,0 +1,16 @@
+#!/bin/sh
+# author: lfranchi@kde.org
+# usage:  Run from inside the bundle root directory, eg. Tomahawk.app
+#         The first parameter should be the spotify resolver binary to copy.
+# eg:     add-spotify.sh /path/to/spotify_tomahawkresolver
+################################################################################
+
+mkdir -p Contents/Frameworks
+cp -R /Library/Frameworks/libspotify.framework Contents/Frameworks
+
+install_name_tool -change /usr/local/Cellar/qt/4.7.3/lib/QtCore.framework/Versions/4/QtCore  @executable_path/../Frameworks/QtCore.framework/Versions/4/QtCore $1
+install_name_tool -change /usr/local/Cellar/qt/4.7.3/lib/QtNetwork.framework/Versions/4/QtNetwork  @executable_path/../Frameworks/QtNetwork.framework/Versions/4/QtNetwork $1
+install_name_tool -change libqjson.0.dylib  @executable_path/libqjson.0.7.1.dylib $1
+install_name_tool -change /usr/local/Cellar/qjson/0.7.1/lib/libqjson.0.7.1.dylib @executable_path/libqjson.0.7.1.dylib $1
+mkdir -p Contents/MacOS
+cp $1 Contents/MacOS/

admin/mac/build-release-osx.sh

@@ -23,28 +23,65 @@ then
 fi
 
 ROOT=`pwd`
-VERSION=$1
 
+QTDIR=`which qmake`
+LINKDIR=`readlink $QTDIR`
+QTDIR=`dirname $QTDIR`
+QTDIR=$QTDIR/`dirname $LINKDIR`
+QTDIR=`dirname $QTDIR`
+test -L "$QTDIR" && QTDIR=`readlink $QTDIR`
+
+echo "Goes here: $QTDIR"
+
+export QMAKESPEC='macx-g++'
+export QTDIR
+export VERSION
+export QTVERSION='4.7.3'
 ################################################################################
 
-    mv tomahawk.app Tomahawk.app
-    mv Tomahawk.app/Contents/MacOS/tomahawk Tomahawk.app/Contents/MacOS/Tomahawk
 
-    header "Fixing and copying libraries"
-    $ROOT/../admin/mac/macdeploy.py Tomahawk.app quiet
+CLEAN='1'
+BUILD='1'
+NOTQUICK='1'
+CREATEDMG='1'
+VERSION=$1
 
-    cd Tomahawk.app
+    header "Adding Qt to app bundle"
+    cd tomahawk.app
+    $ROOT/../admin/mac/add-Qt-to-bundle.sh \
+                   'QtCore QtGui QtXml QtNetwork QtSql QtXmlPatterns QtWebKit phonon'
+#                   'QtCore QtGui QtXml QtNetwork QtSql QtXmlPatterns QtWebKit QtDbus phonon'
 
-    header "Renaming icon"
+    header "Renaming files"
     mv Contents/Resources/tomahawkSources.icns Contents/Resources/Tomahawk.icns
-    cp $ROOT/../admin/mac/qt.conf Contents/Resources/qt.conf
+    mv Contents/MacOS/tomahawk Contents/MacOS/Tomahawk
+#    cp $ROOT/../admin/mac/Info.plist Contents/Info.plist
 
-    header "Copying Sparkle framework"
+    header "Copying VLC plugins into bundle"
+    mkdir -p Contents/plugins
+    cp -R /usr/local/Cellar/vlc-git/HEAD/lib/vlc/plugins/ Contents/plugins
+    rm -rf Contents/plugins/video_* Contents/plugins/gui Contents/plugins/*/libold* Contents/plugins/*/libvcd* Contents/plugins/*/libdvd* \
+           Contents/plugins/*/liblibass* Contents/plugins/*/libx264* Contents/plugins/*/libschroe* Contents/plugins/*/liblibmpeg2* \
+           Contents/plugins/*/libstream_out_* Contents/plugins/*/libmjpeg_plugin* Contents/plugins/*/libh264_plugin* Contents/plugins/*/libzvbi_plugin* Contents/plugins/*/lib*sub*
+
+    header "Running install_name_tool"
+    $ROOT/../admin/mac/deposx.sh
+
+    header "Copying Sparkle pubkey & framework, and qt.conf"
+    cp $ROOT/../admin/mac/sparkle_pub.pem Contents/Resources
     cp -R /Library/Frameworks/Sparkle.framework Contents/Frameworks
-    
+    cp $ROOT/../admin/mac/qt.conf Contents/Resources
+
+    header "Adding spotify resolver to bundle if spotify_tomahawkresolver found in $ROOT"
+    if [ -e $ROOT/spotify_tomahawkresolver ]
+       then
+        header "Found, so adding spotify resolver."ac
+        $ROOT/../admin/mac/add-spotify.sh $ROOT/spotify_tomahawkresolver
+    fi
+
     header "Creating DMG"
     cd ..
-
+    mv tomahawk.app Tomahawk.app
     $ROOT/../admin/mac/create-dmg.sh Tomahawk.app
     mv Tomahawk.dmg Tomahawk-$VERSION.dmg
     

admin/mac/deposx.sh

@@ -0,0 +1,164 @@
+#!/bin/sh
+# author: max@last.fm, chris@last.fm
+################################################################################
+
+
+if [ -z $QTDIR ]
+then
+    echo QTDIR must be set
+    exit 1
+fi
+
+if [ -z $QTVERSION ]
+then
+    echo QTVERSION must be set
+    exit 1
+fi
+
+cd ..
+ORIGROOT=`pwd`
+cd -
+
+cd Contents
+
+QTLIBS=`ls Frameworks | cut -d. -f1`
+LIBS=`cd MacOS && ls -fR1 | grep dylib`
+PLUGINFOLDERS=`ls plugins | cut -d. -f1`
+
+################################################################################
+
+
+function import_lib
+{
+    echo "L \`$1'"
+    cp -R -L $1 MacOS/`basename $1`
+    chmod u+rw MacOS/`basename $1`
+    deplib_change MacOS/`basename $1`
+    deposx_change MacOS/`basename $1`
+}
+
+function deposx_change 
+{
+    echo "D \`$1'"
+    echo $QTDIR
+    
+    for y in $QTLIBS
+    do
+        install_name_tool -change $QTDIR/lib/$y.framework/Versions/4/$y \
+                          @executable_path/../Frameworks/$y.framework/Versions/4/$y \
+                          "$1"
+
+        install_name_tool -change /usr/local/Cellar/qt/$QTVERSION/lib/$y.framework/Versions/4/$y \
+                          @executable_path/../Frameworks/$y.framework/Versions/4/$y \
+                          "$1"                          
+    done
+    
+    for y in $LIBS
+    do
+        install_name_tool -change $y \
+                          @executable_path/$y \
+                          "$1"
+    done
+}
+
+function deplib_change
+{
+    install_name_tool -change /usr/local/Cellar/qjson/0.7.1/lib/libqjson.0.7.1.dylib @executable_path/libqjson.0.7.1.dylib $1
+    install_name_tool -change /usr/local/lib/libechonest.1.1.dylib @executable_path/libechonest.1.1.dylib $1
+    install_name_tool -change /usr/local/lib/libclucene-core.1.dylib @executable_path/libclucene-core.1.dylib $1
+    install_name_tool -change /usr/local/lib/libclucene-shared.1.dylib @executable_path/libclucene-shared.1.dylib $1
+    install_name_tool -change /usr/local/Cellar/taglib/1.7/lib/libtag.1.7.0.dylib @executable_path/libtag.1.7.0.dylib $1
+#    install_name_tool -change /usr/local/Cellar/gloox/1.0/lib/libgloox.8.dylib @executable_path/libgloox.8.dylib $1
+#    install_name_tool -change /usr/local/Cellar/libogg/1.2.0/lib/libogg.0.dylib @executable_path/libogg.0.dylib $1
+#    install_name_tool -change /usr/local/Cellar/libvorbis/1.3.1/lib/libvorbis.0.dylib @executable_path/libvorbis.0.dylib $1
+#    install_name_tool -change /usr/local/Cellar/libvorbis/1.3.1/lib/libvorbisfile.3.dylib @executable_path/libvorbisfile.3.dylib $1
+#    install_name_tool -change /usr/local/Cellar/mad/0.15.1b/lib/libmad.0.dylib @executable_path/libmad.0.dylib $1
+#    install_name_tool -change /usr/local/Cellar/flac/1.2.1/lib/libFLAC++.6.dylib @executable_path/libFLAC++.6.dylib $1
+#    install_name_tool -change /usr/local/Cellar/flac/1.2.1/lib/libFLAC.8.dylib @executable_path/libFLAC.8.dylib $1
+    install_name_tool -change /usr/local/Cellar/kde-phonon/4.5.0/lib/libphonon.4.dylib  @executable_path/libphonon.4.dylib $1
+    install_name_tool -change /usr/local/Cellar/kde-phonon/4.5.0/lib/libphonon.4.5.0.dylib  @executable_path/libphonon.4.dylib $1
+
+    install_name_tool -change $ORIGROOT/libtomahawklib.dylib @executable_path/libtomahawklib.dylib $1
+    install_name_tool -change $ORIGROOT/libtomahawk_sipjabber.dylib @executable_path/libtomahawk_sipjabber.dylib $1
+    install_name_tool -change $ORIGROOT/libtomahawk_sipgoogle.dylib @executable_path/libtomahawk_sipgoogle.dylib $1
+    install_name_tool -change $ORIGROOT/libtomahawk_siptwitter.dylib @executable_path/libtomahawk_siptwitter.dylib $1
+    install_name_tool -change $ORIGROOT/libtomahawk_sipzeroconf.dylib @executable_path/libtomahawk_sipzeroconf.dylib $1
+    install_name_tool -change $ORIGROOT/libtomahawk_qtweetlib.dylib @executable_path/libtomahawk_qtweetlib.dylib $1
+    install_name_tool -change $ORIGROOT/libtomahawk_portfwd.dylib @executable_path/libtomahawk_portfwd.dylib $1
+    install_name_tool -change $ORIGROOT/libjreen.dylib  @executable_path/libjreen.dylib $1
+    install_name_tool -change /usr/local/Cellar/jreen/HEAD/lib/libjreen.dylib  @executable_path/libjreen.dylib $1
+    install_name_tool -change /usr/local/Cellar/qca/2.0.2/lib/qca.framework/Versions/2/qca  @executable_path/../Frameworks/qca.framework/Versions/2/qca $1
+    install_name_tool -change /usr/local/Cellar/gettext/0.18.1.1/lib/libintl.8.dylib  @executable_path/libintl.8.dylib $1
+    install_name_tool -change /usr/local/Cellar/vlc-git/HEAD/lib/libvlc.5.dylib   @executable_path/libvlc.5.dylib $1
+    install_name_tool -change /usr/local/Cellar/vlc-git/HEAD/lib/libvlccore.4.dylib  @executable_path/libvlccore.4.dylib $1
+
+    install_name_tool -change libqjson.0.dylib @executable_path/libqjson.0.7.1.dylib $1
+    install_name_tool -change libechonest.1.1.dylib @executable_path/libechonest.1.1.dylib $1
+    install_name_tool -change libclucene-core.1.dylib @executable_path/libclucene-core.1.dylib $1
+    install_name_tool -change libclucene-shared.1.dylib @executable_path/libclucene-shared.1.dylib $1
+}
+
+################################################################################
+
+
+# first all libraries and executables
+find MacOS -type f -a -perm -100 | while read x
+do
+    echo $x
+    y=$(file "$x" | grep 'Mach-O')
+    deposx_change "$x"
+    deplib_change "$x"
+done
+
+import_lib /usr/local/Cellar/qjson/0.7.1/lib/libqjson.0.7.1.dylib
+import_lib /usr/local/Cellar/taglib/1.7/lib/libtag.1.7.0.dylib
+#import_lib /usr/local/Cellar/gloox/1.0/lib/libgloox.8.dylib
+#import_lib /usr/local/Cellar/libogg/1.2.0/lib/libogg.0.dylib
+#import_lib /usr/local/Cellar/libvorbis/1.3.1/lib/libvorbis.0.dylib
+#import_lib /usr/local/Cellar/libvorbis/1.3.1/lib/libvorbisfile.3.dylib
+#import_lib /usr/local/Cellar/mad/0.15.1b/lib/libmad.0.dylib
+#import_lib /usr/local/Cellar/flac/1.2.1/lib/libFLAC++.6.dylib
+#import_lib /usr/local/Cellar/flac/1.2.1/lib/libFLAC.8.dylib
+import_lib /usr/local/lib/libechonest.1.1.dylib
+import_lib /usr/local/lib/libclucene-core.1.dylib
+import_lib /usr/local/lib/libclucene-shared.1.dylib
+import_lib /usr/local/Cellar/kde-phonon/4.5.0/lib/libphonon.4.dylib
+import_lib /usr/local/Cellar/vlc-git/HEAD/lib/libvlc.5.dylib
+import_lib /usr/local/Cellar/vlc-git/HEAD/lib/libvlccore.4.dylib
+import_lib /usr/local/Cellar/gettext/0.18.1.1/lib/libintl.8.dylib
+
+import_lib $ORIGROOT/libjreen.dylib
+import_lib $ORIGROOT/libtomahawklib.dylib
+import_lib $ORIGROOT/libtomahawk_sipjabber.dylib
+import_lib $ORIGROOT/libtomahawk_sipgoogle.dylib
+import_lib $ORIGROOT/libtomahawk_siptwitter.dylib
+import_lib $ORIGROOT/libtomahawk_sipzeroconf.dylib
+import_lib $ORIGROOT/libtomahawk_qtweetlib.dylib
+import_lib $ORIGROOT/libtomahawk_portfwd.dylib
+
+cp -R  /usr/local/Cellar/qca/2.0.2/lib/qca.framework Frameworks/
+chmod 644 Frameworks/qca.framework/Versions/2/qca
+deplib_change Frameworks/qca.framework/Versions/2/qca
+deposx_change Frameworks/qca.framework/Versions/2/qca
+
+# now Qt
+for x in $QTLIBS
+do
+    echo `pwd`
+#    ls -l Frameworks/$x.framework/Versions/4/$x
+    deposx_change Frameworks/$x.framework/Versions/4/$x
+    install_name_tool -id @executable_path/../Frameworks/$x.framework/Versions/4/$x \
+                      Frameworks/$x.framework/Versions/4/$x
+    deplib_change "Frameworks/$x.framework/Versions/4/$x"
+done
+
+# now VLC plugins
+for x in plugins/$PLUGINFOLDERS
+do
+    for plugin in `ls plugins/$x | cut -f1`
+    do
+        echo "Fixing VLC plugin: $plugin"
+        chmod 644 plugins/$x/$plugin
+        deplib_change plugins/$x/$plugin
+    done
+done

admin/mac/macdeploy.py

@@ -1,522 +0,0 @@
-#!/usr/bin/python
-
-#  This file is part of Clementine.
-#
-#  Clementine is free software: you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation, either version 3 of the License, or
-#  (at your option) any later version.
-#
-#  Clementine is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with Clementine.  If not, see <http://www.gnu.org/licenses/>.
-
-import os
-import re
-import subprocess
-import sys
-
-FRAMEWORK_SEARCH_PATH=[
-    '/Library/Frameworks',
-    os.path.join(os.environ['HOME'], 'Library/Frameworks')
-]
-
-LIBRARY_SEARCH_PATH=['/usr/local/lib', '/usr/local/Cellar/gettext/0.18.1.1/lib', '.']
-
-
-VLC_PLUGINS=[
-  'access/libaccess_attachment_plugin.dylib',
-  #'access/libaccess_avio_plugin.dylib',
-  'access/libaccess_fake_plugin.dylib',
-  'access/libaccess_ftp_plugin.dylib',
-  'access/libaccess_http_plugin.dylib',
-  'access/libaccess_imem_plugin.dylib',
-  'access/libaccess_mmap_plugin.dylib',
-  'access/libaccess_mms_plugin.dylib',
-  'access/libaccess_realrtsp_plugin.dylib',
-  'access/libaccess_tcp_plugin.dylib',
-  'access/libaccess_udp_plugin.dylib',
-  'access/libcdda_plugin.dylib',
-  'access/libfilesystem_plugin.dylib',
-  'access/libqtcapture_plugin.dylib',
-  'access/librtp_plugin.dylib',
-  'access/libzip_plugin.dylib',
-  'access_output/libaccess_output_dummy_plugin.dylib',
-  'access_output/libaccess_output_file_plugin.dylib',
-  'access_output/libaccess_output_http_plugin.dylib',
-  'access_output/libaccess_output_shout_plugin.dylib',
-  'access_output/libaccess_output_udp_plugin.dylib',
-  'audio_filter/liba52tofloat32_plugin.dylib',
-  'audio_filter/liba52tospdif_plugin.dylib',
-  'audio_filter/libaudio_format_plugin.dylib',
-  'audio_filter/libaudiobargraph_a_plugin.dylib',
-  'audio_filter/libchorus_flanger_plugin.dylib',
-  'audio_filter/libconverter_fixed_plugin.dylib',
-  'audio_filter/libdolby_surround_decoder_plugin.dylib',
-  'audio_filter/libdtstofloat32_plugin.dylib',
-  'audio_filter/libdtstospdif_plugin.dylib',
-  'audio_filter/libequalizer_plugin.dylib',
-  'audio_filter/libheadphone_channel_mixer_plugin.dylib',
-  'audio_filter/libmono_plugin.dylib',
-  'audio_filter/libmpgatofixed32_plugin.dylib',
-  'audio_filter/libnormvol_plugin.dylib',
-  'audio_filter/libparam_eq_plugin.dylib',
-  'audio_filter/libscaletempo_plugin.dylib',
-  'audio_filter/libsimple_channel_mixer_plugin.dylib',
-  'audio_filter/libspatializer_plugin.dylib',
-  'audio_filter/libtrivial_channel_mixer_plugin.dylib',
-  'audio_filter/libugly_resampler_plugin.dylib',
-  'audio_mixer/libfloat32_mixer_plugin.dylib',
-  'audio_mixer/libspdif_mixer_plugin.dylib',
-  'audio_mixer/libtrivial_mixer_plugin.dylib',
-  'audio_output/libaout_file_plugin.dylib',
-  'audio_output/libauhal_plugin.dylib',
-  'codec/liba52_plugin.dylib',
-  'codec/libadpcm_plugin.dylib',
-  'codec/libaes3_plugin.dylib',
-  'codec/libaraw_plugin.dylib',
-  'codec/libavcodec_plugin.dylib',
-  'codec/libcc_plugin.dylib',
-  'codec/libcdg_plugin.dylib',
-  'codec/libdts_plugin.dylib',
-  'codec/libfaad_plugin.dylib',
-  'codec/libfake_plugin.dylib',
-  'codec/libflac_plugin.dylib',
-  'codec/libfluidsynth_plugin.dylib',
-  'codec/libinvmem_plugin.dylib',
-  'codec/liblpcm_plugin.dylib',
-  'codec/libmpeg_audio_plugin.dylib',
-  'codec/libpng_plugin.dylib',
-  'codec/librawvideo_plugin.dylib',
-  'codec/libspeex_plugin.dylib',
-  'codec/libspudec_plugin.dylib',
-  'codec/libtheora_plugin.dylib',
-  'codec/libtwolame_plugin.dylib',
-  'codec/libvorbis_plugin.dylib',
-  'control/libgestures_plugin.dylib',
-  'control/libhotkeys_plugin.dylib',
-  'control/libmotion_plugin.dylib',
-  'control/libnetsync_plugin.dylib',
-  'control/libsignals_plugin.dylib',
-  'demux/libaiff_plugin.dylib',
-  'demux/libasf_plugin.dylib',
-  'demux/libau_plugin.dylib',
-  #'demux/libavformat_plugin.dylib',
-  'demux/libavi_plugin.dylib',
-  'demux/libdemux_cdg_plugin.dylib',
-  'demux/libdemuxdump_plugin.dylib',
-  'demux/libdirac_plugin.dylib',
-  'demux/libes_plugin.dylib',
-  'demux/libflacsys_plugin.dylib',
-  'demux/liblive555_plugin.dylib',
-  'demux/libmkv_plugin.dylib',
-  'demux/libmod_plugin.dylib',
-  'demux/libmp4_plugin.dylib',
-  'demux/libmpc_plugin.dylib',
-  'demux/libmpgv_plugin.dylib',
-  'demux/libnsc_plugin.dylib',
-  'demux/libnsv_plugin.dylib',
-  'demux/libnuv_plugin.dylib',
-  'demux/libogg_plugin.dylib',
-  'demux/libplaylist_plugin.dylib',
-  'demux/libps_plugin.dylib',
-  'demux/libpva_plugin.dylib',
-  'demux/librawaud_plugin.dylib',
-  'demux/librawdv_plugin.dylib',
-  'demux/librawvid_plugin.dylib',
-  'demux/libreal_plugin.dylib',
-  'demux/libsmf_plugin.dylib',
-  'demux/libts_plugin.dylib',
-  'demux/libtta_plugin.dylib',
-  'demux/libty_plugin.dylib',
-  'demux/libvc1_plugin.dylib',
-  'demux/libvoc_plugin.dylib',
-  'demux/libwav_plugin.dylib',
-  'demux/libxa_plugin.dylib',
-  'meta_engine/libfolder_plugin.dylib',
-  'meta_engine/libtaglib_plugin.dylib',
-  'misc/libaudioscrobbler_plugin.dylib',
-  'misc/libdummy_plugin.dylib',
-  'misc/libexport_plugin.dylib',
-  'misc/libfreetype_plugin.dylib',
-  'misc/libgnutls_plugin.dylib',
-  'misc/liblogger_plugin.dylib',
-  'misc/liblua_plugin.dylib',
-  'misc/libosd_parser_plugin.dylib',
-  'misc/libquartztext_plugin.dylib',
-  'misc/libstats_plugin.dylib',
-  'misc/libvod_rtsp_plugin.dylib',
-  'misc/libxml_plugin.dylib',
-  'misc/libxtag_plugin.dylib',
-  'mmx/libi420_rgb_mmx_plugin.dylib',
-  'mmx/libi420_yuy2_mmx_plugin.dylib',
-  'mmx/libi422_yuy2_mmx_plugin.dylib',
-  'mmx/libmemcpymmx_plugin.dylib',
-  'mmxext/libmemcpymmxext_plugin.dylib',
-  'mux/libmux_asf_plugin.dylib',
-  'mux/libmux_avi_plugin.dylib',
-  'mux/libmux_dummy_plugin.dylib',
-  'mux/libmux_mp4_plugin.dylib',
-  'mux/libmux_mpjpeg_plugin.dylib',
-  'mux/libmux_ogg_plugin.dylib',
-  'mux/libmux_ps_plugin.dylib',
-  'mux/libmux_ts_plugin.dylib',
-  'mux/libmux_wav_plugin.dylib',
-  'packetizer/libpacketizer_copy_plugin.dylib',
-  'packetizer/libpacketizer_dirac_plugin.dylib',
-  'packetizer/libpacketizer_flac_plugin.dylib',
-  'packetizer/libpacketizer_h264_plugin.dylib',
-  'packetizer/libpacketizer_mlp_plugin.dylib',
-  'packetizer/libpacketizer_mpeg4audio_plugin.dylib',
-  'packetizer/libpacketizer_mpeg4video_plugin.dylib',
-  'packetizer/libpacketizer_mpegvideo_plugin.dylib',
-  'packetizer/libpacketizer_vc1_plugin.dylib',
-  'sse2/libi420_rgb_sse2_plugin.dylib',
-  'sse2/libi420_yuy2_sse2_plugin.dylib',
-  'sse2/libi422_yuy2_sse2_plugin.dylib',
-  'stream_filter/libdecomp_plugin.dylib',
-  'stream_filter/libstream_filter_rar_plugin.dylib',
-  'stream_filter/libstream_filter_record_plugin.dylib',
-  'visualization/libvisual_plugin.dylib',
-]
-
-VLC_SEARCH_PATH=[
-    '/usr/local/lib/vlc/plugins/',
-]
-
-QT_PLUGINS = [
-    'crypto/libqca-ossl.dylib',
-    'phonon_backend/phonon_vlc.so',
-    'sqldrivers/libqsqlite.dylib',
-    'imageformats/libqgif.dylib',
-    'imageformats/libqico.dylib',
-    'imageformats/libqjpeg.dylib',
-    'imageformats/libqmng.dylib',
-]
-
-TOMAHAWK_PLUGINS = [
-  'libtomahawk_sipjabber.dylib',
-  'libtomahawk_sipgoogle.dylib',
-  'libtomahawk_siptwitter.dylib',
-  'libtomahawk_sipzeroconf.dylib',
-  'libtomahawk_qtweetlib.dylib',
-]
-
-QT_PLUGINS_SEARCH_PATH=[
-    '/usr/local/Cellar/qt/4.7.4/plugins',
-]
-
-
-class Error(Exception):
-  pass
-
-
-class CouldNotFindQtPluginErrorFindFrameworkError(Error):
-  pass
-
-
-class InstallNameToolError(Error):
-  pass
-
-
-class CouldNotFindQtPluginError(Error):
-  pass
-
-
-class CouldNotFindVLCPluginError(Error):
-  pass
-
-
-class CouldNotFindScriptPluginError(Error):
-  pass
-
-
-
-if len(sys.argv) < 2:
-  print 'Usage: %s <bundle.app>' % sys.argv[0]
-
-bundle_dir = sys.argv[1]
-
-bundle_name = os.path.basename(bundle_dir).split('.')[0]
-
-commands = []
-
-binary_dir = os.path.join(bundle_dir, 'Contents', 'MacOS')
-frameworks_dir = os.path.join(bundle_dir, 'Contents', 'Frameworks')
-commands.append(['mkdir', '-p', frameworks_dir])
-resources_dir = os.path.join(bundle_dir, 'Contents', 'Resources')
-commands.append(['mkdir', '-p', resources_dir])
-plugins_dir = os.path.join(bundle_dir, 'Contents', 'plugins')
-binary = os.path.join(bundle_dir, 'Contents', 'MacOS', bundle_name)
-
-fixed_libraries = []
-fixed_frameworks = []
-
-def GetBrokenLibraries(binary):
-  #print "Checking libs for binary: %s" % binary
-  output = subprocess.Popen(['otool', '-L', binary], stdout=subprocess.PIPE).communicate()[0]
-  broken_libs = {
-      'frameworks': [],
-      'libs': []}
-  for line in [x.split(' ')[0].lstrip() for x in output.split('\n')[1:]]:
-    #print "Checking line: %s" % line
-    if not line:  # skip empty lines
-      continue
-    if os.path.basename(binary) == os.path.basename(line):
-      #print "mnope %s-%s" % (os.path.basename(binary), os.path.basename(line))
-      continue
-    if re.match(r'^\s*/System/', line):
-      continue  # System framework
-    elif re.match(r'^\s*/usr/lib/', line):
-      #print "unix style system lib"
-      continue  # unix style system library
-    elif re.match(r'Breakpad', line):
-      continue  # Manually added by cmake.
-    elif re.match(r'^\s*@executable_path', line) or re.match(r'^\s*@loader_path', line):
-      # Potentially already fixed library
-      if '.framework' in line:
-        relative_path = os.path.join(*line.split('/')[3:])
-        if not os.path.exists(os.path.join(frameworks_dir, relative_path)):
-          broken_libs['frameworks'].append(relative_path)
-      else:
-        relative_path = os.path.join(*line.split('/')[1:])
-        #print "RELPATH %s %s" % (relative_path, os.path.join(binary_dir, relative_path))
-        if not os.path.exists(os.path.join(binary_dir, relative_path)):
-          broken_libs['libs'].append(relative_path)
-    elif re.search(r'\w+\.framework', line):
-      broken_libs['frameworks'].append(line)
-    else:
-      broken_libs['libs'].append(line)
-
-  return broken_libs
-
-def FindFramework(path):
-  for search_path in FRAMEWORK_SEARCH_PATH:
-    abs_path = os.path.join(search_path, path)
-    if os.path.exists(abs_path):
-      return abs_path
-
-  raise CouldNotFindFrameworkError(path)
-
-def FindLibrary(path):
-  if os.path.exists(path):
-    return path
-  for search_path in LIBRARY_SEARCH_PATH:
-    abs_path = os.path.join(search_path, path)
-    if os.path.exists(abs_path):
-      return abs_path
-    else: # try harder---look for lib name in library folders
-      newpath = os.path.join(search_path,os.path.basename(path))
-      if os.path.exists(newpath):
-        return newpath
-
-  return ""
-  #raise CouldNotFindFrameworkError(path)
-
-def FixAllLibraries(broken_libs):
-  for framework in broken_libs['frameworks']:
-    FixFramework(framework)
-  for lib in broken_libs['libs']:
-    FixLibrary(lib)
-
-def FixFramework(path):
-  if path in fixed_libraries:
-    return
-  else:
-    fixed_libraries.append(path)
-  abs_path = FindFramework(path)
-  broken_libs = GetBrokenLibraries(abs_path)
-  FixAllLibraries(broken_libs)
-
-  new_path = CopyFramework(abs_path)
-  id = os.sep.join(new_path.split(os.sep)[3:])
-  FixFrameworkId(new_path, id)
-  for framework in broken_libs['frameworks']:
-    FixFrameworkInstallPath(framework, new_path)
-  for library in broken_libs['libs']:
-    FixLibraryInstallPath(library, new_path)
-
-def FixLibrary(path):
-  if path in fixed_libraries or FindSystemLibrary(os.path.basename(path)) is not None:
-    return
-  else:
-    fixed_libraries.append(path)
-  abs_path = FindLibrary(path)
-  if abs_path == "":
-    print "Could not resolve %s, not fixing!" % path
-    return
-  broken_libs = GetBrokenLibraries(abs_path)
-  FixAllLibraries(broken_libs)
-
-  new_path = CopyLibrary(abs_path)
-  FixLibraryId(new_path)
-  for framework in broken_libs['frameworks']:
-    FixFrameworkInstallPath(framework, new_path)
-  for library in broken_libs['libs']:
-    FixLibraryInstallPath(library, new_path)
-
-def FixVLCPlugin(abs_path, subdir):
-  broken_libs = GetBrokenLibraries(abs_path)
-  FixAllLibraries(broken_libs)
-
-  #print "Copying plugin....%s %s %s" % (plugins_dir, subdir, os.path.join(abs_path.split('/')[-2:]))
-  plugindir = abs_path.split('/')[-2]
-  new_path = os.path.join(plugins_dir, subdir, plugindir, os.path.basename(abs_path))
-  args = ['mkdir', '-p', os.path.dirname(new_path)]
-  commands.append(args)
-  args = ['ditto', '--arch=i386', '--arch=x86_64', abs_path, new_path]
-  commands.append(args)
-  args = ['chmod', 'u+w', new_path]
-  commands.append(args)
-  for framework in broken_libs['frameworks']:
-    FixFrameworkInstallPath(framework, new_path)
-  for library in broken_libs['libs']:
-    FixLibraryInstallPath(library, new_path)
-
-def FixPlugin(abs_path, subdir):
-  broken_libs = GetBrokenLibraries(abs_path)
-  FixAllLibraries(broken_libs)
-
-  new_path = CopyPlugin(abs_path, subdir)
-  for framework in broken_libs['frameworks']:
-    FixFrameworkInstallPath(framework, new_path)
-  for library in broken_libs['libs']:
-    FixLibraryInstallPath(library, new_path)
-
-def FixBinary(path):
-  broken_libs = GetBrokenLibraries(path)
-  FixAllLibraries(broken_libs)
-  for framework in broken_libs['frameworks']:
-    FixFrameworkInstallPath(framework, path)
-  for library in broken_libs['libs']:
-    FixLibraryInstallPath(library, path)
-
-def CopyLibrary(path):
-  new_path = os.path.join(frameworks_dir, os.path.basename(path))
-  args = ['ditto', '--arch=i386', '--arch=x86_64', path, new_path]
-  commands.append(args)
-  args = ['chmod', 'u+w', new_path]
-  commands.append(args)
-  return new_path
-
-def CopyPlugin(path, subdir):
-  new_path = os.path.join(plugins_dir, subdir, os.path.basename(path))
-  args = ['mkdir', '-p', os.path.dirname(new_path)]
-  commands.append(args)
-  args = ['ditto', '--arch=i386', '--arch=x86_64', path, new_path]
-  commands.append(args)
-  args = ['chmod', 'u+w', new_path]
-  commands.append(args)
-  return new_path
-
-def CopyFramework(path):
-  parts = path.split(os.sep)
-  for i, part in enumerate(parts):
-    if re.match(r'\w+\.framework', part):
-      full_path = os.path.join(frameworks_dir, *parts[i:-1])
-      break
-  args = ['mkdir', '-p', full_path]
-  commands.append(args)
-  args = ['ditto', '--arch=i386', '--arch=x86_64', path, full_path]
-  commands.append(args)
-  args = ['chmod', 'u+w', os.path.join(full_path, parts[-1])]
-  commands.append(args)
-
-  menu_nib = os.path.join(os.path.split(path)[0], 'Resources', 'qt_menu.nib')
-  if os.path.exists(menu_nib):
-    args = ['cp', '-r', menu_nib, resources_dir]
-    commands.append(args)
-
-  return os.path.join(full_path, parts[-1])
-
-def FixId(path, library_name):
-  id = '@executable_path/../Frameworks/%s' % library_name
-  args = ['install_name_tool', '-id', id, path]
-  commands.append(args)
-
-def FixLibraryId(path):
-  library_name = os.path.basename(path)
-  FixId(path, library_name)
-
-def FixFrameworkId(path, id):
-  FixId(path, id)
-
-def FixInstallPath(library_path, library, new_path):
-  args = ['install_name_tool', '-change', library_path, new_path, library]
-  commands.append(args)
-
-def FindSystemLibrary(library_name):
-  for path in ['/lib', '/usr/lib']:
-    full_path = os.path.join(path, library_name)
-    if os.path.exists(full_path):
-      return full_path
-  return None
-
-def FixLibraryInstallPath(library_path, library):
-  system_library = FindSystemLibrary(os.path.basename(library_path))
-  if system_library is None:
-    new_path = '@executable_path/../Frameworks/%s' % os.path.basename(library_path)
-    FixInstallPath(library_path, library, new_path)
-  else:
-    FixInstallPath(library_path, library, system_library)
-
-def FixFrameworkInstallPath(library_path, library):
-  parts = library_path.split(os.sep)
-  for i, part in enumerate(parts):
-    if re.match(r'\w+\.framework', part):
-      full_path = os.path.join(*parts[i:])
-      break
-  new_path = '@executable_path/../Frameworks/%s' % full_path
-  FixInstallPath(library_path, library, new_path)
-
-def FindQtPlugin(name):
-  for path in QT_PLUGINS_SEARCH_PATH:
-    if os.path.exists(path):
-      if os.path.exists(os.path.join(path, name)):
-        return os.path.join(path, name)
-  raise CouldNotFindQtPluginError(name)
-
-
-def FindVLCPlugin(name):
-  for path in VLC_SEARCH_PATH:
-    if os.path.exists(path):
-      if os.path.exists(os.path.join(path, name)):
-        return os.path.join(path, name)
-  raise CouldNotFindVLCPluginError(name)
-
-FixBinary(binary)
-
-for plugin in VLC_PLUGINS:
-  FixVLCPlugin(FindVLCPlugin(plugin), '.')
-
-for plugin in TOMAHAWK_PLUGINS:
-  FixPlugin(plugin, '../MacOS')
-
-try:
-  FixPlugin('spotify_tomahawkresolver', '../MacOS')
-except:
-  print 'Failed to find spotify resolver'
-  
-try:
-  FixPlugin('tomahawk_crash_reporter', '../MacOS')
-except:
-  print 'Failed to find tomahawk_crash_reporter'
-
-for plugin in QT_PLUGINS:
-  FixPlugin(FindQtPlugin(plugin), os.path.dirname(plugin))
-
-if len(sys.argv) <= 2:
-  print 'Would run %d commands:' % len(commands)
-  for command in commands:
-    print ' '.join(command)
-
-  print 'OK?'
-  raw_input()
-
-for command in commands:
-  p = subprocess.Popen(command)
-  os.waitpid(p.pid, 0)

admin/mac/qt.conf

@@ -1,2 +1,2 @@
 [Paths]
-Plugins = PlugIns
+Plugins = plugins

admin/unix/tomahawk.desktop

@@ -4,9 +4,8 @@ Version=1.0
 Name=Tomahawk
 GenericName=Music Player
 TryExec=tomahawk
-Exec=tomahawk %u
+Exec=tomahawk
 Comment=Tomahawk - Social Music Player
 Icon=tomahawk
 Terminal=false
 Categories=Qt;AudioVideo;Audio;Player;
-MimeType=x-scheme-handler/tomahawk;

admin/win/Toolchain-mingw32-openSUSE.cmake

@@ -1,27 +1,20 @@
-SET(MINGW_PREFIX  "i686-w64-mingw32")
-
 # this one is important
 SET(CMAKE_SYSTEM_NAME Windows)
 
 # specify the cross compiler
-SET(CMAKE_C_COMPILER ccache ${MINGW_PREFIX}-gcc)
-SET(CMAKE_CXX_COMPILER ccache ${MINGW_PREFIX}-g++)
-SET(CMAKE_RC_COMPILER /usr/bin/${MINGW_PREFIX}-windres)
+SET(CMAKE_C_COMPILER i686-w64-mingw32-gcc)
+SET(CMAKE_CXX_COMPILER i686-w64-mingw32-g++)
 
 # where is the target environment containing libraries
-SET(CMAKE_FIND_ROOT_PATH  /usr/${MINGW_PREFIX}/sys-root/mingw)
+SET(CMAKE_FIND_ROOT_PATH  /usr/i686-w64-mingw32/sys-root/mingw)
 SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY  ONLY)
 SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE  ONLY)
 SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM  NEVER)
 
-
+# windres executable for application icon support
+SET(WINDRES_EXECUTABLE /usr/bin/i686-w64-mingw32-windres)
 
 # libs with broken find modules
 SET(TAGLIB_FOUND true)
 SET(TAGLIB_LIBRARIES  ${CMAKE_FIND_ROOT_PATH}/lib/libtag.dll.a)
 SET(TAGLIB_INCLUDES   ${CMAKE_FIND_ROOT_PATH}/include/taglib)
-
-SET(QT_PLUGINS_DIR  ${CMAKE_FIND_ROOT_PATH}/lib/qt4/plugins/)
-SET(QT_QTUITOOLS_LIBRARY_RELEASE  ${CMAKE_FIND_ROOT_PATH}/lib/libQtUiTools.a)
-SET(QT_QTUITOOLS_LIBRARY_DEBUG  ${CMAKE_FIND_ROOT_PATH}/lib/libQtUiToolsd.a)
-SET(QT_QTUITOOLS_LIBRARY  ${QT_QTUITOOLS_LIBRARY_RELEASE})

admin/win/nsi/revision.txt

@@ -0,0 +1 @@
+105

admin/win/nsi/tomahawk.nsi

@@ -20,54 +20,53 @@
 !endif
 !define MING_BIN "${MING_PATH}/bin"
 !define MING_LIB "${MING_PATH}/lib"
-!define BUILD_PATH "@CMAKE_BINARY_DIR@"
-!define SOURCE_PATH "@CMAKE_SOURCE_DIR@"
+!define ROOT_PATH "..\..\.." ; assuming the script is in ROOT/admin/win/nsi
+!define BUILD_PATH "${ROOT_PATH}\build"
 !define QT_DLL_PATH "${MING_BIN}"
 !define SQLITE_DLL_PATH "${MING_LIB}/qt4/plugins/sqldrivers"
 !define IMAGEFORMATS_DLL_PATH "${MING_LIB}/qt4/plugins/imageformats"
-
-; We use official release plugins
-; mingw32-vlc from obs misses a lot and has even broken ones probably
-!define VLC_PATH "${SOURCE_PATH}\admin\win\vlc\prefix" ; SIC! ^
-!define VLC_BIN "${VLC_PATH}\bin"
-!define VLC_PLUGIN_PATH "${VLC_BIN}\plugins"
-
-!define NSI_PATH "${SOURCE_PATH}/admin/win/nsi"
+!define VLC_PATH "${ROOT_PATH}\..\vlc"
+!define VLC_PLUGIN_PATH "${VLC_PATH}\plugins"
 
 ;-----------------------------------------------------------------------------
-; Installer version
+; Increment installer revision number as part of this script.
 ;-----------------------------------------------------------------------------
+!define /file REVISION_LAST revision.txt
+!define /math REVISION ${REVISION_LAST} + 1
+!delfile revision.txt
+!appendfile revision.txt ${REVISION}
 
-!define VER_MAJOR "@CPACK_PACKAGE_VERSION_MAJOR@"
-!define VER_MINOR "@CPACK_PACKAGE_VERSION_MINOR@"
-!define VER_BUILD "@CPACK_PACKAGE_VERSION_PATCH@"
-!define VERSION "@CPACK_PACKAGE_VERSION@"
+!ifndef VER_MAJOR && VER_MINOR && VER_BUILD
+    !define VER_MAJOR "0"
+    !define VER_MINOR "1"
+    !define VER_BUILD "0rc2"
+!endif
+
+!define VERSION "${VER_MAJOR}.${VER_MINOR}.${VER_BUILD}"
 
 ;-----------------------------------------------------------------------------
 ; Installer build timestamp.
 ;-----------------------------------------------------------------------------
-!define /date BUILD_TIME "built on %Y/%m/%d at %I:%M %p"
+!define /date BUILD_TIME "built on %Y/%m/%d at %I:%M %p  (rev. ${REVISION})"
 
 ;-----------------------------------------------------------------------------
 ; Initial installer setup and definitions.
 ;-----------------------------------------------------------------------------
-Name "@CPACK_NSIS_PACKAGE_NAME@"
+Name "Tomahawk"
 Caption "Tomahawk Installer"
 BrandingText "Tomahawk ${VERSION}  -- ${BUILD_TIME}"
-OutFile "@CPACK_TOPLEVEL_DIRECTORY@/@CPACK_OUTPUT_FILE_NAME@"
-InstallDir "$PROGRAMFILES\@CPACK_PACKAGE_INSTALL_DIRECTORY@"
+OutFile "tomahawk-${VERSION}.exe"
+InstallDir "$PROGRAMFILES\Tomahawk"
 InstallDirRegKey HKCU "Software\Tomahawk" ""
 InstType Standard
 InstType Full
 InstType Minimal
 CRCCheck On
-SetCompressor @CPACK_NSIS_COMPRESSOR@
+SetCompressor /SOLID lzma
 RequestExecutionLevel user ;Now using the UAC plugin.
-ReserveFile NSIS.InstallOptions.ini
+ReserveFile tomahawk.ini
 ReserveFile "${NSISDIR}\Plugins\InstallOptions.dll"
 
-@CPACK_NSIS_SECTION_SELECTED_VARS@
-
 ;-----------------------------------------------------------------------------
 ; Include some required header files.
 ;-----------------------------------------------------------------------------
@@ -90,17 +89,17 @@ ReserveFile "${NSISDIR}\Plugins\InstallOptions.dll"
 ; Modern User Interface (MUI) defintions and setup.
 ;-----------------------------------------------------------------------------
 !define MUI_ABORTWARNING
-!define MUI_ICON ${NSI_PATH}\installer.ico
-!define MUI_UNICON ${NSI_PATH}\installer.ico
-!define MUI_WELCOMEFINISHPAGE_BITMAP ${NSI_PATH}\welcome.bmp
-!define MUI_WELCOMEPAGE_TITLE "@CPACK_PACKAGE_NAME@ ${VERSION} Setup$\r$\nInstaller"
+!define MUI_ICON installer.ico
+!define MUI_UNICON installer.ico
+!define MUI_WELCOMEFINISHPAGE_BITMAP welcome.bmp
+!define MUI_WELCOMEPAGE_TITLE "Tomahawk ${VERSION} Setup$\r$\nInstaller Build Revision ${REVISION}"
 !define MUI_WELCOMEPAGE_TEXT "This wizard will guide you through the installation.$\r$\n$\r$\n$_CLICK"
 !define MUI_HEADERIMAGE
-!define MUI_HEADERIMAGE_BITMAP ${NSI_PATH}\page_header.bmp
+!define MUI_HEADERIMAGE_BITMAP page_header.bmp
 !define MUI_COMPONENTSPAGE_SMALLDESC
-!define MUI_FINISHPAGE_TITLE "@CPACK_PACKAGE_NAME@ Install Completed"
-!define MUI_FINISHPAGE_LINK "Click here to visit the @CPACK_PACKAGE_NAME@ website."
-!define MUI_FINISHPAGE_LINK_LOCATION "http://@TOMAHAWK_ORGANIZATION_DOMAIN@"
+!define MUI_FINISHPAGE_TITLE "Tomahawk Install Completed"
+!define MUI_FINISHPAGE_LINK "Click here to visit the Tomahawk website."
+!define MUI_FINISHPAGE_LINK_LOCATION "http://tomahawk-player.org/"
 !define MUI_FINISHPAGE_NOREBOOTSUPPORT
 !ifdef OPTION_FINISHPAGE_RELEASE_NOTES
    !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
@@ -203,37 +202,40 @@ Function PageReinstall
       IntCmp $R0 ${VER_MINOR} build_check new_version older_version
    build_check:
       ReadRegDWORD $R0 HKLM "Software\Tomahawk" "VersionBuild"
-      IntCmp $R0 ${VER_BUILD} same_version new_version older_version
+      IntCmp $R0 ${VER_BUILD} revision_check new_version older_version
+   revision_check:
+      ReadRegDWORD $R0 HKLM "Software\Tomahawk" "VersionRevision"
+      IntCmp $R0 ${REVISION} same_version new_version older_version
 
    new_version:
-      !insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 1" "Text" "An older version of Tomahawk is installed on your system. It is recommended that you uninstall the current version before installing. Select the operation you want to perform and click Next to continue."
-      !insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 2" "Text" "Uninstall before installing"
-      !insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 3" "Text" "Do not uninstall"
+      !insertmacro INSTALLOPTIONS_WRITE "tomahawk.ini" "Field 1" "Text" "An older version of Tomahawk is installed on your system. It is recommended that you uninstall the current version before installing. Select the operation you want to perform and click Next to continue."
+      !insertmacro INSTALLOPTIONS_WRITE "tomahawk.ini" "Field 2" "Text" "Uninstall before installing"
+      !insertmacro INSTALLOPTIONS_WRITE "tomahawk.ini" "Field 3" "Text" "Do not uninstall"
       !insertmacro MUI_HEADER_TEXT "Already Installed" "Choose how you want to install Tomahawk."
       StrCpy $R0 "1"
       Goto reinst_start
 
    older_version:
-      !insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 1" "Text" "A newer version of Tomahawk is already installed! It is not recommended that you install an older version. If you really want to install this older version, it is better to uninstall the current version first. Select the operation you want to perform and click Next to continue."
-      !insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 2" "Text" "Uninstall before installing"
-      !insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 3" "Text" "Do not uninstall"
+      !insertmacro INSTALLOPTIONS_WRITE "tomahawk.ini" "Field 1" "Text" "A newer version of Tomahawk is already installed! It is not recommended that you install an older version. If you really want to install this older version, it is better to uninstall the current version first. Select the operation you want to perform and click Next to continue."
+      !insertmacro INSTALLOPTIONS_WRITE "tomahawk.ini" "Field 2" "Text" "Uninstall before installing"
+      !insertmacro INSTALLOPTIONS_WRITE "tomahawk.ini" "Field 3" "Text" "Do not uninstall"
       !insertmacro MUI_HEADER_TEXT "Already Installed" "Choose how you want to install Tomahawk."
       StrCpy $R0 "1"
       Goto reinst_start
 
    same_version:
-      !insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 1" "Text" "Tomahawk ${VERSION} is already installed.\r\nSelect the operation you want to perform and click Next to continue."
-      !insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 2" "Text" "Add/Reinstall components"
-      !insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 3" "Text" "Uninstall Tomahawk"
+      !insertmacro INSTALLOPTIONS_WRITE "tomahawk.ini" "Field 1" "Text" "Tomahawk ${VERSION} is already installed.\r\nSelect the operation you want to perform and click Next to continue."
+      !insertmacro INSTALLOPTIONS_WRITE "tomahawk.ini" "Field 2" "Text" "Add/Reinstall components"
+      !insertmacro INSTALLOPTIONS_WRITE "tomahawk.ini" "Field 3" "Text" "Uninstall Tomahawk"
       !insertmacro MUI_HEADER_TEXT "Already Installed" "Choose the maintenance option to perform."
       StrCpy $R0 "2"
 
    reinst_start:
-      !insertmacro INSTALLOPTIONS_DISPLAY "NSIS.InstallOptions.ini"
+      !insertmacro INSTALLOPTIONS_DISPLAY "tomahawk.ini"
 FunctionEnd
 
 Function PageLeaveReinstall
-   !insertmacro INSTALLOPTIONS_READ $R1 "NSIS.InstallOptions.ini" "Field 2" "State"
+   !insertmacro INSTALLOPTIONS_READ $R1 "tomahawk.ini" "Field 2" "State"
    StrCmp $R0 "1" 0 +2
    StrCmp $R1 "1" reinst_uninstall reinst_done
    StrCmp $R0 "2" 0 +3
@@ -260,6 +262,7 @@ FunctionEnd
 #   INSTALLER SECTIONS                                                       #
 #                                                                            #
 ##############################################################################
+
 Section "Tomahawk Player" SEC_TOMAHAWK_PLAYER
    SectionIn 1 2 3 RO
    SetDetailsPrint listonly
@@ -273,13 +276,9 @@ Section "Tomahawk Player" SEC_TOMAHAWK_PLAYER
         ;Main executable.
         File "${INSTALL_PATH}\bin\tomahawk.exe"
 
-        File "${INSTALL_PATH}\bin\tomahawk_crash_reporter.exe"
-        File "${INSTALL_PATH}\bin\libtomahawk_breakpad.dll"
-
         File "${INSTALL_PATH}\bin\libqxtweb-standalone.dll"
         File "${INSTALL_PATH}\bin\libtomahawk_portfwd.dll"
         File "${INSTALL_PATH}\bin\libtomahawk_lastfm2.dll"
-        File "${INSTALL_PATH}\bin\libquazip.dll"
         File "${INSTALL_PATH}\bin\libtomahawklib.dll"
         File "${INSTALL_PATH}\lib\libtomahawk_sip*.dll"
    !endif
@@ -287,20 +286,16 @@ Section "Tomahawk Player" SEC_TOMAHAWK_PLAYER
         ;Main executable.
         File "${BUILD_PATH}\tomahawk.exe"
 
-        File "${BUILD_PATH}\tomahawk_crash_reporter.exe"
-        File "${BUILD_PATH}\libtomahawk_breakpad.dll"
-
         File "${BUILD_PATH}\libtomahawklib.dll"
         File "${BUILD_PATH}\libqxtweb-standalone.dll"
         File "${BUILD_PATH}\libtomahawk_portfwd.dll"
         File "${BUILD_PATH}\libtomahawk_lastfm2.dll"
-        File "${BUILD_PATH}\libquazip.dll"
         File "${BUILD_PATH}\libtomahawk_sip*.dll"
    !endif
 
    ;License & release notes.
-   File "@CPACK_RESOURCE_FILE_LICENSE@"
-   File /oname=NOTES.txt ${NSI_PATH}\RELEASE_NOTES.txt
+   File "${ROOT_PATH}\LICENSE.txt"
+   File /oname=NOTES.txt RELEASE_NOTES.txt
 
    ;QT stuff:
    File "${QT_DLL_PATH}\QtCore4.dll"
@@ -329,18 +324,31 @@ Section "Tomahawk Player" SEC_TOMAHAWK_PLAYER
    File "${MING_BIN}\libstdc++-6.dll"
 
    ;Phonon stuff
-   File "${VLC_BIN}\libphonon.dll"
+
+   ;Fix the phonon build to not use Dbus
+   File "${QT_DLL_PATH}\QtDbus4.dll"
+   File "${MING_BIN}\libdbus-1-3.dll"
+   File "${MING_BIN}\dbus-daemon.exe"
+
+   File "${MING_BIN}\libphonon.dll"
    SetOutPath "$INSTDIR\phonon_backend"
-   File "${VLC_BIN}\phonon_backend\phonon_vlc.dll"
+   File "${MING_BIN}\phonon_backend\phonon_vlc.dll"
    SetOutPath "$INSTDIR"
 
    ;VLC
    ;SetOutPath "$INSTDIR\phonon_backend"
-   File "${VLC_BIN}\libvlc.dll"
-   File "${VLC_BIN}\libvlccore.dll"
+   File "${VLC_PATH}\libvlc.dll"
+   File "${VLC_PATH}\libvlccore.dll"
    SetOutPath "$INSTDIR\plugins"
    File /r "${VLC_PLUGIN_PATH}\*.dll"
    SetOutPath "$INSTDIR"
+   File "${MING_BIN}\libmad-0.dll" ; MP3
+   File "${MING_BIN}\libFLAC-8.dll" ; FLAC
+   File "${MING_BIN}\libogg-0.dll" ; OGG, FLAC
+   File "${MING_BIN}\libvorbis-0.dll" ; OGG
+   File "${MING_BIN}\libvorbisenc-2.dll" ; OGG
+
+
 
    ; Other
    File "${MING_BIN}\libqjson.dll"
@@ -365,7 +373,6 @@ Section "Tomahawk Player" SEC_TOMAHAWK_PLAYER
    File "${MING_LIB}\libclucene-shared.dll"
 
    File "${MING_BIN}\libqtsparkle.dll"
-   File "${MING_BIN}\libattica.dll"
 SectionEnd
 
 SectionGroup "Shortcuts"
@@ -455,8 +462,7 @@ Section -post
    WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk" "NoRepair" "1"
 
    ; Register tomahawk:// protocol handler
-   WriteRegStr HKCR "tomahawk" "" "URL:Tomahawk Protocol"
-   WriteRegStr HKCR "tomahawk" "URL Protocol" ""
+   WriteRegStr HKCR "tomahawk" "" "URL: Tomahawk Protocol"
    WriteRegStr HKCR "tomahawk\DefaultIcon" "" $INSTDIR\tomahawk.exe,1
    WriteRegStr HKCR "tomahawk\shell" "" "open"
    WriteRegStr HKCR "tomahawk\shell\open\command" "" '"$INSTDIR\tomahawk.exe" "%1"'
@@ -560,7 +566,7 @@ SectionEnd
 ##############################################################################
 
 Function .onInit
-   !insertmacro INSTALLOPTIONS_EXTRACT "NSIS.InstallOptions.ini"
+   !insertmacro INSTALLOPTIONS_EXTRACT "tomahawk.ini"
 
    ;Remove Quick Launch option from Windows 7, as no longer applicable - usually.
    ${IfNot} ${AtMostWinVista}

admin/win/update-vlc.sh

@@ -1,58 +1,20 @@
 #!/bin/bash
-mkdir -p vlc/
-
-if [ "$1" = "-c" ] ; then
-echo "Continuing last download.."
-rm -rvf vlc/prefix/
-else
 echo "Remove old vlc dir..."
-rm -rvf vlc/*
-fi
+#rm -vf vlc-*.7z
+rm -rf vlc/
 
-cd vlc/
-
-echo "Download phonon archive..."
+echo "Download specified binary..."
 #wget -c "http://downloads.sourceforge.net/project/vlc/1.1.9/win32/vlc-1.1.9-win32.7z?r=http%3A%2F%2Fwww.videolan.org%2Fvlc%2Fdownload-windows.html&ts=1306272584&use_mirror=leaseweb"
-#wget -c "http://download.tomahawk-player.org/tomahawk-vlc-0.1.zip"
-#wget -c http://people.videolan.org/~jb/phonon/phonon-vlc-last.7z
-wget -c http://people.videolan.org/~jb/phonon/phonon_phonon-vlc_20111128.7z
+wget -c "http://nightlies.videolan.org/build/win32/trunk-20110524-1321/vlc-1.2.0-git-20110524-1321-win32.7z"
 
 echo "Extract binary..."
-7z x phonon*.7z
-#mv -v vlc-*/ vlc/
-#unzip tomahawk-vlc-0.1.zip
-
-echo "Download phonon_vlc_no_video.dll..."
-wget -c http://people.videolan.org/~jb/phonon/phonon_vlc_no_video.dll
-cp -v phonon_vlc_no_video.dll prefix/bin/phonon_backend/phonon_vlc.dll
+7z x vlc-*.7z
+mv -v vlc-*/ vlc/
 
 echo "Strip unneeded plugins from vlc/plugins..."
-cd prefix/bin/plugins
-rm -rvf libold* libvcd* libdvd* liblibass* libx264* libschroe* liblibmpeg2* \
-    libstream_out_* libmjpeg_plugin* libh264_plugin* libzvbi_plugin* lib*sub* \
-    *qt4* *skins2* libaccess_bd_plugin.dll \
-    libaudiobargraph_* libball_plugin.dll \
-    libdirac_plugin.dll \
-    libgnutls_plugin.dll \
-    libcaca_plugin.dll \
-    libfreetype_plugin.dll \
-    libaccess_output_shout_plugin.dll \
-    libremoteosd_plugin.dll \
-    libsdl_image_plugin.dll \
-    libvout_sdl_plugin.dll \
-    libpng_plugin.dll \
-    libgoom_plugin.dll \
-    libatmo_plugin.dll \
-    libmux_ts_plugin.dll \
-    libkate_plugin.dll \
-    libtaglib_plugin.dll
-
-
-# this is for vlc-1.2
-# rm -rvf video_*/ gui/ */libold* */libvcd* */libdvd* */liblibass* */libx264* */libschroe* */liblibmpeg2* \
-#      */libstream_out_* */libmjpeg_plugin* */libh264_plugin* */libzvbi_plugin* */lib*sub* \
-#      services_discover/ visualization/ control/ misc/
-
+cd vlc/plugins/
+rm -rvf video_*/ gui/ */libold* */libvcd* */libdvd* */liblibass* */libx264* */libschroe* */liblibmpeg2* \
+     */libstream_out_* */libmjpeg_plugin* */libh264_plugin* */libzvbi_plugin* */lib*sub*
 
 echo "Downloaded and stripped VLC"
 

data/icons/tomahawk-icon.svg

@@ -1,60 +1,60 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="600px" height="600px" viewBox="0 0 600 600" enable-background="new 0 0 600 600" xml:space="preserve">
-<path fill="#010101" d="M543.773,253.359c0-49.962-19.305-86.572-54.194-104.54C477.84,71.133,405.027,13.418,316.568,13.418
-	c-86.917,0-159.483,56.481-172.605,132.58c-38.049,16.818-59.889,55.24-59.889,107.361c0,27.029,7.188,51.824,20.321,71.749
-	c-1.816,1.565-3.444,3.282-4.77,5.239c0,0,2.582,2.359,3.689,3.373c-4.262,2.123-8.22,4.322-11.555,6.67
-	c0,0,3.021,7.355,5.896,14.353c-11.991,9.688-21.312,18.92-27.553,27.51c0,0,1.611,1.789,2.011,2.225
-	c-12.354,9.158-22.133,18.205-28.528,27.021c0,0,6.927,7.35,12.408,13.166c-17.824,28.76-43.348,74.85-43.348,102.988
-	c0,3.278,0.346,6.315,1.093,9.053c1.764,6.443,5.752,11.438,11.229,14.059c15.255,7.312,39.646-6.362,72.589-40.434
-	c-0.828,8.287-1.457,16.662-1.457,24.736c0,16.805,2.266,32.069,8.77,41.25c4.887,6.895,10.898,9.067,15.084,9.682
-	c6.723,0.99,26.375,3.797,57.992-61.295c2.678,0.705,5.421,1.178,8.235,1.178c8.798,0,17.065-3.424,23.287-9.639
-	c4.284-4.287,7.133-9.584,8.562-15.312c7.516-2.129,14.555-6.701,20.779-13.19c19.562,24.86,44.779,37.643,75.38,37.643
-	c7.317,0,14.474-0.754,21.281-2.242c0.392-0.073,2.555-0.623,2.555-0.623l0.62-0.166c23.05-5.823,42.463-20.409,58-43.254
-	c7.2,9.23,15.731,15.994,24.849,19.457c1.141,6.658,4.226,12.808,9.102,17.691c6.22,6.213,14.487,9.639,23.288,9.639
-	c8.798,0,17.063-3.426,23.285-9.639c6.221-6.229,9.647-14.494,9.647-23.293c0-8.797-3.429-17.066-9.647-23.293
-	c-2.988-2.988-6.478-5.297-10.248-6.924c0.275-2.947,0.611-5.849,0.611-9.009c0-10.028-1.398-20.979-4.19-31.897
-	c-1.196-4.672-2.757-8.746-4.513-12.568c2.84-6.467,4.807-13.268,4.807-20.426c0-7.316-1.74-14.422-4.706-21.01
-	C509.263,358.345,543.773,313.068,543.773,253.359z M451.232,150.998c-33.396-54.619-88.048-93.359-134.569-85.472
-	c-49.022-7.864-102.775,30.64-135.326,85.018c-2.646,0.208-5.276,0.497-7.875,0.88c8.694-54.414,69.431-111.108,143.107-111.108
-	c74.113,0,135.142,57.197,143.271,112.08C457.013,151.799,454.137,151.348,451.232,150.998z"/>
-<path fill="#010101" stroke="#FFFFFF" stroke-width="4.8437" d="M110.937,367.38c-72.03,93.07-97.843,163.349-81.865,170.996
-	c15.97,7.654,74.912-46.055,139.701-143.287c45.751-68.647,60.797-94.43,45.68-95.922l20.614-43.357l-10.687-6.644l-33.91,33.371
+	 width="841.89px" height="595.28px" viewBox="0 0 841.89 595.28" enable-background="new 0 0 841.89 595.28" xml:space="preserve">
+<path fill="#010101" d="M543.773,253.359c0-49.962-19.305-86.572-54.194-104.54C477.838,71.133,405.027,13.418,316.568,13.418
+	c-86.917,0-159.483,56.481-172.605,132.58c-38.049,16.818-59.889,55.24-59.889,107.361c0,27.029,7.186,51.825,20.321,71.748
+	c-1.816,1.566-3.444,3.283-4.768,5.24c0,0,2.582,2.36,3.689,3.374c-4.262,2.123-8.22,4.322-11.555,6.669
+	c0,0,3.022,7.355,5.898,14.352c-11.991,9.687-21.314,18.92-27.553,27.51c0,0,1.612,1.789,2.011,2.224
+	c-12.355,9.158-22.133,18.206-28.528,27.021c0,0,6.925,7.351,12.408,13.167c-17.824,28.759-43.348,74.85-43.348,102.987
+	c0,3.281,0.346,6.318,1.093,9.054c1.764,6.442,5.752,11.437,11.229,14.058c15.255,7.311,39.648-6.364,72.589-40.434
+	c-0.828,8.288-1.457,16.663-1.457,24.737c0,16.804,2.266,32.07,8.77,41.249c4.886,6.895,10.898,9.07,15.084,9.683
+	c6.721,0.989,26.375,3.796,57.992-61.296c2.678,0.705,5.421,1.179,8.235,1.179c8.798,0,17.067-3.425,23.287-9.639
+	c4.286-4.288,7.133-9.584,8.562-15.313c7.516-2.129,14.555-6.702,20.779-13.191c19.563,24.861,44.78,37.643,75.38,37.643
+	c7.318,0,14.474-0.755,21.281-2.243c0.392-0.075,2.555-0.622,2.555-0.622l0.62-0.167c23.05-5.824,42.463-20.41,58-43.254
+	c7.2,9.231,15.733,15.994,24.849,19.458c1.139,6.658,4.224,12.806,9.1,17.69c6.22,6.214,14.488,9.639,23.288,9.639
+	c8.798,0,17.065-3.425,23.285-9.639c6.221-6.228,9.649-14.494,9.649-23.292s-3.429-17.066-9.649-23.294
+	c-2.988-2.988-6.476-5.296-10.248-6.923c0.277-2.947,0.613-5.848,0.613-9.007c0-10.031-1.4-20.982-4.192-31.9
+	c-1.196-4.672-2.757-8.745-4.511-12.567c2.838-6.467,4.805-13.268,4.805-20.426c0-7.317-1.74-14.422-4.706-21.011
+	C509.263,358.346,543.773,313.068,543.773,253.359z M451.232,150.998c-33.395-54.619-88.048-93.359-134.569-85.472
+	c-49.024-7.864-102.777,30.64-135.326,85.018c-2.648,0.208-5.278,0.497-7.875,0.88c8.694-54.414,69.429-111.108,143.107-111.108
+	c74.113,0,135.141,57.197,143.269,112.08C457.013,151.799,454.137,151.348,451.232,150.998z"/>
+<path fill="#010101" stroke="#FFFFFF" stroke-width="4.8437" d="M110.937,367.38c-72.03,93.07-97.843,163.348-81.865,170.997
+	c15.97,7.654,74.912-46.056,139.701-143.288c45.751-68.648,60.797-94.429,45.68-95.922l20.614-43.357l-10.685-6.644l-33.912,33.371
 	C179.323,272.615,166.073,296.146,110.937,367.38z"/>
-<path fill="#010101" stroke="#FFFFFF" stroke-width="4.8437" d="M140.932,379.755c-39.101,113.041-39.738,189.89-20.813,192.654
-	c18.912,2.787,59.039-67.617,89.306-182.603c21.383-81.178,27.257-111.029,11.438-108l5.133-48.806l-13.207-3.354l-22.192,42.936
+<path fill="#010101" stroke="#FFFFFF" stroke-width="4.8437" d="M140.932,379.755c-39.099,113.042-39.738,189.89-20.813,192.654
+	c18.912,2.787,59.039-67.616,89.306-182.6c21.381-81.178,27.255-111.03,11.438-108.001l5.133-48.806l-13.207-3.354l-22.194,42.936
 	C175.736,266.142,170.865,293.244,140.932,379.755z"/>
-<circle fill="none" stroke="#010101" stroke-width="4.8437" cx="410.28" cy="388.832" r="37.801"/>
+<circle fill="none" stroke="#010101" stroke-width="4.8437" cx="410.28" cy="388.831" r="37.801"/>
 <path fill="#ED2224" stroke="#010101" stroke-width="4.8437" d="M475.237,157.792c-7.115-73.197-76.231-130.645-160.495-130.645
-	c-83.402,0-152.009,56.27-160.306,128.393c-39.811,13.607-58.455,52.219-58.455,97.818c0,56.946,34.681,103.108,89.925,103.108
-	c35.784,0,67.089-19.432,84.771-48.551c14.01,3.533,28.776,5.463,44.064,5.463c13.16,0,25.934-1.438,38.173-4.076
-	c17.966,28.357,49.108,47.164,84.604,47.164c55.665,0,90.696-46.162,90.696-103.108
-	C528.218,210.073,512.209,173.073,475.237,157.792z M314.742,274.908c-10.501,0-20.723-0.878-30.584-2.506
+	c-83.402,0-152.009,56.27-160.306,128.393c-39.809,13.607-58.455,52.219-58.455,97.818c0,56.947,34.681,103.109,89.925,103.109
+	c35.784,0,67.089-19.432,84.771-48.551c14.01,3.533,28.778,5.463,44.066,5.463c13.16,0,25.932-1.438,38.173-4.077
+	c17.966,28.357,49.108,47.165,84.604,47.165c55.665,0,90.696-46.162,90.696-103.109
+	C528.216,210.073,512.208,173.073,475.237,157.792z M314.742,274.908c-10.501,0-20.723-0.878-30.584-2.506
 	c1.125-6.177,1.778-12.527,1.778-19.043c0-56.941-44.786-103.104-100.03-103.104c-4.858,0-9.597,0.478-14.271,1.169
-	c8.692-54.414,69.43-111.108,143.105-111.108c74.113,0,135.144,57.197,143.27,112.08c-6.617-1.398-13.473-2.141-20.49-2.141
+	c8.694-54.414,69.43-111.108,143.107-111.108c74.113,0,135.142,57.197,143.268,112.08c-6.617-1.398-13.471-2.141-20.49-2.141
 	c-55.675,0-100.801,46.163-100.801,103.104c0,6.852,0.687,13.536,1.931,20.013C330.872,274.364,322.888,274.908,314.742,274.908z"/>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="-1087.6663" y1="191.4385" x2="-992.1917" y2="191.4385" gradientTransform="matrix(-0.3782 -0.8348 1.083 -0.4907 -423.9551 -476.2263)">
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="-55.6953" y1="95.2363" x2="39.7773" y2="95.2363" gradientTransform="matrix(-0.3782 -0.8348 1.083 -0.4907 70.5233 338.0542)">
 	<stop  offset="0" style="stop-color:#010101"/>
 	<stop  offset="0.2606" style="stop-color:#3E221C"/>
 	<stop  offset="0.7732" style="stop-color:#B03126"/>
 	<stop  offset="1" style="stop-color:#ED2224"/>
 </linearGradient>
-<path fill="url(#SVGID_1_)" d="M153.69,260.35c31.322-14.19,65.739-18.887,77.129,6.254c11.391,25.14-4.763,57.026-36.091,71.214
-	c-31.323,14.192-65.948,5.311-77.338-19.83C106,292.849,122.366,274.543,153.69,260.35z"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="-1275.886" y1="215.5034" x2="-1180.4114" y2="215.5034" gradientTransform="matrix(-0.9008 -0.3607 0.555 -1.386 -752.6548 131.7681)">
+<path fill="url(#SVGID_1_)" d="M153.69,260.35c31.322-14.19,65.739-18.887,77.129,6.254c11.391,25.14-4.763,57.027-36.091,71.213
+	c-31.323,14.194-65.948,5.312-77.338-19.829C106,292.849,122.366,274.543,153.69,260.35z"/>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="-180.8516" y1="181.2642" x2="-85.3789" y2="181.2642" gradientTransform="matrix(-0.9008 -0.3607 0.555 -1.386 252.7537 479.2919)">
 	<stop  offset="0" style="stop-color:#B11F24"/>
 	<stop  offset="0.1017" style="stop-color:#B62024"/>
 	<stop  offset="1" style="stop-color:#ED2224"/>
 </linearGradient>
-<path fill="url(#SVGID_2_)" d="M427.738,265.165c16.043-40.085,41.342-74.985,68.475-64.122
-	c27.121,10.86,36.109,52.165,20.056,92.248c-16.053,40.089-51.062,63.773-78.189,52.912
+<path fill="url(#SVGID_2_)" d="M427.738,265.165c16.043-40.085,41.342-74.985,68.473-64.122
+	c27.122,10.86,36.111,52.165,20.056,92.248c-16.053,40.089-51.062,63.772-78.189,52.911
 	C410.95,335.343,411.683,305.253,427.738,265.165z"/>
-<path fill="#010101" stroke="#010101" stroke-width="4.8437" d="M448.219,425.226c7.774,30.396,3.98,62.357-14.521,62.357
-	c-16.301,0-34.904-17.332-42.675-47.732c-7.777-30.399,4.243-75.016,14.521-62.364C423.584,399.707,440.442,394.826,448.219,425.226
-	z"/>
-<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="-639.5422" y1="548.502" x2="-691.4051" y2="458.673" gradientTransform="matrix(0.9868 0.0515 0.0515 0.7987 840.2104 72.6462)">
+<path fill="#010101" stroke="#010101" stroke-width="4.8437" d="M448.219,425.226c7.776,30.397,3.982,62.358-14.521,62.358
+	c-16.301,0-34.904-17.333-42.675-47.733c-7.777-30.4,4.243-75.016,14.521-62.365C423.583,399.707,440.442,394.825,448.219,425.226z"
+	/>
+<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="217.0322" y1="557.499" x2="165.1699" y2="467.6709" gradientTransform="matrix(0.9868 0.0515 0.0515 0.7987 -5.5217 21.3475)">
 	<stop  offset="0" style="stop-color:#5B3E1D"/>
 	<stop  offset="0.1121" style="stop-color:#42301B"/>
 	<stop  offset="0.2377" style="stop-color:#2E2316"/>
@@ -64,30 +64,29 @@
 	<stop  offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <path fill="url(#SVGID_3_)" stroke="#010101" stroke-width="4.8437" d="M184.076,437.859c-6.111,23.875,1.745,46.508,17.54,50.549
-	c15.79,4.039,33.552-12.045,39.658-35.924c6.101-23.882-9.153-57.129-24.947-61.17C200.537,387.275,190.178,413.972,184.076,437.859
+	c15.79,4.039,33.552-12.045,39.658-35.924c6.101-23.881-9.153-57.129-24.947-61.17C200.537,387.275,190.178,413.973,184.076,437.859
 	z"/>
-<path fill="#010101" stroke="#010101" stroke-width="4.8437" d="M314.837,65.525c72.757-12.333,165.505,89.311,165.505,187.528
-	c0,98.213-74.307,162.833-165.707,162.833"/>
-<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="-664.3811" y1="374.0068" x2="-500.546" y2="90.2362" gradientTransform="matrix(1 0 0 1 858.79 0.3506)">
+<path fill="#010101" stroke="#010101" stroke-width="4.8437" d="M314.837,65.525c72.755-12.333,165.503,89.311,165.503,187.528
+	c0,98.215-74.305,162.834-165.707,162.834"/>
+<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="194.4072" y1="374.3564" x2="358.2427" y2="90.5851">
 	<stop  offset="0" style="stop-color:#000000"/>
 	<stop  offset="1" style="stop-color:#5B3E1D"/>
 </linearGradient>
-<path fill="url(#SVGID_4_)" stroke="#010101" stroke-width="4.8437" d="M314.635,415.888c-91.402,0-165.299-64.619-165.299-162.833
+<path fill="url(#SVGID_4_)" stroke="#010101" stroke-width="4.8437" d="M314.634,415.888c-91.402,0-165.297-64.619-165.297-162.834
 	c0-98.218,88.615-199.862,165.5-187.528"/>
-<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="-760.302" y1="-37.9087" x2="-639.3506" y2="-247.4027" gradientTransform="matrix(-0.6092 0.7802 -0.4118 -0.3216 -240.6183 671.6459)">
+<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="297.3164" y1="139.4717" x2="418.2684" y2="-70.0234" gradientTransform="matrix(-0.6092 0.7802 -0.4118 -0.3216 476.7253 -96.4624)">
 	<stop  offset="0" style="stop-color:#8B654B"/>
 	<stop  offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <path fill="url(#SVGID_5_)" d="M169.611,266.578c-27.578-21.539-16.863-81.354,23.935-133.604
-	c40.804-52.245,93.81-72.894,126.21-59.689c26.672,10.864,14.476,85.434-26.326,137.681
+	c40.802-52.245,93.808-72.894,126.21-59.689c26.67,10.864,14.474,85.434-26.328,137.681
 	C252.63,263.215,197.193,288.112,169.611,266.578z"/>
-<circle fill="#010101" cx="214.367" cy="388.832" r="34.682"/>
+<circle fill="#010101" cx="214.367" cy="388.831" r="34.682"/>
 <g>
-	<path fill="#F4DFED" d="M131.831,427.708c-23.973,79.734-18.741,132.268-9.011,135.459c10.854,3.564,43.561-47.223,60.839-128.324
-		c12.189-57.264,11.729-83.75,0.009-81.625l3.505-31.108l-8.899-2.435l-14.271,32.445
-		C152.554,347.564,150.184,366.689,131.831,427.708z"/>
-	
-		<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="-710.6404" y1="319.3252" x2="-710.6405" y2="562.8164" gradientTransform="matrix(1 0 0 1 858.79 0.3506)">
+	<path fill="#F4DFED" d="M131.831,427.709c-23.973,79.733-18.741,132.267-9.011,135.459c10.855,3.563,43.561-47.223,60.839-128.324
+		c12.189-57.265,11.727-83.75,0.009-81.625l3.505-31.111l-8.901-2.432l-14.271,32.445
+		C152.554,347.564,150.184,366.689,131.831,427.709z"/>
+	<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="148.1519" y1="319.6758" x2="148.1518" y2="563.168">
 		<stop  offset="0" style="stop-color:#571A54"/>
 		<stop  offset="0.2641" style="stop-color:#7C5378"/>
 		<stop  offset="0.528" style="stop-color:#A78AA3"/>
@@ -95,11 +94,11 @@
 		<stop  offset="0.9095" style="stop-color:#EAE1E8"/>
 		<stop  offset="1" style="stop-color:#F9F3F8"/>
 	</linearGradient>
-	<path fill="url(#SVGID_6_)" d="M146.41,479.117l-22.914,19.186l35.325-65.182l4.683-17.371c0,0,3.1-26.758-24.228,14.713
-		c16.962-56.432,32.317-62.998,32.317-62.998l11.402-46.658l-4.725-1.131l-14.702,30.23c-11.429-4.588-13.859,14.521-32.392,75.483
-		c-24.226,79.656-20.501,124.087-8.358,137.777L146.41,479.117z"/>
+	<path fill="url(#SVGID_6_)" d="M146.41,479.117l-22.914,19.186l35.325-65.182l4.683-17.371c0,0,3.098-26.758-24.228,14.713
+		c16.962-56.432,32.317-62.998,32.317-62.998l11.404-46.658l-4.725-1.131l-14.702,30.23c-11.429-4.588-13.859,14.521-32.392,75.485
+		c-24.224,79.655-20.501,124.085-8.358,137.776L146.41,479.117z"/>
 	
-		<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="-789.3508" y1="444.1797" x2="-821.2424" y2="531.975" gradientTransform="matrix(0.9399 -0.3414 0.3414 0.9399 754.2939 -277.891)">
+		<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="75.7998" y1="402.9658" x2="43.9086" y2="490.7602" gradientTransform="matrix(0.9399 -0.3414 0.3414 0.9399 -44.7892 56.207)">
 		<stop  offset="0" style="stop-color:#802986"/>
 		<stop  offset="0.2641" style="stop-color:#9D66A2"/>
 		<stop  offset="0.528" style="stop-color:#BE9BC2"/>
@@ -107,10 +106,10 @@
 		<stop  offset="0.9095" style="stop-color:#F0E6F1"/>
 		<stop  offset="1" style="stop-color:#F9F3F8"/>
 	</linearGradient>
-	<path fill="url(#SVGID_7_)" d="M147.332,501.478l31.839-92.399c0,0,6.608,60.69-7.474,93.406
-		c1.438-44.879-2.328-36.951-9.176-25.257C159.71,482.031,147.332,501.478,147.332,501.478z"/>
+	<path fill="url(#SVGID_7_)" d="M147.332,501.478l31.839-92.4c0,0,6.608,60.692-7.474,93.405
+		c1.438-44.878-2.328-36.951-9.176-25.254C159.71,482.03,147.332,501.478,147.332,501.478z"/>
 	
-		<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="-764.8928" y1="411.2344" x2="-797.3259" y2="500.5203" gradientTransform="matrix(0.9399 -0.3414 0.3414 0.9399 754.2939 -277.891)">
+		<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="100.2559" y1="370.0205" x2="67.8228" y2="459.3065" gradientTransform="matrix(0.9399 -0.3414 0.3414 0.9399 -44.7892 56.207)">
 		<stop  offset="0" style="stop-color:#802986"/>
 		<stop  offset="0.2641" style="stop-color:#9D66A2"/>
 		<stop  offset="0.528" style="stop-color:#BE9BC2"/>
@@ -118,10 +117,10 @@
 		<stop  offset="0.9095" style="stop-color:#F0E6F1"/>
 		<stop  offset="1" style="stop-color:#F9F3F8"/>
 	</linearGradient>
-	<path fill="url(#SVGID_8_)" d="M156.286,463.716l38.825-93.953c0,0,2.251,62.279-11.831,94.992
-		c-0.298-44.25-5.388-28.09-8.538-23.508C165.662,454.416,156.286,463.716,156.286,463.716z"/>
+	<path fill="url(#SVGID_8_)" d="M156.286,463.716l38.825-93.952c0,0,2.251,62.278-11.831,94.991
+		c-0.298-44.249-5.388-28.089-8.538-23.508C165.662,454.416,156.286,463.716,156.286,463.716z"/>
 	
-		<linearGradient id="SVGID_9_" gradientUnits="userSpaceOnUse" x1="-872.7551" y1="422.8174" x2="-924.3751" y2="475.0038" gradientTransform="matrix(0.711 -0.7032 0.7032 0.711 517.3177 -556.6326)">
+		<linearGradient id="SVGID_9_" gradientUnits="userSpaceOnUse" x1="19.1768" y1="337.1123" x2="-32.4432" y2="389.2988" gradientTransform="matrix(0.711 -0.7032 0.7032 0.711 -56.5767 131.5096)">
 		<stop  offset="0" style="stop-color:#571A54"/>
 		<stop  offset="0.2641" style="stop-color:#7C5378"/>
 		<stop  offset="0.528" style="stop-color:#A78AA3"/>
@@ -129,22 +128,21 @@
 		<stop  offset="0.9095" style="stop-color:#EAE1E8"/>
 		<stop  offset="1" style="stop-color:#F9F3F8"/>
 	</linearGradient>
-	<path fill="url(#SVGID_9_)" d="M180.916,431.115l9.787-73.404c0,0,18.589,43.111,16.428,71.426
-		c-11.771-30.424-13.671-21.049-17.576-14.961C187.396,417.539,180.916,431.115,180.916,431.115z"/>
-	<path fill="#1E3D73" d="M174.914,335.556L158.76,362.31l-23.24,76.646c0,0,1.211-8.172,1.788-15.883l-18.783,50.772
-		c0,0,8.386-31.227,3.607-28.383c-4.775,2.84,4.227-21.91-23.102,13.73c5.316-18.517,20.495-39.511,33.324-54.9
-		c-2.172,0.473-7.102,4.787-18.388,18.373c4.381-15.232,14.956-32.934,25.357-47.898c-1.159-2.682-5.151-3.889-21.234,5.224
-		C134.366,356.718,174.914,335.556,174.914,335.556z"/>
+	<path fill="url(#SVGID_9_)" d="M180.916,431.115l9.787-73.404c0,0,18.589,43.111,16.428,71.425
+		c-11.773-30.423-13.671-21.048-17.578-14.96C187.396,417.538,180.916,431.115,180.916,431.115z"/>
+	<path fill="#1E3D73" d="M174.914,335.556L158.76,362.31l-23.24,76.647c0,0,1.211-8.173,1.788-15.883l-18.783,50.773
+		c0,0,8.386-31.226,3.609-28.382c-4.777,2.84,4.225-21.91-23.102,13.729c5.316-18.514,20.495-39.508,33.324-54.9
+		c-2.172,0.474-7.1,4.788-18.387,18.374c4.38-15.232,14.957-32.934,25.358-47.898c-1.159-2.683-5.151-3.889-21.234,5.221
+		C134.366,356.719,174.914,335.556,174.914,335.556z"/>
 </g>
 <g>
-	<path fill="#F4DFED" d="M94.453,401.164c-49.752,66.752-62.779,117.912-54.719,124.242c8.987,7.059,57.062-29.513,100.989-99.847
-		c31.011-49.655,39.62-74.709,27.879-76.713l13.916-28.053l-7.539-5.318l-24.483,25.623
-		C141.291,332.912,132.531,350.072,94.453,401.164z"/>
-	<path fill="#656B84" d="M90.603,454.464l-28.088,10.205l55.456-49.201l10.331-14.729c0,0,12.047-24.097-27.796,5.559
-		c35.213-47.256,51.892-48.182,51.892-48.182l26.641-39.957l-4.058-2.683l-24.133,23.4c-9.179-8.223-17.989,8.91-56.226,59.885
-		c-49.96,66.601-61.634,109.635-54.889,126.646L90.603,454.464z"/>
-	
-		<linearGradient id="SVGID_10_" gradientUnits="userSpaceOnUse" x1="-752.551" y1="484.6816" x2="-736.7991" y2="395.3488" gradientTransform="matrix(1 0 0 1 858.79 0.3506)">
+	<path fill="#F4DFED" d="M94.453,401.163c-49.752,66.752-62.779,117.913-54.719,124.242c8.987,7.059,57.064-29.51,100.989-99.844
+		c31.011-49.657,39.62-74.709,27.879-76.714l13.916-28.052l-7.539-5.319L150.496,341.1
+		C141.291,332.911,132.531,350.072,94.453,401.163z"/>
+	<path fill="#656B84" d="M90.603,454.464L62.515,464.67l55.456-49.201l10.331-14.731c0,0,12.047-24.096-27.794,5.558
+		c35.211-47.255,51.89-48.182,51.89-48.182l26.641-39.956l-4.058-2.681l-24.133,23.399c-9.177-8.222-17.989,8.911-56.224,59.885
+		c-49.96,66.6-61.634,109.635-54.889,126.645L90.603,454.464z"/>
+	<linearGradient id="SVGID_10_" gradientUnits="userSpaceOnUse" x1="106.2383" y1="485.0312" x2="121.9901" y2="395.6984">
 		<stop  offset="0" style="stop-color:#571A54"/>
 		<stop  offset="0.2641" style="stop-color:#7C5378"/>
 		<stop  offset="0.528" style="stop-color:#A78AA3"/>
@@ -152,10 +150,9 @@
 		<stop  offset="0.9095" style="stop-color:#EAE1E8"/>
 		<stop  offset="1" style="stop-color:#F9F3F8"/>
 	</linearGradient>
-	<path fill="url(#SVGID_10_)" d="M83.829,475.791l61.476-75.98c0,0-14.509,59.306-38.916,85.248
-		c16.678-41.694,12.058-33.366,0-26.873C101.491,460.822,83.829,475.791,83.829,475.791z"/>
-	
-		<linearGradient id="SVGID_11_" gradientUnits="userSpaceOnUse" x1="-727.8064" y1="453.3486" x2="-711.9149" y2="363.2233" gradientTransform="matrix(1 0 0 1 858.79 0.3506)">
+	<path fill="url(#SVGID_10_)" d="M83.829,475.791l61.474-75.981c0,0-14.507,59.304-38.916,85.248
+		c16.678-41.696,12.058-33.368,0-26.873C101.491,460.821,83.829,475.791,83.829,475.791z"/>
+	<linearGradient id="SVGID_11_" gradientUnits="userSpaceOnUse" x1="130.9844" y1="453.7012" x2="146.8758" y2="363.5764">
 		<stop  offset="0" style="stop-color:#571A54"/>
 		<stop  offset="0.2641" style="stop-color:#7C5378"/>
 		<stop  offset="0.528" style="stop-color:#A78AA3"/>
@@ -163,36 +160,37 @@
 		<stop  offset="0.9095" style="stop-color:#EAE1E8"/>
 		<stop  offset="1" style="stop-color:#F9F3F8"/>
 	</linearGradient>
-	<path fill="url(#SVGID_11_)" d="M105.143,443.357l68.562-75.052c0,0-19.143,59.297-43.551,85.248
-		c14.824-41.7,10.567-27.994,0-25.022C124.802,430.041,105.143,443.357,105.143,443.357z"/>
-	<path fill="#656B84" d="M139.423,421.125l34.262-65.654c0,0,2.748,46.867-8.945,72.74c-0.676-32.615-3.041-28.432-11.413-20.061
-		C150.5,410.974,139.423,421.125,139.423,421.125z"/>
-	<path fill="#656B84" d="M166.408,329.255l-24.322,19.631l-48.011,64.111c0,0,3.931-7.273,7.104-14.322L66.185,439.99
-		c0,0,18.552-26.484,13.089-25.449c-5.464,1.041,11.451-19.148-26.399,5.02c11.313-15.588,32.751-30.137,50.064-40.227
-		c-2.205-0.299-8.316,2.076-23.552,10.988c9.312-12.818,25.302-25.842,40.183-36.357c-0.175-2.918-3.515-5.416-21.74-2.346
-		C121.065,335.3,166.408,329.255,166.408,329.255z"/>
+	<path fill="url(#SVGID_11_)" d="M105.143,443.356l68.564-75.05c0,0-19.143,59.297-43.551,85.248
+		c14.824-41.701,10.567-27.993,0-25.023C124.802,430.041,105.143,443.356,105.143,443.356z"/>
+	<path fill="#656B84" d="M139.423,421.124l34.26-65.654c0,0,2.748,46.867-8.945,72.74c-0.676-32.615-3.041-28.432-11.413-20.06
+		C150.5,410.974,139.423,421.124,139.423,421.124z"/>
+	<path fill="#656B84" d="M166.408,329.256l-24.322,19.63l-48.011,64.112c0,0,3.931-7.274,7.104-14.322l-34.994,41.313
+		c0,0,18.552-26.484,13.089-25.448c-5.464,1.04,11.451-19.148-26.399,5.019c11.313-15.587,32.751-30.137,50.064-40.227
+		c-2.205-0.298-8.316,2.077-23.552,10.989c9.313-12.818,25.302-25.842,40.183-36.357c-0.175-2.919-3.515-5.416-21.74-2.346
+		C121.065,335.3,166.408,329.256,166.408,329.256z"/>
 </g>
 <g>
-	<path fill="#D9AF82" d="M315.05,115.063c-50.514,0-83.218,15.021-109.641,64.839c-2.502,4.713-0.23,14.337-2.796,19.152
-		c-13.845,26.007-37.089,48.236-37.089,71.707c0,34.335,19.1,65.637,42.505,89.296c12.185,71.646,34.7,151.595,104.339,151.595"/>
-	<path fill="#010101" d="M203.271,178.766c-1.521,2.855-1.59,6.774-1.656,10.562c-0.062,3.283-0.123,6.677-1.14,8.588
-		c-4.537,8.519-10.146,16.707-15.577,24.624c-11.21,16.353-21.797,31.798-21.797,48.221c0,30.307,15.166,62.38,42.666,90.412
-		c12.578,73.607,36.113,150.479,106.6,150.479v-1.547c-67.084,0-89.722-78.556-101.95-150.453l-0.127-0.748l-0.54-0.549
-		c-26.957-27.257-41.805-58.361-41.805-87.594c0-14.923,10.174-29.766,20.949-45.482c5.501-8.027,11.19-16.327,15.855-25.087
-		c1.562-2.935,1.638-6.92,1.707-10.773c0.059-3.221,0.118-6.551,1.088-8.381c24.258-45.734,54.398-65.974,107.503-65.974v-2.422
+	<path fill="#D9AF82" enable-background="new    " d="M315.05,115.063c-50.514,0-83.218,15.021-109.641,64.839
+		c-2.502,4.713-0.232,14.337-2.796,19.152c-13.845,26.007-37.089,48.236-37.089,71.707c0,34.337,19.1,65.637,42.505,89.297
+		c12.185,71.644,34.7,151.593,104.339,151.593"/>
+	<path fill="#010101" d="M203.271,178.766c-1.519,2.855-1.59,6.774-1.656,10.562c-0.062,3.283-0.123,6.677-1.14,8.588
+		c-4.537,8.519-10.146,16.707-15.577,24.624c-11.21,16.353-21.797,31.798-21.797,48.221c0,30.307,15.166,62.382,42.666,90.413
+		c12.578,73.606,36.115,150.477,106.6,150.477v-1.546c-67.084,0-89.722-78.554-101.95-150.453l-0.127-0.748l-0.54-0.549
+		c-26.957-27.255-41.805-58.361-41.805-87.594c0-14.923,10.174-29.766,20.949-45.482c5.501-8.027,11.192-16.327,15.857-25.087
+		c1.56-2.935,1.636-6.92,1.707-10.773c0.057-3.221,0.118-6.551,1.088-8.381c24.256-45.734,54.398-65.974,107.503-65.974v-2.422
 		C259.849,112.641,228.506,131.181,203.271,178.766z"/>
 </g>
-<path fill="#8B654B" d="M312.368,511.65c72.045,0,92.163-79.949,104.338-151.595c23.405-23.657,42.514-54.959,42.514-89.296
-	c0-37.004-22.588-49.51-38.609-77.154c-5.681-9.798-1.496-24.634-8.084-33.382c-26.905-35.728-53.772-45.162-97.477-45.162"/>
+<path fill="#8B654B" d="M312.368,511.65c72.045,0,92.163-79.949,104.338-151.593c23.405-23.66,42.512-54.96,42.512-89.297
+	c0-37.004-22.588-49.51-38.609-77.154c-5.681-9.798-1.496-24.634-8.084-33.382c-26.905-35.728-53.772-45.162-97.475-45.162"/>
 <ellipse fill="#D9AF82" cx="313.792" cy="343.947" rx="21.906" ry="68.144"/>
-<path fill="#8B654B" d="M342.916,373.455c0,7.812-14.979,12.535-27.273,12.535c-12.293,0-27.81-4.736-27.81-12.549
-	c3.432-3.433,15.246,4.885,27.544,4.885C334.789,378.326,342.916,312.496,342.916,373.455z"/>
-<path fill="#D9AF82" d="M335.697,435.216c0,37.637-9.81,68.832-21.91,68.832c-12.096,0-21.899-31.195-21.899-68.832
-	c0-37.639,9.882-50.258,21.977-50.258C325.962,384.958,335.697,397.578,335.697,435.216z"/>
-<path opacity="0.36" fill="#8A644B" enable-background="new    " d="M328.365,281.605c-1.826,24.682-14.186-7.573-34.757,20.975
-	c-8.672,12.025-23.23,10.877-38.845,10.877c-39.61,0-66.544-26.031-67.859-38.869c-2.517-24.557,29.024-39.586,71.464-39.586
+<path fill="#8B654B" d="M342.916,373.454c0,7.813-14.98,12.535-27.275,12.535c-12.293,0-27.808-4.735-27.808-12.549
+	c3.43-3.43,15.246,4.886,27.544,4.886C334.789,378.326,342.916,312.495,342.916,373.454z"/>
+<path fill="#D9AF82" d="M335.697,435.217c0,37.637-9.81,68.831-21.91,68.831c-12.096,0-21.901-31.194-21.901-68.831
+	c0-37.639,9.882-50.259,21.977-50.259C325.962,384.958,335.697,397.578,335.697,435.217z"/>
+<path opacity="0.36" fill="#8A644B" d="M328.365,281.605c-1.826,24.681-14.186-7.573-34.757,20.974
+	c-8.672,12.026-23.23,10.877-38.845,10.877c-39.61,0-66.544-26.03-67.859-38.868c-2.517-24.557,29.024-39.586,71.464-39.586
 	C297.028,235.002,329.255,269.622,328.365,281.605z"/>
-<linearGradient id="SVGID_12_" gradientUnits="userSpaceOnUse" x1="-644.0354" y1="340.7031" x2="-568.3508" y2="340.7031" gradientTransform="matrix(1 0 0 1 858.79 0.3506)">
+<linearGradient id="SVGID_12_" gradientUnits="userSpaceOnUse" x1="214.7554" y1="341.0537" x2="290.4385" y2="341.0537">
 	<stop  offset="0" style="stop-color:#D9AF82"/>
 	<stop  offset="0.0786" style="stop-color:#DFB791"/>
 	<stop  offset="0.2053" style="stop-color:#E7C1A5"/>
@@ -201,38 +199,40 @@
 	<stop  offset="0.6917" style="stop-color:#F4D3C7"/>
 	<stop  offset="1" style="stop-color:#F5D4C9"/>
 </linearGradient>
-<path opacity="0.36" fill="url(#SVGID_12_)" enable-background="new    " d="M272.246,361.529
-	c-28.722,19.461-56.346-24.299-57.491-43.314c15.913,13.822,62.032,18.457,75.685-2.516L272.246,361.529z"/>
-<path opacity="0.36" fill="#8A644B" enable-background="new    " d="M313.706,461.212c-38.167,0-61.229-13.68-61.229-31.629
-	c0-6.049,15.649-24.078,37.318-49.365c5.952-3.699,7.464,10.037,14.958,4.73C331.61,392.044,328.318,461.212,313.706,461.212z"/>
+<path opacity="0.36" fill="url(#SVGID_12_)" d="M272.246,361.529c-28.722,19.46-56.346-24.299-57.491-43.314
+	c15.913,13.821,62.032,18.457,75.683-2.517L272.246,361.529z"/>
+<path opacity="0.36" fill="#8A644B" d="M313.706,461.213c-38.167,0-61.231-13.681-61.231-31.63c0-6.048,15.651-24.078,37.32-49.365
+	c5.952-3.699,7.464,10.038,14.958,4.731C331.61,392.044,328.318,461.213,313.706,461.213z"/>
 <g>
-	<path fill="#8A644B" d="M260.464,472.117c8.341,23.938,32.817,36.465,52.688,36.465v-4.844
-		C294.99,503.738,268.056,493.921,260.464,472.117L260.464,472.117z"/>
+	<path fill="#8A644B" d="M260.464,472.116c8.339,23.94,32.817,36.466,52.688,36.466v-4.845
+		C294.99,503.737,268.056,493.921,260.464,472.116L260.464,472.116z"/>
 </g>
 <g>
-	<path fill="#8A644B" d="M180.954,271.658c0,21.359,5.388,36.679,27.101,48.222c0.587,1.121,7.021,13.387,7.021,13.387
-		c8.916,16.375,19.021,34.939,19.021,54.406h4.844c0-20.699-10.416-39.84-19.612-56.725l-7.586-14.455l-0.709-0.426
-		C190.51,305.4,180.954,291.289,180.954,271.658L180.954,271.658z"/>
+	<path fill="#8A644B" d="M180.954,271.658c0,21.359,5.388,36.679,27.099,48.222c0.587,1.121,7.021,13.387,7.021,13.387
+		c8.916,16.375,19.02,34.94,19.02,54.406h4.844c0-20.699-10.416-39.839-19.612-56.725l-7.586-14.455l-0.709-0.426
+		C190.509,305.4,180.954,291.289,180.954,271.658L180.954,271.658z"/>
 </g>
 <g>
-	<path fill="#010101" d="M208.814,230.649l-0.104-0.97c-3.106-15.25-3.226-33.651-0.312-49.217l-4.764-0.889
+	<path fill="#010101" d="M208.814,230.649l-0.104-0.97c-3.108-15.25-3.226-33.651-0.312-49.217l-4.764-0.889
 		C200.613,195.722,205.583,214.815,208.814,230.649z"/>
 </g>
-<linearGradient id="SVGID_13_" gradientUnits="userSpaceOnUse" x1="-667.7327" y1="310.1709" x2="-407.218" y2="310.1709" gradientTransform="matrix(1 0 0 1 858.79 0.3506)">
+<linearGradient id="SVGID_13_" gradientUnits="userSpaceOnUse" x1="191.0591" y1="310.5205" x2="451.5771" y2="310.5205">
 	<stop  offset="0" style="stop-color:#5B3E1D"/>
 	<stop  offset="1" style="stop-color:#010101"/>
 </linearGradient>
-<path fill="url(#SVGID_13_)" d="M423.943,199.054c-3.983-11.059-0.737-20.853-8.062-31.231
-	c-19.885-28.185-51.07-56.271-108.998-52.618l5.214,140.363c0,0-122.733-25.589-121.021,15.935c0.229,5.387,40.188,2.88,63.46,4.428
-	c-26.092,4.566-32.185,5.898-32.185,8.838c0,6.206,21.861,0.683,25.106,2.467c4.978,2.739-43.139,7.052-34.351,8.757
-	c10.057,1.951,44.474,3.086,57.442,3.086c28.931,0,41.077-25.413,41.077-4.485c7.348,27.894,14.739,59.239,13.974,69.882
-	c-1.477,20.661-19.62,20.188-19.62,20.188l5.089,24.285c-8.557,0.438-6.245-1.324-13.85-0.549c-14.429,0-32.354,13.03-32.354,16.055
-	l39.989,0.434c0,0-29.081,13.771-22.977,22.931c4.765,7.143,20.316,13.377,31.093,13.424c0,0,3.271,8.549,3.271,22.352
-	c0,13.812-4.035,22.564-4.035,22.564c46.171,0,67.49-49.035,80.324-118.445c6.083-32.877,20.018-58.104,36.034-71.658
-	c15.742-13.319,23.008-26.64,23.008-52.07C451.577,249.847,443.574,230.354,423.943,199.054z"/>
-<path fill="#D9AF82" d="M325.395,252.416l-13.297,4.328c0,0-65.85-96.356-46.493-121.312c12.682-16.357,24.609-18.136,40.046-19.238
-	c13.519-0.965,21.294,16.525,27.302,24.271C350.375,162.927,325.395,252.416,325.395,252.416z"/>
-<linearGradient id="SVGID_14_" gradientUnits="userSpaceOnUse" x1="-629.0159" y1="50.6562" x2="-540.175" y2="50.6562" gradientTransform="matrix(0.676 0.6564 -0.9247 0.9523 711.8302 511.1852)">
+<path fill="url(#SVGID_13_)" d="M423.943,199.054c-3.983-11.059-0.737-20.853-8.061-31.231
+	c-19.885-28.185-51.072-56.27-108.998-52.618l5.212,140.363c0,0-122.733-25.589-121.021,15.935c0.227,5.387,40.188,2.88,63.46,4.428
+	c-26.092,4.566-32.185,5.898-32.185,8.838c0,6.206,21.863,0.683,25.108,2.467c4.976,2.739-43.139,7.052-34.351,8.757
+	c10.057,1.951,44.474,3.086,57.444,3.086c28.929,0,41.077-25.412,41.077-4.485c7.346,27.893,14.739,59.24,13.972,69.882
+	c-1.475,20.662-19.62,20.188-19.62,20.188l5.089,24.285c-8.557,0.439-6.245-1.324-13.85-0.549
+	c-14.427,0-32.354,13.032-32.354,16.054l39.989,0.435c0,0-29.081,13.771-22.975,22.928c4.763,7.143,20.316,13.378,31.091,13.424
+	c0,0,3.273,8.55,3.273,22.352c0,13.811-4.035,22.565-4.035,22.565c46.171,0,67.49-49.036,80.324-118.446
+	c6.083-32.876,20.018-58.106,36.034-71.657c15.742-13.321,23.008-26.641,23.008-52.071
+	C451.577,249.847,443.574,230.354,423.943,199.054z"/>
+<path fill="#D9AF82" d="M325.395,252.416l-13.297,4.328c0,0-65.848-96.356-46.493-121.312
+	c12.682-16.357,24.611-18.136,40.046-19.238c13.519-0.965,21.294,16.525,27.302,24.271
+	C350.375,162.927,325.395,252.416,325.395,252.416z"/>
+<linearGradient id="SVGID_14_" gradientUnits="userSpaceOnUse" x1="260.7119" y1="113.4033" x2="349.5527" y2="113.4033" gradientTransform="matrix(0.676 0.6564 -0.9247 0.9523 168.3961 -132.5865)">
 	<stop  offset="0" style="stop-color:#FFFFFF"/>
 	<stop  offset="0.0769" style="stop-color:#F4E9DD"/>
 	<stop  offset="0.1814" style="stop-color:#EBD6BF"/>
@@ -242,10 +242,10 @@
 	<stop  offset="0.7265" style="stop-color:#DAB084"/>
 	<stop  offset="1" style="stop-color:#D9AF82"/>
 </linearGradient>
-<path fill="url(#SVGID_14_)" d="M305.253,199.27c-26.745,27.542-70.168,41.961-81.281,24.357
-	c-14.515-22.972-12.896-47.545,13.854-75.082c26.74-27.547,64.922-33.847,85.28-14.081
+<path fill="url(#SVGID_14_)" d="M305.253,199.27c-26.745,27.542-70.168,41.961-81.283,24.357
+	c-14.513-22.972-12.896-47.545,13.854-75.082c26.74-27.547,64.922-33.847,85.28-14.081
 	C343.464,154.233,332.003,171.726,305.253,199.27z"/>
-<linearGradient id="SVGID_15_" gradientUnits="userSpaceOnUse" x1="-617.7107" y1="401.4551" x2="-617.7107" y2="317.8633" gradientTransform="matrix(1 0 0 1 858.79 0.3506)">
+<linearGradient id="SVGID_15_" gradientUnits="userSpaceOnUse" x1="241.0796" y1="401.8057" x2="241.0796" y2="318.2148">
 	<stop  offset="0" style="stop-color:#D9AF82"/>
 	<stop  offset="0.1127" style="stop-color:#BD936E"/>
 	<stop  offset="0.2679" style="stop-color:#A57C5E"/>
@@ -253,29 +253,27 @@
 	<stop  offset="0.6554" style="stop-color:#8D664D"/>
 	<stop  offset="1" style="stop-color:#8A644B"/>
 </linearGradient>
-<path fill="url(#SVGID_15_)" d="M272.246,361.529c0,46.272-35.419,42.799-45.104,36.896c0-45.752-17.229-80.211-17.229-80.211
-	S249.882,354.22,272.246,361.529z"/>
-<linearGradient id="SVGID_16_" gradientUnits="userSpaceOnUse" x1="-925.8547" y1="344.666" x2="-972.7458" y2="361.7328" gradientTransform="matrix(-1 0 0 1 -562.3931 0.3506)">
+<path fill="url(#SVGID_15_)" d="M272.246,361.529c0,46.274-35.419,42.799-45.106,36.896c0-45.751-17.227-80.21-17.227-80.21
+	S249.882,354.221,272.246,361.529z"/>
+<linearGradient id="SVGID_16_" gradientUnits="userSpaceOnUse" x1="175.4648" y1="345.0176" x2="128.5757" y2="362.0838" gradientTransform="matrix(-1 0 0 1 538.9277 0)">
 	<stop  offset="0" style="stop-color:#382815"/>
 	<stop  offset="0.4081" style="stop-color:#553E2B"/>
 	<stop  offset="1" style="stop-color:#8B654B"/>
 </linearGradient>
-<path fill="url(#SVGID_16_)" d="M359.338,356.349c0,46.271,21.506,44.033,31.073,44.033c7.488-45.135,35.671-81.516,35.671-81.516
-	S381.703,349.044,359.338,356.349z"/>
+<path fill="url(#SVGID_16_)" d="M359.338,356.35c0,46.27,21.504,44.032,31.073,44.032c7.488-45.135,35.671-81.515,35.671-81.515
+	S381.703,349.045,359.338,356.35z"/>
 <path fill="none" stroke="#010101" stroke-width="4.8437" d="M173.934,294.978"/>
 <g>
-	<path fill="#010101" d="M311.507,115.089c53.106,0,83.247,20.214,107.505,65.948c0.902,1.702,0.902,4.883,0.902,7.96
-		c-0.005,4.146-0.005,8.432,2.029,11.419c16.157,23.757,31.934,48.809,31.934,70.969c0,32.38-12.817,62.458-37.073,86.969
-		l-0.541,0.551l-0.13,0.748c-12.222,71.897-36.672,150.451-103.765,150.451v1.518c70.499,0,95.847-76.844,108.416-150.455
-		c24.803-25.336,37.937-56.355,37.937-89.781c0-23.537-16.19-49.311-32.774-73.694c-1.151-1.698-1.19-5.061-1.19-8.37
-		c0-0.109,0.004-0.537,0.004-0.646c0-3.567-0.041-7.221-1.471-9.91C398.053,131.18,366.71,112.64,311.51,112.64v2.449H311.507
-		L311.507,115.089z"/>
+	<path fill="#010101" d="M311.507,115.089c53.106,0,83.247,20.214,107.503,65.948c0.904,1.702,0.904,4.883,0.904,7.96
+		c-0.005,4.146-0.005,8.432,2.029,11.419c16.157,23.757,31.933,48.809,31.933,70.969c0,32.381-12.818,62.458-37.074,86.969
+		l-0.541,0.549l-0.128,0.748c-12.222,71.899-36.672,150.453-103.765,150.453v1.517c70.499,0,95.847-76.845,108.416-150.456
+		c24.801-25.335,37.935-56.354,37.935-89.78c0-23.537-16.19-49.311-32.774-73.694c-1.153-1.698-1.192-5.061-1.192-8.37
+		c0-0.109,0.004-0.537,0.004-0.646c0-3.567-0.041-7.221-1.469-9.91c-25.237-47.585-56.579-66.125-111.78-66.125V115.089z"/>
 </g>
 <polygon fill="#010101" points="339.974,84.79 334.59,115.675 300.608,113.719 312.435,66.413 "/>
 <circle fill="#010101" stroke="#010101" stroke-width="4.8437" cx="452.06" cy="492.948" r="19.204"/>
 <g>
-	
-		<linearGradient id="SVGID_17_" gradientUnits="userSpaceOnUse" x1="-749.6116" y1="335.9512" x2="-687.9983" y2="335.9512" gradientTransform="matrix(1 0 0 1 858.79 0.3506)">
+	<linearGradient id="SVGID_17_" gradientUnits="userSpaceOnUse" x1="109.1782" y1="336.3027" x2="170.7935" y2="336.3027">
 		<stop  offset="0" style="stop-color:#571A54"/>
 		<stop  offset="0.2641" style="stop-color:#7C5378"/>
 		<stop  offset="0.528" style="stop-color:#A78AA3"/>
@@ -283,10 +281,10 @@
 		<stop  offset="0.9095" style="stop-color:#EAE1E8"/>
 		<stop  offset="1" style="stop-color:#F9F3F8"/>
 	</linearGradient>
-	<path fill="url(#SVGID_17_)" d="M109.178,338.035c9.592-7.824,34.694,4.861,34.833,4.861l26.78-8.396
-		C170.211,334.501,120.246,321.648,109.178,338.035z"/>
+	<path fill="url(#SVGID_17_)" d="M109.178,338.034c9.592-7.823,34.696,4.862,34.833,4.862l26.782-8.396
+		C170.211,334.501,120.246,321.648,109.178,338.034z"/>
 </g>
-<linearGradient id="SVGID_18_" gradientUnits="userSpaceOnUse" x1="-1081.0227" y1="320.6133" x2="-1063.3801" y2="320.6133" gradientTransform="matrix(-0.0113 -0.7169 1.2476 -0.0198 -98.6661 -397.1379)">
+<linearGradient id="SVGID_18_" gradientUnits="userSpaceOnUse" x1="-102.0645" y1="221.0444" x2="-84.4219" y2="221.0444" gradientTransform="matrix(-0.0113 -0.7169 1.2476 -0.0198 36.6184 302.7065)">
 	<stop  offset="0" style="stop-color:#D9AF82"/>
 	<stop  offset="0.0786" style="stop-color:#DFB791"/>
 	<stop  offset="0.2053" style="stop-color:#E7C1A5"/>
@@ -295,10 +293,10 @@
 	<stop  offset="0.6917" style="stop-color:#F4D3C7"/>
 	<stop  offset="1" style="stop-color:#F5D4C9"/>
 </linearGradient>
-<path opacity="0.36" fill="url(#SVGID_18_)" enable-background="new    " d="M313.352,358.851c6.074-0.1,11.045,2.654,11.102,6.15
-	c0.06,3.49-4.829,6.398-10.907,6.498c-6.076,0.1-11.045-2.658-11.105-6.154C302.388,361.853,307.269,358.947,313.352,358.851z"/>
-<path fill="#483218" d="M397.109,309.378c15.699-3.76,26.445-18.402,20.099-27.063c-38.738,19.354-75.295,11.369-85.529,9.147
+<path opacity="0.36" fill="url(#SVGID_18_)" d="M313.352,358.852c6.074-0.1,11.045,2.653,11.102,6.149
+	c0.058,3.49-4.829,6.399-10.907,6.498c-6.078,0.101-11.045-2.657-11.107-6.153C302.388,361.854,307.269,358.946,313.352,358.852z"/>
+<path fill="#483218" d="M397.109,309.378c15.699-3.759,26.445-18.402,20.099-27.063c-38.74,19.354-75.295,11.369-85.531,9.147
 	C368.014,309.492,371.117,315.595,397.109,309.378z"/>
-<path fill="#B4B4B4" d="M310.92,73.714c-38.372,0-93.116,22.758-117.549,74.944c-6.089,12.999-6.656,32.87,0.64,45.014
-	c0,0,18.604-81.43,108.229-86.494"/>
+<path fill="#B4B4B4" d="M310.92,73.714c-38.372,0-93.118,22.758-117.549,74.944c-6.089,12.999-6.656,32.87,0.638,45.014
+	c0,0,18.604-81.43,108.231-86.494"/>
 </svg>