Skip to content

Commit 74df875

Browse files
jef-njef-n
committed
remove standalone browser
1 parent 4505ba7 commit 74df875

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+6
-1404
lines changed

‎CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -762,7 +762,7 @@ ENDIF (APPLE)
762762

763763
# manual page - makes sense only on unix systems
764764
IF (UNIX AND NOT APPLE)
765-
INSTALL (FILES qgis.1 qbrowser.1 DESTINATION ${QGIS_MANUAL_DIR}/man1)
765+
INSTALL (FILES qgis.1 DESTINATION ${QGIS_MANUAL_DIR}/man1)
766766
ENDIF (UNIX AND NOT APPLE)
767767

768768
INSTALL(FILES cmake/FindQGIS.cmake DESTINATION ${QGIS_DATA_DIR})

‎debian/icons/qbrowser-icon128x128.png

-52.1 KB
Binary file not shown.

‎debian/icons/qbrowser-icon16x16.png

-1.86 KB
Binary file not shown.

‎debian/icons/qbrowser-icon192x192.png

-98.5 KB
Binary file not shown.

‎debian/icons/qbrowser-icon22x22.png

-2.98 KB
Binary file not shown.

‎debian/icons/qbrowser-icon24x24.png

-3.38 KB
Binary file not shown.

‎debian/icons/qbrowser-icon256x256.png

-156 KB
Binary file not shown.

‎debian/icons/qbrowser-icon32x32.png

-5.44 KB
Binary file not shown.

‎debian/icons/qbrowser-icon36x36.png

-6.6 KB
Binary file not shown.

‎debian/icons/qbrowser-icon42x42.png

-8.58 KB
Binary file not shown.

‎debian/icons/qbrowser-icon48x48.png

-10.6 KB
Binary file not shown.

‎debian/icons/qbrowser-icon512x512.png

-432 KB
Binary file not shown.

‎debian/icons/qbrowser-icon64x64.png

-17 KB
Binary file not shown.

‎debian/icons/qbrowser-icon72x72.png

-20.4 KB
Binary file not shown.

‎debian/icons/qbrowser-icon80x80.png

-24.3 KB
Binary file not shown.

‎debian/icons/qbrowser-icon8x8.png

-690 Bytes
Binary file not shown.

‎debian/icons/qbrowser-icon96x96.png

-32.8 KB
Binary file not shown.

‎debian/qbrowser.desktop

-56
This file was deleted.

‎debian/rules

+2-13
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ CMAKE_OPTS := \
6363
-DBINDINGS_GLOBAL_INSTALL=TRUE \
6464
-DPEDANTIC=TRUE \
6565
-DSERVER_SKIP_ECW=TRUE \
66-
-DSUPPRESS_SIP_WARNINGS=TRUE \
6766
-DQGIS_CGIBIN_SUBDIR=/usr/lib/cgi-bin \
6867
-DWITH_APIDOC=TRUE \
6968
-DGENERATE_QHP=TRUE \
@@ -225,7 +224,7 @@ binary binary-arch binary-indep build build-arch build-indep clean install insta
225224
dh $@ --with python3 --parallel --builddirectory=$(QGIS_BUILDDIR)
226225

227226
override_dh_clean: cleantemplates
228-
dh_clean qgis.bin.1 qbrowser.bin.1
227+
dh_clean qgis.bin.1
229228

230229
-$(RM) -r $(CURDIR)/$(QGIS_BUILDDIR)/
231230

@@ -282,17 +281,14 @@ override_dh_auto_install:
282281

283282
# Man pages are installed by dh_installman
284283
$(RM) $(CURDIR)/debian/tmp/usr/man/man1/qgis.1
285-
$(RM) $(CURDIR)/debian/tmp/usr/man/man1/qbrowser.1
286284

287285
# Don't ship srs.db, automatically updated in postinst with crssync
288286
mv $(CURDIR)/debian/tmp/usr/share/qgis/resources/srs.db $(CURDIR)/debian/tmp/usr/share/qgis/resources/srs-template.db
289287

290288
# Install menu pixmap
291289
install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/pixmaps
292290
install -o root -g root -m 644 $(CURDIR)/images/icons/qgis_icon.svg $(CURDIR)/debian/tmp/usr/share/pixmaps/qgis.svg
293-
install -o root -g root -m 644 $(CURDIR)/images/icons/qbrowser_icon.svg $(CURDIR)/debian/tmp/usr/share/pixmaps/qbrowser.svg
294291
install -o root -g root -m 644 $(CURDIR)/images/icons/qgis-icon.png $(CURDIR)/debian/tmp/usr/share/pixmaps/qgis.png
295-
install -o root -g root -m 644 $(CURDIR)/images/icons/qbrowser-icon.png $(CURDIR)/debian/tmp/usr/share/pixmaps/qbrowser.png
296292
install -o root -g root -m 644 $(CURDIR)/images/icons/qgis-mime-icon.png $(CURDIR)/debian/tmp/usr/share/pixmaps/qgis-mime.png
297293

298294
# Install MIME type icon
@@ -315,17 +311,14 @@ override_dh_auto_install:
315311
for size in 8x8 16x16 22x22 24x24 32x32 36x36 42x42 48x48 64x64 72x72 80x80 96x96 128x128 192x192 256x256 512x512; do \
316312
install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/icons/hicolor/$${size}/apps ; \
317313
install -o root -g root -m 644 $(CURDIR)/debian/icons/qgis-icon$${size}.png $(CURDIR)/debian/tmp/usr/share/icons/hicolor/$${size}/apps/qgis.png ; \
318-
install -o root -g root -m 644 $(CURDIR)/debian/icons/qbrowser-icon$${size}.png $(CURDIR)/debian/tmp/usr/share/icons/hicolor/$${size}/apps/qbrowser.png ; \
319314
done
320315

321316
install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/icons/hicolor/scalable/apps
322317
install -o root -g root -m 644 $(CURDIR)/images/icons/qgis_icon.svg $(CURDIR)/debian/tmp/usr/share/icons/hicolor/scalable/apps/qgis.svg
323-
install -o root -g root -m 644 $(CURDIR)/images/icons/qbrowser_icon.svg $(CURDIR)/debian/tmp/usr/share/icons/hicolor/scalable/apps/qbrowser.svg
324318

325319
# Install desktop files
326320
install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/applications
327321
install -o root -g root -m 644 $(CURDIR)/debian/qgis.desktop $(CURDIR)/debian/tmp/usr/share/applications
328-
install -o root -g root -m 644 $(CURDIR)/debian/qbrowser.desktop $(CURDIR)/debian/tmp/usr/share/applications
329322

330323
# Mime info
331324
install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/mime/packages
@@ -337,10 +330,8 @@ override_dh_auto_install:
337330
# qgis binaries
338331
install -o root -g root -m 755 -d $(CURDIR)/debian/qgis/usr/bin
339332
install -o root -g root -m 755 $(CURDIR)/debian/tmp/usr/bin/qgis $(CURDIR)/debian/qgis/usr/bin/qgis.bin
340-
install -o root -g root -m 755 $(CURDIR)/debian/tmp/usr/bin/qbrowser $(CURDIR)/debian/qgis/usr/bin/qbrowser.bin
341333

342334
$(RM) $(CURDIR)/debian/tmp/usr/bin/qgis
343-
$(RM) $(CURDIR)/debian/tmp/usr/bin/qbrowser
344335

345336
# qgis binary wrappers
346337
sed -r \
@@ -349,7 +340,6 @@ override_dh_auto_install:
349340
$(CURDIR)/debian/qgis.sh.in >$(CURDIR)/debian/qgis.sh
350341

351342
install -o root -g root -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis/usr/bin/qgis
352-
install -o root -g root -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis/usr/bin/qbrowser
353343

354344
override_dh_install:
355345
dh_install --autodest --list-missing
@@ -359,9 +349,8 @@ override_dh_installchangelogs:
359349

360350
override_dh_installman:
361351
cp qgis.1 qgis.bin.1
362-
cp qbrowser.1 qbrowser.bin.1
363352

364-
dh_installman -pqgis qgis.1 qbrowser.1 qgis.bin.1 qbrowser.bin.1
353+
dh_installman -pqgis qgis.1 qgis.bin.1
365354

366355
override_dh_installmime:
367356
dh_installmime -pqgis

‎images/icons/qbrowser-icon-60x60.png

-15.3 KB
Binary file not shown.

‎images/images.qrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<file>flags/xh.png</file>
4444
<file>icons/qgis-icon-16x16.png</file>
4545
<file>icons/qgis-icon-60x60.png</file>
46-
<file>icons/qbrowser-icon-60x60.png</file>
46+
<file>icons/qbrowser_icon.svg</file>
4747
<file>north_arrows/default.png</file>
4848
<file>north_arrows/gpsarrow.svg</file>
4949
<file>north_arrows/gpsarrow2.svg</file>

‎mac/browser.info.plist.in

-80
This file was deleted.

‎ms-windows/osgeo4w/browser-grass.bat.tmpl

-10
This file was deleted.

‎ms-windows/osgeo4w/browser.bat.tmpl

-9
This file was deleted.

‎ms-windows/osgeo4w/package-nightly.cmd

-10
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,6 @@ cmake -G Ninja ^
200200
-D QCA_INCLUDE_DIR=%OSGEO4W_ROOT%\apps\Qt5\include\QtCrypto ^
201201
-D QCA_LIBRARY=%OSGEO4W_ROOT%\apps\Qt5\lib\qca-qt5.lib ^
202202
-D QSCINTILLA_LIBRARY=%OSGEO4W_ROOT%\apps\Qt5\lib\qscintilla2.lib ^
203-
-D SUPPRESS_SIP_WARNINGS=TRUE ^
204203
%CMAKE_OPT% ^
205204
%SRCDIR:\=/%
206205
if errorlevel 1 (echo cmake failed & goto error)
@@ -277,10 +276,6 @@ for %%g IN (%GRASS_VERSIONS%) do (
277276
sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' -e 's/@grassversion@/%%g/g' qgis-grass.bat.tmpl >%OSGEO4W_ROOT%\bin\%PACKAGENAME%-g%%g.bat.tmpl
278277
if errorlevel 1 (echo creation of desktop template failed & goto error)
279278
set batches=!batches! bin/%PACKAGENAME%-g%%g.bat.tmpl
280-
281-
sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' -e 's/@grassversion@/%%g/g' browser-grass.bat.tmpl >%OSGEO4W_ROOT%\bin\%PACKAGENAME%-browser-g%%g.bat.tmpl
282-
if errorlevel 1 (echo creation of browser template & goto error)
283-
set batches=!batches! bin/%PACKAGENAME%-browser-g%%g.bat.tmpl
284279
)
285280

286281
sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' python.bat.tmpl >%OSGEO4W_ROOT%\bin\python-%PACKAGENAME%.bat.tmpl
@@ -297,10 +292,6 @@ move %PKGDIR%\bin\qgis.exe %OSGEO4W_ROOT%\bin\%PACKAGENAME%-bin.exe
297292
if errorlevel 1 (echo move of desktop executable failed & goto error)
298293
copy qgis.vars %OSGEO4W_ROOT%\bin\%PACKAGENAME%-bin.vars
299294
if errorlevel 1 (echo copy of desktop executable vars failed & goto error)
300-
move %PKGDIR%\bin\qbrowser.exe %OSGEO4W_ROOT%\bin\%PACKAGENAME%-browser-bin.exe
301-
if errorlevel 1 (echo move of browser executable failed & goto error)
302-
copy qgis.vars %OSGEO4W_ROOT%\bin\%PACKAGENAME%-browser-bin.vars
303-
if errorlevel 1 (echo copy of browser executable vars failed & goto error)
304295

305296
if not exist %PKGDIR%\qtplugins\sqldrivers mkdir %PKGDIR%\qtplugins\sqldrivers
306297
move %OSGEO4W_ROOT%\apps\qt5\plugins\sqldrivers\qsqlocispatial.dll %PKGDIR%\qtplugins\sqldrivers
@@ -322,7 +313,6 @@ tar -C %OSGEO4W_ROOT% -cjf %ARCH%/release/qgis/%PACKAGENAME%/%PACKAGENAME%-%VERS
322313
--exclude "*.pyc" ^
323314
apps/%PACKAGENAME% ^
324315
bin/%PACKAGENAME%-bin.exe ^
325-
bin/%PACKAGENAME%-browser-bin.exe ^
326316
%batches% ^
327317
bin/%PACKAGENAME%-designer.bat.tmpl ^
328318
bin/python-%PACKAGENAME%.bat.tmpl ^

‎ms-windows/osgeo4w/package.cmd

-15
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,6 @@ cmake -G Ninja ^
192192
-D QCA_INCLUDE_DIR=%OSGEO4W_ROOT%\apps\Qt5\include\QtCrypto ^
193193
-D QCA_LIBRARY=%OSGEO4W_ROOT%\apps\Qt5\lib\qca-qt5.lib ^
194194
-D QSCINTILLA_LIBRARY=%OSGEO4W_ROOT%\apps\Qt5\lib\qscintilla2.lib ^
195-
-D SUPPRESS_SIP_WARNINGS=TRUE ^
196195
%CMAKE_OPT% ^
197196
%SRCDIR:\=/%
198197
if errorlevel 1 (echo cmake failed & goto error)
@@ -254,9 +253,6 @@ if errorlevel 1 (echo creation of desktop preremove failed & goto error)
254253
sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' qgis.bat.tmpl >%OSGEO4W_ROOT%\bin\%PACKAGENAME%.bat.tmpl
255254
if errorlevel 1 (echo creation of desktop template failed & goto error)
256255

257-
sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' browser.bat.tmpl >%OSGEO4W_ROOT%\bin\%PACKAGENAME%-browser.bat.tmpl
258-
if errorlevel 1 (echo creation of browser template & goto error)
259-
260256
sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' designer.bat.tmpl >%OSGEO4W_ROOT%\bin\%PACKAGENAME%-designer.bat.tmpl
261257
if errorlevel 1 (echo creation of designer template failed & goto error)
262258

@@ -289,8 +285,6 @@ for %%g IN (%GRASS_VERSIONS%) do (
289285
if errorlevel 1 (echo creation of grass desktop preremove failed & goto error)
290286
sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' -e 's/@grassversion@/%%g/g' -e 's/@grassmajor@/!v!/g' qgis-grass.bat.tmpl >%OSGEO4W_ROOT%\bin\%PACKAGENAME%-grass!v!.bat.tmpl
291287
if errorlevel 1 (echo creation of grass desktop template failed & goto error)
292-
sed -e 's/@package@/%PACKAGENAME%/g' -e 's/@version@/%VERSION%/g' -e 's/@grassversion@/%%g/g' -e 's/@grassmajor@/!v!/g' browser-grass.bat.tmpl >%OSGEO4W_ROOT%\bin\%PACKAGENAME%-browser-grass!v!.bat.tmpl
293-
if errorlevel 1 (echo creation of grass browser template & goto error)
294288

295289
set packages=!packages! "-grass-plugin!w!"
296290
)
@@ -358,10 +352,6 @@ move %PKGDIR%\bin\qgis.exe %OSGEO4W_ROOT%\bin\%PACKAGENAME%-bin.exe
358352
if errorlevel 1 (echo move of desktop executable failed & goto error)
359353
copy qgis.vars %OSGEO4W_ROOT%\bin\%PACKAGENAME%-bin.vars
360354
if errorlevel 1 (echo copy of desktop executable vars failed & goto error)
361-
move %PKGDIR%\bin\qbrowser.exe %OSGEO4W_ROOT%\bin\%PACKAGENAME%-browser-bin.exe
362-
if errorlevel 1 (echo move of browser executable failed & goto error)
363-
copy qgis.vars %OSGEO4W_ROOT%\bin\%PACKAGENAME%-browser-bin.vars
364-
if errorlevel 1 (echo copy of browser executable vars failed & goto error)
365355

366356
if not exist %PKGDIR%\qtplugins\sqldrivers mkdir %PKGDIR%\qtplugins\sqldrivers
367357
move %OSGEO4W_ROOT%\apps\qt5\plugins\sqldrivers\qsqlocispatial.dll %PKGDIR%\qtplugins\sqldrivers
@@ -384,13 +374,10 @@ tar -C %OSGEO4W_ROOT% -cjf %ARCH%/release/qgis/%PACKAGENAME%/%PACKAGENAME%-%VERS
384374
--exclude "apps/%PACKAGENAME%/python/qgis/_server.pyd" ^
385375
--exclude "apps/%PACKAGENAME%/python/qgis/_server.lib" ^
386376
--exclude "apps/%PACKAGENAME%/python/qgis/server" ^
387-
"bin/%PACKAGENAME%-browser-bin.exe" ^
388-
"bin/%PACKAGENAME%-browser-bin.vars" ^
389377
"bin/%PACKAGENAME%-bin.exe" ^
390378
"bin/%PACKAGENAME%-bin.vars" ^
391379
"bin/python-%PACKAGENAME%.bat.tmpl" ^
392380
"apps/%PACKAGENAME%/bin/qgis_app.dll" ^
393-
"apps/%PACKAGENAME%/bin/qgis_browser.dll" ^
394381
"apps/%PACKAGENAME%/bin/qgis.reg.tmpl" ^
395382
"apps/%PACKAGENAME%/i18n/" ^
396383
"apps/%PACKAGENAME%/icons/" ^
@@ -410,7 +397,6 @@ tar -C %OSGEO4W_ROOT% -cjf %ARCH%/release/qgis/%PACKAGENAME%/%PACKAGENAME%-%VERS
410397
"apps/%PACKAGENAME%/resources/customization.xml" ^
411398
"apps/%PACKAGENAME%/resources/themes/" ^
412399
"bin/%PACKAGENAME%.bat.tmpl" ^
413-
"bin/%PACKAGENAME%-browser.bat.tmpl" ^
414400
"bin/%PACKAGENAME%-designer.bat.tmpl" ^
415401
"etc/postinstall/%PACKAGENAME%.bat" ^
416402
"etc/preremove/%PACKAGENAME%.bat"
@@ -447,7 +433,6 @@ for %%g IN (%GRASS_VERSIONS%) do (
447433
"apps/%PACKAGENAME%/plugins/grassplugin!v!.dll" ^
448434
"apps/%PACKAGENAME%/plugins/grassprovider!v!.dll" ^
449435
"apps/%PACKAGENAME%/plugins/grassrasterprovider!v!.dll" ^
450-
"bin/%PACKAGENAME%-browser-grass!v!.bat.tmpl" ^
451436
"bin/%PACKAGENAME%-grass!v!.bat.tmpl" ^
452437
"etc/postinstall/%PACKAGENAME%-grass-plugin!w!.bat" ^
453438
"etc/preremove/%PACKAGENAME%-grass-plugin!w!.bat"

‎ms-windows/osgeo4w/postinstall-desktop.bat

-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
textreplace -std -t bin\@package@.bat
2-
textreplace -std -t bin\@package@-browser.bat
32
textreplace -std -t bin\@package@-designer.bat
43
textreplace -std -t bin\python-@package@.bat
54

@@ -8,17 +7,13 @@ for %%i in ("%OSGEO4W_ROOT%") do set O4W_ROOT=%%~fsi
87
if "%OSGEO4W_DESKTOP%"=="" set OSGEO4W_DESKTOP=~$folder.common_desktop$
98

109
"%OSGEO4W_ROOT%\bin\@package@.bat" --exit
11-
"%OSGEO4W_ROOT%\bin\@package@-browser.bat" --exit
1210

1311
if not %OSGEO4W_MENU_LINKS%==0 mkdir "%OSGEO4W_STARTMENU%"
1412
if not %OSGEO4W_DESKTOP_LINKS%==0 mkdir "%OSGEO4W_DESKTOP%"
1513

1614
if not %OSGEO4W_MENU_LINKS%==0 nircmd shortcut "%O4W_ROOT%\bin\@package@-bin.exe" "%OSGEO4W_STARTMENU%" "QGIS Desktop @version@"
1715
if not %OSGEO4W_DESKTOP_LINKS%==0 nircmd shortcut "%O4W_ROOT%\bin\package@-bin.exe" "%OSGEO4W_DESKTOP%" "QGIS Desktop @version@"
1816

19-
if not %OSGEO4W_MENU_LINKS%==0 nircmd shortcut "%O4W_ROOT%\bin\@package@-browser-bin.exe" "%OSGEO4W_STARTMENU%" "QGIS Browser @version@"
20-
if not %OSGEO4W_DESKTOP_LINKS%==0 nircmd shortcut "%O4W_ROOT%\bin\@package@-browser-bin.exe" "%OSGEO4W_DESKTOP%" "QGIS Browser @version@"
21-
2217
if not %OSGEO4W_MENU_LINKS%==0 nircmd shortcut "%O4W_ROOT%\bin\nircmd.exe" "%OSGEO4W_STARTMENU%" "Qt Designer with QGIS @version@ custom widgets" "exec hide """%OSGEO4W_ROOT%\bin\@package@-designer.bat"" "%O4W_ROOT%\apps\@package@\icons\QGIS.ico"
2318
if not %OSGEO4W_DESKTOP_LINKS%==0 nircmd shortcut "%O4W_ROOT%\bin\nircmd.exe" "%OSGEO4W_DESKTOP%" "Qt Designer with QGIS @version@ custom widgets" "exec hide %O4W_ROOT%\bin\@package@-designer.bat" "%O4W_ROOT%\apps\@package@\icons\QGIS.ico"
2419

0 commit comments

Comments
 (0)