Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4387 from Rmys/master

Browse Source 
gtk2-2.24.32:ver.bump
This commit is contained in:
Rmys
2018-01-31 13:17:58 +03:00
committed by GitHub
parent 5a44951824 b14f57c579
commit 0d3145410d
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/toolkit/gtk/gtk2/files/fedora/window-dragging.patch
+2 -2
View File
@@ -5,7 +5,7 @@ diff -up gtk+-2.24.7/gtk/gtkmenushell.c.window-dragging gtk+-2.24.7/gtk/gtkmenus
if (!menu_shell->active || !menu_shell->button) if (!menu_shell->active || !menu_shell->button)
{ {
- _gtk_menu_shell_activate (menu_shell); - gtk_menu_shell_activate (menu_shell);
+ gboolean initially_active = menu_shell->active; + gboolean initially_active = menu_shell->active;
menu_shell->button = event->button; menu_shell->button = event->button;
@@ -22,7 +22,7 @@ diff -up gtk+-2.24.7/gtk/gtkmenushell.c.window-dragging gtk+-2.24.7/gtk/gtkmenus
{ {
- menu_shell->activate_time = event->time; - menu_shell->activate_time = event->time;
- gtk_menu_shell_select_item (menu_shell, menu_item); - gtk_menu_shell_select_item (menu_shell, menu_item);
+ _gtk_menu_shell_activate (menu_shell); + gtk_menu_shell_activate (menu_shell);
+ menu_shell->button = event->button; + menu_shell->button = event->button;
+ +
+ if (GTK_MENU_SHELL_GET_CLASS (menu_shell)->submenu_placement == GTK_TOP_BOTTOM) + if (GTK_MENU_SHELL_GET_CLASS (menu_shell)->submenu_placement == GTK_TOP_BOTTOM)
desktop/toolkit/gtk/gtk2/pspec.xml
+11 -1
View File
@@ -11,7 +11,7 @@
<License>LGPLv2.1</License> <License>LGPLv2.1</License>
<Summary>The GIMP Toolkit version 2</Summary> <Summary>The GIMP Toolkit version 2</Summary>
<Description>GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete set of widgets, GTK+ is suitable for projects ranging from small one-off projects to complete application suites.</Description> <Description>GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete set of widgets, GTK+ is suitable for projects ranging from small one-off projects to complete application suites.</Description>
<Archive sha1sum="c3d828135994a52cc9428a60175bd2b294656611" type="tarxz">mirrors://gnome/gtk+/2.24/gtk+-2.24.31.tar.xz</Archive> <Archive sha1sum="c885ade62b06854590822c8eb906daf7dd15d90a" type="tarxz">mirrors://gnome/gtk+/2.24/gtk+-2.24.32.tar.xz</Archive>
<BuildDependencies> <BuildDependencies>
<Dependency>cups-devel</Dependency><!--It was disabled to avoid circle--> <Dependency>cups-devel</Dependency><!--It was disabled to avoid circle-->
<Dependency>libXi-devel</Dependency> <Dependency>libXi-devel</Dependency>
@@ -31,6 +31,7 @@
<Dependency>graphite2-devel</Dependency> <Dependency>graphite2-devel</Dependency>
<Dependency>gdk-pixbuf-devel</Dependency> <Dependency>gdk-pixbuf-devel</Dependency>
<Dependency>gtk-doc</Dependency> <Dependency>gtk-doc</Dependency>
<Dependency>python-six</Dependency>
<Dependency>gobject-introspection-devel</Dependency> <Dependency>gobject-introspection-devel</Dependency>
</BuildDependencies> </BuildDependencies>
<Patches> <Patches>
@@ -48,6 +49,7 @@
<Package> <Package>
<Name>gtk2</Name> <Name>gtk2</Name>
<RuntimeDependencies> <RuntimeDependencies>
<Dependency>cups</Dependency>
<Dependency>libXi</Dependency> <Dependency>libXi</Dependency>
<Dependency>cairo</Dependency> <Dependency>cairo</Dependency>
<Dependency>libXext</Dependency> <Dependency>libXext</Dependency>
@@ -118,6 +120,7 @@
<RuntimeDependencies> <RuntimeDependencies>
<Dependency release="current">gtk2</Dependency> <Dependency release="current">gtk2</Dependency>
<Dependency>atk-devel</Dependency> <Dependency>atk-devel</Dependency>
<Dependency>glib2-devel</Dependency>
<Dependency>pango-devel</Dependency> <Dependency>pango-devel</Dependency>
<Dependency>cairo-devel</Dependency> <Dependency>cairo-devel</Dependency>
<Dependency>gdk-pixbuf-devel</Dependency> <Dependency>gdk-pixbuf-devel</Dependency>
@@ -182,6 +185,13 @@
</Package> </Package>
<History> <History>
<Update release="6">
<Date>2018-01-30</Date>
<Version>2.24.32</Version>
<Comment>Rebuild</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="5"> <Update release="5">
<Date>2017-05-08</Date> <Date>2017-05-08</Date>
<Version>2.24.31</Version> <Version>2.24.31</Version>