mirror of https://git.wownero.com/dsc/mxe.git
commit
c6d6a4aff0
|
@ -165,28 +165,6 @@ index 1111111..2222222 100644
|
||||||
QSqlQuery set_fts_tokenizer(db);
|
QSqlQuery set_fts_tokenizer(db);
|
||||||
set_fts_tokenizer.prepare("SELECT fts3_tokenizer(:name, :pointer)");
|
set_fts_tokenizer.prepare("SELECT fts3_tokenizer(:name, :pointer)");
|
||||||
set_fts_tokenizer.bindValue(":name", "unicode");
|
set_fts_tokenizer.bindValue(":name", "unicode");
|
||||||
|
|
||||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Krzysztof Sobiecki <sobkas@gmail.com>
|
|
||||||
Date: Sun, 9 Jul 2017 19:05:14 +0200
|
|
||||||
Subject: [PATCH 3/4] Fix build in src/ui/
|
|
||||||
|
|
||||||
It looks like there is a problem with build of src/ui/appearancesettingspage.cpp
|
|
||||||
It might fix it.
|
|
||||||
https://github.com/clementine-player/Clementine/pull/5784
|
|
||||||
|
|
||||||
diff --git a/src/ui/appearancesettingspage.cpp b/src/ui/appearancesettingspage.cpp
|
|
||||||
index 1111111..2222222 100644
|
|
||||||
--- a/src/ui/appearancesettingspage.cpp
|
|
||||||
+++ b/src/ui/appearancesettingspage.cpp
|
|
||||||
@@ -81,7 +81,7 @@ AppearanceSettingsPage::AppearanceSettingsPage(SettingsDialog* dialog)
|
|
||||||
connect(ui_->use_no_background, SIGNAL(toggled(bool)),
|
|
||||||
SLOT(DisableBlurAndOpacitySliders(bool)));
|
|
||||||
#if !defined (Q_OS_UNIX) || defined (Q_OS_MACOS)
|
|
||||||
- ui_->sys_icons->setDisabled(true);
|
|
||||||
+ ui_->b_use_sys_icons->setDisabled(true);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
|
|
@ -0,0 +1,9 @@
|
||||||
|
diff -ruN clementine-player-Clementine-4619a4c.orig/3rdparty/libmygpo-qt5/src/CMakeLists.txt clementine-player-Clementine-4619a4c/3rdparty/libmygpo-qt5/src/CMakeLists.txt
|
||||||
|
--- clementine-player-Clementine-4619a4c.orig/3rdparty/libmygpo-qt5/src/CMakeLists.txt 2018-05-23 15:23:21.000000000 +0200
|
||||||
|
+++ clementine-player-Clementine-4619a4c/3rdparty/libmygpo-qt5/src/CMakeLists.txt 2018-06-07 21:27:00.817420485 +0200
|
||||||
|
@@ -86,4 +86,4 @@
|
||||||
|
add_library( ${MYGPO_QT_TARGET_NAME} STATIC ${LIBMYGPO_QT_SRC} ${LIBMYGPO_QT_MOC_SRC} )
|
||||||
|
|
||||||
|
target_link_libraries( ${MYGPO_QT_TARGET_NAME} ${QJSON_LIBRARIES} ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY} )
|
||||||
|
-qt5_use_modules( ${MYGPO_QT_TARGET_NAME} Core Network )
|
||||||
|
+target_link_libraries( ${MYGPO_QT_TARGET_NAME} Qt5::Core Qt5::Network )
|
|
@ -2,8 +2,8 @@
|
||||||
|
|
||||||
PKG := clementine
|
PKG := clementine
|
||||||
$(PKG)_IGNORE :=
|
$(PKG)_IGNORE :=
|
||||||
$(PKG)_VERSION := fbc2f78
|
$(PKG)_VERSION := 4619a4c
|
||||||
$(PKG)_CHECKSUM := b36dc3f24366aabd591e83998b0d437f13755eae62cff4d8a2833c5995bc2f0f
|
$(PKG)_CHECKSUM := 332e834438b151f8614a3e70c9df77a0bdc57d372353d03ea6f604d396224e61
|
||||||
$(PKG)_GH_CONF := clementine-player/Clementine/branches/qt5
|
$(PKG)_GH_CONF := clementine-player/Clementine/branches/qt5
|
||||||
$(PKG)_WEBSITE := https://www.clementine-player.org/
|
$(PKG)_WEBSITE := https://www.clementine-player.org/
|
||||||
$(PKG)_OWNER := https://github.com/pavelvat
|
$(PKG)_OWNER := https://github.com/pavelvat
|
||||||
|
@ -30,7 +30,7 @@ define $(PKG)_BUILD
|
||||||
$(INSTALL) '$(PREFIX)/$(TARGET)/bin/gstreamer-1.0/libgstautodetect.dll' '$(PREFIX)/$(TARGET)/apps/$(PKG)/bin/gstreamer-plugins'
|
$(INSTALL) '$(PREFIX)/$(TARGET)/bin/gstreamer-1.0/libgstautodetect.dll' '$(PREFIX)/$(TARGET)/apps/$(PKG)/bin/gstreamer-plugins'
|
||||||
$(INSTALL) '$(PREFIX)/$(TARGET)/bin/gstreamer-1.0/libgstcdio.dll' '$(PREFIX)/$(TARGET)/apps/$(PKG)/bin/gstreamer-plugins'
|
$(INSTALL) '$(PREFIX)/$(TARGET)/bin/gstreamer-1.0/libgstcdio.dll' '$(PREFIX)/$(TARGET)/apps/$(PKG)/bin/gstreamer-plugins'
|
||||||
$(INSTALL) '$(PREFIX)/$(TARGET)/bin/gstreamer-1.0/libgstcoreelements.dll' '$(PREFIX)/$(TARGET)/apps/$(PKG)/bin/gstreamer-plugins'
|
$(INSTALL) '$(PREFIX)/$(TARGET)/bin/gstreamer-1.0/libgstcoreelements.dll' '$(PREFIX)/$(TARGET)/apps/$(PKG)/bin/gstreamer-plugins'
|
||||||
$(INSTALL) '$(PREFIX)/$(TARGET)/bin/gstreamer-1.0/libgstdirectsoundsink.dll' '$(PREFIX)/$(TARGET)/apps/$(PKG)/bin/gstreamer-plugins'
|
$(INSTALL) '$(PREFIX)/$(TARGET)/bin/gstreamer-1.0/libgstdirectsound.dll' '$(PREFIX)/$(TARGET)/apps/$(PKG)/bin/gstreamer-plugins'
|
||||||
$(INSTALL) '$(PREFIX)/$(TARGET)/bin/gstreamer-1.0/libgstequalizer.dll' '$(PREFIX)/$(TARGET)/apps/$(PKG)/bin/gstreamer-plugins'
|
$(INSTALL) '$(PREFIX)/$(TARGET)/bin/gstreamer-1.0/libgstequalizer.dll' '$(PREFIX)/$(TARGET)/apps/$(PKG)/bin/gstreamer-plugins'
|
||||||
$(INSTALL) '$(PREFIX)/$(TARGET)/bin/gstreamer-1.0/libgstfaad.dll' '$(PREFIX)/$(TARGET)/apps/$(PKG)/bin/gstreamer-plugins'
|
$(INSTALL) '$(PREFIX)/$(TARGET)/bin/gstreamer-1.0/libgstfaad.dll' '$(PREFIX)/$(TARGET)/apps/$(PKG)/bin/gstreamer-plugins'
|
||||||
$(INSTALL) '$(PREFIX)/$(TARGET)/bin/gstreamer-1.0/libgstflac.dll' '$(PREFIX)/$(TARGET)/apps/$(PKG)/bin/gstreamer-plugins'
|
$(INSTALL) '$(PREFIX)/$(TARGET)/bin/gstreamer-1.0/libgstflac.dll' '$(PREFIX)/$(TARGET)/apps/$(PKG)/bin/gstreamer-plugins'
|
||||||
|
|
|
@ -47,34 +47,6 @@ index 1111111..2222222 100644
|
||||||
)
|
)
|
||||||
|
|
||||||
add_library(tinysvcmdns STATIC
|
add_library(tinysvcmdns STATIC
|
||||||
diff --git a/ext/clementine-tagreader/CMakeLists.txt b/ext/clementine-tagreader/CMakeLists.txt
|
|
||||||
index 1111111..2222222 100644
|
|
||||||
--- a/ext/clementine-tagreader/CMakeLists.txt
|
|
||||||
+++ b/ext/clementine-tagreader/CMakeLists.txt
|
|
||||||
@@ -27,10 +27,10 @@ add_executable(clementine-tagreader
|
|
||||||
|
|
||||||
target_link_libraries(clementine-tagreader
|
|
||||||
${TAGLIB_LIBRARIES}
|
|
||||||
- ${QT_QTCORE_LIBRARY}
|
|
||||||
- ${QT_QTNETWORK_LIBRARY}
|
|
||||||
libclementine-common
|
|
||||||
libclementine-tagreader
|
|
||||||
+ ${QT_QTCORE_LIBRARY}
|
|
||||||
+ ${QT_QTNETWORK_LIBRARY}
|
|
||||||
)
|
|
||||||
|
|
||||||
if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
|
|
||||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
|
||||||
index 1111111..2222222 100644
|
|
||||||
--- a/src/CMakeLists.txt
|
|
||||||
+++ b/src/CMakeLists.txt
|
|
||||||
@@ -1343,6 +1343,7 @@ if (WIN32)
|
|
||||||
tinysvcmdns
|
|
||||||
qtwin
|
|
||||||
dsound
|
|
||||||
+ ${QT_QTGUI_LIBRARY}
|
|
||||||
)
|
|
||||||
endif (WIN32)
|
|
||||||
|
|
||||||
|
|
||||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
|
|
@ -10,9 +10,9 @@
|
||||||
|
|
||||||
PKG := clementine_qt4
|
PKG := clementine_qt4
|
||||||
$(PKG)_IGNORE :=
|
$(PKG)_IGNORE :=
|
||||||
$(PKG)_VERSION := 1.3.1
|
$(PKG)_VERSION := 925e74f
|
||||||
$(PKG)_CHECKSUM := f885931a9ab7c88607d07b50c64fcce46fc05f13dd2c0a04188c94eff938f37c
|
$(PKG)_CHECKSUM := 9da96ca2dc8adbba9dc9b6921def258a18d8c004eebacb897369b7821ec0c320
|
||||||
$(PKG)_GH_CONF := clementine-player/Clementine/tags
|
$(PKG)_GH_CONF := clementine-player/Clementine/branches/master
|
||||||
$(PKG)_WEBSITE := https://www.clementine-player.org/
|
$(PKG)_WEBSITE := https://www.clementine-player.org/
|
||||||
$(PKG)_OWNER := https://github.com/pavelvat
|
$(PKG)_OWNER := https://github.com/pavelvat
|
||||||
$(PKG)_DEPS := cc boost chromaprint cryptopp fftw glew gst-libav gst-plugins-bad \
|
$(PKG)_DEPS := cc boost chromaprint cryptopp fftw glew gst-libav gst-plugins-bad \
|
||||||
|
@ -38,7 +38,7 @@ define $(PKG)_BUILD
|
||||||
$(INSTALL) '$(PREFIX)/$(TARGET)/bin/gstreamer-1.0/libgstautodetect.dll' '$(PREFIX)/$(TARGET)/apps/$(PKG)/bin/gstreamer-plugins'
|
$(INSTALL) '$(PREFIX)/$(TARGET)/bin/gstreamer-1.0/libgstautodetect.dll' '$(PREFIX)/$(TARGET)/apps/$(PKG)/bin/gstreamer-plugins'
|
||||||
$(INSTALL) '$(PREFIX)/$(TARGET)/bin/gstreamer-1.0/libgstcdio.dll' '$(PREFIX)/$(TARGET)/apps/$(PKG)/bin/gstreamer-plugins'
|
$(INSTALL) '$(PREFIX)/$(TARGET)/bin/gstreamer-1.0/libgstcdio.dll' '$(PREFIX)/$(TARGET)/apps/$(PKG)/bin/gstreamer-plugins'
|
||||||
$(INSTALL) '$(PREFIX)/$(TARGET)/bin/gstreamer-1.0/libgstcoreelements.dll' '$(PREFIX)/$(TARGET)/apps/$(PKG)/bin/gstreamer-plugins'
|
$(INSTALL) '$(PREFIX)/$(TARGET)/bin/gstreamer-1.0/libgstcoreelements.dll' '$(PREFIX)/$(TARGET)/apps/$(PKG)/bin/gstreamer-plugins'
|
||||||
$(INSTALL) '$(PREFIX)/$(TARGET)/bin/gstreamer-1.0/libgstdirectsoundsink.dll' '$(PREFIX)/$(TARGET)/apps/$(PKG)/bin/gstreamer-plugins'
|
$(INSTALL) '$(PREFIX)/$(TARGET)/bin/gstreamer-1.0/libgstdirectsound.dll' '$(PREFIX)/$(TARGET)/apps/$(PKG)/bin/gstreamer-plugins'
|
||||||
$(INSTALL) '$(PREFIX)/$(TARGET)/bin/gstreamer-1.0/libgstequalizer.dll' '$(PREFIX)/$(TARGET)/apps/$(PKG)/bin/gstreamer-plugins'
|
$(INSTALL) '$(PREFIX)/$(TARGET)/bin/gstreamer-1.0/libgstequalizer.dll' '$(PREFIX)/$(TARGET)/apps/$(PKG)/bin/gstreamer-plugins'
|
||||||
$(INSTALL) '$(PREFIX)/$(TARGET)/bin/gstreamer-1.0/libgstfaad.dll' '$(PREFIX)/$(TARGET)/apps/$(PKG)/bin/gstreamer-plugins'
|
$(INSTALL) '$(PREFIX)/$(TARGET)/bin/gstreamer-1.0/libgstfaad.dll' '$(PREFIX)/$(TARGET)/apps/$(PKG)/bin/gstreamer-plugins'
|
||||||
$(INSTALL) '$(PREFIX)/$(TARGET)/bin/gstreamer-1.0/libgstflac.dll' '$(PREFIX)/$(TARGET)/apps/$(PKG)/bin/gstreamer-plugins'
|
$(INSTALL) '$(PREFIX)/$(TARGET)/bin/gstreamer-1.0/libgstflac.dll' '$(PREFIX)/$(TARGET)/apps/$(PKG)/bin/gstreamer-plugins'
|
||||||
|
|
Loading…
Reference in New Issue