Compare commits

...

No commits in common. "c8" and "c9s" have entirely different histories.
c8 ... c9s

11 changed files with 770 additions and 774 deletions

182
.gitignore vendored
View File

@ -1 +1,181 @@
SOURCES/gnome-desktop-3.32.2.tar.xz
gnome-desktop-2.90.4.tar.bz2
/gnome-desktop-2.91.0.tar.bz2
/gnome-desktop-2.91.1.tar.bz2
/gnome-desktop-2.91.2.tar.bz2
/gnome-desktop-2.91.3.tar.bz2
/gnome-desktop-2.91.4.tar.bz2
/gnome-desktop-2.91.5.tar.bz2
/gnome-desktop-2.91.6.tar.bz2
/gnome-desktop-2.91.6.1.tar.bz2
/gnome-desktop-2.91.90.tar.bz2
/gnome-desktop-2.91.91.tar.bz2
/gnome-desktop-2.91.92.tar.bz2
/gnome-desktop-2.91.93.tar.bz2
/gnome-desktop-3.0.0.tar.bz2
/gnome-desktop-3.0.1.tar.bz2
/gnome-desktop-3.1.1.tar.bz2
/gnome-desktop-3.1.2.tar.xz
/gnome-desktop-3.1.3.tar.xz
/gnome-desktop-3.1.4.tar.xz
/gnome-desktop-3.1.91.tar.xz
/gnome-desktop-3.1.92.tar.xz
/gnome-desktop-3.2.0.tar.xz
/gnome-desktop-3.2.1.tar.xz
/gnome-desktop-3.3.1.tar.xz
/gnome-desktop-3.3.2.tar.xz
/gnome-desktop-3.3.3.tar.xz
/gnome-desktop-3.3.4.tar.xz
/gnome-desktop-3.3.5.tar.xz
/gnome-desktop-3.3.92.tar.xz
/gnome-desktop-3.4.0.tar.xz
/gnome-desktop-3.4.1.tar.xz
/gnome-desktop-3.4.2.tar.xz
/gnome-desktop-3.5.2.tar.xz
/gnome-desktop-3.5.3.tar.xz
/gnome-desktop-3.5.4.tar.xz
/gnome-desktop-3.5.5.tar.xz
/gnome-desktop-3.5.90.tar.xz
/gnome-desktop-3.5.91.tar.xz
/gnome-desktop-3.6.0.tar.xz
/gnome-desktop-3.6.0.1.tar.xz
/gnome-desktop-3.6.1.tar.xz
/gnome-desktop-3.7.1.tar.xz
/gnome-desktop-3.7.2.tar.xz
/gnome-desktop-3.7.3.tar.xz
/gnome-desktop-3.7.4.tar.xz
/gnome-desktop-3.7.5.tar.xz
/gnome-desktop-3.7.90.tar.xz
/gnome-desktop-3.7.91.1.tar.xz
/gnome-desktop-3.7.92.tar.xz
/gnome-desktop-3.8.0.tar.xz
/gnome-desktop-3.8.0.1.tar.xz
/gnome-desktop-3.8.1.tar.xz
/gnome-desktop-3.8.2.tar.xz
/gnome-desktop-3.9.1.1.tar.xz
/gnome-desktop-3.9.5.tar.xz
/gnome-desktop-3.9.90.tar.xz
/gnome-desktop-3.9.91.tar.xz
/gnome-desktop-3.9.92.tar.xz
/gnome-desktop-3.10.0.tar.xz
/gnome-desktop-3.10.1.tar.xz
/gnome-desktop-3.11.1.tar.xz
/gnome-desktop-3.11.2.tar.xz
/gnome-desktop-3.11.4.tar.xz
/gnome-desktop-3.11.5.tar.xz
/gnome-desktop-3.11.90.tar.xz
/gnome-desktop-3.11.91.tar.xz
/gnome-desktop-3.12.0.tar.xz
/gnome-desktop-3.12.1.tar.xz
/gnome-desktop-3.13.1.tar.xz
/gnome-desktop-3.13.2.tar.xz
/gnome-desktop-3.13.3.tar.xz
/gnome-desktop-3.13.4.tar.xz
/gnome-desktop-3.13.90.tar.xz
/gnome-desktop-3.13.91.tar.xz
/gnome-desktop-3.13.92.tar.xz
/gnome-desktop-3.14.0.tar.xz
/gnome-desktop-3.14.1.tar.xz
/gnome-desktop-3.14.2.tar.xz
/gnome-desktop-3.15.2.tar.xz
/gnome-desktop-3.15.2.1.tar.xz
/gnome-desktop-3.15.3.tar.xz
/gnome-desktop-3.15.4.tar.xz
/gnome-desktop-3.15.90.tar.xz
/gnome-desktop-3.15.91.tar.xz
/gnome-desktop-3.15.92.tar.xz
/gnome-desktop-3.16.0.tar.xz
/gnome-desktop-3.16.1.tar.xz
/gnome-desktop-3.16.2.tar.xz
/gnome-desktop-3.17.2.tar.xz
/gnome-desktop-3.17.3.tar.xz
/gnome-desktop-3.17.4.tar.xz
/gnome-desktop-3.17.90.tar.xz
/gnome-desktop-3.17.91.tar.xz
/gnome-desktop-3.17.92.tar.xz
/gnome-desktop-3.18.0.tar.xz
/gnome-desktop-3.18.1.tar.xz
/gnome-desktop-3.19.1.tar.xz
/gnome-desktop-3.19.2.tar.xz
/gnome-desktop-3.19.3.tar.xz
/gnome-desktop-3.19.90.tar.xz
/gnome-desktop-3.19.91.tar.xz
/gnome-desktop-3.19.92.tar.xz
/gnome-desktop-3.19.93.tar.xz
/gnome-desktop-3.20.0.tar.xz
/gnome-desktop-3.20.1.tar.xz
/gnome-desktop-3.21.1.tar.xz
/gnome-desktop-3.21.2.tar.xz
/gnome-desktop-3.21.3.tar.xz
/gnome-desktop-3.21.4.tar.xz
/gnome-desktop-3.21.90.tar.xz
/gnome-desktop-3.21.92.tar.xz
/gnome-desktop-3.22.0.tar.xz
/gnome-desktop-3.22.1.tar.xz
/gnome-desktop-3.23.1.tar.xz
/gnome-desktop-3.23.2.tar.xz
/gnome-desktop-3.23.3.tar.xz
/gnome-desktop-3.23.90.tar.xz
/gnome-desktop-3.23.91.tar.xz
/gnome-desktop-3.23.92.tar.xz
/gnome-desktop-3.24.0.tar.xz
/gnome-desktop-3.24.1.tar.xz
/gnome-desktop-3.24.2.tar.xz
/gnome-desktop-3.25.2.tar.xz
/gnome-desktop-3.25.3.tar.xz
/gnome-desktop-3.25.4.tar.xz
/gnome-desktop-3.25.90.tar.xz
/gnome-desktop-3.25.91.1.tar.xz
/gnome-desktop-3.25.92.tar.xz
/gnome-desktop-3.26.0.tar.xz
/gnome-desktop-3.26.1.tar.xz
/gnome-desktop-3.26.2.tar.xz
/gnome-desktop-3.27.90.tar.xz
/gnome-desktop-3.27.92.tar.xz
/gnome-desktop-3.28.0.tar.xz
/gnome-desktop-3.28.1.tar.xz
/gnome-desktop-3.28.2.tar.xz
/gnome-desktop-3.29.90.1.tar.xz
/gnome-desktop-3.30.0.tar.xz
/gnome-desktop-3.30.1.tar.xz
/gnome-desktop-3.30.2.tar.xz
/gnome-desktop-3.31.4.tar.xz
/gnome-desktop-3.31.90.tar.xz
/gnome-desktop-3.31.91.tar.xz
/gnome-desktop-3.31.92.tar.xz
/gnome-desktop-3.32.0.tar.xz
/gnome-desktop-3.32.1.tar.xz
/gnome-desktop-3.32.2.tar.xz
/gnome-desktop-3.33.1.tar.xz
/gnome-desktop-3.33.2.tar.xz
/gnome-desktop-3.33.3.tar.xz
/gnome-desktop-3.33.4.tar.xz
/gnome-desktop-3.33.90.tar.xz
/gnome-desktop-3.33.91.tar.xz
/gnome-desktop-3.33.92.1.tar.xz
/gnome-desktop-3.34.0.tar.xz
/gnome-desktop-3.34.1.tar.xz
/gnome-desktop-3.35.2.tar.xz
/gnome-desktop-3.35.4.tar.xz
/gnome-desktop-3.35.90.tar.xz
/gnome-desktop-3.35.91.tar.xz
/gnome-desktop-3.36.0.tar.xz
/gnome-desktop-3.36.1.tar.xz
/gnome-desktop-3.36.2.tar.xz
/gnome-desktop-3.37.1.tar.xz
/gnome-desktop-3.37.2.tar.xz
/gnome-desktop-3.37.3.tar.xz
/gnome-desktop-3.37.90.1.tar.xz
/gnome-desktop-3.37.91.tar.xz
/gnome-desktop-3.37.92.tar.xz
/gnome-desktop-3.38.0.tar.xz
/gnome-desktop-3.38.1.tar.xz
/gnome-desktop-3.38.2.tar.xz
/gnome-desktop-3.38.3.tar.xz
/gnome-desktop-40.alpha.0.tar.xz
/gnome-desktop-40.beta.tar.xz
/gnome-desktop-40.rc.tar.xz
/gnome-desktop-40.0.tar.xz
/gnome-desktop-40.1.tar.xz
/gnome-desktop-40.2.tar.xz
/gnome-desktop-40.3.tar.xz
/gnome-desktop-40.4.tar.xz

1
.gnome-desktop3.metadata Normal file
View File

@ -0,0 +1 @@
57a003aa0e4f68fbfb18a56f2b807e145e1f643c gnome-desktop-40.4.tar.xz

View File

@ -1,732 +0,0 @@
From fd54e06bb9ac519fc562f3d309a6befd47f9abf6 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jeremy@system76.com>
Date: Tue, 11 Jun 2019 15:25:26 -0600
Subject: [PATCH] Use connector_type from mutter to fix detection of builtin
display on NVIDIA
---
libgnome-desktop/gnome-rr-config.c | 6 +++---
libgnome-desktop/gnome-rr-output-info.c | 2 ++
libgnome-desktop/gnome-rr-private.h | 4 +++-
libgnome-desktop/gnome-rr.c | 28 ++++++++++++++++++++++++-
4 files changed, 35 insertions(+), 5 deletions(-)
diff --git a/libgnome-desktop/gnome-rr-config.c b/libgnome-desktop/gnome-rr-config.c
index 707df697..396f1f4d 100644
--- a/libgnome-desktop/gnome-rr-config.c
+++ b/libgnome-desktop/gnome-rr-config.c
@@ -136,60 +136,61 @@ gnome_rr_config_finalize (GObject *gobject)
G_OBJECT_CLASS (gnome_rr_config_parent_class)->finalize (gobject);
}
gboolean
gnome_rr_config_load_current (GnomeRRConfig *config, GError **error)
{
GPtrArray *a;
GnomeRROutput **rr_outputs;
int i;
int clone_width = -1;
int clone_height = -1;
int last_x;
g_return_val_if_fail (GNOME_IS_RR_CONFIG (config), FALSE);
a = g_ptr_array_new ();
rr_outputs = gnome_rr_screen_list_outputs (config->priv->screen);
config->priv->clone = FALSE;
for (i = 0; rr_outputs[i] != NULL; ++i)
{
GnomeRROutput *rr_output = rr_outputs[i];
GnomeRROutputInfo *output = g_object_new (GNOME_TYPE_RR_OUTPUT_INFO, NULL);
GnomeRRMode *mode = NULL;
GnomeRRCrtc *crtc;
output->priv->name = g_strdup (gnome_rr_output_get_name (rr_output));
output->priv->connected = TRUE;
output->priv->display_name = g_strdup (gnome_rr_output_get_display_name (rr_output));
+ output->priv->connector_type = g_strdup (_gnome_rr_output_get_connector_type (rr_output));
output->priv->config = config;
output->priv->is_tiled = _gnome_rr_output_get_tile_info (rr_output,
&output->priv->tile);
if (output->priv->is_tiled)
{
_gnome_rr_output_get_tiled_display_size (rr_output, NULL, NULL,
&output->priv->total_tiled_width,
&output->priv->total_tiled_height);
}
if (!output->priv->connected)
{
output->priv->x = -1;
output->priv->y = -1;
output->priv->width = -1;
output->priv->height = -1;
output->priv->rate = -1;
}
else
{
gnome_rr_output_get_ids_from_edid (rr_output,
&output->priv->vendor,
&output->priv->product,
&output->priv->serial);
crtc = gnome_rr_output_get_crtc (rr_output);
mode = crtc ? gnome_rr_crtc_get_current_mode (crtc) : NULL;
if (crtc && mode)
{
@@ -411,60 +412,61 @@ gnome_rr_config_equal (GnomeRRConfig *c1,
GnomeRROutputInfo *output1 = c1->priv->outputs[i];
GnomeRROutputInfo *output2;
output2 = find_output (c2, output1->priv->name);
if (!output2 || !output_equal (output1, output2))
return FALSE;
}
return TRUE;
}
static GnomeRROutputInfo **
make_outputs (GnomeRRConfig *config)
{
GPtrArray *outputs;
GnomeRROutputInfo *first_on;
int i;
outputs = g_ptr_array_new ();
first_on = NULL;
for (i = 0; config->priv->outputs[i] != NULL; ++i)
{
GnomeRROutputInfo *old = config->priv->outputs[i];
GnomeRROutputInfo *new = g_object_new (GNOME_TYPE_RR_OUTPUT_INFO, NULL);
*(new->priv) = *(old->priv);
new->priv->name = g_strdup (old->priv->name);
new->priv->display_name = g_strdup (old->priv->display_name);
+ new->priv->connector_type = g_strdup (old->priv->connector_type);
new->priv->vendor = g_strdup (old->priv->vendor);
new->priv->product = g_strdup (old->priv->product);
new->priv->serial = g_strdup (old->priv->serial);
if (old->priv->on && !first_on)
first_on = old;
if (config->priv->clone && new->priv->on)
{
g_assert (first_on);
new->priv->width = first_on->priv->width;
new->priv->height = first_on->priv->height;
new->priv->rotation = first_on->priv->rotation;
new->priv->x = 0;
new->priv->y = 0;
}
g_ptr_array_add (outputs, new);
}
g_ptr_array_add (outputs, NULL);
return (GnomeRROutputInfo **)g_ptr_array_free (outputs, FALSE);
}
gboolean
gnome_rr_config_applicable (GnomeRRConfig *configuration,
GnomeRRScreen *screen,
GError **error)
@@ -565,63 +567,61 @@ gnome_rr_config_ensure_primary (GnomeRRConfig *configuration)
g_return_val_if_fail (GNOME_IS_RR_CONFIG (configuration), FALSE);
builtin_display = NULL;
top_left = NULL;
found = FALSE;
priv = configuration->priv;
for (i = 0; priv->outputs[i] != NULL; ++i) {
GnomeRROutputInfo *info = priv->outputs[i];
if (!info->priv->on) {
info->priv->primary = FALSE;
continue;
}
/* ensure only one */
if (info->priv->primary) {
if (found) {
info->priv->primary = FALSE;
} else {
found = TRUE;
}
}
if (top_left == NULL
|| (info->priv->x < top_left->priv->x
&& info->priv->y < top_left->priv->y)) {
top_left = info;
}
if (builtin_display == NULL
- && _gnome_rr_output_name_is_builtin_display (info->priv->name)) {
- /* shame we can't find the connector type
- as with gnome_rr_output_is_builtin_display */
+ && _gnome_rr_output_connector_type_is_builtin_display (info->priv->connector_type)) {
builtin_display = info;
}
}
if (!found) {
if (builtin_display != NULL) {
builtin_display->priv->primary = TRUE;
} else if (top_left != NULL) {
/* Note: top_left can be NULL if all outputs are off */
top_left->priv->primary = TRUE;
}
}
return !found;
}
static gboolean
gnome_rr_config_apply_helper (GnomeRRConfig *config,
GnomeRRScreen *screen,
gboolean persistent,
GError **error)
{
CrtcAssignment *assignment;
GnomeRROutputInfo **outputs;
gboolean result = FALSE;
int i;
g_return_val_if_fail (GNOME_IS_RR_CONFIG (config), FALSE);
g_return_val_if_fail (GNOME_IS_RR_SCREEN (screen), FALSE);
diff --git a/libgnome-desktop/gnome-rr-output-info.c b/libgnome-desktop/gnome-rr-output-info.c
index 7f97ecc1..08e9b45e 100644
--- a/libgnome-desktop/gnome-rr-output-info.c
+++ b/libgnome-desktop/gnome-rr-output-info.c
@@ -13,69 +13,71 @@
* The Gnome Library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with the Gnome Desktop Library; see the file COPYING.LIB. If not,
* write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
#define GNOME_DESKTOP_USE_UNSTABLE_API
#include <config.h>
#include "gnome-rr-config.h"
#include "gnome-rr-private.h"
G_DEFINE_TYPE (GnomeRROutputInfo, gnome_rr_output_info, G_TYPE_OBJECT)
static void
gnome_rr_output_info_init (GnomeRROutputInfo *self)
{
self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GNOME_TYPE_RR_OUTPUT_INFO, GnomeRROutputInfoPrivate);
self->priv->name = NULL;
self->priv->on = FALSE;
self->priv->rotation = GNOME_RR_ROTATION_0;
self->priv->display_name = NULL;
+ self->priv->connector_type = NULL;
}
static void
gnome_rr_output_info_finalize (GObject *gobject)
{
GnomeRROutputInfo *self = GNOME_RR_OUTPUT_INFO (gobject);
g_free (self->priv->name);
g_free (self->priv->display_name);
+ g_free (self->priv->connector_type);
g_free (self->priv->product);
g_free (self->priv->serial);
g_free (self->priv->vendor);
G_OBJECT_CLASS (gnome_rr_output_info_parent_class)->finalize (gobject);
}
static void
gnome_rr_output_info_class_init (GnomeRROutputInfoClass *klass)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
g_type_class_add_private (klass, sizeof (GnomeRROutputInfoPrivate));
gobject_class->finalize = gnome_rr_output_info_finalize;
}
/**
* gnome_rr_output_info_get_name:
*
* Returns: (transfer none): the output name
*/
char *gnome_rr_output_info_get_name (GnomeRROutputInfo *self)
{
g_return_val_if_fail (GNOME_IS_RR_OUTPUT_INFO (self), NULL);
return self->priv->name;
}
/**
diff --git a/libgnome-desktop/gnome-rr-private.h b/libgnome-desktop/gnome-rr-private.h
index e721e39c..5a852010 100644
--- a/libgnome-desktop/gnome-rr-private.h
+++ b/libgnome-desktop/gnome-rr-private.h
@@ -59,65 +59,67 @@ struct GnomeRRTile {
guint max_vert_tiles;
guint loc_horiz;
guint loc_vert;
guint width;
guint height;
};
typedef struct GnomeRRTile GnomeRRTile;
struct _GnomeRROutputInfoPrivate
{
char * name;
gboolean on;
int width;
int height;
int rate;
int x;
int y;
GnomeRRRotation rotation;
GnomeRRRotation available_rotations;
gboolean connected;
char * vendor;
char * product;
char * serial;
double aspect;
int pref_width;
int pref_height;
char * display_name;
+ char * connector_type;
gboolean primary;
gboolean underscanning;
gboolean is_tiled;
GnomeRRTile tile;
int total_tiled_width;
int total_tiled_height;
/* ptr back to info */
GnomeRRConfig *config;
};
struct _GnomeRRConfigPrivate
{
gboolean clone;
GnomeRRScreen *screen;
GnomeRROutputInfo **outputs;
};
gboolean _gnome_rr_output_name_is_builtin_display (const char *name);
+gboolean _gnome_rr_output_connector_type_is_builtin_display (const char *connector_type);
gboolean _gnome_rr_screen_apply_configuration (GnomeRRScreen *screen,
gboolean persistent,
GVariant *crtcs,
GVariant *outputs,
GError **error);
-
+const char * _gnome_rr_output_get_connector_type (GnomeRROutput *output);
gboolean _gnome_rr_output_get_tile_info (GnomeRROutput *output,
GnomeRRTile *tile);
gboolean _gnome_rr_output_get_tiled_display_size (GnomeRROutput *output,
int *tile_w, int *tile_h,
int *width, int *height);
#endif
diff --git a/libgnome-desktop/gnome-rr.c b/libgnome-desktop/gnome-rr.c
index dca50694..bfbd785d 100644
--- a/libgnome-desktop/gnome-rr.c
+++ b/libgnome-desktop/gnome-rr.c
@@ -37,60 +37,61 @@
#include "gnome-rr-private.h"
/* From xf86drmMode.h: it's ABI so it won't change */
#define DRM_MODE_FLAG_INTERLACE (1<<4)
enum {
SCREEN_PROP_0,
SCREEN_PROP_GDK_SCREEN,
SCREEN_PROP_DPMS_MODE,
SCREEN_PROP_LAST,
};
enum {
SCREEN_CHANGED,
SCREEN_OUTPUT_CONNECTED,
SCREEN_OUTPUT_DISCONNECTED,
SCREEN_SIGNAL_LAST,
};
gint screen_signals[SCREEN_SIGNAL_LAST];
struct GnomeRROutput
{
ScreenInfo * info;
guint id;
glong winsys_id;
char * name;
char * display_name;
+ char * connector_type;
GnomeRRCrtc * current_crtc;
GnomeRRCrtc ** possible_crtcs;
GnomeRROutput ** clones;
GnomeRRMode ** modes;
char * vendor;
char * product;
char * serial;
int width_mm;
int height_mm;
GBytes * edid;
char * edid_file;
int backlight;
int min_backlight_step;
gboolean is_primary;
gboolean is_presentation;
gboolean is_underscanning;
gboolean supports_underscanning;
GnomeRRTile tile_info;
};
struct GnomeRRCrtc
{
ScreenInfo * info;
guint id;
glong winsys_id;
@@ -1375,153 +1376,156 @@ output_initialize (GnomeRROutput *output, GVariant *info)
while (g_variant_iter_loop (clones, "u", &id))
{
GnomeRROutput *gnome_rr_output = gnome_rr_output_by_id (output->info, id);
if (gnome_rr_output)
g_ptr_array_add (a, gnome_rr_output);
}
g_ptr_array_add (a, NULL);
output->clones = (GnomeRROutput **)g_ptr_array_free (a, FALSE);
g_variant_iter_free (clones);
/* Modes */
a = g_ptr_array_new ();
while (g_variant_iter_loop (modes, "u", &id))
{
GnomeRRMode *mode = mode_by_id (output->info, id);
if (mode)
g_ptr_array_add (a, mode);
}
g_ptr_array_add (a, NULL);
output->modes = (GnomeRRMode **)g_ptr_array_free (a, FALSE);
g_variant_iter_free (modes);
g_variant_lookup (properties, "vendor", "s", &output->vendor);
g_variant_lookup (properties, "product", "s", &output->product);
g_variant_lookup (properties, "serial", "s", &output->serial);
g_variant_lookup (properties, "width-mm", "i", &output->width_mm);
g_variant_lookup (properties, "height-mm", "i", &output->height_mm);
g_variant_lookup (properties, "display-name", "s", &output->display_name);
+ g_variant_lookup (properties, "connector-type", "s", &output->connector_type);
g_variant_lookup (properties, "backlight", "i", &output->backlight);
g_variant_lookup (properties, "min-backlight-step", "i", &output->min_backlight_step);
g_variant_lookup (properties, "primary", "b", &output->is_primary);
g_variant_lookup (properties, "presentation", "b", &output->is_presentation);
g_variant_lookup (properties, "underscanning", "b", &output->is_underscanning);
g_variant_lookup (properties, "supports-underscanning", "b", &output->supports_underscanning);
if ((edid = g_variant_lookup_value (properties, "edid", G_VARIANT_TYPE ("ay"))))
{
output->edid = g_variant_get_data_as_bytes (edid);
g_variant_unref (edid);
}
else
g_variant_lookup (properties, "edid-file", "s", &output->edid_file);
if ((tile = g_variant_lookup_value (properties, "tile", G_VARIANT_TYPE ("(uuuuuuuu)"))))
{
g_variant_get (tile, "(uuuuuuuu)",
&output->tile_info.group_id, &output->tile_info.flags,
&output->tile_info.max_horiz_tiles, &output->tile_info.max_vert_tiles,
&output->tile_info.loc_horiz, &output->tile_info.loc_vert,
&output->tile_info.width, &output->tile_info.height);
g_variant_unref (tile);
}
else
memset(&output->tile_info, 0, sizeof(output->tile_info));
if (output->is_primary)
output->info->primary = output;
g_variant_unref (properties);
}
static GnomeRROutput*
output_copy (const GnomeRROutput *from)
{
GPtrArray *array;
GnomeRRCrtc **p_crtc;
GnomeRROutput **p_output;
GnomeRRMode **p_mode;
GnomeRROutput *output = g_slice_new0 (GnomeRROutput);
output->id = from->id;
output->info = from->info;
output->name = g_strdup (from->name);
output->display_name = g_strdup (from->display_name);
+ output->connector_type = g_strdup (from->connector_type);
output->vendor = g_strdup (from->vendor);
output->product = g_strdup (from->product);
output->serial = g_strdup (from->serial);
output->current_crtc = from->current_crtc;
output->backlight = from->backlight;
if (from->edid)
output->edid = g_bytes_ref (from->edid);
output->edid_file = g_strdup (from->edid_file);
output->is_primary = from->is_primary;
output->is_presentation = from->is_presentation;
array = g_ptr_array_new ();
for (p_crtc = from->possible_crtcs; *p_crtc != NULL; p_crtc++)
{
g_ptr_array_add (array, *p_crtc);
}
output->possible_crtcs = (GnomeRRCrtc**) g_ptr_array_free (array, FALSE);
array = g_ptr_array_new ();
for (p_output = from->clones; *p_output != NULL; p_output++)
{
g_ptr_array_add (array, *p_output);
}
output->clones = (GnomeRROutput**) g_ptr_array_free (array, FALSE);
array = g_ptr_array_new ();
for (p_mode = from->modes; *p_mode != NULL; p_mode++)
{
g_ptr_array_add (array, *p_mode);
}
output->modes = (GnomeRRMode**) g_ptr_array_free (array, FALSE);
return output;
}
static void
output_free (GnomeRROutput *output)
{
g_free (output->clones);
g_free (output->modes);
g_free (output->possible_crtcs);
g_free (output->name);
g_free (output->vendor);
g_free (output->product);
g_free (output->serial);
g_free (output->display_name);
+ g_free (output->connector_type);
g_free (output->edid_file);
if (output->edid)
g_bytes_unref (output->edid);
g_slice_free (GnomeRROutput, output);
}
guint32
gnome_rr_output_get_id (GnomeRROutput *output)
{
g_assert(output != NULL);
return output->id;
}
const guint8 *
gnome_rr_output_get_edid_data (GnomeRROutput *output,
gsize *size)
{
if (output->edid)
return g_bytes_get_data (output->edid, size);
if (output->edid_file)
{
GMappedFile *mmap;
mmap = g_mapped_file_new (output->edid_file, FALSE, NULL);
if (mmap)
{
output->edid = g_mapped_file_get_bytes (mmap);
@@ -1667,66 +1671,80 @@ gnome_rr_output_get_crtc (GnomeRROutput *output)
/**
* gnome_rr_output_get_possible_crtcs:
* @output: a #GnomeRROutput
* Returns: (array zero-terminated=1) (transfer none):
*/
GnomeRRCrtc **
gnome_rr_output_get_possible_crtcs (GnomeRROutput *output)
{
g_return_val_if_fail (output != NULL, NULL);
return output->possible_crtcs;
}
gboolean
_gnome_rr_output_name_is_builtin_display (const char *name)
{
if (!name)
return FALSE;
if (strstr (name, "lvds") || /* Most drivers use an "LVDS" prefix... */
strstr (name, "LVDS") ||
strstr (name, "Lvds") ||
strstr (name, "LCD") || /* ... but fglrx uses "LCD" in some versions. Shoot me now, kthxbye. */
strstr (name, "eDP") || /* eDP is for internal built-in panel connections */
strstr (name, "DSI"))
return TRUE;
return FALSE;
}
+gboolean
+_gnome_rr_output_connector_type_is_builtin_display (const char *connector_type)
+{
+ if (!connector_type)
+ return FALSE;
+
+ if (strcmp (connector_type, "LVDS") == 0 ||
+ strcmp (connector_type, "eDP") == 0 ||
+ strcmp (connector_type, "DSI") == 0)
+ return TRUE;
+
+ return FALSE;
+}
+
gboolean
gnome_rr_output_is_builtin_display (GnomeRROutput *output)
{
g_return_val_if_fail (output != NULL, FALSE);
- return _gnome_rr_output_name_is_builtin_display (output->name);
+ return _gnome_rr_output_connector_type_is_builtin_display (output->connector_type);
}
/**
* gnome_rr_output_get_current_mode:
* @output: a #GnomeRROutput
* Returns: (transfer none): the current mode of this output
*/
GnomeRRMode *
gnome_rr_output_get_current_mode (GnomeRROutput *output)
{
GnomeRRCrtc *crtc;
GnomeRRMode *mode;
g_return_val_if_fail (output != NULL, NULL);
if ((crtc = gnome_rr_output_get_crtc (output)))
{
int total_w, total_h, tile_w, tile_h;
mode = gnome_rr_crtc_get_current_mode (crtc);
if (_gnome_rr_output_get_tiled_display_size (output, &tile_w, &tile_h, &total_w, &total_h))
{
if (mode->width == tile_w &&
mode->height == tile_h) {
if (output->modes[0]->tiled)
return output->modes[0];
}
}
return gnome_rr_crtc_get_current_mode (crtc);
}
return NULL;
@@ -2217,60 +2235,68 @@ gnome_rr_crtc_get_gamma (GnomeRRCrtc *crtc,
if (red)
*red = g_bytes_unref_to_data (red_bytes, &dummy);
else
g_bytes_unref (red_bytes);
if (green)
*green = g_bytes_unref_to_data (green_bytes, &dummy);
else
g_bytes_unref (green_bytes);
if (blue)
*blue = g_bytes_unref_to_data (blue_bytes, &dummy);
else
g_bytes_unref (blue_bytes);
return TRUE;
}
gboolean
gnome_rr_output_get_is_underscanning (GnomeRROutput *output)
{
g_assert(output != NULL);
return output->is_underscanning;
}
gboolean
gnome_rr_output_supports_underscanning (GnomeRROutput *output)
{
g_assert (output != NULL);
return output->supports_underscanning;
}
+const char *
+_gnome_rr_output_get_connector_type (GnomeRROutput *output)
+{
+ g_return_val_if_fail (output != NULL, NULL);
+
+ return output->connector_type;
+}
+
gboolean
_gnome_rr_output_get_tile_info (GnomeRROutput *output,
GnomeRRTile *tile)
{
if (output->tile_info.group_id == UNDEFINED_GROUP_ID)
return FALSE;
if (!tile)
return FALSE;
*tile = output->tile_info;
return TRUE;
}
GType
gnome_rr_dpms_mode_get_type (void)
{
static GType etype = 0;
if (etype == 0) {
static const GEnumValue values[] = {
{ GNOME_RR_DPMS_ON, "GNOME_RR_DPMS_ON", "on" },
{ GNOME_RR_DPMS_STANDBY, "GNOME_RR_DPMS_STANDBY", "standby" },
{ GNOME_RR_DPMS_SUSPEND, "GNOME_RR_DPMS_SUSPEND", "suspend" },
{ GNOME_RR_DPMS_OFF, "GNOME_RR_DPMS_OFF", "off" },
{ GNOME_RR_DPMS_UNKNOWN, "GNOME_RR_DPMS_UNKNOWN", "unknown" },
{ 0, NULL, NULL }
};
etype = g_enum_register_static ("GnomeRRDpmsModeType", values);
}
return etype;
--
2.39.2

23
eog-defaults.list Normal file
View File

@ -0,0 +1,23 @@
image/bmp=org.gnome.eog.desktop;
image/gif=org.gnome.eog.desktop;
image/jpeg=org.gnome.eog.desktop;
image/jpg=org.gnome.eog.desktop;
image/pjpeg=org.gnome.eog.desktop;
image/png=org.gnome.eog.desktop;
image/tiff=org.gnome.eog.desktop;
image/x-bmp=org.gnome.eog.desktop;
image/x-gray=org.gnome.eog.desktop;
image/x-icb=org.gnome.eog.desktop;
image/x-ico=org.gnome.eog.desktop;
image/x-png=org.gnome.eog.desktop;
image/x-portable-anymap=org.gnome.eog.desktop;
image/x-portable-bitmap=org.gnome.eog.desktop;
image/x-portable-graymap=org.gnome.eog.desktop;
image/x-portable-pixmap=org.gnome.eog.desktop;
image/x-xbitmap=org.gnome.eog.desktop;
image/x-xpixmap=org.gnome.eog.desktop;
image/x-pcx=org.gnome.eog.desktop;
image/svg+xml=org.gnome.eog.desktop;
image/svg+xml-compressed=org.gnome.eog.desktop;
image/vnd.wap.wbmp=org.gnome.eog.desktop;
image/x-icns=org.gnome.eog.desktop;

34
evince-defaults.list Normal file
View File

@ -0,0 +1,34 @@
application/pdf=org.gnome.Evince.desktop;
application/x-bzpdf=org.gnome.Evince.desktop;
application/x-gzpdf=org.gnome.Evince.desktop;
application/x-xzpdf=org.gnome.Evince.desktop;
application/x-ext-pdf=org.gnome.Evince.desktop;
application/postscript=org.gnome.Evince.desktop;
application/x-bzpostscript=org.gnome.Evince.desktop;
application/x-gzpostscript=org.gnome.Evince.desktop;
image/x-eps=org.gnome.Evince.desktop;
image/x-bzeps=org.gnome.Evince.desktop;
image/x-gzeps=org.gnome.Evince.desktop;
application/x-ext-ps=org.gnome.Evince.desktop;
application/x-ext-eps=org.gnome.Evince.desktop;
application/illustrator=org.gnome.Evince.desktop;
application/x-dvi=org.gnome.Evince.desktop;
application/x-bzdvi=org.gnome.Evince.desktop;
application/x-gzdvi=org.gnome.Evince.desktop;
application/x-ext-dvi=org.gnome.Evince.desktop;
image/vnd.djvu+multipage=org.gnome.Evince.desktop;
application/x-ext-djv=org.gnome.Evince.desktop;
application/x-ext-djvu=org.gnome.Evince.desktop;
image/tiff=org.gnome.Evince.desktop;
application/x-cbr=org.gnome.Evince.desktop;
application/x-cbz=org.gnome.Evince.desktop;
application/x-cb7=org.gnome.Evince.desktop;
application/x-cbt=org.gnome.Evince.desktop;
application/x-ext-cbr=org.gnome.Evince.desktop;
application/x-ext-cbz=org.gnome.Evince.desktop;
application/x-ext-cb7=org.gnome.Evince.desktop;
application/x-ext-cbt=org.gnome.Evince.desktop;
application/vnd.comicbook+zip=org.gnome.Evince.desktop;
application/vnd.comicbook-rar=org.gnome.Evince.desktop;
application/oxps=org.gnome.Evince.desktop;
application/vnd.ms-xpsdocument=org.gnome.Evince.desktop;

58
file-roller-defaults.list Normal file
View File

@ -0,0 +1,58 @@
application/bzip2=org.gnome.Nautilus.desktop;org.gnome.FileRoller.desktop;
application/gzip=org.gnome.Nautilus.desktop;org.gnome.FileRoller.desktop;
application/vnd.android.package-archive=org.gnome.FileRoller.desktop;
application/vnd.ms-cab-compressed=org.gnome.FileRoller.desktop;
application/vnd.debian.binary-package=org.gnome.FileRoller.desktop;
application/x-7z-compressed=org.gnome.Nautilus.desktop;org.gnome.FileRoller.desktop;
application/x-7z-compressed-tar=org.gnome.Nautilus.desktop;org.gnome.FileRoller.desktop;
application/x-ace=org.gnome.FileRoller.desktop;
application/x-alz=org.gnome.FileRoller.desktop;
application/x-ar=org.gnome.FileRoller.desktop;
application/x-archive=org.gnome.FileRoller.desktop;
application/x-arj=org.gnome.FileRoller.desktop;
application/x-brotli=org.gnome.FileRoller.desktop;
application/x-bzip-brotli-tar=org.gnome.FileRoller.desktop;
application/x-bzip=org.gnome.Nautilus.desktop;org.gnome.FileRoller.desktop;
application/x-bzip-compressed-tar=org.gnome.Nautilus.desktop;org.gnome.FileRoller.desktop;
application/x-bzip1=org.gnome.FileRoller.desktop;
application/x-bzip1-compressed-tar=org.gnome.FileRoller.desktop;
application/x-cabinet=org.gnome.FileRoller.desktop;
application/x-compress=org.gnome.Nautilus.desktop;org.gnome.FileRoller.desktop;
application/x-compressed-tar=org.gnome.Nautilus.desktop;org.gnome.FileRoller.desktop;
application/x-cpio=org.gnome.Nautilus.desktop;org.gnome.FileRoller.desktop;
application/x-chrome-extension=org.gnome.FileRoller.desktop;
application/x-deb=org.gnome.FileRoller.desktop;
application/x-ear=org.gnome.FileRoller.desktop;
application/x-ms-dos-executable=org.gnome.FileRoller.desktop;
application/x-gtar=org.gnome.FileRoller.desktop;
application/x-gzip=org.gnome.Nautilus.desktop;org.gnome.FileRoller.desktop;
application/x-java-archive=org.gnome.FileRoller.desktop;
application/x-lha=org.gnome.Nautilus.desktop;org.gnome.FileRoller.desktop;
application/x-lhz=org.gnome.FileRoller.desktop;
application/x-lrzip=org.gnome.FileRoller.desktop;
application/x-lrzip-compressed-tar=org.gnome.FileRoller.desktop;
application/x-lz4=org.gnome.FileRoller.desktop;
application/x-lzip=org.gnome.Nautilus.desktop;org.gnome.FileRoller.desktop;
application/x-lzip-compressed-tar=org.gnome.Nautilus.desktop;org.gnome.FileRoller.desktop;
application/x-lzma=org.gnome.Nautilus.desktop;org.gnome.FileRoller.desktop;
application/x-lzma-compressed-tar=org.gnome.Nautilus.desktop;org.gnome.FileRoller.desktop;
application/x-lzop=org.gnome.FileRoller.desktop;
application/x-lz4-compressed-tar=org.gnome.FileRoller.desktop;
application/x-lzop-compressed-tar=org.gnome.FileRoller.desktop;
application/x-ms-wim=org.gnome.FileRoller.desktop;
application/x-rar=org.gnome.FileRoller.desktop;
application/x-rar-compressed=org.gnome.FileRoller.desktop;
application/x-source-rpm=org.gnome.FileRoller.desktop;
application/x-rzip=org.gnome.FileRoller.desktop;
application/x-rzip-compressed-tar=org.gnome.FileRoller.desktop;
application/x-tar=org.gnome.Nautilus.desktop;org.gnome.FileRoller.desktop;
application/x-tarz=org.gnome.Nautilus.desktop;org.gnome.FileRoller.desktop;
application/x-stuffit=org.gnome.FileRoller.desktop;
application/x-war=org.gnome.FileRoller.desktop;
application/x-xar=org.gnome.Nautilus.desktop;org.gnome.FileRoller.desktop;
application/x-xz=org.gnome.Nautilus.desktop;org.gnome.FileRoller.desktop;
application/x-xz-compressed-tar=org.gnome.Nautilus.desktop;org.gnome.FileRoller.desktop;
application/x-zip=org.gnome.FileRoller.desktop;
application/x-zip-compressed=org.gnome.FileRoller.desktop;
application/x-zoo=org.gnome.FileRoller.desktop;
application/zip=org.gnome.Nautilus.desktop;org.gnome.FileRoller.desktop;

6
gating.yaml Normal file
View File

@ -0,0 +1,6 @@
--- !Policy
product_versions:
- rhel-9
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}

View File

@ -1,21 +1,39 @@
%global gdk_pixbuf2_version 2.36.5
%global gtk3_version 3.3.6
%global glib2_version 2.53.0
%global gtk_doc_version 1.14
%global gsettings_desktop_schemas_version 3.27.0
%global po_package gnome-desktop-3.0
%global tarball_version %%(echo %{version} | tr '~' '.')
Name: gnome-desktop3
Version: 3.32.2
Release: 3%{?dist}
Summary: Shared code among gnome-panel, gnome-session, nautilus, etc
Version: 40.4
Release: 1%{?dist}
Summary: Library with common API for various GNOME modules
License: GPLv2+ and LGPLv2+
URL: http://www.gnome.org
Source0: http://download.gnome.org/sources/gnome-desktop/3.32/gnome-desktop-%{version}.tar.xz
Source0: http://download.gnome.org/sources/gnome-desktop/40/gnome-desktop-%{tarball_version}.tar.xz
Patch0: 0001-Use-connector_type-from-mutter-to-fix-detection-of-b.patch
Source1: gnome-mimeapps.list
# Generated with:
# for i in `cat /home/hadess/Projects/jhbuild/totem/data/mime-type-list.txt | grep -v audio/flac | grep -v ^#` ; do if grep MimeType /home/hadess/Projects/jhbuild/rhythmbox/data/rhythmbox.desktop.in.in | grep -q "$i;" ; then echo "$i=org.gnome.Rhythmbox3.desktop;rhythmbox.desktop;org.gnome.Totem.desktop;" >> totem-defaults.list ; else echo "$i=org.gnome.Totem.desktop;" >> totem-defaults.list ; fi ; done ; for i in `cat /home/hadess/Projects/jhbuild/totem/data/uri-schemes-list.txt | grep -v ^#` ; do echo "x-scheme-handler/$i=org.gnome.Totem.desktop;" >> totem-defaults.list ; done
Source2: totem-defaults.list
# Generated with:
# for i in `cat /home/hadess/Projects/jhbuild/file-roller/data/supported-mime-types | sed 's/;//g'` application/x-source-rpm ; do if grep MimeType /usr/share/applications/org.gnome.Nautilus.desktop | grep -q "$i;" ; then echo "$i=org.gnome.Nautilus.desktop;org.gnome.FileRoller.desktop;" >> file-roller-defaults.list ; elif ! `grep -q $i gnome-mimeapps.list` ; then echo $i=org.gnome.FileRoller.desktop\; >> file-roller-defaults.list ; fi ; done && for i in `grep MimeType= /usr/share/applications/org.gnome.Nautilus.desktop | sed 's/MimeType=//' | sed 's/;/ /g'` ; do if ! `grep -q $i file-roller-defaults.list || grep -q $i gnome-mimeapps.list` ; then echo "missing handler $i" ; fi ; done
Source3: file-roller-defaults.list
# Generated with:
# for i in `grep MimeType= /usr/share/applications/org.gnome.eog.desktop | sed 's/MimeType=//' | sed 's/;/ /g'` ; do echo $i=org.gnome.eog.desktop\; >> eog-defaults.list ; done
Source4: eog-defaults.list
# Generated with:
# for i in `grep MimeType= /usr/share/applications/org.gnome.Evince.desktop | sed 's/MimeType=//' | sed 's/;/ /g'` ; do echo $i=org.gnome.Evince.desktop\; >> evince-defaults.list ; done
Source5: evince-defaults.list
BuildRequires: gcc
BuildRequires: gettext
BuildRequires: gtk-doc
BuildRequires: itstool
BuildRequires: meson
BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= %{gdk_pixbuf2_version}
BuildRequires: pkgconfig(gio-2.0) >= %{glib2_version}
BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version}
@ -26,34 +44,30 @@ BuildRequires: pkgconfig(iso-codes)
BuildRequires: pkgconfig(libseccomp)
BuildRequires: pkgconfig(libudev)
BuildRequires: pkgconfig(xkeyboard-config)
BuildRequires: gcc
BuildRequires: gettext
BuildRequires: gtk-doc >= %{gtk_doc_version}
BuildRequires: itstool
BuildRequires: meson
Conflicts: shared-mime-info < 2.0-4
Requires: shared-mime-info
%if !0%{?flatpak}
Requires: bubblewrap
%endif
Requires: gdk-pixbuf2%{?_isa} >= %{gdk_pixbuf2_version}
Requires: glib2%{?_isa} >= %{glib2_version}
# Make sure that gnome-themes-standard gets pulled in for upgrades
Requires: gnome-themes-standard
# needed for GnomeWallClock
Requires: gsettings-desktop-schemas >= %{gsettings_desktop_schemas_version}
# GnomeIdleMonitor API change breaks older gnome-shell versions
Conflicts: gnome-shell < 3.7.90
%if 0%{?fedora}
# From rhughes-f20-gnome-3-12 copr
Obsoletes: compat-gnome-desktop310 < 3.12
%endif
# GnomeBGSlideShow API change breaks older gnome-shell versions
Conflicts: gnome-shell < 3.33.4
%description
gnome-desktop contains the libgnome-desktop library as well as a data
file that exports the "GNOME" version to the Settings Details panel.
The %{name} package contains an internal library
(libgnomedesktop) used to implement some portions of the GNOME
desktop, and also some data files and other shared components of the
GNOME user environment.
The libgnome-desktop library provides API shared by several applications
on the desktop, but that cannot live in the platform for various
reasons. There is no API or ABI guarantee, although we are doing our
best to provide stability. Documentation for the API is available with
gtk-doc.
%package devel
Summary: Libraries and headers for %{name}
@ -61,8 +75,8 @@ License: LGPLv2+
Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel
Libraries and header files for the GNOME-internal private library
libgnomedesktop.
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.
%package tests
Summary: Tests for the %{name} package
@ -73,7 +87,7 @@ The %{name}-tests package contains tests that can be used to verify
the functionality of the installed %{name} package.
%prep
%autosetup -p1 -n gnome-desktop-%{version}
%autosetup -p1 -n gnome-desktop-%{tarball_version}
%build
%meson -Dgtk_doc=true -Dinstalled_tests=true
@ -82,16 +96,24 @@ the functionality of the installed %{name} package.
%install
%meson_install
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
install -m 644 %SOURCE1 $RPM_BUILD_ROOT/%{_datadir}/applications/gnome-mimeapps.list
cat %SOURCE2 >> $RPM_BUILD_ROOT/%{_datadir}/applications/gnome-mimeapps.list
cat %SOURCE3 >> $RPM_BUILD_ROOT/%{_datadir}/applications/gnome-mimeapps.list
cat %SOURCE4 >> $RPM_BUILD_ROOT/%{_datadir}/applications/gnome-mimeapps.list
cat %SOURCE5 >> $RPM_BUILD_ROOT/%{_datadir}/applications/gnome-mimeapps.list
%find_lang %{po_package} --all-name --with-gnome
%files -f %{po_package}.lang
%doc AUTHORS NEWS README
%doc AUTHORS NEWS README.md
%license COPYING COPYING.LIB
%{_datadir}/gnome/gnome-version.xml
%{_libexecdir}/gnome-rr-debug
%{_datadir}/applications/gnome-mimeapps.list
# LGPL
%{_libdir}/libgnome-desktop-3.so.17{,.*}
%{_libdir}/libgnome-desktop-3.so.19{,.*}
%{_libdir}/girepository-1.0/GnomeDesktop-3.0.typelib
%{_libexecdir}/gnome-desktop-debug/
%files devel
%{_libdir}/lib*.so
@ -107,20 +129,195 @@ the functionality of the installed %{name} package.
%{_datadir}/installed-tests
%changelog
* Tue Apr 18 2023 Ray Strode <rstrode@redhat.com> - 3.32.2-3
- Add back dropped function from previous commit to maintain ABI
Related: #2076472
* Thu Aug 19 2021 Kalev Lember <klember@redhat.com> - 40.4-1
- Update to 40.4
* Thu Mar 16 2023 Jonas Ådahl <jadahl@redhat.com> - 3.32.2-2
- Backport GnomeRR fix for detecting built in panels
Resolves: #2076472
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 40.1-2
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Fri Jun 14 2019 Florian Müllner <fmuellner@redhat.com> - 3.32.2-1
- Rebase to 3.32.2
Resolves: #1719241
* Wed May 05 2021 Kalev Lember <klember@redhat.com> - 40.1-1
- Update to 40.1
* Wed Dec 12 2018 Ray Strode <rstrode@redhat.com> - 3.28.2-2
- rebuild
* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 40.0-3
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Thu Apr 01 2021 Bastien Nocera <bnocera@redhat.com> - 40.0-2
+ gnome-desktop3-40.0-2
- Re-add mistakenly removed debug utilities
* Mon Mar 22 2021 Kalev Lember <klember@redhat.com> - 40.0-1
- Update to 40.0
* Thu Mar 18 2021 Kalev Lember <klember@redhat.com> - 40~rc-1
- Update to 40.rc
* Sun Feb 21 2021 Kalev Lember <klember@redhat.com> - 40~beta-1
- Update to 40.beta
* Wed Feb 10 2021 Kalev Lember <klember@redhat.com> - 40~alpha.0-1
- Update to 40.alpha.0
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.38.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Sat Jan 16 2021 Kalev Lember <klember@redhat.com> - 3.38.3-1
- Update to 3.38.3
* Wed Nov 25 2020 Kalev Lember <klember@redhat.com> - 3.38.2-1
- Update to 3.38.2
* Mon Oct 5 2020 Kalev Lember <klember@redhat.com> - 3.38.1-1
- Update to 3.38.1
* Mon Sep 14 2020 Kalev Lember <klember@redhat.com> - 3.38.0-1
- Update to 3.38.0
* Mon Sep 07 2020 Kalev Lember <klember@redhat.com> - 3.37.92-1
- Update to 3.37.92
* Wed Aug 26 2020 Kalev Lember <klember@redhat.com> - 3.37.91-1
- Update to 3.37.91
* Tue Aug 25 2020 Bastien Nocera <bnocera@redhat.com> - 3.37.90.1-2
+ gnome-desktop3-3.37.90.1-2
- Add GNOME specific defaults apps list, moved from shared-mime-info
* Mon Aug 17 2020 Kalev Lember <klember@redhat.com> - 3.37.90.1-1
- Update to 3.37.90.1
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.37.3-3
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.37.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Mon Jul 20 2020 Kalev Lember <klember@redhat.com> - 3.37.3-1
- Update to 3.37.3
* Fri Jun 05 2020 Kalev Lember <klember@redhat.com> - 3.37.2-1
- Update to 3.37.2
* Thu Apr 30 2020 Kalev Lember <klember@redhat.com> - 3.37.1-1
- Update to 3.37.1
* Wed Apr 29 2020 Kalev Lember <klember@redhat.com> - 3.36.2-1
- Update to 3.36.2
* Tue Mar 31 2020 Kalev Lember <klember@redhat.com> - 3.36.1-1
- Update to 3.36.1
* Tue Mar 10 2020 Kalev Lember <klember@redhat.com> - 3.36.0-1
- Update to 3.36.0
* Mon Feb 17 2020 Kalev Lember <klember@redhat.com> - 3.35.91-1
- Update to 3.35.91
* Thu Feb 06 2020 Kalev Lember <klember@redhat.com> - 3.35.90-1
- Update to 3.35.90
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.35.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Thu Jan 16 2020 Kalev Lember <klember@redhat.com> - 3.35.4-1
- Update to 3.35.4
* Thu Dec 05 2019 Benjamin Berg <bberg@redhat.com> - 3.35.2-2
- Add upstream patch adding new API that is already in stable
https://gitlab.gnome.org/GNOME/gnome-desktop/merge_requests/58
* Mon Dec 02 2019 Kalev Lember <klember@redhat.com> - 3.35.2-1
- Update to 3.35.2
* Tue Oct 08 2019 Kalev Lember <klember@redhat.com> - 3.34.1-1
- Update to 3.34.1
* Tue Sep 10 2019 Kalev Lember <klember@redhat.com> - 3.34.0-1
- Update to 3.34.0
* Thu Sep 05 2019 Kalev Lember <klember@redhat.com> - 3.33.92.1-1
- Update to 3.33.92.1
* Wed Aug 21 2019 Kalev Lember <klember@redhat.com> - 3.33.91-1
- Update to 3.33.91
* Mon Aug 12 2019 Kalev Lember <klember@redhat.com> - 3.33.90-1
- Update to 3.33.90
* Fri Jul 26 2019 Michael Catanzaro <mcatanzaro@gnome.org> - 3.33.4-3
- Drop compat library, which might be causing problems
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.33.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Sat Jul 20 2019 Kalev Lember <klember@redhat.com> - 3.33.4-1
- Update to 3.33.4
* Tue Jun 18 2019 Kalev Lember <klember@redhat.com> - 3.33.3-1
- Update to 3.33.3
* Wed May 22 2019 Kalev Lember <klember@redhat.com> - 3.33.2-1
- Update to 3.33.2
* Thu May 09 2019 Kalev Lember <klember@redhat.com> - 3.33.1-1
- Update to 3.33.1
* Tue May 07 2019 Kalev Lember <klember@redhat.com> - 3.32.2-1
- Update to 3.32.2
* Tue Apr 16 2019 Adam Williamson <awilliam@redhat.com> - 3.32.1-2
- Rebuild with Meson fix for #1699099
* Wed Apr 10 2019 Kalev Lember <klember@redhat.com> - 3.32.1-1
- Update to 3.32.1
* Tue Mar 12 2019 Kalev Lember <klember@redhat.com> - 3.32.0-1
- Update to 3.32.0
* Fri Mar 08 2019 Kalev Lember <klember@redhat.com> - 3.31.92-1
- Update to 3.31.92
* Wed Feb 20 2019 Kalev Lember <klember@redhat.com> - 3.31.91-1
- Update to 3.31.91
* Tue Feb 19 2019 Kalev Lember <klember@redhat.com> - 3.31.90-3
- Rebuilt against fixed atk (#1626575)
* Tue Feb 19 2019 Pete Walter <pwalter@fedoraproject.org> - 3.31.90-2
- Drop gnome-themes-extra requires
* Tue Feb 05 2019 Kalev Lember <klember@redhat.com> - 3.31.90-1
- Update to 3.31.90
- Sync package description with upstream README
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.31.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Wed Jan 09 2019 Kalev Lember <klember@redhat.com> - 3.31.4-1
- Update to 3.31.4
- Switch to the meson build system
* Sat Oct 27 2018 Kalev Lember <klember@redhat.com> - 3.30.2-1
- Update to 3.30.2
* Fri Sep 28 2018 Owen Taylor <otaylor@redhat.com> - 3.30.1-2
- Disable bubblewrap Requires when building for inclusion in a Flatpak
* Wed Sep 26 2018 Kalev Lember <klember@redhat.com> - 3.30.1-1
- Update to 3.30.1
* Fri Sep 07 2018 Kalev Lember <klember@redhat.com> - 3.30.0-2
- Rebuilt against fixed atk (#1626575)
* Thu Sep 06 2018 Kalev Lember <klember@redhat.com> - 3.30.0-1
- Update to 3.30.0
* Sun Aug 12 2018 Kalev Lember <klember@redhat.com> - 3.29.90.1-1
- Update to 3.29.90.1
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.28.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Thu May 10 2018 Kalev Lember <klember@redhat.com> - 3.28.2-1
- Update to 3.28.2

77
gnome-mimeapps.list Normal file
View File

@ -0,0 +1,77 @@
[Default Applications]
application/x-dia-diagram=dia.desktop
text/x-vcard=evolution.desktop
text/directory=evolution.desktop
text/calendar=evolution.desktop
application/x-cd-image=gnome-disk-image-mounter.desktop
application/x-raw-disk-image=gnome-disk-image-writer.desktop
application/x-raw-disk-image-xz-compressed=gnome-disk-image-writer.desktop
image/x-compressed-xcf=gimp.desktop
image/x-xcf=gimp.desktop
image/x-psd=gimp.desktop
image/x-fits=gimp.desktop
application/vnd.ms-word=libreoffice-writer.desktop
application/vnd.wordperfect=libreoffice-writer.desktop
application/vnd.sun.xml.writer=libreoffice-writer.desktop
application/vnd.sun.xml.writer.global=libreoffice-writer.desktop
application/vnd.sun.xml.writer.template=libreoffice-writer.desktop
application/vnd.stardivision.writer=libreoffice-writer.desktop
application/vnd.oasis.opendocument.text=libreoffice-writer.desktop
application/vnd.oasis.opendocument.text-template=libreoffice-writer.desktop
application/vnd.oasis.opendocument.text-web=libreoffice-writer.desktop
application/vnd.oasis.opendocument.text-master=libreoffice-writer.desktop
application/vnd.openxmlformats-officedocument.wordprocessingml.document=libreoffice-writer.desktop
application/vnd.openxmlformats-officedocument.wordprocessingml.template=libreoffice-writer.desktop
application/vnd.ms-excel=libreoffice-calc.desktop
application/vnd.stardivision.calc=libreoffice-calc.desktop
application/vnd.sun.xml.calc=libreoffice-calc.desktop
application/vnd.sun.xml.calc.template=libreoffice-calc.desktop
application/vnd.openxmlformats-officedocument.spreadsheetml.sheet=libreoffice-calc.desktop
application/vnd.openxmlformats-officedocument.spreadsheetml.template=libreoffice-calc.desktop
application/vnd.oasis.opendocument.spreadsheet=libreoffice-calc.desktop
application/vnd.oasis.opendocument.spreadsheet-template=libreoffice-calc.desktop
application/vnd.ms-powerpoint=libreoffice-impress.desktop
application/vnd.stardivision.impress=libreoffice-impress.desktop
application/vnd.sun.xml.impress=libreoffice-impress.desktop
application/vnd.sun.xml.impress.template=libreoffice-impress.desktop
application/vnd.oasis.opendocument.presentation=libreoffice-impress.desktop
application/vnd.oasis.opendocument.presentation-template=libreoffice-impress.desktop
application/vnd.openxmlformats-officedocument.presentationml.presentation=libreoffice-impress.desktop
application/vnd.openxmlformats-officedocument.presentationml.template=libreoffice-impress.desktop
application/vnd.stardivision.draw=libreoffice-draw.desktop
application/vnd.sun.xml.draw=libreoffice-draw.desktop
application/vnd.sun.xml.draw.template=libreoffice-draw.desktop
application/vnd.oasis.opendocument.graphics=libreoffice-draw.desktop
application/vnd.oasis.opendocument.graphics-template=libreoffice-draw.desktop
application/vnd.oasis.opendocument.formula=libreoffice-math.desktop
application/vnd.sun.xml.math=libreoffice-math.desktop
application/vnd.stardivision.math=libreoffice-math.desktop
application/vnd.oasis.opendocument.database=libreoffice-base.desktop
application/vnd.sun.xml.base=libreoffice-base.desktop
application/x-qw=gnome-gnucash.desktop
application/x-gnucash=gnome-gnucash.desktop
application/vnd.lotus-1-2-3=gnumeric.desktop
application/x-oleo=gnumeric.desktop
application/x-gnumeric=gnumeric.desktop
application/x-xbase=gnumeric.desktop
application/x-abiword=abiword.desktop
application/x-catalog=gpk-install-catalog.desktop
application/x-rpm=gpk-install-local-file.desktop
text/csv=libreoffice-calc.desktop
text/plain=org.gnome.gedit.desktop
text/html=firefox.desktop
application/xhtml+xml=firefox.desktop
inode/directory=org.gnome.Nautilus.desktop
x-content/blank-cd=brasero-nautilus.desktop
x-content/blank-dvd=brasero-nautilus.desktop
x-content/blank-bd=brasero-nautilus.desktop
x-content/blank-hddvd=brasero-nautilus.desktop
x-content/audio-cdda=rhythmbox.desktop
x-content/audio-dvd=rhythmbox.desktop
x-content/audio-player=rhythmbox.desktop
x-content/image-dcf=shotwell.desktop
x-content/image-picturecd=shotwell.desktop
# URI scheme handlers
x-scheme-handler/mailto=evolution.desktop
x-scheme-handler/http=firefox.desktop
x-scheme-handler/https=firefox.desktop

1
sources Normal file
View File

@ -0,0 +1 @@
SHA512 (gnome-desktop-40.4.tar.xz) = 4e91438c17faa2d12e7d6a9914fe4308543bbd5f8821e94dee9052f087110e2a3776109c203de6ef7bf66ae1825fc5e890d969ce2ebab2654cc157e9629fe6fc

151
totem-defaults.list Normal file
View File

@ -0,0 +1,151 @@
application/mxf=org.gnome.Totem.desktop;
application/ogg=org.gnome.Rhythmbox3.desktop;rhythmbox.desktop;org.gnome.Totem.desktop;
application/ram=org.gnome.Totem.desktop;
application/sdp=org.gnome.Totem.desktop;
application/smil=org.gnome.Totem.desktop;
application/smil+xml=org.gnome.Totem.desktop;
application/vnd.apple.mpegurl=org.gnome.Totem.desktop;
application/vnd.ms-asf=org.gnome.Totem.desktop;
application/vnd.ms-wpl=org.gnome.Totem.desktop;
application/vnd.rn-realmedia=org.gnome.Totem.desktop;
application/vnd.rn-realmedia-vbr=org.gnome.Totem.desktop;
application/x-extension-m4a=org.gnome.Totem.desktop;
application/x-extension-mp4=org.gnome.Totem.desktop;
application/x-flac=org.gnome.Totem.desktop;
application/x-flash-video=org.gnome.Totem.desktop;
application/x-matroska=org.gnome.Totem.desktop;
application/x-netshow-channel=org.gnome.Totem.desktop;
application/x-ogg=org.gnome.Rhythmbox3.desktop;rhythmbox.desktop;org.gnome.Totem.desktop;
application/x-quicktime-media-link=org.gnome.Totem.desktop;
application/x-quicktimeplayer=org.gnome.Totem.desktop;
application/x-shorten=org.gnome.Totem.desktop;
application/x-smil=org.gnome.Totem.desktop;
application/xspf+xml=org.gnome.Totem.desktop;
audio/3gpp=org.gnome.Totem.desktop;
audio/3gpp2=org.gnome.Totem.desktop;
audio/aac=org.gnome.Totem.desktop;
audio/ac3=org.gnome.Totem.desktop;
audio/AMR=org.gnome.Totem.desktop;
audio/AMR-WB=org.gnome.Totem.desktop;
audio/basic=org.gnome.Totem.desktop;
audio/dv=org.gnome.Totem.desktop;
audio/eac3=org.gnome.Totem.desktop;
audio/m4a=org.gnome.Totem.desktop;
audio/midi=org.gnome.Totem.desktop;
audio/mp1=org.gnome.Totem.desktop;
audio/mp2=org.gnome.Totem.desktop;
audio/mp3=org.gnome.Totem.desktop;
audio/mp4=org.gnome.Rhythmbox3.desktop;rhythmbox.desktop;org.gnome.Totem.desktop;
audio/mpeg=org.gnome.Rhythmbox3.desktop;rhythmbox.desktop;org.gnome.Totem.desktop;
audio/mpegurl=org.gnome.Totem.desktop;
audio/mpg=org.gnome.Totem.desktop;
audio/ogg=org.gnome.Totem.desktop;
audio/opus=org.gnome.Totem.desktop;
audio/prs.sid=org.gnome.Totem.desktop;
audio/scpls=org.gnome.Totem.desktop;
audio/vnd.rn-realaudio=org.gnome.Totem.desktop;
audio/wav=org.gnome.Totem.desktop;
audio/webm=org.gnome.Totem.desktop;
audio/x-aac=org.gnome.Totem.desktop;
audio/x-aiff=org.gnome.Totem.desktop;
audio/x-ape=org.gnome.Totem.desktop;
audio/x-flac=org.gnome.Rhythmbox3.desktop;rhythmbox.desktop;org.gnome.Totem.desktop;
audio/x-gsm=org.gnome.Totem.desktop;
audio/x-it=org.gnome.Rhythmbox3.desktop;rhythmbox.desktop;org.gnome.Totem.desktop;
audio/x-m4a=org.gnome.Totem.desktop;
audio/x-m4b=org.gnome.Totem.desktop;
audio/x-matroska=org.gnome.Totem.desktop;
audio/x-mod=org.gnome.Rhythmbox3.desktop;rhythmbox.desktop;org.gnome.Totem.desktop;
audio/x-mp1=org.gnome.Totem.desktop;
audio/x-mp2=org.gnome.Totem.desktop;
audio/x-mp3=org.gnome.Rhythmbox3.desktop;rhythmbox.desktop;org.gnome.Totem.desktop;
audio/x-mpg=org.gnome.Totem.desktop;
audio/x-mpeg=org.gnome.Rhythmbox3.desktop;rhythmbox.desktop;org.gnome.Totem.desktop;
audio/x-mpegurl=org.gnome.Rhythmbox3.desktop;rhythmbox.desktop;org.gnome.Totem.desktop;
audio/x-ms-asf=org.gnome.Totem.desktop;
audio/x-ms-asx=org.gnome.Totem.desktop;
audio/x-ms-wax=org.gnome.Totem.desktop;
audio/x-ms-wma=org.gnome.Totem.desktop;
audio/x-musepack=org.gnome.Totem.desktop;
audio/x-opus+ogg=org.gnome.Totem.desktop;
audio/x-pn-aiff=org.gnome.Totem.desktop;
audio/x-pn-au=org.gnome.Totem.desktop;
audio/x-pn-realaudio=org.gnome.Totem.desktop;
audio/x-pn-realaudio-plugin=org.gnome.Totem.desktop;
audio/x-pn-wav=org.gnome.Totem.desktop;
audio/x-pn-windows-acm=org.gnome.Totem.desktop;
audio/x-realaudio=org.gnome.Totem.desktop;
audio/x-real-audio=org.gnome.Totem.desktop;
audio/x-s3m=org.gnome.Rhythmbox3.desktop;rhythmbox.desktop;org.gnome.Totem.desktop;
audio/x-sbc=org.gnome.Totem.desktop;
audio/x-scpls=org.gnome.Rhythmbox3.desktop;rhythmbox.desktop;org.gnome.Totem.desktop;
audio/x-shorten=org.gnome.Totem.desktop;
audio/x-speex=org.gnome.Totem.desktop;
audio/x-stm=org.gnome.Rhythmbox3.desktop;rhythmbox.desktop;org.gnome.Totem.desktop;
audio/x-tta=org.gnome.Totem.desktop;
audio/x-wav=org.gnome.Totem.desktop;
audio/x-wavpack=org.gnome.Totem.desktop;
audio/x-vorbis=org.gnome.Rhythmbox3.desktop;rhythmbox.desktop;org.gnome.Totem.desktop;
audio/x-vorbis+ogg=org.gnome.Rhythmbox3.desktop;rhythmbox.desktop;org.gnome.Totem.desktop;
audio/x-xm=org.gnome.Rhythmbox3.desktop;rhythmbox.desktop;org.gnome.Totem.desktop;
image/vnd.rn-realpix=org.gnome.Totem.desktop;
image/x-pict=org.gnome.Totem.desktop;
misc/ultravox=org.gnome.Totem.desktop;
text/google-video-pointer=org.gnome.Totem.desktop;
text/x-google-video-pointer=org.gnome.Totem.desktop;
video/3gp=org.gnome.Totem.desktop;
video/3gpp=org.gnome.Totem.desktop;
video/3gpp2=org.gnome.Totem.desktop;
video/dv=org.gnome.Totem.desktop;
video/divx=org.gnome.Totem.desktop;
video/fli=org.gnome.Totem.desktop;
video/flv=org.gnome.Totem.desktop;
video/mp2t=org.gnome.Totem.desktop;
video/mp4=org.gnome.Totem.desktop;
video/mp4v-es=org.gnome.Totem.desktop;
video/mpeg=org.gnome.Totem.desktop;
video/mpeg-system=org.gnome.Totem.desktop;
video/msvideo=org.gnome.Totem.desktop;
video/ogg=org.gnome.Totem.desktop;
video/quicktime=org.gnome.Totem.desktop;
video/vivo=org.gnome.Totem.desktop;
video/vnd.divx=org.gnome.Totem.desktop;
video/vnd.mpegurl=org.gnome.Totem.desktop;
video/vnd.rn-realvideo=org.gnome.Totem.desktop;
video/vnd.vivo=org.gnome.Totem.desktop;
video/webm=org.gnome.Totem.desktop;
video/x-anim=org.gnome.Totem.desktop;
video/x-avi=org.gnome.Totem.desktop;
video/x-flc=org.gnome.Totem.desktop;
video/x-fli=org.gnome.Totem.desktop;
video/x-flic=org.gnome.Totem.desktop;
video/x-flv=org.gnome.Totem.desktop;
video/x-m4v=org.gnome.Totem.desktop;
video/x-matroska=org.gnome.Totem.desktop;
video/x-mjpeg=org.gnome.Totem.desktop;
video/x-mpeg=org.gnome.Totem.desktop;
video/x-mpeg2=org.gnome.Totem.desktop;
video/x-ms-asf=org.gnome.Totem.desktop;
video/x-ms-asf-plugin=org.gnome.Totem.desktop;
video/x-ms-asx=org.gnome.Totem.desktop;
video/x-msvideo=org.gnome.Totem.desktop;
video/x-ms-wm=org.gnome.Totem.desktop;
video/x-ms-wmv=org.gnome.Totem.desktop;
video/x-ms-wmx=org.gnome.Totem.desktop;
video/x-ms-wvx=org.gnome.Totem.desktop;
video/x-nsv=org.gnome.Totem.desktop;
video/x-ogm+ogg=org.gnome.Totem.desktop;
video/x-theora=org.gnome.Totem.desktop;
video/x-theora+ogg=org.gnome.Totem.desktop;
video/x-totem-stream=org.gnome.Totem.desktop;
x-content/video-dvd=org.gnome.Totem.desktop;
x-scheme-handler/pnm=org.gnome.Totem.desktop;
x-scheme-handler/mms=org.gnome.Totem.desktop;
x-scheme-handler/net=org.gnome.Totem.desktop;
x-scheme-handler/rtp=org.gnome.Totem.desktop;
x-scheme-handler/rtmp=org.gnome.Totem.desktop;
x-scheme-handler/rtsp=org.gnome.Totem.desktop;
x-scheme-handler/mmsh=org.gnome.Totem.desktop;
x-scheme-handler/uvox=org.gnome.Totem.desktop;
x-scheme-handler/icy=org.gnome.Totem.desktop;
x-scheme-handler/icyx=org.gnome.Totem.desktop;