r49051 - in /packages/unstable/gnome-builder/debian: ./ patches/

jbicha-guest at users.alioth.debian.org jbicha-guest at users.alioth.debian.org
Mon Jun 6 00:34:19 UTC 2016 

Author: jbicha-guest
Date: Mon Jun  6 00:34:19 2016
New Revision: 49051

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=49051
Log:
* debian/rules, debian/gnome-builder.install, and
  0001-app-rename-program-mode-checks-to-gnome-builder-cli.patch:
  - Rename `/usr/bin/ide` to `gnome-builder-cli` (Closes: #824517)
* Backport some other fixes from git:
  - 0002-terminal-add-scrollbar-for-terminal.patch
  - 0003-desktop-Add-IDE-category.patch

Added:
    packages/unstable/gnome-builder/debian/patches/
    packages/unstable/gnome-builder/debian/patches/0001-app-rename-program-mode-checks-to-gnome-builder-cli.patch
    packages/unstable/gnome-builder/debian/patches/0002-terminal-add-scrollbar-for-terminal.patch
    packages/unstable/gnome-builder/debian/patches/0003-desktop-Add-IDE-category.patch
    packages/unstable/gnome-builder/debian/patches/series
Modified:
    packages/unstable/gnome-builder/debian/changelog
    packages/unstable/gnome-builder/debian/gnome-builder.install
    packages/unstable/gnome-builder/debian/rules

Modified: packages/unstable/gnome-builder/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-builder/debian/changelog?rev=49051&op=diff
==============================================================================
--- packages/unstable/gnome-builder/debian/changelog	[utf-8] (original)
+++ packages/unstable/gnome-builder/debian/changelog	[utf-8] Mon Jun  6 00:34:19 2016
@@ -1,10 +1,19 @@
 gnome-builder (3.20.4-2) UNRELEASED; urgency=medium
 
+  [ Andreas Henriksson ]
   * Depend on clang to have a solid out-of-the-box experience with C/C++
     - as recommended by upstream
   * Depend on gir1.2-git2-glib-1.0 as needed by contributing_plugin
   * Depend on libvala-0.32-dev as libvala-0.32.pc is needed to find
     libvala-0.32. Fixes warning on console while opening a project.
+
+  [ Jeremy Bicha ]
+  * debian/rules, debian/gnome-builder.install, and
+    0001-app-rename-program-mode-checks-to-gnome-builder-cli.patch:
+    - Rename `/usr/bin/ide` to `gnome-builder-cli` (Closes: #824517)
+  * Backport some other fixes from git:
+    - 0002-terminal-add-scrollbar-for-terminal.patch
+    - 0003-desktop-Add-IDE-category.patch
 
  -- Andreas Henriksson <andreas at fatal.se>  Tue, 24 May 2016 18:40:10 +0200
 

Modified: packages/unstable/gnome-builder/debian/gnome-builder.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-builder/debian/gnome-builder.install?rev=49051&op=diff
==============================================================================
--- packages/unstable/gnome-builder/debian/gnome-builder.install	[utf-8] (original)
+++ packages/unstable/gnome-builder/debian/gnome-builder.install	[utf-8] Mon Jun  6 00:34:19 2016
@@ -1,6 +1,6 @@
 usr/bin/gnome-builder
+usr/bin/gnome-builder-cli
 usr/bin/gnome-builder-worker
-usr/bin/ide
 usr/lib/*/gnome-builder/*.so
 usr/lib/*/gnome-builder/*.so*
 usr/lib/*/gnome-builder/girepository-1.0/*.typelib

Added: packages/unstable/gnome-builder/debian/patches/0001-app-rename-program-mode-checks-to-gnome-builder-cli.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-builder/debian/patches/0001-app-rename-program-mode-checks-to-gnome-builder-cli.patch?rev=49051&op=file
==============================================================================
--- packages/unstable/gnome-builder/debian/patches/0001-app-rename-program-mode-checks-to-gnome-builder-cli.patch	(added)
+++ packages/unstable/gnome-builder/debian/patches/0001-app-rename-program-mode-checks-to-gnome-builder-cli.patch	[utf-8] Mon Jun  6 00:34:19 2016
@@ -0,0 +1,39 @@
+Bug-Debian: https://bugs.debian.org/824517
+From 4fe369f5aa7c6215cf87740dc873b1b8e3f2b919 Mon Sep 17 00:00:00 2001
+From: Christian Hergert <chergert at redhat.com>
+Date: Sun, 5 Jun 2016 14:36:51 -0700
+Subject: app: rename program mode checks to gnome-builder-cli
+
+---
+ libide/ide-application-command-line.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/libide/ide-application-command-line.c b/libide/ide-application-command-line.c
+index 98958c7..68df5bb 100644
+--- a/libide/ide-application-command-line.c
++++ b/libide/ide-application-command-line.c
+@@ -257,7 +257,7 @@ ide_application_local_command_line (GApplication   *application,
+   if (prgname && g_str_has_prefix (prgname, "lt-"))
+     prgname += strlen ("lt-");
+ 
+-  if (g_str_equal (prgname, "ide"))
++  if (g_str_equal (prgname, "gnome-builder-cli"))
+     {
+       g_assert_cmpstr (entries [0].long_name, ==, "list-commands");
+       entries [0].flags = 0;
+@@ -277,10 +277,10 @@ ide_application_local_command_line (GApplication   *application,
+   ide_application_discover_plugins (self);
+ 
+   /*
+-   * If we are the "ide" program, then we want to setup ourselves for
++   * If we are the "cli" program, then we want to setup ourselves for
+    * verb style commands and add a commands group for help.
+    */
+-  if (g_str_equal (prgname, "ide"))
++  if (g_str_equal (prgname, "gnome-builder-cli"))
+     {
+       gchar *command_help;
+ 
+-- 
+2.8.1
+

Added: packages/unstable/gnome-builder/debian/patches/0002-terminal-add-scrollbar-for-terminal.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-builder/debian/patches/0002-terminal-add-scrollbar-for-terminal.patch?rev=49051&op=file
==============================================================================
--- packages/unstable/gnome-builder/debian/patches/0002-terminal-add-scrollbar-for-terminal.patch	(added)
+++ packages/unstable/gnome-builder/debian/patches/0002-terminal-add-scrollbar-for-terminal.patch	[utf-8] Mon Jun  6 00:34:19 2016
@@ -0,0 +1,112 @@
+From 6818137ee596a30141653409e83ca0ee068284ab Mon Sep 17 00:00:00 2001
+From: Christian Hergert <chergert at redhat.com>
+Date: Tue, 10 May 2016 12:57:27 +0300
+Subject: terminal: add scrollbar for terminal
+
+---
+ plugins/terminal/gb-terminal-view-private.h |  3 +++
+ plugins/terminal/gb-terminal-view.c         | 15 ++++++++++++++-
+ plugins/terminal/gb-terminal-view.ui        | 14 ++++++++++++++
+ 3 files changed, 31 insertions(+), 1 deletion(-)
+
+diff --git a/plugins/terminal/gb-terminal-view-private.h b/plugins/terminal/gb-terminal-view-private.h
+index d3326ac..7d271e9 100644
+--- a/plugins/terminal/gb-terminal-view-private.h
++++ b/plugins/terminal/gb-terminal-view-private.h
+@@ -31,6 +31,9 @@ struct _GbTerminalView
+   VteTerminal         *terminal_top;
+   VteTerminal         *terminal_bottom;
+ 
++  GtkScrollbar        *top_scrollbar;
++  GtkScrollbar        *bottom_scrollbar;
++
+   GFile               *save_as_file_top;
+   GFile               *save_as_file_bottom;
+ 
+diff --git a/plugins/terminal/gb-terminal-view.c b/plugins/terminal/gb-terminal-view.c
+index 7e54009..968b5fa 100644
+--- a/plugins/terminal/gb-terminal-view.c
++++ b/plugins/terminal/gb-terminal-view.c
+@@ -413,7 +413,10 @@ gb_terminal_set_split_view (IdeLayoutView   *view,
+                                             "expand", TRUE,
+                                             "visible", TRUE,
+                                             NULL);
+-      gtk_container_add (GTK_CONTAINER (self->bottom_container), GTK_WIDGET (self->terminal_bottom));
++      gtk_container_add_with_properties (GTK_CONTAINER (self->bottom_container),
++                                         GTK_WIDGET (self->terminal_bottom),
++                                         "position", 0,
++                                         NULL);
+       gtk_widget_show (self->bottom_container);
+ 
+       gb_terminal_view_connect_terminal (self, self->terminal_bottom);
+@@ -459,9 +462,17 @@ static void
+ gb_terminal_view_connect_terminal (GbTerminalView *self,
+                                    VteTerminal    *terminal)
+ {
++  GtkAdjustment *vadj;
+   GQuark quark;
+   guint signal_id;
+ 
++  vadj = gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (terminal));
++
++  if (terminal == self->terminal_top)
++    gtk_range_set_adjustment (GTK_RANGE (self->top_scrollbar), vadj);
++  else
++    gtk_range_set_adjustment (GTK_RANGE (self->bottom_scrollbar), vadj);
++
+   g_signal_connect_object (terminal,
+                            "size-allocate",
+                            G_CALLBACK (size_allocate_cb),
+@@ -553,6 +564,8 @@ gb_terminal_view_class_init (GbTerminalViewClass *klass)
+   gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/builder/plugins/terminal/gb-terminal-view.ui");
+   gtk_widget_class_bind_template_child (widget_class, GbTerminalView, terminal_top);
+   gtk_widget_class_bind_template_child (widget_class, GbTerminalView, bottom_container);
++  gtk_widget_class_bind_template_child (widget_class, GbTerminalView, top_scrollbar);
++  gtk_widget_class_bind_template_child (widget_class, GbTerminalView, bottom_scrollbar);
+ 
+   g_type_ensure (VTE_TYPE_TERMINAL);
+ 
+diff --git a/plugins/terminal/gb-terminal-view.ui b/plugins/terminal/gb-terminal-view.ui
+index 8a66b06..30a3ebe 100644
+--- a/plugins/terminal/gb-terminal-view.ui
++++ b/plugins/terminal/gb-terminal-view.ui
+@@ -10,6 +10,7 @@
+         <property name="visible">true</property>
+         <child>
+           <object class="GtkBox" id="top_container">
++            <property name="orientation">horizontal</property>
+             <property name="expand">true</property>
+             <property name="visible">true</property>
+             <child>
+@@ -20,6 +21,12 @@
+                 <property name="scrollback-lines">0xffffffff</property>
+               </object>
+             </child>
++            <child>
++              <object class="GtkScrollbar" id="top_scrollbar">
++                <property name="orientation">vertical</property>
++                <property name="visible">true</property>
++              </object>
++            </child>
+           </object>
+           <packing>
+             <property name="resize">true</property>
+@@ -28,8 +35,15 @@
+         </child>
+         <child>
+           <object class="GtkBox" id="bottom_container">
++            <property name="orientation">horizontal</property>
+             <property name="expand">true</property>
+             <property name="visible">false</property>
++            <child>
++              <object class="GtkScrollbar" id="bottom_scrollbar">
++                <property name="orientation">vertical</property>
++                <property name="visible">true</property>
++              </object>
++            </child>
+           </object>
+           <packing>
+             <property name="resize">true</property>
+-- 
+2.8.1
+

Added: packages/unstable/gnome-builder/debian/patches/0003-desktop-Add-IDE-category.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-builder/debian/patches/0003-desktop-Add-IDE-category.patch?rev=49051&op=file
==============================================================================
--- packages/unstable/gnome-builder/debian/patches/0003-desktop-Add-IDE-category.patch	(added)
+++ packages/unstable/gnome-builder/debian/patches/0003-desktop-Add-IDE-category.patch	[utf-8] Mon Jun  6 00:34:19 2016
@@ -0,0 +1,30 @@
+From 1e25a1f0d07e6c227124270f3872b6dcfbdce5f2 Mon Sep 17 00:00:00 2001
+From: Jeremy Bicha <jbicha at linux.com>
+Date: Sun, 5 Jun 2016 14:12:49 -0400
+Subject: desktop: Add IDE category
+
+Now GNOME Builder will show up in Development Tools>IDE in
+GNOME Software.
+
+https://standards.freedesktop.org/menu-spec/latest/apas02.html
+
+https://bugzilla.gnome.org/show_bug.cgi?id=767273
+---
+ data/org.gnome.Builder.desktop.in.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/org.gnome.Builder.desktop.in.in b/data/org.gnome.Builder.desktop.in.in
+index f8f36a8..76d2214 100644
+--- a/data/org.gnome.Builder.desktop.in.in
++++ b/data/org.gnome.Builder.desktop.in.in
+@@ -7,6 +7,6 @@ DBusActivatable=true
+ StartupNotify=true
+ Terminal=false
+ Type=Application
+-Categories=GNOME;GTK;Development;
++Categories=GNOME;GTK;Development;IDE;
+ _Keywords=Build;Develop;
+ MimeType=text/x-c;text/x-csrc;text/x-changelog;text/x-chdr;text/x-c++hdr;text/x-python;application/x-python;application/javascript;application/x-javascript;text/x-javascript;text/javascript;text/x-js;text/x-shellscript;application/x-shellscript;text/x-sh;text/x-vala;text/x-makefile;text/x-c++;text/x-cpp;text/x-c++src;text/css;application/x-gnome-app-info;application/x-desktop;text/x-go;text/html;text/x-markdown;application/json;application/x-m4;application/xml;text/xml;application/x-yaml;text/x-sql;application/x-ruby;text/x-ruby;text/x-pkg-config;text/x-lua;text/x-php;application/x-php;text/x-php-source;application/x-php-source;text/x-perl;application/x-perl;
+-- 
+2.8.1
+

Added: packages/unstable/gnome-builder/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-builder/debian/patches/series?rev=49051&op=file
==============================================================================
--- packages/unstable/gnome-builder/debian/patches/series	(added)
+++ packages/unstable/gnome-builder/debian/patches/series	[utf-8] Mon Jun  6 00:34:19 2016
@@ -0,0 +1,3 @@
+0001-app-rename-program-mode-checks-to-gnome-builder-cli.patch
+0002-terminal-add-scrollbar-for-terminal.patch
+0003-desktop-Add-IDE-category.patch

Modified: packages/unstable/gnome-builder/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-builder/debian/rules?rev=49051&op=diff
==============================================================================
--- packages/unstable/gnome-builder/debian/rules	[utf-8] (original)
+++ packages/unstable/gnome-builder/debian/rules	[utf-8] Mon Jun  6 00:34:19 2016
@@ -71,6 +71,7 @@
 	find debian/tmp -name '*.la' -delete
 	find debian/tmp/usr/lib/ -name '*.pyc' -o -name '*.pyo' -delete
 	rm -rf debian/tmp/usr/include/gnome-builder-*
+	mv debian/tmp/usr/bin/ide debian/tmp/usr/bin/gnome-builder-cli
 	dh_install --fail-missing -Xgtk-doc -Xpkgconfig -Xgir-1.0
 
 override_dh_makeshlibs:

More information about the pkg-gnome-commits mailing list