AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-26 13:41:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'matthiasc/for-master' into 'master'

Browse Source 
Revert "flatpak: No need to build sassc anymore"

See merge request GNOME/gtk!3266
This commit is contained in:
Matthias Clasen 2021-03-07 14:59:57 +00:00
commit 42b515a1e5
4 changed files with 92 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
build-aux/flatpak/org.gtk.Demo4.json
View File

@ -63,6 +63,36 @@
}
]
},
{
"name" : "libsass",
"buildsystem" : "meson",
"builddir" : true,
"config-opts" : [
"--libdir=/app/lib"
],
"sources" : [
{
"type" : "git",
"url" : "https://github.com/lazka/libsass.git",
"branch" : "meson"
}
]
},
{
"name" : "sassc",
"buildsystem" : "meson",
"builddir" : true,
"config-opts" : [
"--libdir=/app/lib"
],
"sources" : [
{
"type" : "git",
"url" : "https://github.com/lazka/sassc.git",
"branch" : "meson"
}
]
},
{
"name" : "gtk",
"buildsystem" : "meson",

30
build-aux/flatpak/org.gtk.IconBrowser4.json
View File

@ -63,6 +63,36 @@
}
]
},
{
"name" : "libsass",
"buildsystem" : "meson",
"builddir" : true,
"config-opts" : [
"--libdir=/app/lib"
],
"sources" : [
{
"type" : "git",
"url" : "https://github.com/lazka/libsass.git",
"branch" : "meson"
}
]
},
{
"name" : "sassc",
"buildsystem" : "meson",
"builddir" : true,
"config-opts" : [
"--libdir=/app/lib"
],
"sources" : [
{
"type" : "git",
"url" : "https://github.com/lazka/sassc.git",
"branch" : "meson"
}
]
},
{
"name" : "gtk",
"buildsystem" : "meson",

30
build-aux/flatpak/org.gtk.WidgetFactory4.json
View File

@ -63,6 +63,36 @@
}
]
},
{
"name" : "libsass",
"buildsystem" : "meson",
"builddir" : true,
"config-opts" : [
"--libdir=/app/lib"
],
"sources" : [
{
"type" : "git",
"url" : "https://github.com/lazka/libsass.git",
"branch" : "meson"
}
]
},
{
"name" : "sassc",
"buildsystem" : "meson",
"builddir" : true,
"config-opts" : [
"--libdir=/app/lib"
],
"sources" : [
{
"type" : "git",
"url" : "https://github.com/lazka/sassc.git",
"branch" : "meson"
}
]
},
{
"name" : "gtk",
"buildsystem" : "meson",

9
gsk/gskroundedrect.c
View File

@ -388,8 +388,7 @@ gsk_rounded_rect_locate_point (const GskRoundedRect *self,
* @self: a #GskRoundedRect
* @point: the point to check
*
* Checks if the given @point is inside the rounded rectangle. This function
* returns %FALSE if the point is in the rounded corner areas.
* Checks if the given @point is inside the rounded rectangle.
*
* Returns: %TRUE if the @point is inside the rounded rectangle
**/
@ -406,8 +405,6 @@ gsk_rounded_rect_contains_point (const GskRoundedRect *self,
* @rect: the rectangle to check
*
* Checks if the given @rect is contained inside the rounded rectangle.
* This function returns %FALSE if @rect extends into one of the rounded
* corner areas.
*
* Returns: %TRUE if the @rect is fully contained inside the rounded rectangle
**/
@ -436,11 +433,9 @@ gsk_rounded_rect_contains_rect (const GskRoundedRect *self,
* @rect: the rectangle to check
*
* Checks if part of the given @rect is contained inside the rounded rectangle.
* This function returns %FALSE if @rect only extends into one of the rounded
* corner areas but not into the rounded rectangle itself.
*
* Returns: %TRUE if the @rect intersects with the rounded rectangle
**/
*/
gboolean
gsk_rounded_rect_intersects_rect (const GskRoundedRect *self,
const graphene_rect_t *rect)