mirror of
https://abf.rosa.ru/djam/retroshare-qt5.git
synced 2025-02-23 16:42:53 +00:00
Update to 0.6.4
This commit is contained in:
User
parent
13f2cb3091
commit
36c8914b93
5 changed files with 88 additions and 64 deletions
4
.abf.yml
4
.abf.yml
|
|
@ -1,2 +1,4 @@
|
|||
sources:
|
||||
removed_sources:
|
||||
RetroShare-0.6.2.tar.gz: 633308bd636a4d3b3615b1ccede3a654145045ad
|
||||
sources:
|
||||
RetroShare-0.6.4.tar.gz: 81bba3753d4a6039e89c9ec11f0abd4c2975e8f5
|
||||
|
|
|
|||
|
|
@ -1,33 +1,44 @@
|
|||
*** retroshare-gui/src/retroshare-gui.pro 2017-03-17 16:29:23.000000000 +0300
|
||||
--- retroshare-gui/src/retroshare-gui.pro.orig 2017-03-10 17:57:40.000000000 +0300
|
||||
*** retroshare-gui/src/retroshare-gui.pro.orig 2018-05-09 09:05:41.000000000 +0300
|
||||
--- retroshare-gui/src/retroshare-gui.pro 2018-05-09 09:13:41.000000000 +0300
|
||||
***************
|
||||
*** 4,10 ****
|
||||
QT += network xml
|
||||
*** 5,11 ****
|
||||
CONFIG += qt gui uic qrc resources idle bitdht
|
||||
CONFIG += link_prl
|
||||
CONFIG += console
|
||||
! TARGET = retroshare
|
||||
DEFINES += TARGET=\\\"$${TARGET}\\\"
|
||||
|
||||
# Plz never commit the .pro with these flags enabled.
|
||||
--- 5,11 ----
|
||||
CONFIG += qt gui uic qrc resources idle bitdht
|
||||
CONFIG += link_prl
|
||||
CONFIG += console
|
||||
! TARGET = retroshare-qt5
|
||||
DEFINES += TARGET=\\\"$TARGET\\\"
|
||||
|
||||
# Plz never commit the .pro with these flags enabled.
|
||||
--- 4,10 ----
|
||||
QT += network xml
|
||||
CONFIG += qt gui uic qrc resources idle bitdht
|
||||
CONFIG += link_prl
|
||||
! TARGET = RetroShare06
|
||||
DEFINES += TARGET=\\\"$TARGET\\\"
|
||||
DEFINES += TARGET=\\\"$${TARGET}\\\"
|
||||
|
||||
# Plz never commit the .pro with these flags enabled.
|
||||
***************
|
||||
*** 101,108 ****
|
||||
--- 101,111 ----
|
||||
*** 109,119 ****
|
||||
INSTALLS += icon_files
|
||||
|
||||
desktop_files.path = "$${PREFIX}/share/applications"
|
||||
+ desktop_files.files = ../../data/retroshare06.desktop
|
||||
! desktop_files.files = ../../data/retroshare.desktop
|
||||
INSTALLS += desktop_files
|
||||
+
|
||||
|
||||
pixmap_files.path = "$${PREFIX}/share/pixmaps"
|
||||
+ pixmap_files.files = ../../data/retroshare06.xpm
|
||||
! pixmap_files.files = ../../data/retroshare.xpm
|
||||
INSTALLS += pixmap_files
|
||||
|
||||
}
|
||||
--- 109,119 ----
|
||||
INSTALLS += icon_files
|
||||
|
||||
desktop_files.path = "$${PREFIX}/share/applications"
|
||||
! desktop_files.files = ../../data/retroshare-qt5.desktop
|
||||
INSTALLS += desktop_files
|
||||
|
||||
pixmap_files.path = "$${PREFIX}/share/pixmaps"
|
||||
! pixmap_files.files = ../../data/retroshare-qt5.xpm
|
||||
INSTALLS += pixmap_files
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
*** retroshare-nogui/src/retroshare-nogui.pro 2017-03-17 16:31:46.000000000 +0300
|
||||
--- retroshare-nogui/src/retroshare-nogui.pro.orig 2017-03-10 17:57:40.000000000 +0300
|
||||
*** retroshare-nogui/src/retroshare-nogui.pro.orig 2018-03-13 22:25:38.000000000 +0300
|
||||
--- retroshare-nogui/src/retroshare-nogui.pro 2018-05-09 09:16:08.000000000 +0300
|
||||
***************
|
||||
*** 1,7 ****
|
||||
!include("../../retroshare.pri"): error("Could not include file ../../retroshare.pri")
|
||||
|
||||
TEMPLATE = app
|
||||
! TARGET = retroshare-qt5-nogui
|
||||
! TARGET = retroshare-nogui
|
||||
CONFIG += bitdht
|
||||
#CONFIG += introserver
|
||||
CONFIG -= qt xml gui
|
||||
|
|
@ -13,7 +13,7 @@
|
|||
!include("../../retroshare.pri"): error("Could not include file ../../retroshare.pri")
|
||||
|
||||
TEMPLATE = app
|
||||
! TARGET = RetroShare06-nogui
|
||||
! TARGET = retroshare-nogui-qt5
|
||||
CONFIG += bitdht
|
||||
#CONFIG += introserver
|
||||
CONFIG -= qt xml gui
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
Summary: Secure decentralized communication platform
|
||||
Name: %{pkname}-%{suff}
|
||||
Version: 0.6.2
|
||||
Version: 0.6.4
|
||||
Release: 1
|
||||
License: GPLv2+
|
||||
Group: Networking/File transfer
|
||||
|
|
@ -20,9 +20,9 @@ Url: https://github.com/RetroShare/RetroShare
|
|||
Source0: https://github.com/RetroShare/RetroShare/archive/%{oname}-%{version}.tar.gz
|
||||
Source100: %{name}.rpmlintrc
|
||||
## patch delete all plugins
|
||||
%if !%{plugins}
|
||||
Patch0: %{oname}.pro.patch
|
||||
%endif
|
||||
#if !%{plugins}
|
||||
#Patch0: %{oname}.pro.patch
|
||||
#endif
|
||||
# patches renamed TARGET
|
||||
Patch1: %{pkname}-gui.pro.patch
|
||||
Patch2: %{pkname}-nogui.pro.patch
|
||||
|
|
@ -46,7 +46,7 @@ BuildRequires: pkgconfig(sqlcipher)
|
|||
BuildRequires: pkgconfig(libmicrohttpd)
|
||||
BuildRequires: pkgconfig(libavcodec)
|
||||
BuildRequires: pkgconfig(opencv)
|
||||
BuildRequires: qt5-qttools-examples
|
||||
BuildRequires: %{_lib}qt5uitools-devel
|
||||
BuildRequires: desktop-file-utils
|
||||
|
||||
%description
|
||||
|
|
@ -74,7 +74,7 @@ Clients exist for portable devices running e.g. Android.
|
|||
|
||||
%files nogui
|
||||
%doc LICENSE.txt
|
||||
%{_bindir}/%{name}-nogui
|
||||
%{_bindir}/%{pkname}-nogui-%{suff}
|
||||
|
||||
%if %{plugins}
|
||||
%package voip-plugin
|
||||
|
|
@ -93,7 +93,7 @@ need the plugin installed to be able to talk together.
|
|||
|
||||
%files voip-plugin
|
||||
%doc LICENSE.txt
|
||||
%{_libdir}/retroshare/extensions6/libVOIP.so*
|
||||
%{_libdir}/retroshare/extensions/libVOIP.so*
|
||||
|
||||
%package feedreader-plugin
|
||||
Summary: RetroShare FeedReader plugin
|
||||
|
|
@ -107,18 +107,18 @@ The plugin adds a RSS feed reader tab to retroshare.
|
|||
|
||||
%files feedreader-plugin
|
||||
%doc LICENSE.txt
|
||||
%{_libdir}/retroshare/extensions6/libFeedReader.so*
|
||||
%{_libdir}/retroshare/extensions/libFeedReader.so*
|
||||
|
||||
%endif
|
||||
|
||||
%prep
|
||||
%setup -qn %{oname}-%{version}
|
||||
%patch0 -p0
|
||||
%patch1 -R -p0
|
||||
%patch2 -R -p0
|
||||
%patch3 -p0
|
||||
#patch0 -p0
|
||||
%patch1 -p0
|
||||
%patch2 -p0
|
||||
#patch3 -p0
|
||||
|
||||
sed -i s,"/usr/lib/retroshare","%{_libdir}/retroshare-qt5",g libretroshare/src/rsserver/rsinit.cc
|
||||
#sed -i s,"/usr/lib/retroshare","%{_libdir}/retroshare-qt5",g libretroshare/src/rsserver/rsinit.cc
|
||||
|
||||
%build
|
||||
%global optflags %{optflags} -std=c++11
|
||||
|
|
@ -127,22 +127,28 @@ sed -i s,"/usr/lib/retroshare","%{_libdir}/retroshare-qt5",g libretroshare/src/r
|
|||
# RetroShare.pro
|
||||
|
||||
# build qt4 only
|
||||
%qmake_qt5 "CONFIG-=debug" "CONFIG+=release" PREFIX=%{_prefix} LIB_DIR=%{_libdir} \
|
||||
DATA_DIR=%{_datadir}/%{name} INC_DIR=%{_includedir}/%{pkname} "CONFIG-=retroshare_plugins" "CONFIG -= plugin" \
|
||||
#%qmake_qt5 "CONFIG-=debug" "CONFIG+=release" PREFIX=%{_prefix} LIB_DIR=%{_libdir} \
|
||||
# DATA_DIR=%{_datadir}/%{name} INC_DIR=%{_includedir}/%{pkname} "CONFIG-=retroshare_plugins" "CONFIG -= plugin" \
|
||||
# RetroShare.pro
|
||||
|
||||
qmake-qt5 "CONFIG-=debug" "CONFIG+=release" \
|
||||
PREFIX=%{_prefix} LIB_DIR=%{_libdir} \
|
||||
DATA_DIR=%{_datadir}/%{name} INC_DIR=%{_includedir}/%{name} \
|
||||
RetroShare.pro
|
||||
#CONFIG+=retroshare_plugins
|
||||
%make
|
||||
|
||||
%install
|
||||
make INSTALL_ROOT=$RPM_BUILD_ROOT install
|
||||
make INSTALL_ROOT=%{buildroot} install
|
||||
|
||||
# install menu entry
|
||||
mkdir -p %{buildroot}%{_datadir}/applications/
|
||||
cat > %{buildroot}%{_datadir}/applications/%{name}.desktop << EOF
|
||||
[Desktop Entry]
|
||||
Name=RetroShare
|
||||
Name=RetroShare-Qt5
|
||||
Comment=Secure decentralized communication platform
|
||||
Exec=%{name}
|
||||
Icon=%{name}
|
||||
Icon=%{pkname}
|
||||
Terminal=false
|
||||
Type=Application
|
||||
Categories=Network;FileTransfer;
|
||||
|
|
@ -150,14 +156,17 @@ MimeType=x-scheme-handler/retroshare;
|
|||
EOF
|
||||
|
||||
# install menu icons
|
||||
for N in 16 24 32 48 64 128;
|
||||
do
|
||||
convert data/retroshare06.xpm -scale ${N}x${N} $N.png;
|
||||
install -D -m 0644 $N.png %{buildroot}%{_iconsdir}/hicolor/${N}x${N}/apps/%{name}.png
|
||||
done
|
||||
#for N in 16 24 32 48 64 128;
|
||||
#do
|
||||
#convert data/retroshare06.xpm -scale ${N}x${N} $N.png;
|
||||
#install -D -m 0644 $N.png %{buildroot}%{_iconsdir}/hicolor/${N}x${N}/apps/%{name}.png
|
||||
#done
|
||||
#rm -f data/*.xpm data/*.desktop
|
||||
#cp -a data/ %{buildroot}%{_iconsdir}/hicolor/
|
||||
|
||||
|
||||
#clean stream icons retroshare06.png
|
||||
find %{buildroot}%{_iconsdir}/hicolor -name retroshare06.png -delete
|
||||
#find %{buildroot}%{_iconsdir}/hicolor -name retroshare06.png -delete
|
||||
find %{buildroot}%{_datadir}/%{name} -name *.sh -delete
|
||||
|
||||
|
||||
|
|
@ -165,7 +174,7 @@ find %{buildroot}%{_datadir}/%{name} -name *.sh -delete
|
|||
%doc LICENSE.txt README.md
|
||||
%{_bindir}/%{name}
|
||||
%{_datadir}/applications/%{name}.desktop
|
||||
%{_iconsdir}/hicolor/*/apps/%{name}.png
|
||||
%{_iconsdir}/hicolor/*/apps/%{pkname}.png
|
||||
%{_datadir}/%{name}
|
||||
|
||||
%changelog
|
||||
|
|
|
|||
|
|
@ -1,23 +1,25 @@
|
|||
*** retroshare.pri.orig 2017-03-10 17:57:40.000000000 +0300
|
||||
--- retroshare.pri 2017-03-18 12:34:41.000000000 +0300
|
||||
*** retroshare.pri.orig 2018-03-13 22:25:38.000000000 +0300
|
||||
--- retroshare.pri 2018-05-09 09:19:59.000000000 +0300
|
||||
***************
|
||||
*** 63,71 ****
|
||||
unix {
|
||||
isEmpty(PREFIX) { PREFIX = "/usr" }
|
||||
isEmpty(BIN_DIR) { BIN_DIR = "$${PREFIX}/bin" }
|
||||
! isEmpty(INC_DIR) { INC_DIR = "$${PREFIX}/include/retroshare06" }
|
||||
isEmpty(LIB_DIR) { LIB_DIR = "$${PREFIX}/lib" }
|
||||
! isEmpty(DATA_DIR) { DATA_DIR = "$${PREFIX}/share/RetroShare06" }
|
||||
isEmpty(PLUGIN_DIR) { PLUGIN_DIR = "$${LIB_DIR}/retroshare/extensions6" }
|
||||
|
||||
rs_autologin {
|
||||
--- 63,71 ----
|
||||
unix {
|
||||
*** 104,113 ****
|
||||
linux-* {
|
||||
isEmpty(PREFIX) { PREFIX = "/usr" }
|
||||
isEmpty(BIN_DIR) { BIN_DIR = "$${PREFIX}/bin" }
|
||||
! isEmpty(INC_DIR) { INC_DIR = "$${PREFIX}/include/retroshare" }
|
||||
isEmpty(LIB_DIR) { LIB_DIR = "$${PREFIX}/lib" }
|
||||
! isEmpty(DATA_DIR) { DATA_DIR = "$${PREFIX}/share/retroshare-qt5" }
|
||||
isEmpty(PLUGIN_DIR) { PLUGIN_DIR = "$${LIB_DIR}/retroshare/extensions6" }
|
||||
! isEmpty(DATA_DIR) { DATA_DIR = "$${PREFIX}/share/retroshare" }
|
||||
! isEmpty(PLUGIN_DIR) { PLUGIN_DIR = "$${LIB_DIR}/retroshare/extensions6" }
|
||||
|
||||
rs_autologin {
|
||||
!macx {
|
||||
--- 104,113 ----
|
||||
linux-* {
|
||||
isEmpty(PREFIX) { PREFIX = "/usr" }
|
||||
isEmpty(BIN_DIR) { BIN_DIR = "$${PREFIX}/bin" }
|
||||
! isEmpty(INC_DIR) { INC_DIR = "$${PREFIX}/include/retroshare-qt5" }
|
||||
isEmpty(LIB_DIR) { LIB_DIR = "$${PREFIX}/lib" }
|
||||
! isEmpty(DATA_DIR) { DATA_DIR = "$${PREFIX}/share/retroshare-qt5" }
|
||||
! isEmpty(PLUGIN_DIR) { PLUGIN_DIR = "$${LIB_DIR}/retroshare-qt5/extensions" }
|
||||
|
||||
rs_autologin {
|
||||
!macx {
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue