Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix building 1.24 branch #362

Merged
merged 2 commits into from
Mar 9, 2021
Merged

Fix building 1.24 branch #362

merged 2 commits into from
Mar 9, 2021

Conversation

raveit65
Copy link
Member

@raveit65 raveit65 commented Mar 9, 2021

Fix building 1.24 branch + update travic (CI) config.

@raveit65 raveit65 requested a review from a team March 9, 2021 12:30
@raveit65
Copy link
Member Author

raveit65 commented Mar 9, 2021

fixes

/usr/bin/ld: mate_power_preferences-gpm-prefs-core.o: in function `prefs_setup_battery':

gpm-prefs-core.c:(.text+0x16c5): undefined reference to `GET_WIDGET'

collect2: error: ld returned 1 exit status

make[3]: *** [Makefile:1194: mate-power-preferences] Error 1

https://travis-ci.org/github/mate-desktop/mate-power-manager/jobs/762016193#L1720

@rbuj
I hope my fix is OK?

@rbuj
Copy link
Contributor

rbuj commented Mar 9, 2021

It's because of cherry-picking the commit d879a18 to 1.24 brach.

There is no GET_WIDGET macro on 1.24 branch:

#define GET_WIDGET(x) (GTK_WIDGET (gtk_builder_get_object (prefs->priv->builder, (x))))

just add the macro as follows:

diff --git a/src/gpm-prefs-core.c b/src/gpm-prefs-core.c
index 018a75d..0a25db6 100644
--- a/src/gpm-prefs-core.c
+++ b/src/gpm-prefs-core.c
@@ -41,6 +41,8 @@
 #include "gpm-icon-names.h"
 #include "gpm-brightness.h"
 
+#define GET_WIDGET(x) (GTK_WIDGET (gtk_builder_get_object (prefs->priv->builder, (x))))
+
 static void gpm_prefs_finalize (GObject *object);
 
 struct GpmPrefsPrivate

@raveit65
Copy link
Member Author

raveit65 commented Mar 9, 2021

Yes, i saw the commit where you added
#define GET_WIDGET(x) (GTK_WIDGET (gtk_builder_get_object (prefs->priv->builder, (x))))

So i think my fix is OK?

Copy link
Contributor

@rbuj rbuj left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@rbuj rbuj merged commit 266912b into 1.24 Mar 9, 2021
@rbuj rbuj deleted the travis.1.24 branch March 9, 2021 13:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants