[gnome-software/wip/hughsie/banner-editor-rm] Remove the banner editor



commit 5db4da107d9072a6b5d3461358629d4e2ab4926d
Author: Richard Hughes <richard hughsie com>
Date:   Mon Nov 18 13:11:36 2019 +0000

    Remove the banner editor
    
    There's now a standalone app for banner development:
    https://flathub.org/apps/details/org.gnome.design.BannerViewer

 contrib/gnome-software.spec.in           |   13 +-
 po/POTFILES.in                           |    2 -
 src/gnome-software-editor.gresource.xml  |   12 -
 src/gnome-software-editor.xml            |   66 --
 src/gs-editor.c                          | 1360 ------------------------------
 src/gs-editor.ui                         |  506 -----------
 src/meson.build                          |   61 +-
 src/org.gnome.Software.Editor.desktop.in |   17 -
 8 files changed, 2 insertions(+), 2035 deletions(-)
---
diff --git a/contrib/gnome-software.spec.in b/contrib/gnome-software.spec.in
index 2b551495..cca41df6 100644
--- a/contrib/gnome-software.spec.in
+++ b/contrib/gnome-software.spec.in
@@ -73,6 +73,7 @@ Requires: libxmlb%{?_isa} >= %{libxmlb_version}
 Recommends: PackageKit%{?_isa} >= %{packagekit_version}
 
 Obsoletes: gnome-software-snap < 3.33.1
+Obsoletes: gnome-software-editor < 3.35.1
 
 # this is not a library version
 %define gs_plugin_version               13
@@ -89,13 +90,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 These development files are for building gnome-software plugins outside
 the source tree. Most users do not need this subpackage installed.
 
-%package editor
-Summary: Banner designer for GNOME Software
-Requires: %{name}%{?_isa} = %{version}-%{release}
-
-%description editor
-Editor for designing banners for GNOME Software.
-
 %package rpm-ostree
 Summary: rpm-ostree backend for gnome-software
 Requires: %{name}%{?_isa} = %{version}-%{release}
@@ -215,11 +209,6 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_includedir}/gnome-software/*.h
 %{_datadir}/gtk-doc/html/gnome-software
 
-%files editor
-%{_bindir}/gnome-software-editor
-%{_datadir}/applications/org.gnome.Software.Editor.desktop
-%{_mandir}/man1/gnome-software-editor.1*
-
 %changelog
 * #LONGDATE# Richard Hughes <richard hughsie com> #VERSION#-0.#BUILD##ALPHATAG#
 - Update from GIT
diff --git a/po/POTFILES.in b/po/POTFILES.in
index a1a9b596..43e8387f 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -19,8 +19,6 @@ src/gs-content-rating.c
 src/gs-dbus-helper.c
 src/gs-details-page.c
 src/gs-details-page.ui
-src/gs-editor.c
-src/gs-editor.ui
 src/gs-extras-page.c
 src/gs-extras-page.ui
 src/gs-feature-tile.c
diff --git a/src/meson.build b/src/meson.build
index 98a49a44..febd2b4f 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -26,6 +26,7 @@ gnome_software_sources = [
   'gs-css.c',
   'gs-content-rating.c',
   'gs-details-page.c',
+  'gs-details-page.c',
   'gs-extras-page.c',
   'gs-feature-tile.c',
   'gs-first-run-dialog.c',
@@ -145,39 +146,6 @@ executable(
   install_dir : get_option('libexecdir')
 )
 
-resources_editor_src = gnome.compile_resources(
-  'gs-editor-resources',
-  'gnome-software-editor.gresource.xml',
-  source_dir : '.',
-  c_name : 'gs'
-)
-
-executable(
-  'gnome-software-editor',
-  resources_editor_src,
-  sources : [
-    'gs-app-tile.c',
-    'gs-common.c',
-    'gs-css.c',
-    'gs-editor.c',
-    'gs-summary-tile.c',
-    'gs-star-widget.c',
-    'gs-feature-tile.c',
-    'gs-upgrade-banner.c',
-  ],
-  include_directories : [
-    include_directories('..'),
-    include_directories('../lib'),
-  ],
-  dependencies : gnome_software_dependencies,
-  link_with : [
-    libgnomesoftware
-  ],
-  c_args : cargs,
-  install : true,
-  install_dir : get_option('bindir')
-)
-
 # no quoting
 cdata = configuration_data()
 cdata.set('bindir', join_paths(get_option('prefix'),
@@ -209,15 +177,6 @@ i18n.merge_file(
   install_dir: join_paths(get_option('datadir'), 'applications')
 )
 
-i18n.merge_file(
-  input: 'org.gnome.Software.Editor.desktop.in',
-  output: 'org.gnome.Software.Editor.desktop',
-  type: 'desktop',
-  po_dir: join_paths(meson.source_root(), 'po'),
-  install: true,
-  install_dir: join_paths(get_option('datadir'), 'applications')
-)
-
 i18n.merge_file(
   input: 'gnome-software-local-file.desktop.in',
   output: 'gnome-software-local-file.desktop',
@@ -250,24 +209,6 @@ if get_option('man')
       '@INPUT@'
     ]
   )
-  custom_target('manfile-gnome-software-editor',
-    input: 'gnome-software-editor.xml',
-    output: 'gnome-software-editor.1',
-    install: true,
-    install_dir: join_paths(get_option('mandir'), 'man1'),
-    command: [
-      xsltproc,
-      '--nonet',
-      '--stringparam', 'man.output.quietly', '1',
-      '--stringparam', 'funcsynopsis.style', 'ansi',
-      '--stringparam', 'man.th.extra1.suppress', '1',
-      '--stringparam', 'man.authors.section.enabled', '0',
-      '--stringparam', 'man.copyright.section.enabled', '0',
-      '-o', '@OUTPUT@',
-      'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl',
-      '@INPUT@'
-    ]
-  )
 endif
 
 if get_option('packagekit')


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]