mirror of
https://invent.kde.org/network/falkon.git
synced 2024-12-20 18:56:34 +01:00
Merge branch 'Falkon/3.0'
This commit is contained in:
David Rosca
commit
b8b43f9732
@ -101,9 +101,9 @@ set_package_properties(KF5Wallet PROPERTIES DESCRIPTION "KWallet password backen
|
||||
find_package(PySide2 "2.0.0")
|
||||
find_package(Shiboken2 "2.0.0")
|
||||
find_package(PythonLibs "3.0")
|
||||
set_package_properties(PySide2 PROPERTIES DESCRIPTION "Python plugins" TYPE OPTIONAL)
|
||||
set_package_properties(Shiboken2 PROPERTIES DESCRIPTION "Python plugins" TYPE OPTIONAL)
|
||||
set_package_properties(PythonLibs PROPERTIES DESCRIPTION "Python plugins" TYPE OPTIONAL)
|
||||
set_package_properties(PySide2 PROPERTIES DESCRIPTION "Python plugins (experimental)" TYPE OPTIONAL)
|
||||
set_package_properties(Shiboken2 PROPERTIES DESCRIPTION "Python plugins (experimental)" TYPE OPTIONAL)
|
||||
set_package_properties(PythonLibs PROPERTIES DESCRIPTION "Python plugins (experimental)" TYPE OPTIONAL)
|
||||
if (PySide2_FOUND AND Shiboken2_FOUND AND PythonLibs_FOUND)
|
||||
set(ENABLE_PYTHON_PLUGINS TRUE)
|
||||
endif()
|
||||
|
||||
53
linux/build-appimage.sh
Executable file → Normal file
53
linux/build-appimage.sh
Executable file → Normal file
@ -1,4 +1,4 @@
|
||||
#!/bin/sh
|
||||
#!/bin/sh
|
||||
###############################################################################
|
||||
# Compile Falkon source and pack it as Appimage.
|
||||
###############################################################################
|
||||
@ -7,7 +7,7 @@ set -e
|
||||
SCRIPT_PATH="$(dirname "$(readlink -f "$0")")"
|
||||
NCPUS=$(getconf _NPROCESSORS_ONLN) || :
|
||||
|
||||
which mksquashfs >/dev/null 2>&1 || TEST=no
|
||||
which mksquashfs >/dev/null 2>&1 || TEST=no
|
||||
which chrpath >/dev/null 2>&1 || TEST=no
|
||||
TEST=${TEST:-yes}
|
||||
|
||||
@ -36,9 +36,9 @@ SOURCE_DIR=${SOURCE_DIR:-${SCRIPT_PATH}/..} ; export SOURCE_DIR
|
||||
QMAKE=${QMAKE:-$SYSTEM_QMAKE} ; export QMAKE
|
||||
DEBUG_BUILD="-DCMAKE_BUILD_TYPE=Debug" ; export DEBUG_BUILD
|
||||
|
||||
CFLAGS="${CFLAGS:--O2 -g -pipe -Wall }" ; export CFLAGS ;
|
||||
CFLAGS="${CFLAGS:--O2 -g -pipe -Wall }" ; export CFLAGS ;
|
||||
CXXFLAGS="${CXXFLAGS:--O2 -g -pipe -Wall }" ; export CXXFLAGS ;
|
||||
LDFLAGS="${LDFLAGS:--Wl,-z,relro }"; export LDFLAGS ;
|
||||
LDFLAGS="${LDFLAGS:--Wl,-z,relro }"; export LDFLAGS ;
|
||||
|
||||
optPrint(){
|
||||
printf "\n\t\t${ITL1}VALID OPTIONS ARE${ITL0}:\n
|
||||
@ -71,8 +71,8 @@ ${BLD1}--disable-dbus${BLD0}
|
||||
|
||||
${BLD1}--sourcedir=${BLD0}
|
||||
|
||||
Assuming this script is located in ${ITL1}falkon/scripts${ITL0},
|
||||
otherwise you must specify the path to
|
||||
Assuming this script is located in ${ITL1}falkon/linux${ITL0},
|
||||
otherwise you must specify the path to
|
||||
Falkon source directory.
|
||||
|
||||
${UDR1}example:--sourcedir="/home/build/falkon"${UDR0}
|
||||
@ -112,7 +112,7 @@ printf "\n\tBuild configuration:\n
|
||||
Disable X11=${YNOX11}
|
||||
Disable DBUS=${DISABLE_DBUS}
|
||||
Runtime binary=${RUNTIME_BINARY}
|
||||
Qmake=${QMAKE}\n" | sed -r 's/=$/ » Not set/g'
|
||||
Qmake=${QMAKE}\n" | sed -r 's/=$/ » Not set/g'
|
||||
}
|
||||
|
||||
getVal(){
|
||||
@ -170,7 +170,7 @@ cd "${SOURCE_DIR}"
|
||||
|
||||
if [[ "${UPDATE_SOURCE}" == "true" ]]; then
|
||||
git pull || :
|
||||
fi
|
||||
fi
|
||||
|
||||
rm -fr build || :
|
||||
mkdir build && cd build
|
||||
@ -200,13 +200,11 @@ make -j$NCPUS
|
||||
if [[ $? == 0 ]] ; then
|
||||
make DESTDIR="${PWD}" install
|
||||
fi
|
||||
|
||||
|
||||
mv usr/local bundle_build_dir
|
||||
mv bundle_build_dir/lib/plugins/falkon bundle_build_dir/share/falkon/plugins
|
||||
rmdir bundle_build_dir/lib/plugins
|
||||
pushd bundle_build_dir/share/falkon/plugins
|
||||
chrpath --replace '$ORIGIN/../../../lib' *.so
|
||||
popd
|
||||
pushd bundle_build_dir/lib/plugins/falkon
|
||||
chrpath --replace '$ORIGIN/../..' *.so
|
||||
popd
|
||||
|
||||
NEEDEDLIBSLIST="libicudata.so.56
|
||||
libicui18n.so.56
|
||||
@ -284,10 +282,10 @@ cp ../linux/applications/org.kde.falkon.desktop bundle_build_dir
|
||||
cp ../linux/pixmaps/falkon.png bundle_build_dir
|
||||
ln -s falkon.png bundle_build_dir/.DirIcon
|
||||
|
||||
pushd bundle_build_dir
|
||||
pushd bundle_build_dir
|
||||
mv bin/falkon ./ && rm -fr bin
|
||||
chrpath --replace '$ORIGIN' lib/libFalkonPrivate.so.2
|
||||
chrpath --replace '$ORIGIN/lib' falkon
|
||||
chrpath --replace '$ORIGIN' lib/libFalkonPrivate.so.3.*
|
||||
chrpath --replace '$ORIGIN/lib' falkon
|
||||
chrpath --replace '$ORIGIN/lib' QtWebEngineProcess
|
||||
|
||||
cat <<EOQTCFG >qt.conf
|
||||
@ -306,19 +304,20 @@ set -e
|
||||
FALKON_DIR="\$(dirname "\$(readlink -f "\$0")")"
|
||||
|
||||
XDG_DATA_DIRS="\${FALKON_DIR}/share:\${XDG_DATA_DIRS}"
|
||||
export XDG_DATA_DIRS
|
||||
FALKON_PLUGIN_PATH="\${FALKON_DIR}/lib/plugins/falkon"
|
||||
export XDG_DATA_DIRS FALKON_PLUGIN_PATH
|
||||
|
||||
cd "\${FALKON_DIR}/"
|
||||
exec ./falkon "\$@"
|
||||
exec ./falkon "\$@"
|
||||
EOF
|
||||
chmod +x AppRun
|
||||
popd
|
||||
chmod +x AppRun
|
||||
popd
|
||||
|
||||
printf "Generating app image\n"
|
||||
mksquashfs bundle_build_dir falkon.squashfs -root-owned -noappend
|
||||
mksquashfs bundle_build_dir falkon.squashfs -root-owned -noappend
|
||||
|
||||
cat "${RUNTIME_BINARY}" >bin/Falkon.AppImage
|
||||
cat falkon.squashfs >>bin/Falkon.AppImage
|
||||
cat falkon.squashfs >>bin/Falkon.AppImage
|
||||
chmod a+x bin/Falkon.AppImage
|
||||
}
|
||||
|
||||
@ -333,22 +332,22 @@ if [[ ! -d "${SOURCE_DIR}/src" ]]; then
|
||||
printf "Please install ${UDR1}$0${UDR0} in „${BLD1}scripts${BLD0}“ ${ITL1}(a sub folder in Falkon source directory)${ITL0},
|
||||
or specify the source path with ${BLD1}--sourcedir=${BLD0}full/path!\n"
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
if [[ ${TEST} != "yes" ]] ; then
|
||||
printf "${RDFG}You must have the following tools installed:${DFFG}
|
||||
${ITL1}mmksquashfs, chrpath${ITL0}!\n"
|
||||
${ITL1}mksquashfs, chrpath${ITL0}!\n"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ "${QMAKE}" == "${SYSTEM_QMAKE}" ]] ; then
|
||||
printf "${RDFG}You should use precompiled Qt package${DFFG}
|
||||
printf "${RDFG}You should use precompiled Qt package${DFFG}
|
||||
downloaded from ${UDR1}${ITL1}http://download.qt.io/official_releases/qt/${ALL0}\n"
|
||||
exit 1
|
||||
elif
|
||||
[[ -z ${RUNTIME_BINARY} ]] ; then
|
||||
printf "\n${RDFG}Required precompiled „${BLD1}runtime${BLD0}“ binary!${DFFG}
|
||||
It's a part of ${ITL1}AppImageKit${ITL0}
|
||||
It's a part of ${ITL1}AppImageKit${ITL0}
|
||||
${UDR1}https://github.com/probonopd/AppImageKit${UDR0}\n"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
@ -582,7 +582,7 @@ void BrowserWindow::loadSettings()
|
||||
//Browser Window settings
|
||||
settings.beginGroup("Browser-View-Settings");
|
||||
bool showStatusBar = settings.value("showStatusBar", false).toBool();
|
||||
bool showBookmarksToolbar = settings.value("showBookmarksToolbar", true).toBool();
|
||||
bool showBookmarksToolbar = settings.value("showBookmarksToolbar", false).toBool();
|
||||
bool showNavigationToolbar = settings.value("showNavigationToolbar", true).toBool();
|
||||
bool showMenuBar = settings.value("showMenubar", false).toBool();
|
||||
|
||||
@ -809,8 +809,8 @@ void BrowserWindow::loadAddress(const QUrl &url)
|
||||
int index = m_tabWidget->addView(url, qzSettings->newTabPosition);
|
||||
weView(index)->setFocus();
|
||||
} else {
|
||||
weView()->load(url);
|
||||
weView()->setFocus();
|
||||
weView()->load(url);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -183,8 +183,12 @@ void ProfileManager::updateProfile(const QString ¤t, const QString &profil
|
||||
|
||||
Updater::Version prof(profile);
|
||||
|
||||
// Profile is from newer version than running application
|
||||
if (prof > Updater::Version(Qz::VERSION)) {
|
||||
copyDataToProfile();
|
||||
// Only copy data when profile is not from development version
|
||||
if (prof.revisionNumber != 99) {
|
||||
copyDataToProfile();
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@ -1,43 +1,7 @@
|
||||
{
|
||||
"roots": {
|
||||
"bookmark_bar": {
|
||||
"children": [
|
||||
{
|
||||
"description": "Source code of Falkon",
|
||||
"keyword": "falkon-git",
|
||||
"name": "Falkon Git",
|
||||
"type": "url",
|
||||
"url": "https://phabricator.kde.org/source/falkon/",
|
||||
"visit_count": 0
|
||||
},
|
||||
{
|
||||
"description": "KDE Bug Tracker for Falkon",
|
||||
"keyword": "falkon-bugs",
|
||||
"name": "Falkon Bug Tracker",
|
||||
"type": "url",
|
||||
"url": "https://bugs.kde.org/describecomponents.cgi?product=Falkon",
|
||||
"visit_count": 0
|
||||
},
|
||||
{
|
||||
"description": "Falkon KDE UserBase Wiki",
|
||||
"keyword": "falkon-wiki",
|
||||
"name": "Falkon Wiki",
|
||||
"type": "url",
|
||||
"url": "https://userbase.kde.org/Falkon",
|
||||
"visit_count": 0
|
||||
},
|
||||
{
|
||||
"type": "separator"
|
||||
},
|
||||
{
|
||||
"description": "KDE Community Home",
|
||||
"keyword": "kde-home",
|
||||
"name": "KDE Homepage",
|
||||
"type": "url",
|
||||
"url": "https://www.kde.org/",
|
||||
"visit_count": 0
|
||||
}
|
||||
],
|
||||
"children": [ ],
|
||||
"description": "Bookmarks located in Bookmarks Toolbar",
|
||||
"expanded": true,
|
||||
"expanded_sidebar": true,
|
||||
|
||||
@ -62,13 +62,6 @@ void SpeedDial::loadSettings()
|
||||
m_sdcentered = settings.value("sdcenter", false).toBool();
|
||||
settings.endGroup();
|
||||
|
||||
if (allPages.isEmpty()) {
|
||||
allPages = "url:\"https:/kde.org\"|title:\"KDE Community Home\";"
|
||||
"url:\"https://phabricator.kde.org/source/falkon/\"|title:\"Falkon Git\";"
|
||||
"url:\"https://bugs.kde.org/describecomponents.cgi?product=Falkon\"|title:\"Falkon Bug Tracker\";"
|
||||
"url:\"https://duckduckgo.com\"|title:\"DuckDuckGo\";";
|
||||
|
||||
}
|
||||
changed(allPages);
|
||||
|
||||
m_thumbnailsDir = DataPaths::currentProfilePath() + "/thumbnails/";
|
||||
@ -232,10 +225,6 @@ QString SpeedDial::initialScript()
|
||||
|
||||
void SpeedDial::changed(const QString &allPages)
|
||||
{
|
||||
if (allPages.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
|
||||
const QStringList entries = allPages.split(QLatin1String("\";"), QString::SkipEmptyParts);
|
||||
m_pages.clear();
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user