GNOME.org
 

[gnome-software/wip/kalev/modulesets-rework: 3/7] Drop the "hardcoded categories" plugin and move the data to modulesets

commit 5f1b11d66288ff72208455b39cc2e942c760a7c4
Author: Kalev Lember <kalevlember gmail com>
Date:   Mon Mar 16 17:06:20 2015 +0100

    Drop the "hardcoded categories" plugin and move the data to modulesets
    
    It's much easier to curate the list of apps if they are all in one
    place.

 data/modulesets/default.xml                  |   46 +++++
 data/modulesets/gnome.xml                    |   32 ++++
 po/POTFILES.in                               |    1 -
 src/plugins/Makefile.am                      |    6 -
 src/plugins/gs-plugin-appstream.c            |    2 +-
 src/plugins/gs-plugin-hardcoded-categories.c |  232 --------------------------
 6 files changed, 79 insertions(+), 240 deletions(-)
---
diff --git a/data/modulesets/default.xml b/data/modulesets/default.xml
index b07b328..326efa9 100644
--- a/data/modulesets/default.xml
+++ b/data/modulesets/default.xml
@@ -1,4 +1,5 @@
 <moduleset name="popular">
+  <!-- Apps for the "Editor's Picks" list -->
   <module type="application">calibre-gui.desktop</module>
   <module type="application">gnucash.desktop</module>
   <module type="application">gtg.desktop</module>
@@ -11,8 +12,53 @@
   <module type="application">simple-scan.desktop</module>
   <module type="application">stellarium.desktop</module>
   <module type="application">transmission-gtk.desktop</module>
+
+  <!-- Apps that show up as featured in their respective categories -->
+  <module type="application" category="Audio">ardour2.desktop</module>
+  <module type="application" category="Audio">audacity.desktop</module>
+  <module type="application" category="Audio">rosegarden.desktop</module>
+  <module type="application" category="Development">devassistant.desktop</module>
+  <module type="application" category="Development">eclipse.desktop</module>
+  <module type="application" category="Development">monodevelop.desktop</module>
+  <module type="application" category="Education">celestia.desktop</module>
   <module type="application" category="Game">0ad.desktop</module>
+  <module type="application" category="Game">btanks.desktop</module>
+  <module type="application" category="Game">doom.desktop</module>
+  <module type="application" category="Game">frozen-bubble.desktop</module>
+  <module type="application" category="Game">neverball.desktop</module>
+  <module type="application" category="Game">openarena.desktop</module>
+  <module type="application" category="Game">redeclipse.desktop</module>
   <module type="application" category="Game">supertuxkart.desktop</module>
+  <module type="application" category="Game">tremulous.desktop</module>
   <module type="application" category="Game">wesnoth.desktop</module>
   <module type="application" category="Game">xonotic.desktop</module>
+  <module type="application" category="Graphics">blender.desktop</module>
+  <module type="application" category="Graphics">darktable.desktop</module>
+  <module type="application" category="Graphics">inkscape.desktop</module>
+  <module type="application" category="Graphics">libreoffice-draw.desktop</module>
+  <module type="application" category="Graphics">mypaint.desktop</module>
+  <module type="application" category="Graphics">scribus.desktop</module>
+  <module type="application" category="Graphics">simple-scan.desktop</module>
+  <module type="application" category="Network">chromium.desktop</module>
+  <module type="application" category="Network">firefox.desktop</module>
+  <module type="application" category="Network">mozilla-thunderbird.desktop</module>
+  <module type="application" category="Network">pidgin.desktop</module>
+  <module type="application" category="Network">transmission-gtk.desktop</module>
+  <module type="application" category="Network">xchat.desktop</module>
+  <module type="application" category="Office">abiword.desktop</module>
+  <module type="application" category="Office">gnucash.desktop</module>
+  <module type="application" category="Office">gramps.desktop</module>
+  <module type="application" category="Office">libreoffice-calc.desktop</module>
+  <module type="application" category="Office">libreoffice-impress.desktop</module>
+  <module type="application" category="Office">libreoffice-writer.desktop</module>
+  <module type="application" category="Office">lyx.desktop</module>
+  <module type="application" category="Science">octave.desktop</module>
+  <module type="application" category="Science">saoimage.desktop</module>
+  <module type="application" category="Science">stellarium.desktop</module>
+  <module type="application" category="System">gparted.desktop</module>
+  <module type="application" category="System">virt-manager.desktop</module>
+  <module type="application" category="Utility">workrave.desktop</module>
+  <module type="application" category="Video">openshot.desktop</module>
+  <module type="application" category="Video">pitivi.desktop</module>
+  <module type="application" category="Video">vlc.desktop</module>
 </moduleset>
diff --git a/data/modulesets/gnome.xml b/data/modulesets/gnome.xml
index 7fe8cce..fa91d0a 100644
--- a/data/modulesets/gnome.xml
+++ b/data/modulesets/gnome.xml
@@ -4,10 +4,23 @@
 </moduleset>
 
 <moduleset name="popular">
+  <!-- Apps for the "Editor's Picks" list -->
   <module type="application">bijiben.desktop</module>
   <module type="application">geary.desktop</module>
   <module type="application">org.gnome.Maps.desktop</module>
   <module type="application">pdfmod.desktop</module>
+
+  <!-- Apps that show up as featured in their respective categories -->
+  <module type="application" category="Audio">brasero.desktop</module>
+  <module type="application" category="Audio">gnome-banshee.desktop</module>
+  <module type="application" category="Audio">rhythmbox.desktop</module>
+  <module type="application" category="Audio">sound-juicer.desktop</module>
+  <module type="application" category="Development">anjuta.desktop</module>
+  <module type="application" category="Development">devhelp.desktop</module>
+  <module type="application" category="Development">d-feet.desktop</module>
+  <module type="application" category="Development">gitg.desktop</module>
+  <module type="application" category="Development">glade.desktop</module>
+  <module type="application" category="Development">org.gnome.gedit.desktop</module>
   <module type="application" category="Game">gnome-chess.desktop</module>
   <module type="application" category="Game">gnome-mahjongg.desktop</module>
   <module type="application" category="Game">gnome-mines.desktop</module>
@@ -18,9 +31,28 @@
   <module type="application" category="Game">quadrapassel.desktop</module>
   <module type="application" category="Game">sol.desktop</module>
   <module type="application" category="Game">swell-foop.desktop</module>
+  <module type="application" category="Graphics">gimp.desktop</module>
+  <module type="application" category="Graphics">org.gnome.font-viewer.desktop</module>
+  <module type="application" category="Graphics">shotwell.desktop</module>
+  <module type="application" category="Network">epiphany.desktop</module>
+  <module type="application" category="Network">geary.desktop</module>
+  <module type="application" category="Network">org.gnome.Polari.desktop</module>
+  <module type="application" category="Network">vinagre.desktop</module>
+  <module type="application" category="Office">evolution.desktop</module>
+  <module type="application" category="Office">geary.desktop</module>
+  <module type="application" category="Office">gnumeric.desktop</module>
+  <module type="application" category="System">gnome-disks.desktop</module>
+  <module type="application" category="System">org.gnome.Boxes.desktop</module>
+  <module type="application" category="Utility">bijiben.desktop</module>
+  <module type="application" category="Utility">org.gnome.clocks.desktop</module>
+  <module type="application" category="Utility">org.gnome.Documents.desktop</module>
+  <module type="application" category="Utility">org.gnome.Photos.desktop</module>
+  <module type="application" category="Video">org.gnome.Cheese.desktop</module>
+  <module type="application" category="Video">org.gnome.Totem.desktop</module>
 </moduleset>
 
 <moduleset name="system">
+  <!-- Unremovable system apps -->
   <module type="application">empathy.desktop</module>
   <module type="application">eog.desktop</module>
   <module type="application">epiphany.desktop</module>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6cbfdc7..dd1044e 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -45,7 +45,6 @@ src/gs-update-monitor.c
 src/gs-utils.c
 src/plugins/gs-plugin-appstream.c
 src/plugins/gs-plugin-epiphany.c
-src/plugins/gs-plugin-hardcoded-categories.c
 src/plugins/gs-plugin-moduleset.c
 src/plugins/gs-plugin-packagekit.c
 src/plugins/gs-plugin-packagekit-refine.c
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index de60263..86cffc8 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -28,7 +28,6 @@ plugindir = $(libdir)/gs-plugins-${GS_PLUGIN_API_VERSION}
 plugin_LTLIBRARIES =                                   \
        libgs_plugin_appstream.la                       \
        libgs_plugin_hardcoded-featured.la              \
-       libgs_plugin_hardcoded-categories.la            \
        libgs_plugin_moduleset.la                       \
        libgs_plugin_menu-spec-categories.la            \
        libgs_plugin_menu-spec-refine.la                \
@@ -88,11 +87,6 @@ libgs_plugin_moduleset_la_LIBADD = $(GS_PLUGIN_LIBS)
 libgs_plugin_moduleset_la_LDFLAGS = -module -avoid-version
 libgs_plugin_moduleset_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
 
-libgs_plugin_hardcoded_categories_la_SOURCES = gs-plugin-hardcoded-categories.c
-libgs_plugin_hardcoded_categories_la_LIBADD = $(GS_PLUGIN_LIBS)
-libgs_plugin_hardcoded_categories_la_LDFLAGS = -module -avoid-version
-libgs_plugin_hardcoded_categories_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
-
 libgs_plugin_menu_spec_categories_la_SOURCES =         \
        gs-plugin-menu-spec-categories.c                \
        menu-spec-common.c                              \
diff --git a/src/plugins/gs-plugin-appstream.c b/src/plugins/gs-plugin-appstream.c
index 4045047..962bf71 100644
--- a/src/plugins/gs-plugin-appstream.c
+++ b/src/plugins/gs-plugin-appstream.c
@@ -107,7 +107,7 @@ const gchar **
 gs_plugin_get_deps (GsPlugin *plugin)
 {
        static const gchar *deps[] = {
-               "hardcoded-categories", /* need category list */
+               "moduleset",    /* need category list */
                NULL };
        return deps;
 }
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]